diff --git a/.config/i3/config b/.config/i3/config
index d6e2292..c93ae19 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -73,41 +73,53 @@ bindsym $mod+space focus mode_toggle
 # focus the parent container
 bindsym $mod+a focus parent
 
+# Set workspace names
+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 $ws10 "10"
+
 # switch to workspace
-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 10
+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 $ws10
 
 # move focused container to workspace
-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 10
+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 $ws10
 
 # move focused container and switch to workspace
-bindsym Mod1+Shift+1 move container to workspace 1; workspace 1
-bindsym Mod1+Shift+2 move container to workspace 2; workspace 2
-bindsym Mod1+Shift+3 move container to workspace 3; workspace 3
-bindsym Mod1+Shift+4 move container to workspace 4; workspace 4
-bindsym Mod1+Shift+5 move container to workspace 5; workspace 5
-bindsym Mod1+Shift+6 move container to workspace 6; workspace 6
-bindsym Mod1+Shift+7 move container to workspace 7; workspace 7
-bindsym Mod1+Shift+8 move container to workspace 8; workspace 8
-bindsym Mod1+Shift+9 move container to workspace 9; workspace 9
-bindsym Mod1+Shift+0 move container to workspace 10; workspace 10
+bindsym Mod1+Shift+1 move container to workspace $ws1; workspace $ws1
+bindsym Mod1+Shift+2 move container to workspace $ws2; workspace $ws2
+bindsym Mod1+Shift+3 move container to workspace $ws3; workspace $ws3
+bindsym Mod1+Shift+4 move container to workspace $ws4; workspace $ws4
+bindsym Mod1+Shift+5 move container to workspace $ws5; workspace $ws5
+bindsym Mod1+Shift+6 move container to workspace $ws6; workspace $ws6
+bindsym Mod1+Shift+7 move container to workspace $ws7; workspace $ws7
+bindsym Mod1+Shift+8 move container to workspace $ws8; workspace $ws8
+bindsym Mod1+Shift+9 move container to workspace $ws9; workspace $ws9
+bindsym Mod1+Shift+0 move container to workspace $ws10; workspace $ws10
 
 # reload the configuration file
 bindsym $mod+Shift+c reload