diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 16600303d3..a585e08de4 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,7 +1,6 @@
 ### Questions
-- [ ] Did you test your changes or double check that they work?
+- [ ] Did you test your changes or double-check that they work?
 - [ ] Did you read and follow the [Atlas Contribution Guidelines](https://docs.atlasos.net/contributions/)?
-- [ ] Did you commit to the [`dev`](https://github.com/Atlas-OS/Atlas/tree/dev) branch and not [`main`](https://github.com/Atlas-OS/Atlas)?
 
 ### Describe your pull request
 
diff --git a/.github/workflows/apbx.yaml b/.github/workflows/apbx.yaml
index 51fce75cdd..6bc74d0a71 100644
--- a/.github/workflows/apbx.yaml
+++ b/.github/workflows/apbx.yaml
@@ -117,7 +117,7 @@ jobs:
           echo "Making a renamed password protected (malte) ZIP of playbook files..."
           $pbName = "Atlas Playbook $($env:GITHUB_SHA.Substring(0,8))"
           & ..\local-build.ps1 -ReplaceOldPlaybook -AddLiveLog -Removals Verification, WinverRequirement -FileName $pbName
-          echo "Move the .abpx playbook into 'Release ZIP' to be released as an artifact with the additional files..."
+          echo "Move the .apbx playbook into 'Release ZIP' to be released as an artifact with the additional files..."
           Move-Item "$pbName.apbx" "../release-zip"
         working-directory: src\playbook
 
diff --git a/src/local-build.ps1 b/src/local-build.ps1
index 85bd4bbbd1..83c805711d 100644
--- a/src/local-build.ps1
+++ b/src/local-build.ps1
@@ -37,7 +37,7 @@ $apbxFileName = "$fileName.apbx"
 function GetNewName {
 	while (Test-Path -Path $apbxFileName) {
 		$num++
-		$script:apbxFileName = "$fileName ($num).abpx"
+		$script:apbxFileName = "$fileName ($num).apbx"
 	}
 }
 if ($replaceOldPlaybook -and (Test-Path -Path $apbxFileName)) {
diff --git a/src/playbook/Configuration/tweaks.yml b/src/playbook/Configuration/tweaks.yml
index 6ce651264b..d734eb8913 100644
--- a/src/playbook/Configuration/tweaks.yml
+++ b/src/playbook/Configuration/tweaks.yml
@@ -253,7 +253,6 @@ tasks:
   - tweaks\qol\shell\show-more-pins.yml
   - tweaks\qol\shell\no-recommendations-start-menu.yml
   - tweaks\qol\shell\disable-nearby-sharing.yml
-  - tweaks\qol\shell\disallow-edge-swipe.yml
 
   # -------------------------------------------------------------------------- #
   #  qol\startup-shutdown                                                      #
diff --git a/src/playbook/Configuration/tweaks/qol/ease-of-access/disable-annoying-features-shortcuts.yml b/src/playbook/Configuration/tweaks/qol/ease-of-access/disable-annoying-features-shortcuts.yml
index b3e9378ba2..ff8c593e4b 100644
--- a/src/playbook/Configuration/tweaks/qol/ease-of-access/disable-annoying-features-shortcuts.yml
+++ b/src/playbook/Configuration/tweaks/qol/ease-of-access/disable-annoying-features-shortcuts.yml
@@ -27,3 +27,22 @@ actions:
     value: 'Flags'
     data: '0'
     type: REG_DWORD
+
+    # Disable language bar shortcuts
+  - !registryKey:
+    path: 'HKCU\Control Panel\Input Method\Hot Keys\00000104'
+  - !registryValue:
+    path: 'HKCU\Keyboard Layout\Toggle'
+    value: 'Layout Hotkey'
+    data: '3'
+    type: REG_DWORD
+  - !registryValue:
+    path: 'HKCU\Keyboard Layout\Toggle'
+    value: 'Language Hotkey'
+    data: '3'
+    type: REG_DWORD
+  - !registryValue:
+    path: 'HKCU\Keyboard Layout\Toggle'
+    value: 'Hotkey'
+    data: '3'
+    type: REG_DWORD
diff --git a/src/playbook/Configuration/tweaks/qol/shell/disallow-edge-swipe.yml b/src/playbook/Configuration/tweaks/qol/shell/disallow-edge-swipe.yml
deleted file mode 100644
index 7f7c7d4070..0000000000
--- a/src/playbook/Configuration/tweaks/qol/shell/disallow-edge-swipe.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: Disallow Edge Swipe
-description: Disallows the ability to swipe from the edge of the screen, e.g., when in a fullscreen UWP app, the titlebar won't show when you put your mouse to the top of the screen. This can be useful for games.
-actions:
-  - !cmd:
-    command: 'reg import "AtlasDesktop\4. Interface Tweaks\Edge Swipe\Disallow Edge Swipe (default).reg"'
-    exeDir: true
-    wait: true
diff --git a/src/playbook/Executables/AtlasDesktop/4. Interface Tweaks/Edge Swipe/Allow Edge Swipe.reg b/src/playbook/Executables/AtlasDesktop/4. Interface Tweaks/Edge Swipe/Allow Edge Swipe (default).reg
similarity index 100%
rename from src/playbook/Executables/AtlasDesktop/4. Interface Tweaks/Edge Swipe/Allow Edge Swipe.reg
rename to src/playbook/Executables/AtlasDesktop/4. Interface Tweaks/Edge Swipe/Allow Edge Swipe (default).reg
diff --git a/src/playbook/Executables/AtlasDesktop/4. Interface Tweaks/Edge Swipe/Disallow Edge Swipe (default).reg b/src/playbook/Executables/AtlasDesktop/4. Interface Tweaks/Edge Swipe/Disallow Edge Swipe.reg
similarity index 100%
rename from src/playbook/Executables/AtlasDesktop/4. Interface Tweaks/Edge Swipe/Disallow Edge Swipe (default).reg
rename to src/playbook/Executables/AtlasDesktop/4. Interface Tweaks/Edge Swipe/Disallow Edge Swipe.reg