Merge pull request #944 from Atlas-OS/dev

Automatic PR: Merging dev into main (27fa5a4)

Author: he3als

src/playbook/Configuration/atlas/appx.yml

@@ -57,12 +57,16 @@ actions:
   # Paint 3D
   - !appx: {name: '*Microsoft.MSPaint*', type: family}
 
+  # Game Bar
+  # Support is disabled by default - there shouldn't be a popup about 'ms-gaming-overlay-link'
+  - !appx: {name: '*Microsoft.XboxGameOverlay*', type: family}
+  - !appx: {name: '*Microsoft.XboxGamingOverlay*', type: family}
+
   # Widgets
-  # Uninstallation seems to fail with AME Wizard sometimes
   - !taskKill: {name: '*widgets*', ignoreErrors: true}
   - !appx: {name: '*MicrosoftWindows.Client.WebExperience*', type: family}
   - !powerShell:
-    command: 'Get-AppxPackage *Client.WebExperience* -AllUsers | Remove-AppxPackage -AllUsers'
+    command: 'Get-AppxPackage ''MicrosoftWindows.Client.WebExperience'' | Remove-AppxPackage'
     runas: currentUserElevated
 
   # Get Started
@@ -77,15 +81,15 @@ actions:
   - !appx: {name: '*Global.BackupBanner*', type: app, unregister: true}
   - !appx: {name: '*Global.IrisService*', type: app, unregister: true}
   - !appx: {name: '*Global.ValueBanner*', type: app, unregister: true}
-  - !appx: {name: '*Global.DesktopSpotlight*', type: app, unregister: true}
-  
+
   - !run:
     exe: 'powershell.exe'
     args: '-NoP -File CLIENTCBS.ps1'
     exeDir: true
 
-  # Quick Assist
+  # Family App, Quick Assist
   - !appx: {name: '*MicrosoftCorporationII.QuickAssist*', type: family}
+  - !appx: {name: '*MicrosoftCorporationII.MicrosoftFamily*', type: family}
 
   - !appx: {name: '*Microsoft.Advertising.Xaml*', type: family}
   - !appx: {name: '*Microsoft.BingNews*', type: family}

src/playbook/Configuration/atlas/components.yml

@@ -37,11 +37,11 @@ actions:
   - !writeStatus: {status: 'Removing components'}
   - !run:
     exe: 'powershell'
-    args: '& """$env:windir\AtlasModules\PackagesEnvironment\winrePackages.ps1""" -PlaybookInstall'
+    args: '& """$env:windir\AtlasModules\PackagesEnvironment\centralScript.ps1""" -PlaybookInstall'
     option: 'defender-disable'
   - !run:
     exe: 'powershell'
-    args: '& """$env:windir\AtlasModules\PackagesEnvironment\winrePackages.ps1""" -PlaybookInstall -EverythingButDefender'
+    args: '& """$env:windir\AtlasModules\PackagesEnvironment\centralScript.ps1""" -PlaybookInstall -EverythingButDefender'
     option: 'defender-enable'
 
     # Update Health Tools

src/playbook/Configuration/atlas/services.yml

@@ -7,7 +7,7 @@ actions:
 
   # Backup default Windows serivces & drivers
   - !cmd:
-    command: 'powershell -NoP -EP Unrestricted -File "BACKUP.ps1" "%windir%\AtlasModules\Other\atlasServices.reg"'
+    command: 'powershell -NoP -EP Unrestricted -File "BACKUP.ps1" "%windir%\AtlasModules\Other\winServices.reg"'
     wait: true
     exeDir: true
 

src/playbook/Configuration/atlas/start.yml

@@ -4,7 +4,7 @@ description: Copies Atlas folders/files, installs dependencies and performs the
 privilege: TrustedInstaller
 actions:
     # AME Wizard Live Log for development playbooks
-    # Do not change the line position of this, otherwise things will break
+    # Do not change the line position of this, otherwise things will break when using local-build
   # - !run: {exe: 'cmd.exe', args: '/c start "AME Wizard Live Log" PowerShell -NoP -C "gc -Wait Logs\TIOutput.txt -EA SilentlyContinue | Write-Output; pause"', baseDir: true, wait: false}
 
     # Prevent annoying notifications during deployment
@@ -35,6 +35,15 @@ actions:
   # - !writeStatus: {status: 'Refreshing variables'}
   # - !run: {exeDir: true, exe: 'REFRESHENV.cmd'}
 
+  - !writeStatus: {status: 'Configuring Optional Features'}
+  - !run: {exe: 'DISM.exe', args: '/Online /Cleanup-Image /StartComponentCleanup', weight: 30}
+  - !run: {exe: 'DISM.exe', args: '/Online /Enable-Feature /FeatureName:"DirectPlay" /NoRestart /All', weight: 30}
+  - !run: {exe: 'DISM.exe', args: '/Online /Disable-Feature /FeatureName:"Internet-Explorer-Optional-amd64" /NoRestart', weight: 30, builds: [ '!>=22000' ]}
+  - !run: {exe: 'DISM.exe', args: '/Online /Disable-Feature /FeatureName:"Printing-Foundation-Features" /NoRestart', weight: 30}
+  - !run: {exe: 'DISM.exe', args: '/Online /Disable-Feature /FeatureName:"Printing-Foundation-InternetPrinting-Client" /NoRestart', weight: 30}
+  - !run: {exe: 'DISM.exe', args: '/Online /Disable-Feature /FeatureName:"Printing-XPSServices-Features" /NoRestart', weight: 30}
+  - !run: {exe: 'DISM.exe', args: '/Online /Disable-Feature /FeatureName:"Printing-PrintToPDFServices-Features" /NoRestart', weight: 30}
+
   ################ NO LOCAL BUILD ################
 
   - !writeStatus: {status: 'Installing software'}
@@ -43,27 +52,30 @@ actions:
     args: '-NoP -File "SOFTWARE.ps1"'
     exeDir: true
     weight: 150
+    runas: currentUserElevated
   - !writeStatus: {status: 'Installing Google Chrome', option: 'browser-chrome'}
   - !run:
     exe: 'powershell.exe'
     args: '-NoP -File "SOFTWARE.ps1" -Chrome'
     exeDir: true
     weight: 150
     option: 'browser-chrome'
+    runas: currentUserElevated
   - !writeStatus: {status: 'Installing Brave', option: 'browser-brave'}
   - !run:
     exe: 'powershell.exe'
     args: '-NoP -File "SOFTWARE.ps1" -Brave'
     exeDir: true
     weight: 150
     option: 'browser-brave'
-
+    runas: currentUserElevated
   - !writeStatus: {status: 'Installing Waterfox', option: 'browser-waterfox'}
   - !run:
     exe: 'powershell.exe'
     args: '-NoP -File "SOFTWARE.ps1" -Waterfox'
     exeDir: true
     weight: 150
     option: 'browser-waterfox'
+    runas: currentUserElevated
 
   ################ END NO LOCAL BUILD ################

src/playbook/Configuration/tweaks.yml

@@ -152,7 +152,6 @@ tasks:
   - tweaks\qol\show-all-tasks-control-panel.yml
   - tweaks\qol\visual-effects.yml
   - tweaks\qol\disable-tips.yml
-  - tweaks\qol\disable-system-restore.yml
   - tweaks\qol\set-hidden-settings-pages.yml
 
   # -------------------------------------------------------------------------- #

src/playbook/Configuration/tweaks/debloat/disable-scheduled-tasks.yml

@@ -32,7 +32,7 @@ actions:
 
   # Here are the scheduled tasks that are currently commented as they're under review.
   # This list should be somewhat minimal in the tasks it deletes, as a lot of the tasks below won't run by default ever anyways, unless needed.
-  # Telemetry, Windows Error Reporting and CEIP/SQM is stripped by default anyways, so don't worry about that.
+  # Telemetry and CEIP/SQM is stripped by default anyways, so don't worry about that.
 
   # - !scheduledTask:
   #   path: '\Microsoft\Windows\DeviceDirectoryClient'

src/playbook/Configuration/tweaks/misc/config-oem-information.yml

@@ -11,7 +11,7 @@ actions:
   - !registryValue:
     path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\OEMInformation'
     value: 'Model'
-    data: 'AtlasOS v0.3.0'
+    data: 'AtlasOS v0.3.1'
     type: REG_SZ
   - !registryValue:
     path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\OEMInformation'

src/playbook/Configuration/tweaks/misc/delete-version-specific-files.yml

@@ -10,6 +10,8 @@ actions:
   - !file: {path: '%windir%\AtlasDesktop\4. Optional Tweaks\File Explorer Customization\Gallery', builds: [ '!>=22000' ]}
   - !file: {path: '%windir%\AtlasDesktop\4. Optional Tweaks\Windows 11 Context Menu', builds: [ '!>=22000' ]}
   - !file: {path: '%windir%\AtlasModules\Tools\TimerResolution.exe', builds: [ '!>=22000' ]}
+  - !file: {path: '%windir%\AtlasDesktop\4. Optional Tweaks\File Explorer Customization\Folders in This PC\Win11', builds: [ '!>=22000' ]}
 
     # Delete Windows 10-only tweaks
   - !file: {path: '%windir%\AtlasDesktop\4. Optional Tweaks\Volume Flyout', builds: [ '>=22000' ], ignoreErrors: true}
+  - !file: {path: '%windir%\AtlasDesktop\4. Optional Tweaks\File Explorer Customization\Folders in This PC\Win10', builds: [ '>=22000' ]}

src/playbook/Configuration/tweaks/privacy/search-settings.yml

@@ -57,4 +57,3 @@ actions:
     value: 'SearchboxTaskbarMode'
     data: '1'
     type: REG_DWORD
-    scope: activeUsers

src/playbook/Configuration/tweaks/qol/appearance/atlas-theme.yml

@@ -12,7 +12,7 @@ actions:
     # Set lockscreen
   - !run:
     exe: 'powershell.exe'
-    args: '-NoP -EP Unrestricted & "LOCKSCREEN.ps1"'
+    args: '-NoP -EP Unrestricted -File "LOCKSCREEN.ps1"'
     exeDir: true
     runas: currentUserElevated
   - !taskKill: {name: 'SystemSettings', ignoreErrors: true}

src/playbook/Configuration/tweaks/qol/config-start-menu.yml

@@ -27,9 +27,9 @@ actions:
     data: '1'
     type: REG_DWORD
   - !registryValue:
-    path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Start'
-    value: 'ShowRecentList'
-    data: '0'
+    path: 'HKLM\SOFTWARE\Policies\Microsoft\Windows\Explorer'
+    value: 'ShowOrHideMostUsedApps'
+    data: '2'
     type: REG_DWORD
 
   - !run:

src/playbook/Configuration/tweaks/qol/disable-system-restore.yml

@@ -4,7 +4,7 @@ description: Removes '- Shortcut' text appended onto the end of shortcuts for Qo
 privilege: TrustedInstaller
 actions:
   - !registryValue:
-    path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer'
-    value: 'link'
-    data: '00000000'
-    type: REG_BINARY
+    path: 'HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\NamingTemplates'
+    value: 'ShortcutNameTemplate'
+    data: '"%s.lnk"'
+    type: REG_SZ

src/playbook/Configuration/tweaks/qol/explorer/remove-shortcut-text.yml

@@ -11,8 +11,18 @@ actions:
   - !registryKey: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Orchestrator\UScheduler\DevHomeUpdate'}
   - !registryKey: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Orchestrator\UScheduler\OutlookUpdate'}
 
-    # Prevent random apps from installing, including Widgets
+    # Prevent random apps from installing, including Widgets or advertisements
   - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Orchestrator\Settings', value: 'STOREBIZCRITICALAPPS', operation: delete}
+  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\InstallService\State\CategoryCache', value: '48caba8a-2e62-2097-dcd8-4255c637b32dUS', operation: delete}
+  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Shell\Update\Packages\Components', value: 'AccountsService', operation: delete}
+  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Shell\Update\Packages\Components', value: 'BackupBanner', operation: delete}
+  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Shell\Update\Packages\Components', value: 'DesktopSpotlight', operation: delete}
+  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Shell\Update\Packages\Components', value: 'IrisService', operation: delete}
+  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Shell\Update\Packages\Components', value: 'SystemSettingsExtensions', operation: delete}
+  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Shell\Update\Packages\Components', value: 'WebExperienceHost', operation: delete}
+  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Shell\Update\Packages\Components', value: 'WindowsBackup', operation: delete}
+  - !registryValue: {path: 'HKLM\SYSTEM\CurrentControlSet\Services\SharedAccess\Parameters\FirewallPolicy\RestrictedServices\AppIso\FirewallRules', value: '{5D2C72C6-969D-4C1E-8484-41ED53782351}', data: 'v2.32|Action=Block|Active=TRUE|Dir=Out|Profile=Domain|Profile=Private|Profile=Public|RA42=IntErnet|RA62=IntErnet|Name=Windows Web Experience Pack|Desc=Windows Web Experience Pack|LUAuth=O:LSD:(A;;CC;;;S-1-15-3-1)(A;;CC;;;WD)(A;;CC;;;AN)|LUOwn=S-1-5-21-1752034362-1788923297-4099944-1001|AppPkgId=S-1-15-2-1312876954-3728250218-3694470604-4188764552-3197360367-780678243-3229644300|EmbedCtxt=Windows Web Experience Pack|'}
+  - !registryValue: {path: 'HKLM\SYSTEM\CurrentControlSet\Services\SharedAccess\Parameters\FirewallPolicy\FirewallRules', value: '{26037439-AD8B-4A56-AF2E-F6CDDB59F6BE}', data: 'v2.32|Action=Block|Active=TRUE|Dir=Out|Profile=Domain|Profile=Private|Profile=Public|Name=Windows Web Experience Pack|Desc=Windows Web Experience Pack|LUOwn=S-1-5-21-1752034362-1788923297-4099944-1001|AppPkgId=S-1-15-2-1312876954-3728250218-3694470604-4188764552-3197360367-780678243-3229644300|EmbedCtxt=Windows Web Experience Pack|Platform=2:6:2|Platform2=GTEQ|'}
 
     # Prevent Microsoft Teams installation
   - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Communications', value: 'ConfigureChatAutoInstall', data: '0', type: REG_DWORD}

src/playbook/Configuration/tweaks/qol/windows-update/disable-auto-updates.yml

@@ -4,6 +4,6 @@ description: Backs up default Atlas services and drivers, after all the tweaks a
 privilege: TrustedInstaller
 actions:
   - !cmd:
-    command: 'powershell -NoP -EP Unrestricted -File "BACKUP.ps1" "%windir%\AtlasModules\Other\winServices.reg"'
+    command: 'powershell -NoP -EP Unrestricted -File "BACKUP.ps1" "%windir%\AtlasModules\Other\atlasServices.reg"'
     wait: true
     exeDir: true

src/playbook/Configuration/tweaks/scripts/script-backup2.yml

@@ -7,3 +7,4 @@ actions:
     exe: 'powershell.exe'
     args: '-NoP -File CLEANUP.ps1'
     exeDir: true
+    runas: currentUserElevated

src/playbook/Configuration/tweaks/scripts/script-cleanup.yml

@@ -193,7 +193,7 @@ function RemoveEdgeAppX {
 }
 
 function RemoveWebView {
-    $edges = @(); $bho = @(); $edgeupdates = @(); 'LocalApplicationData','ProgramFilesX86','ProgramFiles' | foreach {
+	$edges = @(); $bho = @(); $edgeupdates = @(); 'LocalApplicationData','ProgramFilesX86','ProgramFiles' | foreach {
     	$folder = [Environment]::GetFolderPath($_)
     	$edges += dir "$folder\Microsoft\Edge*\setup.exe" -rec -ea 0 | where {$_ -like '*EdgeWebView*'}
     }

src/playbook/Executables/AtlasDesktop/1. Software/Remove Edge.ps1

@@ -0,0 +1,5 @@
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,11
+[InternetShortcut]
+IDList=
+URL=https://docs.atlasos.net/faq-and-troubleshooting/common-questions/itunes-compatibility/

src/playbook/Executables/AtlasDesktop/2. Drivers/Apple devices.url

@@ -0,0 +1,5 @@
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,11
+[InternetShortcut]
+IDList=
+URL=https://docs.atlasos.net/faq-and-troubleshooting/common-questions/bluetooth-compatibility/

src/playbook/Executables/AtlasDesktop/2. Drivers/Bluetooth.url

@@ -0,0 +1,5 @@
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,0
+[InternetShortcut]
+IDList=
+URL=ms-windows-store://review/?ProductId=9NZKPSTSNW4P

src/playbook/Executables/AtlasDesktop/3. Configuration/Driver Updates/Disable Automatic Driver Update.reg renamed to src/playbook/Executables/AtlasDesktop/3. Configuration/Driver Updates/Disable Automatic Driver Updates.reg

@@ -15,6 +15,7 @@ call setSvc.cmd srv2 4
 
 DISM /Online /Disable-Feature /FeatureName:"SmbDirect" /NoRestart
 
+echo]
 echo Finished, please reboot your device for changes to apply.
 pause
 exit /b

src/playbook/Executables/AtlasDesktop/3. Configuration/Driver Updates/Enable Automatic Driver Installation.reg renamed to src/playbook/Executables/AtlasDesktop/3. Configuration/Driver Updates/Enable Automatic Driver Updates.reg

@@ -20,6 +20,7 @@ DISM /Online /Enable-Feature /FeatureName:"SmbDirect" /NoRestart
 
 if "%~1" == "/silent" exit /b
 
+echo]
 echo Finished, please reboot your device for changes to apply.
 pause
 exit /b

src/playbook/Executables/AtlasDesktop/3. Configuration/FSO and Game Bar/Disable FSO & Game Bar.reg renamed to src/playbook/Executables/AtlasDesktop/3. Configuration/FSO and XBOX/Disable FSO & Game Bar Support.reg

@@ -9,6 +9,7 @@ whoami /user | find /i "S-1-5-18" > nul 2>&1 || (
 
 :main
 call %windir%\AtlasModules\Scripts\setSvc.cmd WpnService 4
+sc stop WpnService > nul 2>&1
 reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\userNotificationListener" /v "Value" /t REG_SZ /d "Deny" /f > nul
 reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Notifications\Settings" /v "NOC_GLOBAL_SETTING_ALLOW_NOTIFICATION_SOUND" /t REG_DWORD /d "0" /f > nul
 reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\PushNotifications" /v "ToastEnabled" /t REG_DWORD /d "0" /f > nul

src/playbook/Executables/AtlasDesktop/3. Configuration/FSO and Game Bar/Enable FSO & Disable Game Bar (default).reg renamed to src/playbook/Executables/AtlasDesktop/3. Configuration/FSO and XBOX/Enable FSO & Disable Game Bar Support (default).reg

@@ -6,6 +6,7 @@ whoami /user | find /i "S-1-5-18" > nul 2>&1 || (
 )
 
 call setSvc.cmd WpnService 2
+sc start WpnService > nul 2>&1
 reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\userNotificationListener" /v "Value" /t REG_SZ /d "Allow" /f > nul
 reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Notifications\Settings" /v "NOC_GLOBAL_SETTING_ALLOW_NOTIFICATION_SOUND" /t REG_DWORD /d "1" /f > nul
 reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\PushNotifications" /v "ToastEnabled" /t REG_DWORD /d "1" /f > nul

src/playbook/Executables/AtlasDesktop/3. Configuration/FSO and Game Bar/Enable FSO & Game Bar.reg renamed to src/playbook/Executables/AtlasDesktop/3. Configuration/FSO and XBOX/Enable FSO & Game Bar Support.reg

@@ -5,7 +5,7 @@ whoami /user | find /i "S-1-5-18" > nul 2>&1 || (
 	exit /b
 )
 
-reg delete "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\kernel" /v "GlobalTimerResolutionRequests" /f > nul
+reg delete "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\kernel" /v "GlobalTimerResolutionRequests" /f > nul 2>&1
 taskkill /f /im SetTimerResolution.exe > nul 2>&1
 schtasks /delete /tn "Force Timer Resolution" /f > nul 2>&1
 

src/playbook/Executables/AtlasDesktop/3. Configuration/FSO and XBOX/Game Bar Download.url

@@ -14,6 +14,6 @@ reg add "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\kernel" /v "Globa
 schtasks /create /tn "Force Timer Resolution" /xml "%windir%\AtlasModules\Other\Force Timer Resolution.xml" /f > nul
 schtasks /run /tn "Force Timer Resolution" > nul
 
-echo Finished, changes have been applied.
+echo Finished, please reboot your device for changes to apply.
 pause
 exit /b

src/playbook/Executables/AtlasDesktop/3. Configuration/Lanman Workstation (SMB)/Disable Lanman Workstation.cmd

@@ -19,6 +19,19 @@ for %%a in (
 	call setSvc.cmd %%~a 4
 )
 
+:: Hide Settings page
+if not "%~1" == "/silent" (
+    set "pageKey=HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer"
+    reg query "!pageKey!" /v "SettingsPageVisibility" > nul 2>&1
+    if %ERRORLEVEL% == 0 (
+        for /f "usebackq tokens=3" %%a in (`reg query "!pageKey!" /v "SettingsPageVisibility"`) do (
+            reg add "!pageKey!" /v "SettingsPageVisibility" /t REG_SZ /d "%%a;network-vpn;" /f > nul
+        )
+    ) else (
+        reg add "!pageKey!" /v "SettingsPageVisibility" /t REG_SZ /d "hide:network-vpn;" /f > nul
+    )
+)
+
 echo Finished, please reboot your device for changes to apply.
 pause
 exit /b

src/playbook/Executables/AtlasDesktop/3. Configuration/Lanman Workstation (SMB)/Enable Lanman Workstation (default).cmd

@@ -16,6 +16,16 @@ call setSvc.cmd RasMan 2
 call setSvc.cmd SstpSvc 3
 call setSvc.cmd WinHttpAutoProxySvc 3
 
+:: Hide Settings pages
+set "pageKey=HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer"
+reg query "%pageKey%" /v "SettingsPageVisibility" > nul 2>&1
+if %ERRORLEVEL% == 0 call :enableSettingsPage
+
 echo Finished, please reboot your device for changes to apply.
 pause
+exit /b
+
+:enableSettingsPage
+for /f "usebackq tokens=3" %%a in (`reg query "%pageKey%" /v "SettingsPageVisibility"`) do (set "currentPages=%%a")
+reg add "%pageKey%" /v "SettingsPageVisibility" /t REG_SZ /d "%currentPages:network-vpn;=%" /f > nul
 exit /b

src/playbook/Executables/AtlasDesktop/3. Configuration/Notifications/Disable Notifications (default).cmd

@@ -1,10 +1,5 @@
 @echo off
 
-whoami /user | find /i "S-1-5-18" > nul 2>&1 || (
-	call RunAsTI.cmd "%~f0" %*
-	exit /b
-)
-
 for %%a in (
 	"bluetooth"
 	"zipfolder"

src/playbook/Executables/AtlasDesktop/3. Configuration/Notifications/Enable Notifications.cmd

@@ -1,4 +1,4 @@
 Windows Registry Editor Version 5.00
 
-[HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Icons]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Icons]
 "29"="C:\\Windows\\AtlasModules\\Other\\Classic.ico,0"

src/playbook/Executables/AtlasDesktop/3. Configuration/Power/Timer Resolution/Disable timer resolution (default).cmd

@@ -1,4 +1,4 @@
 Windows Registry Editor Version 5.00
 
-[HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Icons]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Icons]
 "29"=-

src/playbook/Executables/AtlasDesktop/3. Configuration/Power/Timer Resolution/Enable timer resolution.cmd

@@ -1,4 +1,4 @@
 Windows Registry Editor Version 5.00
 
-[HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Icons]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Icons]
 "29"="C:\\Windows\\AtlasModules\\Other\\Blank.ico,0"

src/playbook/Executables/AtlasDesktop/3. Configuration/System Restore/Disable System Restore (default).reg renamed to src/playbook/Executables/AtlasDesktop/3. Configuration/System Restore/Disable System Restore.reg

@@ -1,3 +1,3 @@
 Windows Registry Editor Version 5.00
 
-[-HKEY_CLASSES_ROOT\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}]
+[-HKEY_CURRENT_USER\Software\Classes\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}]

src/playbook/Executables/AtlasDesktop/3. Configuration/System Restore/Enable System Restore.reg renamed to src/playbook/Executables/AtlasDesktop/3. Configuration/System Restore/Enable System Restore (default).reg

@@ -1,4 +1,4 @@
 Windows Registry Editor Version 5.00
 
-[HKEY_CLASSES_ROOT\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\InprocServer32]
+[HKEY_CURRENT_USER\Software\Classes\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\InprocServer32]
 @=""