diff --git a/.config/sway/config b/.config/sway/config
index 35fb887..145ac91 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -111,22 +111,10 @@ bindsym $mod+a focus parent
 # focus the child container
 bindsym $mod+d focus child
 
-# Define names for default workspaces for which we configure key bindings later on.
-# We use variables to avoid repeating the names in multiple places.
-set $ws1 "1"
-set $ws2 "2"
-set $ws3 "3"
-set $ws4 "4"
-set $ws5 "5"
-set $ws6 "6"
-set $ws7 "7"
-set $ws8 "8"
-set $ws9 "9"
-set $wsD "D"
-set $wsT "T"
-set $wsH "H"
-
 # force display-specific workspaces to display
+# T = TV-specific workspace
+# H = HEADLESS-1 for VNC
+# D = Data console (hud, monitoring, etc)
 workspace 1 output HDMI-A-2
 workspace 2 output HDMI-A-2
 workspace 3 output HDMI-A-2
@@ -141,39 +129,40 @@ workspace T output HDMI-A-1
 workspace H output HEADLESS-1
 
 # switch to workspace
-bindsym $mod+1 workspace $ws1
-bindsym $mod+2 workspace $ws2
-bindsym $mod+3 workspace $ws3
-bindsym $mod+4 workspace $ws4
-bindsym $mod+5 workspace $ws5
-bindsym $mod+6 workspace $ws6
-bindsym $mod+7 workspace $ws7
-bindsym $mod+8 workspace $ws8
-bindsym $mod+9 workspace $ws9
-bindsym $mod+0 workspace $wsD
-bindsym $mod+T workspace $wsT
+bindsym $mod+1 workspace 1
+bindsym $mod+2 workspace 2
+bindsym $mod+3 workspace 3
+bindsym $mod+4 workspace 4
+bindsym $mod+5 workspace 5
+bindsym $mod+6 workspace 6
+bindsym $mod+7 workspace 7
+bindsym $mod+8 workspace 8
+bindsym $mod+9 workspace 9
+bindsym $mod+0 workspace D
+bindsym $mod+T workspace T
 
 # tilda replacement: workspace 10 is a full screen terminal
 # menu key (old tilda hotkey) just swaps to it
-bindsym Menu workspace $wsD
+bindsym Menu workspace D
 
 # move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace $ws1
-bindsym $mod+Shift+2 move container to workspace $ws2
-bindsym $mod+Shift+3 move container to workspace $ws3
-bindsym $mod+Shift+4 move container to workspace $ws4
-bindsym $mod+Shift+5 move container to workspace $ws5
-bindsym $mod+Shift+6 move container to workspace $ws6
-bindsym $mod+Shift+7 move container to workspace $ws7
-bindsym $mod+Shift+8 move container to workspace $ws8
-bindsym $mod+Shift+9 move container to workspace $ws9
-bindsym $mod+Shift+0 move container to workspace $wsD
-bindsym $mod+Shift+H move container to workspace $wsH
-bindsym $mod+Shift+T move container to workspace $wsT
+bindsym $mod+Shift+1 move container to workspace 1
+bindsym $mod+Shift+2 move container to workspace 2
+bindsym $mod+Shift+3 move container to workspace 3
+bindsym $mod+Shift+4 move container to workspace 4
+bindsym $mod+Shift+5 move container to workspace 5
+bindsym $mod+Shift+6 move container to workspace 6
+bindsym $mod+Shift+7 move container to workspace 7
+bindsym $mod+Shift+8 move container to workspace 8
+bindsym $mod+Shift+9 move container to workspace 9
+bindsym $mod+Shift+0 move container to workspace D
+bindsym $mod+Shift+H move container to workspace H
+bindsym $mod+Shift+T move container to workspace T
 
 # reload the configuration file
 bindsym $mod+Shift+c reload
-# exit sway (logs you out of your X session)
+
+# exit sway
 bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
 
 # Cycle windows in and out of scratchpad
@@ -184,10 +173,10 @@ bindsym $mod+minus scratchpad show
 mode "resize" {
 		# These bindings trigger as soon as you enter the resize mode
 
-		# Pressing left will shrink the window’s width.
-		# Pressing right will grow the window’s width.
-		# Pressing up will shrink the window’s height.
-		# Pressing down will grow the window’s height.
+		# Pressing left will shrink the window's width.
+		# Pressing right will grow the window's width.
+		# Pressing up will shrink the window's height.
+		# Pressing down will grow the window's height.
 		bindsym j resize shrink width 10 px or 10 ppt
 		bindsym k resize grow height 10 px or 10 ppt
 		bindsym l resize shrink height 10 px or 10 ppt