diff --git a/.github/workflows/update.yaml b/.github/workflows/update-submodule.nix
similarity index 58%
rename from .github/workflows/update.yaml
rename to .github/workflows/update-submodule.nix
index f939450..461126d 100644
--- a/.github/workflows/update.yaml
+++ b/.github/workflows/update-submodule.nix
@@ -13,7 +13,13 @@ jobs:
 
       - name: Update module
         run: |
-          git submodule update --init --recursive --checkout -f
+          pushd WinApps-Launcher
+            branch=$(git rev-parse --abbrev-ref origin/HEAD | sed "s|origin/||")
+            git config remote.origin.fetch "+refs/heads/$branch:refs/remotes/origin/$branch"
+            git fetch --depth=1 origin "refs/heads/$branch"
+          popd
+
+          git submodule update --init --remote WinApps-Launcher
 
       - name: Commit and push
         uses: EndBug/add-and-commit@v9
diff --git a/WinApps-Launcher b/WinApps-Launcher
index eaa660d..ae1a9e9 160000
--- a/WinApps-Launcher
+++ b/WinApps-Launcher
@@ -1 +1 @@
-Subproject commit eaa660d39bf3f49b136c98c87c35e3e12f118f8f
+Subproject commit ae1a9e9ea7c958255905cfd056196b3bdc4aad45
diff --git a/packages/winapps-launcher/WinAppsLauncher.patch b/packages/winapps-launcher/WinApps-Launcher.patch
similarity index 100%
rename from packages/winapps-launcher/WinAppsLauncher.patch
rename to packages/winapps-launcher/WinApps-Launcher.patch
diff --git a/packages/winapps-launcher/default.nix b/packages/winapps-launcher/default.nix
index b59efa4..316f0ad 100644
--- a/packages/winapps-launcher/default.nix
+++ b/packages/winapps-launcher/default.nix
@@ -29,10 +29,10 @@ stdenv.mkDerivation rec {
     (callPackage ../winapps { })
   ];
 
-  patches = [ ./WinAppsLauncher.patch ];
+  patches = [ ./WinApps-Launcher.patch ];
 
   postPatch = ''
-    substituteAllInPlace WinAppsLauncher.sh
+    substituteAllInPlace WinApps-Launcher.sh
   '';
 
   installPhase = ''
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out
     cp -r ./Icons $out/Icons
 
-    install -m755 -D WinAppsLauncher.sh $out/bin/winapps-launcher
+    install -m755 -D WinApps-Launcher.sh $out/bin/winapps-launcher
     install -Dm444 -T Icons/AppIcon.svg $out/share/pixmaps/winapps.svg
 
     wrapProgram $out/bin/winapps-launcher \
diff --git a/packages/winapps/setup.patch b/packages/winapps/setup.patch
index 0130828..4f2cd87 100644
--- a/packages/winapps/setup.patch
+++ b/packages/winapps/setup.patch
@@ -22,27 +22,6 @@ index b7d930d6..18000c65 100755
  
  # REMOTE DESKTOP CONFIGURATION
  readonly VM_NAME="RDPWindows"  # Name of the Windows VM (FOR 'libvirt' ONLY).
-@@ -130,13 +130,13 @@ function waTerminateScript() {
- # Role: Displays usage information for the script.
- function waUsage() {
-     echo -e "Usage:
--  ${COMMAND_TEXT}./setup.sh --user${CLEAR_TEXT}                                        # Install WinApps and selected applications in ${HOME}
--  ${COMMAND_TEXT}./setup.sh --system${CLEAR_TEXT}                                      # Install WinApps and selected applications in /usr
--  ${COMMAND_TEXT}./setup.sh --user --setupAllOfficiallySupportedApps${CLEAR_TEXT}      # Install WinApps and all officially supported applications in ${HOME}
--  ${COMMAND_TEXT}./setup.sh --system --setupAllOfficiallySupportedApps${CLEAR_TEXT}    # Install WinApps and all officially supported applications in /usr
--  ${COMMAND_TEXT}./setup.sh --user --uninstall${CLEAR_TEXT}                            # Uninstall everything in ${HOME}
--  ${COMMAND_TEXT}./setup.sh --system --uninstall${CLEAR_TEXT}                          # Uninstall everything in /usr
--  ${COMMAND_TEXT}./setup.sh --help${CLEAR_TEXT}                                        # Display this usage message."
-+  ${COMMAND_TEXT}winapps-setup --user${CLEAR_TEXT}                                        # Install WinApps and selected applications in ${HOME}
-+  ${COMMAND_TEXT}winapps-setup --system${CLEAR_TEXT}                                      # Install WinApps and selected applications in /usr
-+  ${COMMAND_TEXT}winapps-setup --user --setupAllOfficiallySupportedApps${CLEAR_TEXT}      # Install WinApps and all officially supported applications in ${HOME}
-+  ${COMMAND_TEXT}winapps-setup --system --setupAllOfficiallySupportedApps${CLEAR_TEXT}    # Install WinApps and all officially supported applications in /usr
-+  ${COMMAND_TEXT}winapps-setup --user --uninstall${CLEAR_TEXT}                            # Uninstall everything in ${HOME}
-+  ${COMMAND_TEXT}winapps-setup --system --uninstall${CLEAR_TEXT}                          # Uninstall everything in /usr
-+  ${COMMAND_TEXT}winapps-setup --help${CLEAR_TEXT}                                        # Display this usage message."
- }
- 
- # Name: 'waGetSourceCode'
 @@ -155,13 +155,6 @@ function waGetSourceCode() {
          echo -e "${WARNING_TEXT}[WARNING]${CLEAR_TEXT} You might want to remove your old installation on '${SCRIPT_DIR_PATH}'."
      fi
@@ -80,24 +59,6 @@ index b7d930d6..18000c65 100755
  }
  
  # Name: 'waCheckInput'
-@@ -390,7 +370,7 @@ function waCheckExistingInstall() {
- 
-         # Display the suggested action(s).
-         echo "--------------------------------------------------------------------------------"
--        echo -e "Please remove the existing WinApps installation using ${COMMAND_TEXT}./setup.sh --user --uninstall${CLEAR_TEXT}."
-+        echo -e "Please remove the existing WinApps installation using ${COMMAND_TEXT}winapps-setup --user --uninstall${CLEAR_TEXT}."
-         echo "--------------------------------------------------------------------------------"
- 
-         # Terminate the script.
-@@ -410,7 +390,7 @@ function waCheckExistingInstall() {
- 
-         # Display the suggested action(s).
-         echo "--------------------------------------------------------------------------------"
--        echo -e "Please remove the existing WinApps installation using ${COMMAND_TEXT}./setup.sh --system --uninstall${CLEAR_TEXT}."
-+        echo -e "Please remove the existing WinApps installation using ${COMMAND_TEXT}winapps-setup --system --uninstall${CLEAR_TEXT}."
-         echo "--------------------------------------------------------------------------------"
- 
-         # Terminate the script.
 @@ -805,7 +785,7 @@ function waCheckGroupMembership() {
      # Identify groups the current user belongs to.
      USER_GROUPS=$(groups "$(whoami)")