diff --git a/.config/sway/workspaces.json##hostname.normandy b/.config/sway/workspaces.json##hostname.normandy
index 1efd816..df9075e 100644
--- a/.config/sway/workspaces.json##hostname.normandy
+++ b/.config/sway/workspaces.json##hostname.normandy
@@ -4,32 +4,38 @@
       {
         "index": 10,
         "name": "config",
-        "exec": "pavucontrol"
+        "exec": "pavucontrol",
+        "program_name": "pavucontrol"
       },
       {
         "index": 9,
         "name": "email",
-        "exec": "alacritty"
+        "exec": "alacritty",
+        "program_name": "console"
       },
       {
         "index": 8,
         "name": "discord",
-        "exec": "discord"
+        "exec": "discord",
+        "program_name": "discord"
       },
       {
         "index": 7,
         "name": "music",
-        "exec": "feishin"
+        "exec": "feishin",
+        "program_name": "feishin"
       },
       {
         "index": 6,
         "name": "documents",
-        "exec": "alacritty"
+        "exec": "alacritty",
+        "program_name": "console"
       },
       {
         "index": 5,
         "name": "VM management",
-        "exec": "virt-manager"
+        "exec": "virt-manager",
+        "program_name": "virt-manager"
       },
       {
         "index": 4,
@@ -46,24 +52,28 @@
       {
         "index": 2,
         "name": "code",
-        "exec": "alacritty"
+        "exec": "alacritty",
+        "program_name": "console"
       },
       {
         "index": 1,
         "name": "terminal",
-        "exec": "alacritty"
+        "exec": "alacritty",
+        "program_name": "console"
       }
     ],
     "right": [
       {
         "index": 11,
         "name": "terminal",
-        "exec": "alacritty"
+        "exec": "alacritty",
+        "program_name": "console"
       },
       {
         "index": 12,
         "name": "code",
-        "exec": "alacritty"
+        "exec": "alacritty",
+        "program_name": "console"
       },
       {
         "index": 13,
@@ -74,37 +84,44 @@
       {
         "index": 14,
         "name": "steam",
-        "exec": "steam"
+        "exec": "steam",
+        "program_name": "steam"
       },
       {
         "index": 15,
         "name": "minecraft",
-        "exec": "prism-launcher"
+        "exec": "prism-launcher",
+        "program_name": "prism-launcher"
       },
       {
         "index": 16,
         "name": "images",
-        "exec": "gimp"
+        "exec": "gimp",
+        "program_name": "gimp"
       },
       {
         "index": 17,
         "name": "video",
-        "exec": "jellyfinmediaplayer"
+        "exec": "jellyfinmediaplayer",
+        "program_name": "jellyfinmediaplayer"
       },
       {
         "index": 18,
         "name": "slack",
-        "exec": "slack"
+        "exec": "slack",
+        "program_name": "slack"
       },
       {
         "index": 19,
         "name": "zoom",
-        "exec": "zoom"
+        "exec": "zoom",
+        "program_name": "zoom"
       },
       {
         "index": 20,
         "name": "config",
-        "exec": "pavucontrol"
+        "exec": "pavucontrol",
+        "program_name": "pavucontrol"
       }
     ]
   }
diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index e4cef09..5d05979 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -3,6 +3,7 @@
 cd $HOME
 # Initialize and update submodules
 yadm submodule update --init --recursive
+yadm submodule foreach git checkout master
 yadm submodule foreach git pull
 
 # Load OS information from /etc/os-release
@@ -20,7 +21,7 @@ if [[ ${OS_ID} == "arch" ]]; then
 		makepkg -si --noconfirm
 		cd $HOME
 	fi
-	read -q "REPLY?Would you like to update the system? [Y/n] " && ${aur_helper} -Syu --noconfirm
+	read -q "REPLY?Would you like to update the system? [Y/n] " && echo && ${aur_helper} -Syu --noconfirm
 	${aur_helper} -S --noconfirm --needed - <$HOME/.config/packages/arch.txt
 elif [[ ${OS_ID} == "ubuntu" ]]; then
 	sudo apt update