diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 9d50fdcb9c..e95bf3d98d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -57,8 +57,8 @@ body:
     label: Atlas Version
     description: 'If you''re on v0.4.0, see the workarounds page first: https://github.com/orgs/Atlas-OS/projects/7/views/5'
     options:
-    - Atlas v0.5.0 for Windows 10 22H2
     - Atlas v0.5.0 for Windows 11 24H2
+    - Atlas v0.5.0 for Windows 11 25H2
   validations:
     required: true
 
diff --git a/.github/labeler.yml b/.github/labeler.yml
index e2963814d5..d790e7f7c3 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -8,24 +8,20 @@ actions:
 # Playbook
 
 playbook:
-- src/**/*
+- src/playbook/**/*
 
 appx:
-- src/Configuration/atlas/appx.yml
+- src/playbook/Configuration/atlas/appx.yml
 
 components:
-- src/Configuration/atlas/components.yml
-- src/Configuration/atlas/packages.yml
-
-config:
-- src/Configuration/atlas/config.yml
+- src/playbook/Configuration/atlas/components.yml
 
 services:
-- src/Configuration/atlas/services.yml
+- src/playbook/Configuration/atlas/services.yml
 
 tweaks:
-- src/Configuration/tweaks.yml
-- src/Configuration/tweaks/**/*
+- src/playbook/Configuration/tweaks.yml
+- src/playbook/Configuration/tweaks/**/*
 
 desktop folder:
-- src/Executables/AtlasDesktop/**/*
+- src/playbook/Executables/AtlasDesktop/**/*
diff --git a/src/playbook/Executables/AtlasDesktop/6. Advanced Configuration/Services/Network Discovery/Disable Network Discovery Services.cmd b/src/playbook/Executables/AtlasDesktop/6. Advanced Configuration/Services/Network Discovery/Disable Network Discovery Services.cmd
index 60d6d24eae..a71edcf5dc 100644
--- a/src/playbook/Executables/AtlasDesktop/6. Advanced Configuration/Services/Network Discovery/Disable Network Discovery Services.cmd	
+++ b/src/playbook/Executables/AtlasDesktop/6. Advanced Configuration/Services/Network Discovery/Disable Network Discovery Services.cmd	
@@ -23,7 +23,7 @@ reg add "HKLM\SOFTWARE\AtlasOS\Services\%settingName%" /v path /t REG_SZ /d "%sc
 if not "%~1"=="/silent" call "%windir%\AtlasModules\Scripts\serviceWarning.cmd" %*
 
 :: Unpin 'Network' from Explorer sidebar
-reg import "%windir%\AtlasDesktop\3. General Configuration\File Sharing\Network Navigation Pane\Disable Network Navigation Pane (default).reg" > nul
+call "%windir%\AtlasDesktop\3. General Configuration\File Sharing\Network Navigation Pane\Disable Network Navigation Pane (default).cmd" > nul
 
 call setSvc.cmd fdPHost 4
 call setSvc.cmd FDResPub 4
@@ -33,4 +33,4 @@ if "%~1"=="/silent" exit /b
 
 echo Finished, please reboot your device for changes to apply.
 pause
-exit /b
\ No newline at end of file
+exit /b
diff --git a/src/playbook/Executables/AtlasModules/Scripts/Modules/Qol/Qol.psm1 b/src/playbook/Executables/AtlasModules/Scripts/Modules/Qol/Qol.psm1
index acb9808e8f..471255746b 100644
--- a/src/playbook/Executables/AtlasModules/Scripts/Modules/Qol/Qol.psm1
+++ b/src/playbook/Executables/AtlasModules/Scripts/Modules/Qol/Qol.psm1
@@ -38,16 +38,16 @@ function Disable-ReadAndScan {
 
 # Function to disable commonly annoying features and shortcuts
 function Disable-AnnoyingFeaturesAndShortcuts {
-    reg add "HKCU\Control Panel\Accessibility\HighContrast" /v "Flags" /t REG_DWORD /d 0 /f
-    reg add "HKCU\Control Panel\Accessibility\Keyboard Response" /v "Flags" /t REG_DWORD /d 0 /f
-    reg add "HKCU\Control Panel\Accessibility\MouseKeys" /v "Flags" /t REG_DWORD /d 0 /f
-    reg add "HKCU\Control Panel\Accessibility\StickyKeys" /v "Flags" /t REG_DWORD /d 0 /f
-    reg add "HKCU\Control Panel\Accessibility\ToggleKeys" /v "Flags" /t REG_DWORD /d 0 /f
+    reg add "HKCU\Control Panel\Accessibility\HighContrast" /v "Flags" /t REG_SZ /d "0" /f
+    reg add "HKCU\Control Panel\Accessibility\Keyboard Response" /v "Flags" /t REG_SZ /d "0" /f
+    reg add "HKCU\Control Panel\Accessibility\MouseKeys" /v "Flags" /t REG_SZ /d "0" /f
+    reg add "HKCU\Control Panel\Accessibility\StickyKeys" /v "Flags" /t REG_SZ /d "0" /f
+    reg add "HKCU\Control Panel\Accessibility\ToggleKeys" /v "Flags" /t REG_SZ /d "0" /f
 
     reg delete "HKCU\Control Panel\Input Method\Hot Keys\00000104" /f
-    reg add "HKCU\Keyboard Layout\Toggle" /v "Layout Hotkey" /t REG_DWORD /d 3 /f
-    reg add "HKCU\Keyboard Layout\Toggle" /v "Language Hotkey" /t REG_DWORD /d 3 /f
-    reg add "HKCU\Keyboard Layout\Toggle" /v "Hotkey" /t REG_DWORD /d 3 /f
+    reg add "HKCU\Keyboard Layout\Toggle" /v "Layout Hotkey" /t REG_SZ /d "3" /f
+    reg add "HKCU\Keyboard Layout\Toggle" /v "Language Hotkey" /t REG_SZ /d "3" /f
+    reg add "HKCU\Keyboard Layout\Toggle" /v "Hotkey" /t REG_SZ /d "3" /f
 
     reg add "HKCU\Software\Microsoft\Narrator\NoRoam" /v "WinEnterLaunchEnabled" /t REG_DWORD /d 0 /f
 }
diff --git a/src/playbook/Executables/DISABLEPNP.ps1 b/src/playbook/Executables/DISABLEPNP.ps1
index 7612b08db3..651c512970 100644
--- a/src/playbook/Executables/DISABLEPNP.ps1
+++ b/src/playbook/Executables/DISABLEPNP.ps1
@@ -4,7 +4,7 @@ $devices = @(
 	"AMD SMBus",
 	"Base System Device",
 	"Composite Bus Enumerator",
-	"Direct memory access controller"
+	"Direct memory access controller",
 	"High precision event timer",
 	"Intel Management Engine",
 	"Intel SMBus",