New folder structure

- Hide 'Chat' from Settings
- Disable opening GameBar when pressing XBOX button
- Sync time and set to more reliable time servers
- Add Widevine DRM to UGC

src/Configuration/custom.yml

@@ -3,12 +3,11 @@ title: Custom
 description: Custom AME configuration
 privilege: Admin
 actions: []
-features:
-- features\base\regedits.yml
-#- features\base\dotnet.yml
-- features\base\appx.yml
-- features\base\services.yml
-- features\base\components.yml
-- features\base\files.yml
-- features\base\config.yml
-- features\base\software.yml
+tasks:
+- tasks\base\regedits.yml
+- tasks\base\appx.yml
+- tasks\base\services.yml
+- tasks\base\components.yml
+- tasks\base\files.yml
+- tasks\base\config.yml
+- tasks\base\software.yml

src/Configuration/features/base/config.yml

@@ -1,34 +0,0 @@
-title: Configuration
-privilege: TrustedInstaller
-actions:
-  - !writeStatus: {status: 'Configuring permissions'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System', value: 'ConsentPromptBehaviorAdmin', type: REG_DWORD, data: '5'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System', value: 'ConsentPromptBehaviorUser', type: REG_DWORD, data: '3'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System', value: 'EnableInstallerDetection', type: REG_DWORD, data: '1'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System', value: 'EnableLUA', type: REG_DWORD, data: '1'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System', value: 'EnableVirtualization', type: REG_DWORD, data: '1'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System', value: 'PromptOnSecureDesktop', type: REG_DWORD, data: '1'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System', value: 'ValidateAdminCodeSignatures', type: REG_DWORD, data: '0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System', value: 'FilterAdministratorToken', type: REG_DWORD, data: '0'}
-
-  - !run:
-    exeDir: true
-    exe: "ADMIN.bat"
-    weight: 10
-
-  - !writeStatus: {status: 'Implementing SFC mitigation'}
-  - !run:
-    exeDir: true
-    exe: "SFCDEPLOY.bat"
-    weight: 5
-
-  - !writeStatus: {status: 'Configuring start menu'}
-  - !run:
-    exeDir: true
-    exe: "STARTMENU.bat"
-    weight: 15
-
-  - !writeStatus: {status: 'Modifying login screen'}
-  - !run:
-    exeDir: true
-    exe: "LOGIN.bat"

src/Configuration/features/base/software.yml

@@ -1,282 +0,0 @@
----
-title: Software
-description: Installs software
-privilege: TrustedInstaller
-actions:
-  - !writeStatus: {status: 'Installing Open-Shell'}
-  - !run:
-    exeDir: true
-    exe: "SLNT.bat"
-    weight: 50
-
-  - !writeStatus: {status: 'Configuring user interface'}
-  - !run:
-    exeDir: true
-    exe: "UI.bat"
-    weight: 40
-  - !run:
-    exeDir: true
-    exe: "ep_setup-22621.1413.54.5.exe"
-    weight: 70
-
-  - !writeStatus: {status: 'Installing Chocolatey'}
-    # Install Chocolatey
-  - !powerShell:
-    command: 'Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString(''https://community.chocolatey.org/install.ps1''))'
-    weight: 30
-
-  - !cmd:
-    command: 'reg query "HKLM\SOFTWARE\Clients\StartMenuInternet" /k /f "Firefox-" > "%TEMP%\Firefox-Reg-Output.txt"'
-
-  - !writeStatus: {status: 'Installing Firefox'}
-  - !run:
-    path: '%ProgramData%\chocolatey\bin'
-    exe: 'choco.exe'
-    args: 'install -y --allow-empty-checksums firefox'
-    weight: 150
-  - !run:
-    path: '%ProgramData%\chocolatey\bin'
-    exe: 'choco.exe'
-    args: 'upgrade -y --allow-empty-checksums firefox'
-    weight: 150
-
-  - !writeStatus: {status: 'Configuring Firefox'}
-  - !run:
-    exeDir: true
-    exe: "FIREFOXCONF.bat"
-    weight: 20
-
-  - !writeStatus: {status: 'Installing Thunderbird'}
-  - !run:
-    path: '%ProgramData%\chocolatey\bin'
-    exe: 'choco.exe'
-    args: 'install -y --allow-empty-checksums thunderbird'
-    weight: 100
-  - !run:
-    path: '%ProgramData%\chocolatey\bin'
-    exe: 'choco.exe'
-    args: 'upgrade -y --allow-empty-checksums thunderbird'
-    weight: 150
-
-  - !writeStatus: {status: 'Installing VLC'}
-  - !run:
-    path: '%ProgramData%\chocolatey\bin'
-    exe: 'choco.exe'
-    args: 'install -y --force --allow-empty-checksums vlc'
-    weight: 70
-  - !writeStatus: {status: 'Installing 7zip'}
-  - !run:
-    path: '%ProgramData%\chocolatey\bin'
-    exe: 'choco.exe'
-    args: 'install -y --force --allow-empty-checksums 7zip'
-    weight: 50
-  - !writeStatus: {status: 'Installing nomacs'}
-  - !run:
-    path: '%ProgramData%\chocolatey\bin'
-    exe: 'choco.exe'
-    args: 'install -y --force --allow-empty-checksums nomacs'
-    weight: 50
-
-  - !writeStatus: {status: 'Configuring nomacs'}
-
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.3fr.3', value: '', type: 'REG_SZ', data: 'Hasselblad Raw Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.3fr.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.3fr.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.arw.3', value: '', type: 'REG_SZ', data: 'Sony Raw Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.arw.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.arw.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.avif.3', value: '', type: 'REG_SZ', data: 'AV1 Image File Format Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.avif.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.avif.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.avifs.3', value: '', type: 'REG_SZ', data: 'AVIF image sequence Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.avifs.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.avifs.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.bmp.3', value: '', type: 'REG_SZ', data: 'Windows Bitmap Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.bmp.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,4'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.bmp.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.crw.3', value: '', type: 'REG_SZ', data: 'Canon Raw Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.crw.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.crw.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.cur.3', value: '', type: 'REG_SZ', data: 'Windows Cursor Files Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.cur.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.cur.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.dcx.3', value: '', type: 'REG_SZ', data: 'Image Format Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.dcx.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.dcx.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.dng.3', value: '', type: 'REG_SZ', data: 'Digital Negativ Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.dng.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.dng.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.drif.3', value: '', type: 'REG_SZ', data: 'Developers Raw Image Format Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.drif.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.drif.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.exif.3', value: '', type: 'REG_SZ', data: 'EXIF Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.exif.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.exif.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.gif.3', value: '', type: 'REG_SZ', data: 'Graphic Interchange Format Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.gif.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,2'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.gif.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.heic.3', value: '', type: 'REG_SZ', data: 'Image Format Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.heic.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.heic.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.heics.3', value: '', type: 'REG_SZ', data: 'Image Format Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.heics.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.heics.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.heif.3', value: '', type: 'REG_SZ', data: 'Image Format Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.heif.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.heif.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.heifs.3', value: '', type: 'REG_SZ', data: 'Image Format Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.heifs.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.heifs.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.icns.3', value: '', type: 'REG_SZ', data: 'Apple Icon Image Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.icns.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.icns.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.iiq.3', value: '', type: 'REG_SZ', data: 'Phase One Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.iiq.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.iiq.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.jp2.3', value: '', type: 'REG_SZ', data: 'JPEG 2000 Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.jp2.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.jp2.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.jpg.3', value: '', type: 'REG_SZ', data: 'JPEG Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.jpg.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,1'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.jpg.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.jps.3', value: '', type: 'REG_SZ', data: 'JPEG Stereo Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.jps.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.jps.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.mng.3', value: '', type: 'REG_SZ', data: 'Multi-Image Network Graphics Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.mng.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,2'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.mng.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.mos.3', value: '', type: 'REG_SZ', data: 'Leaf Raw Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.mos.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.mos.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.mpo.3', value: '', type: 'REG_SZ', data: 'Multi Picture Object Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.mpo.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.mpo.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.mrw.3', value: '', type: 'REG_SZ', data: 'Minolta Raw Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.mrw.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.mrw.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.nef.3', value: '', type: 'REG_SZ', data: 'Nikon Raw Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.nef.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.nef.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.orf.3', value: '', type: 'REG_SZ', data: 'Olympus Raw Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.orf.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.orf.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.pbm.3', value: '', type: 'REG_SZ', data: 'Portable Bitmap Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.pbm.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.pbm.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.pcx.3', value: '', type: 'REG_SZ', data: 'Image Format Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.pcx.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.pcx.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.pef.3', value: '', type: 'REG_SZ', data: 'Pentax Raw Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.pef.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.pef.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.pgm.3', value: '', type: 'REG_SZ', data: 'Portable Graymap Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.pgm.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,4'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.pgm.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.png.3', value: '', type: 'REG_SZ', data: 'PNG Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.png.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,3'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.png.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.pns.3', value: '', type: 'REG_SZ', data: 'PNG Stereo Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.pns.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.pns.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.ppm.3', value: '', type: 'REG_SZ', data: 'Portable Pixmap Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.ppm.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.ppm.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.psb.3', value: '', type: 'REG_SZ', data: 'Large Document Format Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.psb.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.psb.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.psd.3', value: '', type: 'REG_SZ', data: 'Adobe Photoshop Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.psd.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.psd.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.raf.3', value: '', type: 'REG_SZ', data: 'Fujifilm Raw Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.raf.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.raf.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.raw.3', value: '', type: 'REG_SZ', data: 'Panasonic Raw Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.raw.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.raw.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.roh.3', value: '', type: 'REG_SZ', data: 'Rohkost Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.roh.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.roh.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.srw.3', value: '', type: 'REG_SZ', data: 'Samsung Raw Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.srw.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.srw.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.svg.3', value: '', type: 'REG_SZ', data: 'Scalable Vector Graphics Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.svg.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.svg.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.tga.3', value: '', type: 'REG_SZ', data: 'Truvision Graphics Adapter Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.tga.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.tga.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.tif.3', value: '', type: 'REG_SZ', data: 'TIFF Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.tif.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,4'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.tif.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.vec.3', value: '', type: 'REG_SZ', data: 'OpenCV Haar Training Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.vec.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.vec.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.wbmp.3', value: '', type: 'REG_SZ', data: 'Wireless Bitmap Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.wbmp.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.wbmp.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.webp.3', value: '', type: 'REG_SZ', data: 'WebP Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.webp.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,4'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.webp.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.x3f.3', value: '', type: 'REG_SZ', data: 'Sigma Raw Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.x3f.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.x3f.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.xbm.3', value: '', type: 'REG_SZ', data: 'X11 Bitmap Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.xbm.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.xbm.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.xpm.3', value: '', type: 'REG_SZ', data: 'X11 Pixmap Image'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.xpm.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
-  - !registryValue: {path: 'HKLM\SOFTWARE\classes\nomacs.xpm.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
-  - !run:
-    exeDir: true
-    exe: "NOMACSCONF.bat"
-    weight: 20
-    
-  - !writeStatus: {status: 'Installing vcredist'}
-  - !run:
-    path: '%ProgramData%\chocolatey\bin'
-    exe: 'choco.exe'
-    args: 'install -y --force --allow-empty-checksums vcredist-all'
-    weight: 200
-
-  - !writeStatus: {status: 'Installing DirectX 9'}
-  - !run:
-    path: '%ProgramData%\chocolatey\bin'
-    exe: 'choco.exe'
-    args: 'install -y --allow-empty-checksums directx'
-    weight: 150
-  - !writeStatus: {status: 'Installing OnlyOffice'}
-  - !run:
-    path: '%ProgramData%\chocolatey\bin'
-    exe: 'choco.exe'
-    args: 'install -y --force --allow-empty-checksums onlyoffice'
-    weight: 150
-  - !writeStatus: {status: 'Installing Cascadia Mono font'}
-  - !run:
-    path: '%ProgramData%\chocolatey\bin'
-    exe: 'choco.exe'
-    args: 'install -y --allow-empty-checksums cascadiamono'
-    weight: 30
-
-  - !run:
-    exeDir: true
-    exe: "SHRT.bat"
-    weight: 70
-
-  - !writeStatus: {status: 'Setting file associations'}
-  - !run:
-    exeDir: true
-    exe: "FILEASSOC.bat"
-    weight: 50
-
-  - !writeStatus: {status: 'Installing Scoop apps'}
-  - !run:
-    exeDir: true
-    exe: "PowerShell"
-    args: '-NoP -ExecutionPolicy Bypass -File scoop.ps1'
-    weight: 120
-
-  - !writeStatus: {status: 'Setting wallpapers'}
-  - !run:
-    exeDir: true
-    exe: "WALLPAPER.bat"
-    weight: 20

src/Configuration/features/languages/lang.yml

@@ -1,97 +0,0 @@
-!UTask
-title: Language installation
-description: Installs the files for the languages selected in the GUI
-minVersion: 
-maxVersion: 
-status: ToDo
-actions:
-- !cmd
-  command: Dism /online /Add-Package /PackagePath:%temp%/AME/Languages/basic_de-de.cab
-  standardError: 
-  standardOutput: 
-- !cmd
-  command: Dism /online /Add-Package /PackagePath:%temp%/AME/Languages/speech_de-de.cab
-  standardError: 
-  standardOutput: 
-- !cmd
-  command: Dism /online /Add-Package /PackagePath:%temp%/AME/Languages/tts_de-de.cab
-  standardError: 
-  standardOutput: 
-- !cmd
-  command: Dism /online /Add-Package /PackagePath:%temp%/AME/Languages/ocr_de-de.cab
-  standardError: 
-  standardOutput: 
-- !cmd
-  command: Dism /online /Add-Package /PackagePath:%temp%/AME/Languages/hw_de-de.cab
-  standardError: 
-  standardOutput: 
-- !powershell
-  command: $OldList = Get-WinUserLanguageList; $OldList.Add(de-DE); Set-WinUserLanguageList -LanguageList $OldList -Force
-- !cmd
-  command: Dism /online /Add-Package /PackagePath:%temp%/AME/Languages/basic_en-us.cab
-  standardError: 
-  standardOutput: 
-- !cmd
-  command: Dism /online /Add-Package /PackagePath:%temp%/AME/Languages/speech_en-us.cab
-  standardError: 
-  standardOutput: 
-- !cmd
-  command: Dism /online /Add-Package /PackagePath:%temp%/AME/Languages/tts_en-us.cab
-  standardError: 
-  standardOutput: 
-- !cmd
-  command: Dism /online /Add-Package /PackagePath:%temp%/AME/Languages/ocr_en-us.cab
-  standardError: 
-  standardOutput: 
-- !cmd
-  command: Dism /online /Add-Package /PackagePath:%temp%/AME/Languages/hw_en-us.cab
-  standardError: 
-  standardOutput: 
-- !powershell
-  command: $OldList = Get-WinUserLanguageList; $OldList.Add(en-US); Set-WinUserLanguageList -LanguageList $OldList -Force
-- !cmd
-  command: Dism /online /Add-Package /PackagePath:%temp%/AME/Languages/basic_es-es.cab
-  standardError: 
-  standardOutput: 
-- !cmd
-  command: Dism /online /Add-Package /PackagePath:%temp%/AME/Languages/speech_es-es.cab
-  standardError: 
-  standardOutput: 
-- !cmd
-  command: Dism /online /Add-Package /PackagePath:%temp%/AME/Languages/tts_es-es.cab
-  standardError: 
-  standardOutput: 
-- !cmd
-  command: Dism /online /Add-Package /PackagePath:%temp%/AME/Languages/ocr_es-es.cab
-  standardError: 
-  standardOutput: 
-- !cmd
-  command: Dism /online /Add-Package /PackagePath:%temp%/AME/Languages/hw_es-es.cab
-  standardError: 
-  standardOutput: 
-- !powershell
-  command: $OldList = Get-WinUserLanguageList; $OldList.Add(es-ES); Set-WinUserLanguageList -LanguageList $OldList -Force
-- !cmd
-  command: Dism /online /Add-Package /PackagePath:%temp%/AME/Languages/basic_fi-fi.cab
-  standardError: 
-  standardOutput: 
-- !cmd
-  command: Dism /online /Add-Package /PackagePath:%temp%/AME/Languages/speech_fi-fi.cab
-  standardError: 
-  standardOutput: 
-- !cmd
-  command: Dism /online /Add-Package /PackagePath:%temp%/AME/Languages/tts_fi-fi.cab
-  standardError: 
-  standardOutput: 
-- !cmd
-  command: Dism /online /Add-Package /PackagePath:%temp%/AME/Languages/ocr_fi-fi.cab
-  standardError: 
-  standardOutput: 
-- !cmd
-  command: Dism /online /Add-Package /PackagePath:%temp%/AME/Languages/hw_fi-fi.cab
-  standardError: 
-  standardOutput: 
-- !powershell
-  command: $OldList = Get-WinUserLanguageList; $OldList.Add(fi-FI); Set-WinUserLanguageList -LanguageList $OldList -Force
-priority: 1
-features: []

src/Configuration/langs.txt

@@ -1,4 +0,0 @@
-de-DE
-en-US
-es-ES
-fi-FI

src/Configuration/features/base/appx.yml → src/Configuration/tasks/appx.yml

@@ -4,89 +4,82 @@ description: Removal of APPX packages
 privilege: TrustedInstaller
 actions:
   - !writeStatus: {status: 'Removing APPX packages'}
-  - !appx: {name: '*Microsoft.549981C3F5F10*', type: family}
   - !appx: {name: '*3DViewer*', type: family}
+  - !appx: {name: '*Apprep.Chx*', type: family}
   - !appx: {name: '*AssignedAccessLockApp*', type: family}
-  - !appx: {name: '*PinningConfirmationDialog*', type: family}
-  - !appx: {name: '*SecureAssessmentBrowser*', type: family}
+  - !appx: {name: '*Bing*', type: family}
+  - !appx: {name: '*CamoStudio*', type: family}
+  - !appx: {name: '*Client.WebExperience*', type: family}
+  - !appx: {name: '*Clipchamp*', type: family}
+  - !appx: {name: '*CloudExperienceHost*', type: family}
+  - !appx: {name: '*CommsPhone*', type: family}
+  - !appx: {name: '*ConnectivityStore*', type: family}
+  - !appx: {name: '*ContentDeliveryManager*', type: family}
+  - !appx: {name: '*Disney*', type: family}
   - !appx: {name: '*FeedbackHub*', type: family}
-  - !appx: {name: '*MixedReality*', type: family}
+  - !appx: {name: '*GamingApp*', type: family}
+  - !appx: {name: '*Getstarted*', type: family}
+  - !appx: {name: '*Microsoft.549981C3F5F10*', type: family}
   - !appx: {name: '*Microsoft.Calculator*', type: family}
-  - !appx: {name: '*Microsoft.WindowsAlarms*', type: family}
   - !appx: {name: '*Microsoft.GetHelp*', type: family}
-  - !appx: {name: '*Getstarted*', type: family}
-  - !appx: {name: '*disney*', type: family}
+  - !appx: {name: '*Microsoft.Messaging*', type: family}
   - !appx: {name: '*Microsoft.OneConnect*', type: family}
-  - !appx: {name: '*WindowsCamera*', type: family}
-  - !appx: {name: '*bing*', type: family}
-  - !appx: {name: '*Sticky*', type: family}
+  - !appx: {name: '*Microsoft.People*', type: family}
+  - !appx: {name: '*Microsoft.Todos*', type: family}
+  - !appx: {name: '*Microsoft.WindowsAlarms*', type: family}
   - !appx: {name: '*Microsoft.WindowsStore*', type: family}
-
-  - !appx: {name: '*StorePurchaseApp*', type: family}
-
+  - !appx: {name: '*MicrosoftEdge*', type: family}
   - !appx: {name: '*MicrosoftOfficeHub*', type: family}
-#  - !appx: {name: '*Paint*', type: family}
-  - !appx: {name: '*wallet*', type: family}
+  - !appx: {name: '*MicrosoftTeams*', type: family}
+  - !appx: {name: '*MixedReality*', type: family}
+  - !appx: {name: '*OneDrive*', type: family}
   - !appx: {name: '*OneNote*', type: family}
-  - !appx: {name: '*Microsoft.People*', type: family}
-  - !appx: {name: '*WindowsPhone*', type: family}
-  - !appx: {name: '*YourPhone*', type: family}
-  - !appx: {name: '*photos*', type: family}
+  - !appx: {name: '*OOBENetwork*', type: family}
+  - !appx: {name: '*OutlookForWindows*', type: family}
+  - !appx: {name: '*Parental*', type: family}
+  - !appx: {name: '*PeopleExperienceHost*', type: family}
+  - !appx: {name: '*Photos*', type: family}
+  - !appx: {name: '*PinningConfirmationDialog*', type: family}
+  - !appx: {name: '*PowerAutomate*', type: family}
+  - !appx: {name: '*QuickAssist*', type: family}
+  - !appx: {name: '*SecHealthUI*', type: family}
+  - !appx: {name: '*SecureAssessmentBrowser*', type: family}
   - !appx: {name: '*SkypeApp*', type: family}
-  - !appx: {name: '*solit*', type: family}
-  - !appx: {name: '*spotify*', type: family}
-  - !appx: {name: '*WindowsSoundRecorder*', type: family}
-  - !appx: {name: '*windowscommunicationsapps*', type: family}
-  - !appx: {name: '*zune*', type: family}
-#  - !appx: {name: '*WindowsCalculator*', type: family}
-  - !appx: {name: '*WindowsMaps*', type: family}
+  - !appx: {name: '*Solit*', type: family}
+  - !appx: {name: '*Spotify*', type: family}
+  - !appx: {name: '*Sticky*', type: family}
+  - !appx: {name: '*StorePurchaseApp*', type: family}
   - !appx: {name: '*Sway*', type: family}
-  - !appx: {name: '*CommsPhone*', type: family}
-  - !appx: {name: '*ConnectivityStore*', type: family}
-  - !appx: {name: '*Microsoft.Messaging*', type: family}
-  - !appx: {name: '*Microsoft.WindowsStore*', type: family}
-  - !appx: {name: '*XboxApp*', type: family}
-
-  - !appx: {name: '*GamingApp*', type: family}
-
-  - !appx: {name: '*XboxSpeechToTextOverlay*', type: family}
-  - !appx: {name: '*XboxGamingOverlay*', type: family}
-
+  - !appx: {name: '*Wallet*', type: family}
   - !appx: {name: '*WebExperienceHost*', type: app}
-
-  - !appx: {name: '*XboxGameOverlay*', type: family}
-
+  - !appx: {name: '*Windows.DevHome*', type: family}
+  - !appx: {name: '*WindowsCamera*', type: family}
+  - !appx: {name: '*windowscommunicationsapps*', type: family}
+  - !appx: {name: '*WindowsMaps*', type: family}
+  - !appx: {name: '*WindowsPhone*', type: family}
+  - !appx: {name: '*WindowsSoundRecorder*', type: family}
   - !appx: {name: '*Xbox.TCUI*', type: family}
+  - !appx: {name: '*XboxApp*', type: family}
   - !appx: {name: '*XboxGameCallableUI*', type: family}
+  - !appx: {name: '*XboxGameOverlay*', type: family}
+  - !appx: {name: '*XboxGamingOverlay*', type: family}
   - !appx: {name: '*XboxIdenitity*', type: family}
-
-  - !appx: {name: '*SecHealthUI*', type: family}
-
-  - !appx: {name: '*Microsoft.Todos*', type: family}
-  - !appx: {name: '*PowerAutomate*', type: family}
-  - !appx: {name: '*MicrosoftEdge*', type: family}
-
-  - !appx: {name: '*OneDrive*', type: family}
-#  - !appx: {name: '*DesktopAppInstaller*', type: family}
-  - !appx: {name: '*PeopleExperienceHost*', type: family}
-  - !appx: {name: '*Parental*', type: family}
-  - !appx: {name: '*CloudExperienceHost*', type: family}
-  - !appx: {name: '*ContentDeliveryManager*', type: family}
-  - !appx: {name: '*Client.WebExperience*', type: family}
-  - !appx: {name: '*Apprep.Chx*', type: family}
-  - !appx: {name: '*OOBENetwork*', type: family}
-
-  - !appx: {name: '*MicrosoftTeams*', type: family}
-  - !appx: {name: '*Clipchamp*', type: family}
-  - !appx: {name: '*WindowsTerminal*', type: family}
+  - !appx: {name: '*XboxSpeechToTextOverlay*', type: family}
+  - !appx: {name: '*YourPhone*', type: family}
+  - !appx: {name: '*Zune*', type: family}
 
   - !appx: {name: '*Global.IrisService*', type: app}
   - !appx: {name: '*Global.Accounts*', type: app}
   - !appx: {name: '*Global.ValueBanner*', type: app}
+  - !appx: {name: '*Global.DesktopSpotlight*', type: app}
+  - !appx: {name: '*WindowsBackup*', type: app}
 
   - !appx: {name: '*Client.CBS*', operation: clearCache}
   - !appx: {name: '*StartMenuExperienceHost*', operation: clearCache}
   - !appx: {name: '*Windows.Search*', operation: clearCache}
 
+#  - !appx: {name: '*DesktopAppInstaller*', type: family}
+#  - !appx: {name: '*Paint*', type: family}
+#  - !appx: {name: '*WindowsCalculator*', type: family}
 #  - !appx: {name: 'SystemSettingsExtensions.dll', type: Extension *Client.CBS*}
 #  - !appx: {name: 'SearchUx.InternalWebAPi.dll', type: Extension *Client.CBS*}

src/Configuration/features/base/components.yml → src/Configuration/tasks/components.yml

@@ -1,8 +1,12 @@
+---
 title: Components
-description: Remove certain windows components
+description: Removal of certain Windows components
 privilege: TrustedInstaller
 actions:
   - !taskKill: {name: "explorer"}
+  - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Taskband', value: 'Favorites', type: REG_BINARY, data: '00A40100003A001F80C827341F105C1042AA032EE45287D668260001002600EFBE120000001A1E97454EEFD801757130704EEFD8015EB737704EEFD801140056003100000000006355693411005461736B42617200400009000400EFBE63556934635569342E0000009D8A0100000001000000000000000000000000000000A29F33005400610073006B00420061007200000016001201320097010000A754662A200046494C4545587E312E4C4E4B00007C0009000400EFBE63556934635569342E0000009E8A0100000001000000000000000000520000000000A413A200460069006C00650020004500780070006C006F007200650072002E006C006E006B00000040007300680065006C006C00330032002E0064006C006C002C002D003200320030003600370000001C00120000002B00EFBE22283A704EEFD8011C00420000001D00EFBE02004D006900630072006F0073006F00660074002E00570069006E0064006F00770073002E004500780070006C006F0072006500720000001C00260000001E00EFBE0200530079007300740065006D00500069006E006E006500640000001C000000FF'}
+  - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Taskband', value: 'FavoritesResolve', type: REG_BINARY, data: '330300004C0000000114020000000000C0000000000000468300800020000000E7E332704EEFD80122283A704EEFD8015CF4E1FBD161D801970100000000000001000000000000000000000000000000A0013A001F80C827341F105C1042AA032EE45287D668260001002600EFBE120000001A1E97454EEFD801757130704EEFD8015EB737704EEFD801140056003100000000006355693411005461736B42617200400009000400EFBE63556934635569342E0000009D8A0100000001000000000000000000000000000000A29F33005400610073006B00420061007200000016000E01320097010000A754662A200046494C4545587E312E4C4E4B00007C0009000400EFBE63556934635569342E0000009E8A0100000001000000000000000000520000000000A413A200460069006C00650020004500780070006C006F007200650072002E006C006E006B00000040007300680065006C006C00330032002E0064006C006C002C002D003200320030003600370000001C00220000001E00EFBE02005500730065007200500069006E006E006500640000001C00120000002B00EFBE22283A704EEFD8011C00420000001D00EFBE02004D006900630072006F0073006F00660074002E00570069006E0064006F00770073002E004500780070006C006F0072006500720000001C0000009C0000001C000000010000001C0000002D000000000000009B000000110000000300000013EBC8041000000000433A5C55736572735C4D634E696E5C417070446174615C526F616D696E675C4D6963726F736F66745C496E7465726E6574204578706C6F7265725C517569636B204C61756E63685C557365722050696E6E65645C5461736B4261725C46696C65204578706C6F7265722E6C6E6B000060000000030000A058000000000000006465736B746F702D666A63716F626D00A84D9F7C73D4F344BF15FAA23DFD8B4733F18E66405BED11AA54000C29341E2EA84D9F7C73D4F344BF15FAA23DFD8B4733F18E66405BED11AA54000C29341E2E45000000090000A03900000031535053B1166D44AD8D7048A748402EA43D788C1D0000006800000000480000009B7B87BF89DF6547B6A80DC335F1C9BF000000000000000000000000'}
+
     # ---------- Windows Defender
   - !writeStatus: {status: 'Removing Windows Defender'}
   - !taskKill: {name: "NisSrv"}
@@ -12,6 +16,7 @@ actions:
   - !taskKill: {name: "SkypeBackgroundHost"}
   - !taskKill: {name: "MsMpEng"}
   - !taskKill: {name: "msiexec"}
+
   - !file: {path: "%windir%\\System32\\smartscreen.exe"}
   - !file: {path: "%windir%\\System32\\smartscreenps.dll"}
   - !file: {path: "%windir%\\System32\\SecurityHealthSystray.exe"}
@@ -28,8 +33,8 @@ actions:
   - !file: {path: "%windir%\\System32\\drivers\\WdNisDrv.sys"}
   - !file: {path: "%ProgramW6432%\\Windows Defender Advanced Threat Protection"}
   - !file: {path: "%SystemDrive%\\ProgramData\\Microsoft\\Windows Defender Advanced Threat Protection"}
-  - !file:
-    path: "%windir%\\System32\\drivers\\cldflt.sys"
+  - !file: {path: "%windir%\\System32\\drivers\\cldflt.sys"}
+
   - !scheduledTask:
     path: "\\Microsoft\\Windows\\Windows Defender\\Windows Defender Cache Maintenance"
     operation: delete
@@ -127,9 +132,6 @@ actions:
   - !registryKey: {path: 'HKCU\SOFTWARE\Microsoft\Active Setup\Installed Components\{9459C573-B17A-45AE-9F64-1857B5D58CEE}'}
   - !registryKey: {path: 'HKCU\SOFTWARE\Microsoft\Edge'}
 
-    # WebView
-  - !registryKey: {path: 'HKCU\SOFTWARE\Microsoft\EdgeWebView'}
-
   - !run: {exeDir: true, exe: "EDGE.bat", weight: 20}
 
   - !file:
@@ -146,6 +148,7 @@ actions:
   - !file: {path: "%ProgramFiles(x86)%\\Microsoft\\EdgeCore", weight: 10}
 
     # WebView
+  - !registryKey: {path: 'HKCU\SOFTWARE\Microsoft\EdgeWebView'}
   - !file: {path: "%ProgramFiles(x86)%\\Microsoft\\EdgeWebView", weight: 10}
 
     # ---------- OneDrive

src/Configuration/tasks/config.yml

@@ -0,0 +1,58 @@
+---
+title: Configuration
+description: Main part of amelioration process
+privilege: TrustedInstaller
+actions:
+    # Sync time and set to more reliable time servers
+  - !service: {name: "w32time", operation: start, ignoreErrors: true}
+  - !run: {exe: 'w32tm', args: '/config /syncfromflags:manual /manualpeerlist:"0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org"'}
+  - !run: {exe: 'w32tm', args: '/config /update'}
+  - !run: {exe: 'w32tm', args: '/resync'}
+
+  - !writeStatus: {status: 'Cleaning user interface'}
+  - !service:
+    name: "WpnService"
+    operation: stop
+    ignoreErrors: true
+  - !service:
+    name: "WpnUserService*"
+    operation: stop
+    ignoreErrors: true
+
+  - !taskKill: {name: "explorer"}
+
+  - !run:
+    exeDir: true
+    exe: "CLEANUP.bat"
+    weight: 30
+    
+  - !run: {exe: "explorer.exe", wait: false, runas: currentUser}
+
+  - !writeStatus: {status: 'Configuring security permissions', option: "security-enhanced"}
+  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System', value: 'ConsentPromptBehaviorAdmin', type: REG_DWORD, data: '5', option: "security-enhanced"}
+  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System', value: 'ConsentPromptBehaviorUser', type: REG_DWORD, data: '3', option: "security-enhanced"}
+  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System', value: 'EnableInstallerDetection', type: REG_DWORD, data: '1', option: "security-enhanced"}
+  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System', value: 'EnableLUA', type: REG_DWORD, data: '1', option: "security-enhanced"}
+  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System', value: 'EnableVirtualization', type: REG_DWORD, data: '1', option: "security-enhanced"}
+  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System', value: 'PromptOnSecureDesktop', type: REG_DWORD, data: '1', option: "security-enhanced"}
+  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System', value: 'ValidateAdminCodeSignatures', type: REG_DWORD, data: '0', option: "security-enhanced"}
+  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System', value: 'FilterAdministratorToken', type: REG_DWORD, data: '0', option: "security-enhanced"}
+
+  - !run:
+    exeDir: true
+    exe: "ADMIN.bat"
+    weight: 10
+    option: "security-enhanced"
+
+  - !writeStatus: {status: 'Implementing SFC mitigation', option: "ame-tools"}
+  - !run:
+    exeDir: true
+    exe: "SFCDEPLOY.bat"
+    weight: 5
+    option: "ame-tools"
+
+  - !writeStatus: {status: 'Modifying login screen', option: "ui"}
+  - !run:
+    exeDir: true
+    exe: "LOGIN.bat"
+    option: "ui"

src/Configuration/features/base/dotnet.yml → src/Configuration/tasks/dotnet.yml

@@ -1,14 +1,14 @@
 ---
 title: Dotnet
+description: Installs essential prerequsities
 privilege: TrustedInstaller
 actions:
   - !writeStatus: {status: 'Installing Chocolatey'}
-    # Install Chocolatey
   - !powerShell:
     command: 'Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString(''https://community.chocolatey.org/install.ps1''))'
     weight: 30
+
   - !writeStatus: {status: 'Installing .NET 3.5'}
-    # Install .NET Framework 3.5
   - !cmd:
     command: '"%ProgramData%\chocolatey\bin\choco.exe" install -y --force --allow-empty-checksums dotnet3.5'
     weight: 250

src/Configuration/features/base/files.yml → src/Configuration/tasks/files.yml

@@ -1,5 +1,6 @@
+---
 title: Files
-description: Deletes files
+description: Deletes certain Windows files
 privilege: TrustedInstaller
 actions:
   - !writeStatus: {status: 'Removing files'}
@@ -61,8 +62,8 @@ actions:
     name: "OneDrive"
   - !taskKill:
     name: "msiexec"
-  - !file:
-    path: "%windir%\\System32\\wlidsvc.dll"
+#  - !file:
+#    path: "%windir%\\System32\\wlidsvc.dll"
   - !file:
     path: "%windir%\\System32\\WpcDesktopMonSvc.dll"
   - !file:
@@ -128,6 +129,7 @@ actions:
     operation: stop
   - !file:
     path: "%windir%\\SoftwareDistribution"
+    ignoreErrors: true
   - !file:
     path: "%windir%\\System32\\OOBE"
 #  - !file:
@@ -231,8 +233,10 @@ actions:
     path: "%windir%\\ServiceProfiles\\NetworkService\\AppData\\Local\\Microsoft\\Windows\\DeliveryOptimization\\State\\migration.dat"
   - !taskKill:
     name: "LogonUI"
+    ignoreErrors: true
   - !file:
     path: "%windir%\\ServiceProfiles\\NetworkService\\AppData\\Local\\Microsoft\\Windows\\DeliveryOptimization\\State\\dosvcState.dat"
+    ignoreErrors: true
   - !file:
     path: "%windir%\\ServiceProfiles\\NetworkService\\AppData\\Local\\Microsoft\\Windows\\DeliveryOptimization\\State\\migration.dat.LOG1"
   - !file:
@@ -666,6 +670,4 @@ actions:
   - !file:
     path: "%windir%\\System32\\wuaueng.dll"
   - !file:
-    path: "%windir%\\System32\\MRT.exe"
-
-  - !run: {exe: "NSudoLC.exe", args: '-U:C explorer.exe', baseDir: true}
+    path: "%windir%\\System32\\MRT.exe"

src/Configuration/features/base/regedits.yml → src/Configuration/tasks/regedits.yml

@@ -1,6 +1,6 @@
 ---
 title: Registry Edits
-description: Base AME Registry Edits
+description: Base AME registry edits
 privilege: TrustedInstaller
 actions:
   - !writeStatus: {status: 'Modifying registry'}
@@ -9,6 +9,9 @@ actions:
     exe: "REGI.bat"
     weight: 30
 
+  - !registryValue: {path: 'HKCU\Control Panel\UnsupportedHardwareNotificationCache', value: 'SV1', type: REG_DWORD, data: '0'}
+  - !registryValue: {path: 'HKCU\Control Panel\UnsupportedHardwareNotificationCache', value: 'SV2', type: REG_DWORD, data: '0'}
+
   - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection', value: 'AllowTelemetry', type: REG_DWORD, data: '0'}
   - !registryValue: {path: 'HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Policies\DataCollection', value: 'AllowTelemetry', type: REG_DWORD, data: '0'}
   - !registryValue: {path: 'HKLM\SYSTEM\CurrentControlSet\Control\WMI\AutoLogger\AutoLogger-Diagtrack-Listener', value: 'Start', type: REG_DWORD, data: '0'}
@@ -40,7 +43,7 @@ actions:
   - !registryKey: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Device Metadata', operation: add}
 
     # New Control Panel cleanup - List of commands: https://winaero.com/ms-settings-commands-in-windows-10/
-  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer', value: 'SettingsPageVisibility', type: REG_SZ, data: 'showonly:display;nightlight;sound;notifications;quiethours;powersleep;batterysaver;tabletmode;multitasking;clipboard;remote-desktop;about;bluetooth;connecteddevices;printers;mousetouchpad;devices-touchpad;typing;pen;autoplay;usb;network-status;network-cellular;network-wifi;network-wificalling;network-wifisettings;network-ethernet;network-dialup;network-vpn;network-airplanemode;network-mobilehotspot;datausage;network-proxy;personalization-background;personalization-start;fonts;personalization-colors;colors;lockscreen;themes;taskbar;defaultapps;videoplayback;startupapps;dateandtime;regionformatting;gaming;gamemode;easeofaccess-display;easeofaccess-colorfilter;easeofaccess-audio;easeofaccess-easeofaccess-narrator;easeofaccess-magnifier;easeofaccess-highcontrast;easeofaccess-closedcaptioning;easeofaccess-speechrecognition;easeofaccess-eyecontrol;easeofaccess-keyboard;easeofaccess-mouse;network-advancedsettings'}
+  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer', value: 'SettingsPageVisibility', type: REG_SZ, data: 'hide:windowsdefender;activation;backup;delivery-optimization;findmydevice;developers;launchsecuritykeyenrollment;recovery;troubleshoot;windowsinsider;windowsinsider-optin;windowsupdate;windowsupdate-activehours;windowsupdate-options;workplace-provisioning;workplace-repairtoken;provisioning;windowsanywhere;regionlanguage-adddisplaylanguage;regionlanguage-languageoptions;regionlanguage-setdisplaylanguage;speech;storagerecommendations;surfacehub-accounts;search;search-moredetails;search-permissions;mobile-devices;personalization-start-places;gaming-gamebar;gaming-gamedvr;gaming-gamemode;family-group;cortana-moredetails;cortana-permissions;cortana-windowssearch;cortana;cortana-language;cortana-talktocortana;controlcenter;maps;maps-downloadmaps;videoplayback;appsforwebsites;optionalfeatures;workplace;emailandaccounts;otherusers;assignedaccess;signinoptions;signinoptions-dynamiclock;sync;backup;signinoptions-launchfaceenrollment;signinoptions-launchfingerprintenrollment;yourinfo;privacy-accessoryapps;privacy-accountinfo;privacy-activityhistory;privacy-advertisingid;privacy-appdiagnostics;privacy-automaticfiledownloads;privacy-backgroundapps;privacy-backgroundspatialperception;privacy-calendar;privacy-callhistory;privacy-webcam;privacy-contacts;privacy-documents;privacy-downloadsfolder;privacy-email;privacy-eyetracker (requires eyetracker hardware);privacy-feedback;privacy-broadfilesystemaccess;privacy-general;privacy-graphicscaptureprogrammatic;privacy-graphicscapturewithoutborder;privacy-speechtyping;privacy-location;privacy-messaging;privacy-microphone;privacy-motion;privacy-musiclibrary;privacy-notifications;privacy-customdevices;privacy-phonecalls;privacy-pictures;privacy-radios;privacy-speech;privacy-tasks;privacy-videos;privacy-voiceactivation;account;crossdevice;project;energyrecommendations;camera;deviceusage;home;quiethours'}
 
     # Decrease shutdown time
   - !registryValue: {path: 'HKLM\SYSTEM\CurrentControlSet\Control', value: 'WaitToKillServiceTimeout', type: REG_SZ, data: '2000'}
@@ -122,7 +125,7 @@ actions:
   - !registryValue: {path: 'HKLM\SYSTEM\CurrentControlSet\Control\TimeZoneInformation', value: 'RealTimeIsUniversal', type: REG_DWORD, data: '1'}
 
     # Disable Users On Login Screen
-  - !registryValue: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System', value: 'dontdisplaylastusername', type: REG_DWORD, data: '1'}
+  - !registryValue: {option: "security-enhanced", path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System', value: 'dontdisplaylastusername', type: REG_DWORD, data: '1'}
 
     # Disable The Lock Screen
   - !registryValue: {path: 'HKLM\SOFTWARE\Policies\Microsoft\Windows\Personalization', value: 'NoLockScreen', type: REG_DWORD, data: '1'}
@@ -290,6 +293,14 @@ actions:
     # Turns off Windows blocking installation of files downloaded from the internet
   - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Attachments', value: 'SaveZoneInformation', type: REG_DWORD, data: '1'}
       
+    # Hide 'Chat' taskbar option from Settings
+  - !registryValue: {path: 'HKLM\SOFTWARE\Policies\Microsoft\Windows\Windows Chat', value: 'ChatIcon', type: REG_DWORD, data: '3'}
+    # Hide 'Copilot' taskbar option from Settings
+  - !registryValue: {path: 'HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsCopilot', value: 'TurnOffWindowsCopilot', type: REG_DWORD, data: '1'}
+      
+    # Disable opening GameBar when pressing the XBOX button on an XBOX controller
+  - !registryValue: {path: 'HKCU\Software\Microsoft\GameBar', value: 'UseNexusForGameBarEnabled', type: REG_DWORD, data: '0'}
+      
     # Disables SmartScreen
   - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\AppHost', value: 'ContentEvaluation', type: REG_DWORD, data: '0'}
       
@@ -300,7 +311,7 @@ actions:
   - !registryKey: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\StorageSense', operation: add}
       
     # Search
-  - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search', value: 'SearchboxTaskbarMode', type: REG_DWORD, data: '0'}
+  - !registryValue: {option: "ui", path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search', value: 'SearchboxTaskbarMode', type: REG_DWORD, data: '0'}
   - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search', value: 'BingSearchEnabled', type: REG_DWORD, data: '0'}
   - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search', value: 'CortanaConsent', type: REG_DWORD, data: '0'}
   - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search', value: 'CortanaInAmbientMode', type: REG_DWORD, data: '0'}
@@ -318,19 +329,21 @@ actions:
     # Setup Windows Explorer
     # Removes the shake to minimze all other windows gesture
     #  - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced', value: 'DisallowShaking', type: REG_DWORD, data: '1'}
-  - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced', value: 'NavPaneShowAllFolders', type: REG_DWORD, data: '0'}
   - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced', value: 'LaunchTo', type: REG_DWORD, data: '1'}
   - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced', value: 'HideFileExt', type: REG_DWORD, data: '0'}
   - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced', value: 'Hidden', type: REG_DWORD, data: '1'}
-  - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced', value: 'TaskbarGlomLevel', type: REG_DWORD, data: '2'}
-  - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced', value: 'TaskbarDa', type: REG_DWORD, data: '0'}
-  - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced', value: 'TaskbarAl', type: REG_DWORD, data: '0'}
-  - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced', value: 'NavPaneShowAllFolders', type: REG_DWORD, data: '1'}
+  - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced', value: 'ShowCopilotButton', type: REG_DWORD, data: '0'}
+  - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced', value: 'Start_IrisRecommendations', type: REG_DWORD, data: '0'}
+  - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced', value: 'Start_AccountNotifications', type: REG_DWORD, data: '0'}
+  - !registryValue: {option: "ui", path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced', value: 'TaskbarGlomLevel', type: REG_DWORD, data: '2'}
+  - !registryValue: {option: "ui", path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced', value: 'TaskbarDa', type: REG_DWORD, data: '0'}
+  - !registryValue: {option: "ui", path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced', value: 'TaskbarAl', type: REG_DWORD, data: '0'}
+  - !registryValue: {option: "ui", path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced', value: 'NavPaneShowAllFolders', type: REG_DWORD, data: '0'}
 
     # Taskbar
 #  - !registryValue: {path: 'HKCU\SOFTWARE\Policies\Microsoft\Windows\Explorer', value: 'DisableNotificationCenter', type: REG_DWORD, data: '1'}
   - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced', value: 'ShowCortanaButton', type: REG_DWORD, data: '0'}
-  - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced', value: 'ShowTaskViewButton', type: REG_DWORD, data: '0'}
+  - !registryValue: {option: "ui", path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced', value: 'ShowTaskViewButton', type: REG_DWORD, data: '0'}
   - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer', value: 'EnableAutoTray', type: REG_DWORD, data: '0'}
   - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer', value: 'HideSCAMeetNow', type: REG_DWORD, data: '1'}
     # W11 Chat item
@@ -342,10 +355,90 @@ actions:
   - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Notifications\Settings\Windows.SystemToast.BackupReminder', value: 'Enabled', type: REG_DWORD, data: '0'}
     # Disable "Let's Finish Setting Up Your Device" OOBE screen
   - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager', value: 'SubscribedContent-310093Enabled', type: REG_DWORD, data: '0'}
+    # Settings suggested content
+  - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager', value: 'SubscribedContent-338393Enabled', type: REG_DWORD, data: '0'}
+  - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager', value: 'SubscribedContent-353694Enabled', type: REG_DWORD, data: '0'}
+  - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager', value: 'SubscribedContent-353696Enabled', type: REG_DWORD, data: '0'}
 
     # Disable item checkboxes
   - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced', value: 'AutoCheckSelect', type: REG_DWORD, data: '0'}
 
+    # Reset privacy settings since they are hidden in settings
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\DeviceAccess\Global\{C1D23ACC-752B-43E5-8448-8D0E519CD6D6}', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\userAccountInformation', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\userAccountInformation', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\DeviceAccess\Global\{2297E4E2-5DBE-466D-A12B-0F8286F0D9CA}', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\appDiagnostics', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\appDiagnostics', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\location', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\location', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\DeviceAccess\Global\{E5323777-F976-4f5b-9B55-B94699C46E44}', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\webcam', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\webcam', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\DeviceAccess\Global\{2EEF81BE-33FA-4800-9670-1CD474972C3F}', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\microphone', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\microphone', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Speech_OneCore\Settings\VoiceActivation\UserPreferenceForAllApps', type: REG_DWORD, value: 'AgentActivationEnabled', data: 1 }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Speech_OneCore\Settings\VoiceActivation\UserPreferenceForAllApps', type: REG_DWORD, value: 'AgentActivationOnLockScreenEnabled', data: 1 }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Speech_OneCore\Settings\VoiceActivation\UserPreferenceForAllApps', type: REG_DWORD, value: 'AgentActivationLastUsed', data: 1 }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\DeviceAccess\Global\{52079E78-A92B-413F-B213-E8FE35712E72}', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\userNotificationListener', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\userNotificationListener', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\activity', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\activity', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\DeviceAccess\Global\{7D7E8402-7C54-4821-A34E-AEEFD62DED93}', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\contacts', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\contacts', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\DeviceAccess\Global\{D89823BA-7180-4B81-B50C-7E471E6121A3}', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\appointments', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\appointments', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\phoneCall', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\phoneCall', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\DeviceAccess\Global\{8BC668CF-7728-45BD-93F8-CF2B3B41D7AB}', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\phoneCallHistory', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\phoneCallHistory', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\DeviceAccess\Global\{9231CB4C-BF57-4AF3-8C55-FDA7BFCC04C5}', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\email', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\email', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\DeviceAccess\Global\{E390DF20-07DF-446D-B962-F5C953062741}', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\userDataTasks', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\userDataTasks', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\DeviceAccess\Global\{992AFA70-6F47-4148-B3E9-3003349C1548}', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\chat', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\chat', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\radios', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\radios', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\bluetoothSync', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\bluetoothSync', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\documentsLibrary', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\documentsLibrary', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\picturesLibrary', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\picturesLibrary', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\videosLibrary', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\videosLibrary', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\broadFileSystemAccess', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\broadFileSystemAccess', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\cellularData', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\cellularData', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\gazeInput', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\gazeInput', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\graphicsCaptureProgrammatic', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\graphicsCaptureProgrammatic', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\graphicsCaptureProgrammatic\NonPackaged', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\graphicsCaptureWithoutBorder', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\graphicsCaptureWithoutBorder', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\graphicsCaptureWithoutBorder\NonPackaged', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\musicLibrary', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\musicLibrary', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\downloadsFolder', type: REG_SZ, value: 'Value', data: 'Allow' }
+  - !registryValue: { path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\downloadsFolder', type: REG_SZ, value: 'Value', data: 'Allow' }
+
+  - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Start', value: 'ShowFrequentList', type: REG_DWORD, data: '0'}
+  - !registryValue: {path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Start', value: 'ShowRecentList', type: REG_DWORD, data: '0'}
+
+    # Remove 'Gallery' in file explorer
+  - !registryKey: {path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace_41040327\{e88865ea-0e1c-4e20-9aa6-edcd0212c87c}', operation: delete}
+
   - !writeStatus: {status: 'Checking users'}
   - !run:
     exeDir: true

src/Configuration/features/base/services.yml → src/Configuration/tasks/services.yml

@@ -1,4 +1,6 @@
+---
 title: Services
+description: Modification of Windows services
 privilege: TrustedInstaller
 actions:
   - !writeStatus: {status: 'Configuring services'}
@@ -51,6 +53,7 @@ actions:
   - !service:
     name: "webthreatdefusersvc*"
     operation: delete
+    ignoreErrors: true
   - !service:
     name: "webthreatdefsvc"
     operation: delete
@@ -146,6 +149,7 @@ actions:
   - !service:
     name: "XboxNetApiSvc"
     operation: stop
-  - !service:
-    name: "wlidsvc"
-    operation: delete
+    # Breaks APPX installation sometimes
+#  - !service:
+#    name: "wlidsvc"
+#    operation: delete

src/Configuration/tasks/software.yml

@@ -0,0 +1,388 @@
+---
+title: Software
+description: Installs software
+privilege: TrustedInstaller
+actions:
+  - !writeStatus: {status: 'Installing Open-Shell', option: "ui", cpuArch: "x64"}
+  - !run:
+    exeDir: true
+    exe: "SLNT.bat"
+    weight: 50
+    option: "ui"
+    cpuArch: "x64"
+
+  - !run:
+    exeDir: true
+    exe: "ame-hexer.exe"
+    args: '"%WINDIR%\Resources\Themes\aero\Shell\NormalColor\shellstyle.dll" "3c69662069643d2261746f6d2848656c70427574746f6e29223e" "3c69662069643d2261746f6d282d2d2d52454d4f56454429223e" 120000'
+    weight: 60
+  - !run:
+    exeDir: true
+    exe: "ame-hexer.exe"
+    args: '"%WINDIR%\Resources\Themes\aero\Shell\NormalColor\shellstyle.dll" "3c69662069643d2261746f6d2848656c70427574746f6e29223e" "3c69662069643d2261746f6d282d2d2d52454d4f56454429223e" 120000'
+    weight: 60
+
+  - !writeStatus: {status: 'Configuring user interface', option: "ui"}
+  - !run:
+    exeDir: true
+    exe: "UI.bat"
+    option: "ui"
+    weight: 10
+    builds: [ '>=22621.2428' ]
+    cpuArch: "x64"
+  - !run:
+    exeDir: true
+    exe: "OLDUI.bat"
+    option: "ui"
+    weight: 10
+    builds: [ '<22621.2428' ]
+    cpuArch: "x64"
+  - !run:
+    exeDir: true
+    exe: "ep_setup-22621.2428.59.1.exe"
+    weight: 70
+    option: "ui"
+    builds: [ '<22621.2428' ]
+    cpuArch: "x64"
+
+#   Context Menu
+  - !registryValue: {cpuArch: "!x64", option: 'ui', path: 'HKCU\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\InprocServer32', value: '', data: '', type: REG_SZ}
+#   Old Explorer Search
+  - !registryValue: {cpuArch: "!x64", option: 'ui', path: 'HKCU\CLSID\{1d64637d-31e9-4b06-9124-e83fb178ac6e}\TreatAs', value: '', data: '{64bc32b5-4eec-4de7-972d-bd8bd0324537}', type: REG_SZ}
+
+  - !writeStatus: {status: 'Installing Scoop apps', option: "software"}
+  - !run:
+    exeDir: true
+    exe: "PowerShell"
+    args: '-NoP -ExecutionPolicy Bypass -File scoop.ps1'
+    weight: 120
+    option: "software"
+
+  - !writeStatus: {status: 'Installing Chocolatey'}
+    # Install Chocolatey
+  - !powerShell:
+    command: 'Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString(''https://community.chocolatey.org/install.ps1''))'
+    weight: 30
+
+  - !writeStatus: {status: 'Installing Firefox', option: "browser-firefox"}
+  - !run:
+    exeDir: true
+    exe: "FIREFOX.bat"
+    weight: 150
+    option: "browser-firefox"
+
+  - !writeStatus: {status: 'Installing UGC', option: "browser-ugc"}
+  - !run:
+    exeDir: true
+    exe: "UGC\\UGC.bat"
+    weight: 150
+    option: "browser-ugc"
+
+  - !writeStatus: {status: 'Installing LibreWolf', option: "browser-librewolf"}
+  - !run:
+    exeDir: true
+    exe: "LIBREWOLF.bat"
+    weight: 150
+    option: "browser-librewolf"
+
+  - !writeStatus: {status: 'Installing Brave', option: "browser-brave"}
+  - !run:
+    exeDir: true
+    exe: "BRAVE.bat"
+    weight: 150
+    option: "browser-brave"
+
+  - !writeStatus: {status: 'Configuring start menu', option: "ui"}
+  - !run:
+    exeDir: true
+    exe: "STARTMENU.bat"
+    weight: 15
+    option: "ui"
+
+  - !writeStatus: {status: 'Installing Thunderbird', option: "email-thunderbird"}
+  - !run:
+    path: '%ProgramData%\chocolatey\bin'
+    exe: 'choco.exe'
+    args: 'install -y --allow-empty-checksums thunderbird'
+    weight: 100
+    option: "email-thunderbird"
+  - !run:
+    path: '%ProgramData%\chocolatey\bin'
+    exe: 'choco.exe'
+    args: 'upgrade -y --allow-empty-checksums thunderbird'
+    weight: 50
+    option: "email-thunderbird"
+  - !run:
+    exeDir: true
+    exe: "THUNDERBIRDSHRT.bat"
+    weight: 15
+    option: "email-thunderbird"
+
+
+  - !writeStatus: {status: 'Installing Spark', option: "email-spark"}
+  - !run:
+    path: '%ProgramData%\chocolatey\bin'
+    exe: 'choco.exe'
+    args: 'install -y --force --allow-empty-checksums sparkmail'
+    weight: 70
+    option: "email-spark"
+
+  - !writeStatus: {status: 'Installing Mailspring', option: "email-mailspring"}
+  - !run:
+    path: '%ProgramData%\chocolatey\bin'
+    exe: 'choco.exe'
+    args: 'install -y --force --allow-empty-checksums mailspring'
+    weight: 70
+    option: "email-mailspring"
+
+  - !writeStatus: {status: 'Installing VLC', option: "media-vlc"}
+  - !run:
+    path: '%ProgramData%\chocolatey\bin'
+    exe: 'choco.exe'
+    args: 'install -y --force --allow-empty-checksums vlc'
+    weight: 70
+    option: "media-vlc"
+  - !writeStatus: {status: 'Installing mpv', option: "media-mpv"}
+  - !run:
+    path: '%ProgramData%\chocolatey\bin'
+    exe: 'choco.exe'
+    args: 'install -y --force --allow-empty-checksums mpv'
+    weight: 70
+    option: "media-mpv"
+
+  - !writeStatus: {status: 'Installing 7zip', option: "software"}
+  - !run:
+    path: '%ProgramData%\chocolatey\bin'
+    exe: 'choco.exe'
+    args: 'install -y --force --allow-empty-checksums 7zip'
+    weight: 50
+    option: "software"
+  - !writeStatus: {status: 'Installing nomacs', option: "software"}
+  - !run:
+    path: '%ProgramData%\chocolatey\bin'
+    exe: 'choco.exe'
+    args: 'install -y --force --allow-empty-checksums nomacs'
+    weight: 50
+    option: "software"
+
+  - !writeStatus: {status: 'Configuring nomacs', option: "software"}
+
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.3fr.3', value: '', type: 'REG_SZ', data: 'Hasselblad Raw Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.3fr.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.3fr.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.arw.3', value: '', type: 'REG_SZ', data: 'Sony Raw Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.arw.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.arw.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.avif.3', value: '', type: 'REG_SZ', data: 'AV1 Image File Format Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.avif.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.avif.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.avifs.3', value: '', type: 'REG_SZ', data: 'AVIF image sequence Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.avifs.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.avifs.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.bmp.3', value: '', type: 'REG_SZ', data: 'Windows Bitmap Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.bmp.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,4'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.bmp.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.crw.3', value: '', type: 'REG_SZ', data: 'Canon Raw Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.crw.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.crw.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.cur.3', value: '', type: 'REG_SZ', data: 'Windows Cursor Files Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.cur.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.cur.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.dcx.3', value: '', type: 'REG_SZ', data: 'Image Format Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.dcx.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.dcx.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.dng.3', value: '', type: 'REG_SZ', data: 'Digital Negativ Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.dng.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.dng.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.drif.3', value: '', type: 'REG_SZ', data: 'Developers Raw Image Format Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.drif.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.drif.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.exif.3', value: '', type: 'REG_SZ', data: 'EXIF Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.exif.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.exif.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.gif.3', value: '', type: 'REG_SZ', data: 'Graphic Interchange Format Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.gif.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,2'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.gif.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.heic.3', value: '', type: 'REG_SZ', data: 'Image Format Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.heic.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.heic.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.heics.3', value: '', type: 'REG_SZ', data: 'Image Format Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.heics.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.heics.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.heif.3', value: '', type: 'REG_SZ', data: 'Image Format Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.heif.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.heif.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.heifs.3', value: '', type: 'REG_SZ', data: 'Image Format Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.heifs.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.heifs.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.icns.3', value: '', type: 'REG_SZ', data: 'Apple Icon Image Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.icns.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.icns.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.iiq.3', value: '', type: 'REG_SZ', data: 'Phase One Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.iiq.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.iiq.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.jp2.3', value: '', type: 'REG_SZ', data: 'JPEG 2000 Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.jp2.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.jp2.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.jpg.3', value: '', type: 'REG_SZ', data: 'JPEG Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.jpg.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,1'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.jpg.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.jps.3', value: '', type: 'REG_SZ', data: 'JPEG Stereo Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.jps.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.jps.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.mng.3', value: '', type: 'REG_SZ', data: 'Multi-Image Network Graphics Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.mng.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,2'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.mng.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.mos.3', value: '', type: 'REG_SZ', data: 'Leaf Raw Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.mos.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.mos.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.mpo.3', value: '', type: 'REG_SZ', data: 'Multi Picture Object Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.mpo.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.mpo.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.mrw.3', value: '', type: 'REG_SZ', data: 'Minolta Raw Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.mrw.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.mrw.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.nef.3', value: '', type: 'REG_SZ', data: 'Nikon Raw Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.nef.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.nef.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.orf.3', value: '', type: 'REG_SZ', data: 'Olympus Raw Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.orf.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.orf.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.pbm.3', value: '', type: 'REG_SZ', data: 'Portable Bitmap Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.pbm.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.pbm.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.pcx.3', value: '', type: 'REG_SZ', data: 'Image Format Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.pcx.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.pcx.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.pef.3', value: '', type: 'REG_SZ', data: 'Pentax Raw Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.pef.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.pef.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.pgm.3', value: '', type: 'REG_SZ', data: 'Portable Graymap Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.pgm.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,4'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.pgm.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.png.3', value: '', type: 'REG_SZ', data: 'PNG Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.png.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,3'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.png.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.pns.3', value: '', type: 'REG_SZ', data: 'PNG Stereo Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.pns.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.pns.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.ppm.3', value: '', type: 'REG_SZ', data: 'Portable Pixmap Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.ppm.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.ppm.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.psb.3', value: '', type: 'REG_SZ', data: 'Large Document Format Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.psb.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.psb.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.psd.3', value: '', type: 'REG_SZ', data: 'Adobe Photoshop Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.psd.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.psd.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.raf.3', value: '', type: 'REG_SZ', data: 'Fujifilm Raw Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.raf.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.raf.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.raw.3', value: '', type: 'REG_SZ', data: 'Panasonic Raw Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.raw.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.raw.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.roh.3', value: '', type: 'REG_SZ', data: 'Rohkost Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.roh.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.roh.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.srw.3', value: '', type: 'REG_SZ', data: 'Samsung Raw Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.srw.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.srw.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.svg.3', value: '', type: 'REG_SZ', data: 'Scalable Vector Graphics Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.svg.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.svg.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.tga.3', value: '', type: 'REG_SZ', data: 'Truvision Graphics Adapter Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.tga.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.tga.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.tif.3', value: '', type: 'REG_SZ', data: 'TIFF Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.tif.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,4'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.tif.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.vec.3', value: '', type: 'REG_SZ', data: 'OpenCV Haar Training Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.vec.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.vec.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.wbmp.3', value: '', type: 'REG_SZ', data: 'Wireless Bitmap Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.wbmp.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.wbmp.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.webp.3', value: '', type: 'REG_SZ', data: 'WebP Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.webp.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,4'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.webp.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.x3f.3', value: '', type: 'REG_SZ', data: 'Sigma Raw Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.x3f.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,5'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.x3f.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.xbm.3', value: '', type: 'REG_SZ', data: 'X11 Bitmap Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.xbm.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.xbm.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.xpm.3', value: '', type: 'REG_SZ', data: 'X11 Pixmap Image'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.xpm.3\DefaultIcon', value: '', type: 'REG_SZ', data: 'C:\Program Files\nomacs\bin\nomacs.exe,0'}
+  - !registryValue: {option: "software", path: 'HKLM\SOFTWARE\classes\nomacs.xpm.3\shell\open\command', value: '', type: 'REG_SZ', data: '"C:\Program Files\nomacs\bin\nomacs.exe" "%1"'}
+  - !run:
+    exeDir: true
+    exe: "NOMACSCONF.bat"
+    weight: 20
+    option: "software"
+    
+  - !writeStatus: {status: 'Installing vcredist', option: "software"}
+  - !run:
+    path: '%ProgramData%\chocolatey\bin'
+    exe: 'choco.exe'
+    args: 'install -y --force --allow-empty-checksums vcredist-all'
+    weight: 200
+    option: "software"
+
+  - !writeStatus: {status: 'Installing OnlyOffice', option: "office-onlyoffice"}
+  - !run:
+    path: '%ProgramData%\chocolatey\bin'
+    exe: 'choco.exe'
+    args: 'install -y --force --allow-empty-checksums onlyoffice'
+    weight: 150
+    option: "office-onlyoffice"
+  - !writeStatus: {status: 'Installing FreeOffice', option: "office-freeoffice"}
+  - !run:
+    path: '%ProgramData%\chocolatey\bin'
+    exe: 'choco.exe'
+    args: 'install -y --force --allow-empty-checksums freeoffice'
+    weight: 150
+    option: "office-freeoffice"
+  - !writeStatus: {status: 'Installing LibreOffice', option: "office-libreoffice"}
+  - !run:
+    path: '%ProgramData%\chocolatey\bin'
+    exe: 'choco.exe'
+    args: 'install -y --force --allow-empty-checksums libreoffice'
+    weight: 150
+    option: "office-libreoffice"
+
+  - !writeStatus: {status: 'Installing Cascadia Mono font', option: "software"}
+  - !run:
+    path: '%ProgramData%\chocolatey\bin'
+    exe: 'choco.exe'
+    args: 'install -y --allow-empty-checksums cascadiamono'
+    weight: 30
+    option: "software"
+
+  - !run:
+    exeDir: true
+    exe: "SOFTSHRT.bat"
+    weight: 20
+    option: "software"
+  - !run:
+    exeDir: true
+    exe: "TOOLS.bat"
+    weight: 20
+    option: "ame-tools"
+
+  - !writeStatus: {status: 'Setting file associations', option: "software"}
+  - !run:
+    exeDir: true
+    exe: "FILEASSOC.bat"
+    weight: 30
+    option: "software"
+  - !run:
+    exeDir: true
+    exe: "VLCASSOC.bat"
+    weight: 30
+    option: "media-vlc"
+
+  - !writeStatus: {status: 'Setting wallpapers'}
+  - !run:
+    exeDir: true
+    exe: "WALLPAPER.bat"
+    weight: 20

src/Executables/BRAVE.bat

@@ -0,0 +1,74 @@
+@echo off
+
+if exist "%ProgramData%\Scoop\GlobalScoopApps\apps\brave" call :setAssociations & exit /b 0
+if exist "%ProgramFiles%\BraveSoftware\Brave-Browser\Application\brave.exe" call :setAssociations & exit /b 0
+
+set "PATH=%PATH%;%ProgramData%\Scoop\shims"
+cmd /c "scoop install brave --global"
+
+call :setAssociations
+
+if not exist "%ProgramData%\Scoop\GlobalScoopApps\apps\brave" exit /b 0
+
+for /f "usebackq delims=" %%A in (`dir /b "%ProgramData%\Scoop\GlobalScoopApps\apps\brave" /a:d ^| findstr /v /c:"current"`) do set "dir=%ProgramData%\Scoop\GlobalScoopApps\apps\brave\%%A"
+
+mkdir "%ProgramFiles%\BraveSoftware\Brave-Browser"
+ren "%dir%" "Application"
+move /y "%ProgramData%\Scoop\GlobalScoopApps\apps\brave\Application" "%ProgramFiles%\BraveSoftware\Brave-Browser"
+rmdir /q /s "%ProgramData%\Scoop\GlobalScoopApps\apps\brave"
+
+cmd /c "scoop uninstall brave --global"
+del /q /f "%ProgramData%\Microsoft\Windows\Start Menu\Programs\Scoop Apps\Brave.lnk"
+
+set "dir=%ProgramFiles%\BraveSoftware\Brave-Browser\Application"
+
+copy /y "initial_preferences_brave" "%dir%\initial_preferences"
+
+for /f "usebackq delims=" %%A in (`dir /b /a:d "%SYSTEMDRIVE%\Users" ^| findstr /v /i /x /c:"Public" /c:"Default User" /c:"All Users"`) do (
+	echo 	PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%PUBLIC%\Desktop\Brave.lnk'); $S.TargetPath = '%dir%\brave.exe'; $S.WorkingDirectory = '%dir%'; $S.Save()"
+	PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%PUBLIC%\Desktop\Brave.lnk'); $S.TargetPath = '%dir%\brave.exe'; $S.WorkingDirectory = '%dir%'; $S.Save()"
+
+	copy /y "%PUBLIC%\Desktop\Brave.lnk" "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned"
+)
+
+PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%dir%\Brave.lnk'); $S.TargetPath = '%dir%\brave.exe'; $S.WorkingDirectory = '%dir%'; $S.Save()"
+PowerShell -NoP -C "$Content = (Get-Content '%~dp0\Layout.xml'); $Content = $Content -replace '%%ALLUSERSPROFILE%%\\Microsoft\\Windows\\Start Menu\\Programs\\Brave.lnk', '%dir%\Brave.lnk' | Set-Content '%~dp0\Layout.xml'"
+
+for /f "usebackq tokens=2 delims=\" %%A in (`reg query "HKEY_USERS" ^| findstr /r /x /c:"HKEY_USERS\\S-.*" /c:"HKEY_USERS\\AME_UserHive_[^_]*"`) do (
+	reg query "HKU\%%A" | findstr /c:"Volatile Environment" /c:"AME_UserHive_" > NUL 2>&1
+		if not errorlevel 1 (
+			if "%%A"=="AME_UserHive_Default" (
+				call :AFISCALL "%SYSTEMDRIVE%\Users\Default\AppData\Roaming" "%%A"
+			) else (
+				for /f "usebackq tokens=2* delims= " %%B in (`reg query "HKU\%%A\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" /v "AppData" 2^>^&1 ^| findstr /R /X /C:".*AppData[ ]*REG_SZ[ ].*"`) do (
+					call :AFISCALL "%%C" "%%A"
+				)
+			)
+	)
+)
+exit /b 0
+
+:AFISCALL
+
+setlocal
+
+if not "%~2"=="AME_UserHive_Default" (
+	del "%~1\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar\Chromium.lnk" /q /f
+	mkdir "%~1\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar"
+	PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%~1\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar\Brave.lnk'); $S.TargetPath = '%dir%\brave.exe'; $S.WorkingDirectory = '%dir%'; $S.Save()"
+
+	reg add "HKU\%~2\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Taskband" /v "Favorites" /t REG_BINARY /d "00A40100003A001F80C827341F105C1042AA032EE45287D668260001002600EFBE12000000B938E4724DEFD801B773BC9C4DEFD8017514D99C4DEFD801140056003100000000006355AC3311005461736B42617200400009000400EFBE6355AC336355AC332E0000002C9D01000000010000000000000000000000000000008B2592005400610073006B00420061007200000016001201320097010000874F0749200046494C4545587E312E4C4E4B00007C0009000400EFBE6355AC336355AC332E000000309D0100000001000000000000000000520000000000589C4400460069006C00650020004500780070006C006F007200650072002E006C006E006B00000040007300680065006C006C00330032002E0064006C006C002C002D003200320030003600370000001C00120000002B00EFBED66CDB9C4DEFD8011C00420000001D00EFBE02004D006900630072006F0073006F00660074002E00570069006E0064006F00770073002E004500780070006C006F0072006500720000001C00260000001E00EFBE0200530079007300740065006D00500069006E006E006500640000001C00000000E00100003A001F80C827341F105C1042AA032EE45287D668260001002600EFBE12000000B938E4724DEFD801B773BC9C4DEFD801FFAAD393E790D90114005600310000000000BB56D6B011005461736B42617200400009000400EFBE6355AC33BB56D7B02E0000002C9D0100000001000000000000000000000000000000CA148A005400610073006B00420061007200000016004E01320063070000BB56E4B0200042726176652E6C6E6B00440009000400EFBEBB56E4B0BB56E4B02E000000408C000000000400000000000000000000000000000030214000420072006100760065002E006C006E006B0000001800220000001E00EFBE02005500730065007200500069006E006E006500640000001800120000002B00EFBEFFAAD393E790D9011800BE0000001D00EFBE02007B00360044003800300039003300370037002D0036004100460030002D0034003400340042002D0038003900350037002D004100330037003700330046003000320032003000300045007D005C004200720061007600650053006F006600740077006100720065005C00420072006100760065002D00420072006F0077007300650072005C004100700070006C00690063006100740069006F006E005C00620072006100760065002E00650078006500000018000000FF" /f
+	reg add "HKU\%~2\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Taskband" /v "FavoritesResolve" /t REG_BINARY /d "320300004C0000000114020000000000C0000000000000468300800020000000964FD49C4DEFD801D66CDB9C4DEFD801A8B6C6DADDACD501970100000000000001000000000000000000000000000000A0013A001F80C827341F105C1042AA032EE45287D668260001002600EFBE12000000B938E4724DEFD801B773BC9C4DEFD8017514D99C4DEFD801140056003100000000006355AC3311005461736B42617200400009000400EFBE6355AC336355AC332E0000002C9D01000000010000000000000000000000000000008B2592005400610073006B00420061007200000016000E01320097010000874F0749200046494C4545587E312E4C4E4B00007C0009000400EFBE6355AC336355AC332E000000309D0100000001000000000000000000520000000000589C4400460069006C00650020004500780070006C006F007200650072002E006C006E006B00000040007300680065006C006C00330032002E0064006C006C002C002D003200320030003600370000001C00220000001E00EFBE02005500730065007200500069006E006E006500640000001C00120000002B00EFBED66CDB9C4DEFD8011C00420000001D00EFBE02004D006900630072006F0073006F00660074002E00570069006E0064006F00770073002E004500780070006C006F0072006500720000001C0000009B0000001C000000010000001C0000002D000000000000009A00000011000000030000000522C56C1000000000433A5C55736572735C757365725C417070446174615C526F616D696E675C4D6963726F736F66745C496E7465726E6574204578706C6F7265725C517569636B204C61756E63685C557365722050696E6E65645C5461736B4261725C46696C65204578706C6F7265722E6C6E6B000060000000030000A058000000000000006465736B746F702D666268387633650014B5BC69C2059D439B4347F5B6C63660A421C645405BED118152000C2923D22B14B5BC69C2059D439B4347F5B6C63660A421C645405BED118152000C2923D22B45000000090000A03900000031535053B1166D44AD8D7048A748402EA43D788C1D000000680000000048000000A3E237A16911924EA5DFB5374E1DB68A0000000000000000000000006A0300004C0000000114020000000000C00000000000004683008000200000006D52D193E790D901FFAAD393E790D901D0ECCE93E790D901630700000000000001000000000000000000000000000000E0013A001F80C827341F105C1042AA032EE45287D668260001002600EFBE12000000B938E4724DEFD801B773BC9C4DEFD801FFAAD393E790D90114005600310000000000BB56D6B011005461736B42617200400009000400EFBE6355AC33BB56D7B02E0000002C9D0100000001000000000000000000000000000000CA148A005400610073006B00420061007200000016004E01320063070000BB56E4B0200042726176652E6C6E6B00440009000400EFBEBB56E4B0BB56E4B02E000000408C000000000400000000000000000000000000000030214000420072006100760065002E006C006E006B0000001800220000001E00EFBE02005500730065007200500069006E006E006500640000001800120000002B00EFBEFFAAD393E790D9011800BE0000001D00EFBE02007B00360044003800300039003300370037002D0036004100460030002D0034003400340042002D0038003900350037002D004100330037003700330046003000320032003000300045007D005C004200720061007600650053006F006600740077006100720065005C00420072006100760065002D00420072006F0077007300650072005C004100700070006C00690063006100740069006F006E005C00620072006100760065002E00650078006500000018000000930000001C000000010000001C0000002D000000000000009200000011000000030000000522C56C1000000000433A5C55736572735C757365725C417070446174615C526F616D696E675C4D6963726F736F66745C496E7465726E6574204578706C6F7265725C517569636B204C61756E63685C557365722050696E6E65645C5461736B4261725C42726176652E6C6E6B000060000000030000A058000000000000006465736B746F702D666268387633650014B5BC69C2059D439B4347F5B6C63660022DD17D40F8ED118157000C292F898514B5BC69C2059D439B4347F5B6C63660022DD17D40F8ED118157000C292F898545000000090000A03900000031535053B1166D44AD8D7048A748402EA43D788C1D000000680000000048000000A3E237A16911924EA5DFB5374E1DB68A000000000000000000000000" /f
+)
+
+exit /b 0
+
+:setAssociations
+
+for /f "usebackq tokens=2 delims=\" %%A in (`reg query "HKEY_USERS" ^| findstr /r /x /c:"HKEY_USERS\\S-.*" /c:"HKEY_USERS\\AME_UserHive_[^_]*"`) do (
+	REM If the "Volatile Environment" key exists, that means it is a proper user. Built in accounts/SIDs don't have this key.
+	reg query "HKU\%%A" | findstr /c:"Volatile Environment" /c:"AME_UserHive_" > NUL 2>&1
+		if not errorlevel 1 (
+			PowerShell -NoP -ExecutionPolicy Bypass -File assoc.ps1 "Placeholder" "%%A" ".html:BraveHTML.FRFHIAC45C4JUB3WIVZBOG7E2E" ".htm:BraveHTML.FRFHIAC45C4JUB3WIVZBOG7E2E" "Proto:https:BraveHTML.FRFHIAC45C4JUB3WIVZBOG7E2E" "Proto:http:BraveHTML.FRFHIAC45C4JUB3WIVZBOG7E2E"
+	)
+)

src/Executables/CLEANUP.bat

@@ -0,0 +1,39 @@
+cmd /c "del /q /f "%WINDIR%\HelpPane.exe""
+for /f "usebackq delims=" %%A in (`dir /b "%WINDIR%\SystemApps\*Client.CBS*"`) do (
+	echo del /q /f "%WINDIR%\SystemApps\%%A\SystemSettingsExtensions.dll"
+	del /q /f "%WINDIR%\SystemApps\%%A\SystemSettingsExtensions.dll"
+)
+
+del /q /f "%SYSTEMDRIVE%\Users\Public\Desktop\Microsoft Edge.lnk"
+del /q /f "%ALLUSERSPROFILE%\Microsoft\Windows\Start Menu\Programs\Accessories\Windows Media Player.lnk"
+
+for /f "usebackq tokens=2 delims=\" %%A in (`reg query "HKEY_USERS" ^| findstr /r /x /c:"HKEY_USERS\\S-.*" /c:"HKEY_USERS\\AME_UserHive_[^_]*"`) do (
+
+
+	reg query "HKU\%%A" | findstr /c:"Volatile Environment" /c:"AME_UserHive_" > NUL 2>&1
+		if not errorlevel 1 (
+			:: Clear W11 start menu pinned items, necessary on newer Windows versions.
+			reg delete "HKU\%%A\SOFTWARE\Microsoft\Windows\CurrentVersion\Start" /v "Config" /f
+
+			for /f "usebackq tokens=3* delims= " %%B in (`reg query "HKU\%%A\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" /v "Local AppData" 2^>^&1 ^| findstr /R /X /C:".*Local AppData[ ]*REG_SZ[ ].*"`) do (
+				:: Clear W11 start menu pinned items
+				for /f "usebackq delims=" %%D in (`dir /b "%%C\Packages" /a:d ^| findstr /c:"Microsoft.Windows.StartMenuExperienceHost"`) do (
+					for /f "usebackq delims=" %%E in (`dir /b "%%C\Packages\%%D\LocalState" /a:-d ^| findstr /R /c:"start.\.bin" /c:"start\.bin"`) do (
+						echo del /q /f "%%C\Packages\%%D\LocalState\%%E"
+						del /q /f "%%C\Packages\%%D\LocalState\%%E"
+					)
+				)
+
+				rmdir /q /s "%%C\Microsoft\Windows\Notifications"
+			)
+
+			for /f "usebackq tokens=2* delims= " %%B in (`reg query "HKU\%~1\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" /v "AppData" 2^>^&1 ^| findstr /R /X /C:".*AppData[ ]*REG_SZ[ ].*"`) do (
+				echo del "%%C\Microsoft\Windows\Start Menu\Programs\Accessories\Internet Explorer.lnk" /q /f
+				del "%%C\Microsoft\Windows\Start Menu\Programs\Accessories\Internet Explorer.lnk" /q /f
+				echo del "%%C\Microsoft\Internet Explorer\Quick Launch\Microsoft Edge.lnk" /q /f
+				del "%%C\Microsoft\Internet Explorer\Quick Launch\Microsoft Edge.lnk" /q /f
+				echo del "%%C\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar\Microsoft Edge.lnk" /q /f
+				del "%%C\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar\Microsoft Edge.lnk" /q /f
+			)
+		)
+)

src/Executables/EDGE.bat

@@ -38,10 +38,14 @@ for /f "usebackq delims=" %%a in (`dir /b /a:d "%SystemDrive%\Users" ^| findstr
 	echo rmdir /q /s "%SystemDrive%\Users\%%a\AppData\Local\Microsoft\EdgeCore"
 	rmdir /q /s "%SystemDrive%\Users\%%a\AppData\Local\Microsoft\EdgeCore"
 
-	echo del /q /f "%SYSTEMDRIVE%\Users\%%A\Desktop\Microsoft Edge.lnk"
-	del /q /f "%SYSTEMDRIVE%\Users\%%A\Desktop\Microsoft Edge.lnk"
-	echo del /q /f "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Accessories\Internet Explorer.lnk"
-	del /q /f "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Accessories\Internet Explorer.lnk"
+	echo del /q /f "%SYSTEMDRIVE%\Users\%%a\Desktop\Microsoft Edge.lnk"
+	del /q /f "%SYSTEMDRIVE%\Users\%%a\Desktop\Microsoft Edge.lnk"
+	echo del /q /f "%SYSTEMDRIVE%\Users\%%a\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Accessories\Internet Explorer.lnk"
+	del /q /f "%SYSTEMDRIVE%\Users\%%a\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Accessories\Internet Explorer.lnk"
+)
+
+for /f "usebackq tokens=1* delims=\" %%A in (`schtasks /query /fo list ^| findstr /c:"\MicrosoftEdge"`) do (
+	schtasks /delete /tn "%%B" /f
 )
 
 exit /b 0

src/Executables/FILEASSOC.bat

@@ -6,6 +6,6 @@ for /f "usebackq tokens=2 delims=\" %%A in (`reg query "HKEY_USERS" ^| findstr /
 	REM If the "Volatile Environment" key exists, that means it is a proper user. Built in accounts/SIDs don't have this key.
 	reg query "HKU\%%A" | findstr /c:"Volatile Environment" /c:"AME_UserHive_" > NUL 2>&1
 		if not errorlevel 1 (
-			PowerShell -NoP -ExecutionPolicy Bypass -File assoc.ps1 "Placeholder" "%%A" ".html:FirefoxHTML-308046B0AF4A39CB" ".htm:FirefoxHTML-308046B0AF4A39CB" ".url:FirefoxURL-308046B0AF4A39CB" "Proto:https:FirefoxURL-308046B0AF4A39CB" "Proto:http:FirefoxURL-308046B0AF4A39CB" "Proto:mailto:Thunderbird.Url.mailto" ".3fr:nomacs.3fr.3" ".3g2:VLC.3g2" ".3gp:VLC.3gp" ".3gp2:VLC.3gp2" ".3gpp:VLC.3gpp" ".aac:VLC.aac" ".adts:VLC.adts" ".aif:VLC.aif" ".aifc:VLC.aifc" ".aiff:VLC.aiff" ".amr:VLC.amr" ".asf:VLC.asf" ".asx:VLC.asx" ".au:VLC.au" ".avi:VLC.avi" ".avifs:nomacs.avifs.3" ".bmp:nomacs.bmp.3" ".cda:VLC.cda" ".cur:nomacs.cur.3" ".dcx:nomacs.dcx.3" ".drif:nomacs.drif.3" ".exif:nomacs.exif.3" ".flac:VLC.flac" ".heif:nomacs.heif.3" ".heifs:nomacs.heifs.3" ".icns:nomacs.icns.3" ".iiq:nomacs.iiq.3" ".jp2:nomacs.jp2.3" ".jpf:nomacs.jp2.3" ".jpg:nomacs.jpg.3" ".jpeg:nomacs.jpg.3" ".jps:nomacs.jps.3" ".m1v:VLC.m1v" ".m2t:VLC.m2t" ".m2ts:VLC.m2ts" ".m3u:VLC.m3u" ".m4a:VLC.m4a" ".m4p:VLC.m4p" ".m4v:VLC.m4v" ".mid:VLC.mid" ".mka:VLC.mka" ".mkv:VLC.mkv" ".mng:nomacs.mng.3" ".mos:nomacs.mos.3" ".mov:VLC.mov" ".MP2:VLC.mp2" ".mp2v:VLC.mp2v" ".mp3:VLC.mp3" ".mp4:VLC.mp4" ".mp4v:VLC.mp4v" ".mpa:VLC.mpa" ".MPE:VLC.mpe" ".mpeg:VLC.mpeg" ".mpg:VLC.mpg" ".mpo:nomacs.mpo.3" ".mpv2:VLC.mpv2" ".mts:VLC.mts" ".pbm:nomacs.pbm.3" ".pcx:nomacs.pcx.3" ".pgm:nomacs.pgm.3" ".png:nomacs.png.3" ".pns:nomacs.pns.3" ".ppm:nomacs.ppm.3" ".psb:nomacs.psb.3" ".psd:nomacs.psd.3" ".ra:VLC.ra" ".raf:nomacs.raf.3" ".ram:VLC.ram" ".rmi:VLC.rmi" ".roh:nomacs.roh.3" ".s3m:VLC.s3m" ".snd:VLC.snd" ".svg:nomacs.svg.3" ".tga:nomacs.tga.3" ".tif:nomacs.tif.3" ".TS:VLC.ts" ".TTS:VLC.tts" ".vec:nomacs.vec.3" ".voc:VLC.voc" ".wav:VLC.wav" ".wbmp:nomacs.wbmp.3" ".webp:nomacs.webp.3" ".wma:VLC.wma" ".wmv:VLC.wmv" ".WPL:VLC.wpl" ".wvx:VLC.wvx" ".x3f:nomacs.x3f.3" ".xbm:nomacs.xbm.3" ".xm:VLC.xm" ".xpm:nomacs.xpm.3" ".zpl:VLC.zpl" ".xml:txtfilelegacy"
+			PowerShell -NoP -ExecutionPolicy Bypass -File assoc.ps1 "Placeholder" "%%A" ".3fr:nomacs.3fr.3" ".avifs:nomacs.avifs.3" ".bmp:nomacs.bmp.3" ".cur:nomacs.cur.3" ".dcx:nomacs.dcx.3" ".drif:nomacs.drif.3" ".exif:nomacs.exif.3" ".heif:nomacs.heif.3" ".heifs:nomacs.heifs.3" ".icns:nomacs.icns.3" ".iiq:nomacs.iiq.3" ".jp2:nomacs.jp2.3" ".jpf:nomacs.jp2.3" ".jpg:nomacs.jpg.3" ".jpeg:nomacs.jpg.3" ".jps:nomacs.jps.3" ".mng:nomacs.mng.3" ".mos:nomacs.mos.3" ".mpo:nomacs.mpo.3" ".pbm:nomacs.pbm.3" ".pcx:nomacs.pcx.3" ".pgm:nomacs.pgm.3" ".png:nomacs.png.3" ".pns:nomacs.pns.3" ".ppm:nomacs.ppm.3" ".psb:nomacs.psb.3" ".psd:nomacs.psd.3" ".raf:nomacs.raf.3" ".roh:nomacs.roh.3" ".svg:nomacs.svg.3" ".tga:nomacs.tga.3" ".tif:nomacs.tif.3" ".vec:nomacs.vec.3" ".wbmp:nomacs.wbmp.3" ".webp:nomacs.webp.3" ".x3f:nomacs.x3f.3" ".xbm:nomacs.xbm.3" ".xpm:nomacs.xpm.3" ".xml:txtfilelegacy"
 	)
 )

src/Executables/FIREFOXCONF.bat → src/Executables/FIREFOX.bat

@@ -1,29 +1,38 @@
 @echo OFF
-if not exist "%~dp0\AME-Firefox-Injection" (
-	echo. & echo No supplied AME-Firefox-Injection folder detected.
-	exit /b 4
-)
-
-:ENTRIES
 
 echo. & echo Grabbing previous Firefox entries...
 
-if not exist "%TEMP%\Firefox-Reg-Output.txt" echo No input entries detected & goto CHECKS
-
-setlocal EnableDelayedExpansion
-set /a "count1=0"
-for /f "usebackq tokens=2 delims=-" %%A in (`findstr /c:"Firefox-" "%TEMP%\Firefox-Reg-Output.txt"`) do (
+for /f "usebackq tokens=2 delims=-" %%A in (`reg query "HKLM\SOFTWARE\Clients\StartMenuInternet" /k /f "Firefox-" ^| findstr /c:"Firefox-"`) do (
 	set /a "count1=!count1!+1"
 	set "ffBef!count1!=%%A"
 	set "par=!par!)"
 	set "arg=!arg!if not "%%D"=="%%A" ("
 )
 
-del /q /f "%TEMP%\Firefox-Reg-Output.txt" > NUL 2>&1
+PowerShell -NoP -C "Start-Process '%ProgramData%\chocolatey\bin\choco.exe' -ArgumentList 'install','-y','--allow-empty-checksums','firefox' -NoNewWindow -Wait"
+PowerShell -NoP -C "Start-Process '%ProgramData%\chocolatey\bin\choco.exe' -ArgumentList 'upgrade','-y','--allow-empty-checksums','firefox' -NoNewWindow -Wait"
+
+call :setAssociations
+
+
+for /f "usebackq delims=" %%A in (`dir /b /a:d "%SYSTEMDRIVE%\Users" ^| findstr /v /i /x /c:"Public" /c:"Default User" /c:"All Users"`) do (
+	echo PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned\Firefox.lnk'); $S.TargetPath = '%HOMEDRIVE%\Program Files\Mozilla Firefox\firefox.exe'; $S.WorkingDirectory = 'C:\Program Files\Mozilla Firefox'; $S.Save()"
+	PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned\Firefox.lnk'); $S.TargetPath = '%HOMEDRIVE%\Program Files\Mozilla Firefox\firefox.exe'; $S.WorkingDirectory = 'C:\Program Files\Mozilla Firefox'; $S.Save()"
+)
+
+if not exist "%~dp0\AME-Firefox-Injection" (
+	echo. & echo No supplied AME-Firefox-Injection folder detected.
+	exit /b 4
+)
+
+:ENTRIES
+
+setlocal EnableDelayedExpansion
+set /a "count1=0"
 
 echo. & echo Comparing Firefox entries...
 set /a "count2=0"
-for /f "usebackq tokens=2 delims=-" %%D in (`reg query "HKLM\SOFTWARE\Clients\StartMenuInternet" /f "Firefox-"`) do (
+for /f "usebackq tokens=2 delims=-" %%D in (`reg query "HKLM\SOFTWARE\Clients\StartMenuInternet" /f "Firefox-" ^| findstr /c:"Firefox-"`) do (
 	set /a "count2=!count2!+1"
 	%arg%set "NewCode=%%D"%par%
 )
@@ -63,6 +72,7 @@ setlocal
 if exist "%PROGRAMFILES%\Mozilla Firefox\firefox.exe" (
 	if not "%~2"=="AME_UserHive_Default" (
 		del "%~1\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar\Firefox.lnk" /q /f
+		mkdir "%~1\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar"
 		PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%~1\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar\Firefox.lnk'); $S.TargetPath = '%HOMEDRIVE%\Program Files\Mozilla Firefox\firefox.exe'; $S.WorkingDirectory = 'C:\Program Files\Mozilla Firefox'; $S.Save()"
 
 		reg add "HKU\%~2\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Taskband" /v "FavoritesResolve" /t REG_BINARY /d "330300004c0000000114020000000000c0000000000000468300800020000000e7e332704eefd80122283a704eefd8015cf4e1fbd161d801970100000000000001000000000000000000000000000000a0013a001f80c827341f105c1042aa032ee45287d668260001002600efbe120000001a1e97454eefd801757130704eefd8015eb737704eefd801140056003100000000006355693411005461736b42617200400009000400efbe63556934635569342e0000009d8a0100000001000000000000000000000000000000a29f33005400610073006b00420061007200000016000e01320097010000a754662a200046494c4545587e312e4c4e4b00007c0009000400efbe63556934635569342e0000009e8a0100000001000000000000000000520000000000a413a200460069006c00650020004500780070006c006f007200650072002e006c006e006b00000040007300680065006c006c00330032002e0064006c006c002c002d003200320030003600370000001c00220000001e00efbe02005500730065007200500069006e006e006500640000001c00120000002b00efbe22283a704eefd8011c00420000001d00efbe02004d006900630072006f0073006f00660074002e00570069006e0064006f00770073002e004500780070006c006f0072006500720000001c0000009c0000001c000000010000001c0000002d000000000000009b000000110000000300000013ebc8041000000000433a5c55736572735c4d634e696e5c417070446174615c526f616d696e675c4d6963726f736f66745c496e7465726e6574204578706c6f7265725c517569636b204c61756e63685c557365722050696e6e65645c5461736b4261725c46696c65204578706c6f7265722e6c6e6b000060000000030000a058000000000000006465736b746f702d666a63716f626d00a84d9f7c73d4f344bf15faa23dfd8b4733f18e66405bed11aa54000c29341e2ea84d9f7c73d4f344bf15faa23dfd8b4733f18e66405bed11aa54000c29341e2e45000000090000a03900000031535053b1166d44ad8d7048a748402ea43d788c1d0000006800000000480000009b7b87bf89df6547b6a80dc335f1c9bf000000000000000000000000e30200004c0000000114020000000000c000000000000046830080002000000098425f0f3461d901570c60443461d901d72f4c542e61d901ed030000000000000100000000000000000000000000000056013a001f80c827341f105c1042aa032ee45287d668260001002600efbe120000001a1e97454eefd801757130704eefd801570c60443461d901140056003100000000007c56e22911005461736b42617200400009000400efbe635569347c56e2292e0000009d8a0100000001000000000000000000000000000000e5c2be005400610073006b0042006100720000001600c4003200ed0300007c561424200046697265666f782e6c6e6b00480009000400efbe7c56b5297c56e5292e000000ab1f010000000900000000000000000000000000000029344f00460069007200650066006f0078002e006c006e006b0000001a00220000001e00efbe02005500730065007200500069006e006e006500640000001a00120000002b00efbe570c60443461d9011a002e0000001d00efbe0200330030003800300034003600420030004100460034004100330039004300420000001a000000960000001c000000010000001c0000002d0000000000000095000000110000000300000013ebc8041000000000433a5c55736572735c4d634e696e5c417070446174615c526f616d696e675c4d6963726f736f66745c496e7465726e6574204578706c6f7265725c517569636b204c61756e63685c557365722050696e6e65645c5461736b4261725c46697265666f782e6c6e6b000060000000030000a058000000000000006465736b746f702d666a63716f626d00a84d9f7c73d4f344bf15faa23dfd8b470616f0c623cded11aa5d000c29a5dd03a84d9f7c73d4f344bf15faa23dfd8b470616f0c623cded11aa5d000c29a5dd0345000000090000a03900000031535053b1166d44ad8d7048a748402ea43d788c1d0000006800000000480000009b7b87bf89df6547b6a80dc335f1c9bf000000000000000000000000" /f
@@ -223,4 +233,16 @@ if %count3% EQU 0 (
 ) else (
 	echo. & echo Successfully injected custom Firefox configs.
 	endlocal & exit /b 1
+)
+
+exit /b 0
+
+:setAssociations
+
+for /f "usebackq tokens=2 delims=\" %%A in (`reg query "HKEY_USERS" ^| findstr /r /x /c:"HKEY_USERS\\S-.*" /c:"HKEY_USERS\\AME_UserHive_[^_]*"`) do (
+	REM If the "Volatile Environment" key exists, that means it is a proper user. Built in accounts/SIDs don't have this key.
+	reg query "HKU\%%A" | findstr /c:"Volatile Environment" /c:"AME_UserHive_" > NUL 2>&1
+		if not errorlevel 1 (
+			PowerShell -NoP -ExecutionPolicy Bypass -File assoc.ps1 "Placeholder" "%%A" ".html:FirefoxHTML-308046B0AF4A39CB" ".htm:FirefoxHTML-308046B0AF4A39CB" "Proto:https:FirefoxURL-308046B0AF4A39CB" "Proto:http:FirefoxURL-308046B0AF4A39CB"
+	)
 )

src/Executables/LIBREWOLF.bat

@@ -0,0 +1,64 @@
+@echo OFF
+
+if exist "%ProgramFiles%\LibreWolf\librewolf.exe" call :setAssociations & exit /b 0
+
+PowerShell -NoP -C "Start-Process '%ProgramData%\chocolatey\bin\choco.exe' -ArgumentList 'install','-y','--allow-empty-checksums','librewolf' -NoNewWindow -Wait"
+
+call :setAssociations
+
+rmdir /q /s "%APPDATA%\Microsoft\Windows\Start Menu\Programs\LibreWolf"
+
+for /f "usebackq delims=" %%A in (`dir /b /a:d "%SYSTEMDRIVE%\Users" ^| findstr /v /i /x /c:"Public" /c:"Default User" /c:"All Users"`) do (
+	mkdir "%SYSTEMDRIVE%\Users\%%A\.librewolf"
+	copy /y "librewolf.overrides.cfg" "%SYSTEMDRIVE%\Users\%%A\.librewolf"
+
+	if exist "%ProgramFiles%\LibreWolf\librewolf.exe" (
+		echo 	PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%PUBLIC%\Desktop\LibreWolf.lnk'); $S.TargetPath = '%ProgramFiles%\LibreWolf\librewolf.exe'; $S.WorkingDirectory = '%ProgramFiles%\LibreWolf'; $S.Save()"
+		PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%PUBLIC%\Desktop\LibreWolf.lnk'); $S.TargetPath = '%ProgramFiles%\LibreWolf\librewolf.exe'; $S.WorkingDirectory = '%ProgramFiles%\LibreWolf'; $S.Save()"
+
+		copy /y "%PUBLIC%\Desktop\LibreWolf.lnk" "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned"
+	)
+)
+if not exist "%ProgramFiles%\LibreWolf\librewolf.exe" exit /b 0
+
+PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%ProgramData%\\Microsoft\Windows\Start Menu\Programs\LibreWolf.lnk'); $S.TargetPath = '%ProgramFiles%\LibreWolf\librewolf.exe'; $S.WorkingDirectory = '%ProgramFiles%\LibreWolf'; $S.Save()"
+PowerShell -NoP -C "$Content = (Get-Content '%~dp0\Layout.xml'); $Content = $Content -replace '%%ALLUSERSPROFILE%%\\Microsoft\\Windows\\Start Menu\\Programs\\Firefox.lnk', '%%ALLUSERSPROFILE%%\\Microsoft\\Windows\\Start Menu\\Programs\\LibreWolf.lnk' | Set-Content '%~dp0\Layout.xml'"
+
+for /f "usebackq tokens=2 delims=\" %%A in (`reg query "HKEY_USERS" ^| findstr /r /x /c:"HKEY_USERS\\S-.*" /c:"HKEY_USERS\\AME_UserHive_[^_]*"`) do (
+	reg query "HKU\%%A" | findstr /c:"Volatile Environment" /c:"AME_UserHive_" > NUL 2>&1
+		if not errorlevel 1 (
+			if "%%A"=="AME_UserHive_Default" (
+				call :AFISCALL "%SYSTEMDRIVE%\Users\Default\AppData\Roaming" "%%A"
+			) else (
+				for /f "usebackq tokens=2* delims= " %%B in (`reg query "HKU\%%A\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" /v "AppData" 2^>^&1 ^| findstr /R /X /C:".*AppData[ ]*REG_SZ[ ].*"`) do (
+					call :AFISCALL "%%C" "%%A"
+				)
+			)
+	)
+)
+exit /b 0
+
+:AFISCALL
+
+setlocal
+
+if not "%~2"=="AME_UserHive_Default" (
+	del "%~1\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar\LibreWolf.lnk" /q /f
+	mkdir "%~1\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar"
+	PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%~1\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar\LibreWolf.lnk'); $S.TargetPath = '%ProgramFiles%\LibreWolf\librewolf.exe'; $S.WorkingDirectory = '%ProgramFiles%\LibreWolf'; $S.Save()"
+
+	reg add "HKU\%~2\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Taskband" /v "Favorites" /t REG_BINARY /d "00A40100003A001F80C827341F105C1042AA032EE45287D668260001002600EFBE12000000B938E4724DEFD801B773BC9C4DEFD8017514D99C4DEFD801140056003100000000006355AC3311005461736B42617200400009000400EFBE6355AC336355AC332E0000002C9D01000000010000000000000000000000000000008B2592005400610073006B00420061007200000016001201320097010000874F0749200046494C4545587E312E4C4E4B00007C0009000400EFBE6355AC336355AC332E000000309D0100000001000000000000000000520000000000589C4400460069006C00650020004500780070006C006F007200650072002E006C006E006B00000040007300680065006C006C00330032002E0064006C006C002C002D003200320030003600370000001C00120000002B00EFBED66CDB9C4DEFD8011C00420000001D00EFBE02004D006900630072006F0073006F00660074002E00570069006E0064006F00770073002E004500780070006C006F0072006500720000001C00260000001E00EFBE0200530079007300740065006D00500069006E006E006500640000001C00000000B80100003A001F80C827341F105C1042AA032EE45287D668260001002600EFBE12000000B938E4724DEFD801B773BC9C4DEFD8017C6FD6F4F190D90114005600310000000000BB56E4B011005461736B42617200400009000400EFBE6355AC33BB56E4B02E0000002C9D010000000100000000000000000000000000000093BB3D005400610073006B004200610072000000160026013200EB060000BB56EAB220004C49425245577E312E4C4E4B00004C0009000400EFBEBB56ADBABB56ADBA2E000000638C0000000004000000000000000000000000000000F12CFE004C00690062007200650057006F006C0066002E006C006E006B0000001C00220000001E00EFBE02005500730065007200500069006E006E006500640000001C00120000002B00EFBE81D3D8F4F190D9011C008A0000001D00EFBE02007B00360044003800300039003300370037002D0036004100460030002D0034003400340042002D0038003900350037002D004100330037003700330046003000320032003000300045007D005C004C00690062007200650057006F006C0066005C006C00690062007200650077006F006C0066002E0065007800650000001C000000FF" /f
+	reg add "HKU\%~2\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Taskband" /v "FavoritesResolve" /t REG_BINARY /d "320300004C0000000114020000000000C0000000000000468300800020000000964FD49C4DEFD801D66CDB9C4DEFD801A8B6C6DADDACD501970100000000000001000000000000000000000000000000A0013A001F80C827341F105C1042AA032EE45287D668260001002600EFBE12000000B938E4724DEFD801B773BC9C4DEFD8017514D99C4DEFD801140056003100000000006355AC3311005461736B42617200400009000400EFBE6355AC336355AC332E0000002C9D01000000010000000000000000000000000000008B2592005400610073006B00420061007200000016000E01320097010000874F0749200046494C4545587E312E4C4E4B00007C0009000400EFBE6355AC336355AC332E000000309D0100000001000000000000000000520000000000589C4400460069006C00650020004500780070006C006F007200650072002E006C006E006B00000040007300680065006C006C00330032002E0064006C006C002C002D003200320030003600370000001C00220000001E00EFBE02005500730065007200500069006E006E006500640000001C00120000002B00EFBED66CDB9C4DEFD8011C00420000001D00EFBE02004D006900630072006F0073006F00660074002E00570069006E0064006F00770073002E004500780070006C006F0072006500720000001C0000009B0000001C000000010000001C0000002D000000000000009A00000011000000030000000522C56C1000000000433A5C55736572735C757365725C417070446174615C526F616D696E675C4D6963726F736F66745C496E7465726E6574204578706C6F7265725C517569636B204C61756E63685C557365722050696E6E65645C5461736B4261725C46696C65204578706C6F7265722E6C6E6B000060000000030000A058000000000000006465736B746F702D666268387633650014B5BC69C2059D439B4347F5B6C63660A421C645405BED118152000C2923D22B14B5BC69C2059D439B4347F5B6C63660A421C645405BED118152000C2923D22B45000000090000A03900000031535053B1166D44AD8D7048A748402EA43D788C1D000000680000000048000000A3E237A16911924EA5DFB5374E1DB68A000000000000000000000000460300004C0000000114020000000000C0000000000000468300800020000000FF45CFF4F190D90181D3D8F4F190D9010F4F6CD6E990D901EB0600000000000001000000000000000000000000000000B8013A001F80C827341F105C1042AA032EE45287D668260001002600EFBE12000000B938E4724DEFD801B773BC9C4DEFD8017C6FD6F4F190D90114005600310000000000BB56E4B011005461736B42617200400009000400EFBE6355AC33BB56E4B02E0000002C9D010000000100000000000000000000000000000093BB3D005400610073006B004200610072000000160026013200EB060000BB56EAB220004C49425245577E312E4C4E4B00004C0009000400EFBEBB56ADBABB56ADBA2E000000638C0000000004000000000000000000000000000000F12CFE004C00690062007200650057006F006C0066002E006C006E006B0000001C00220000001E00EFBE02005500730065007200500069006E006E006500640000001C00120000002B00EFBE81D3D8F4F190D9011C008A0000001D00EFBE02007B00360044003800300039003300370037002D0036004100460030002D0034003400340042002D0038003900350037002D004100330037003700330046003000320032003000300045007D005C004C00690062007200650057006F006C0066005C006C00690062007200650077006F006C0066002E0065007800650000001C000000970000001C000000010000001C0000002D000000000000009600000011000000030000000522C56C1000000000433A5C55736572735C757365725C417070446174615C526F616D696E675C4D6963726F736F66745C496E7465726E6574204578706C6F7265725C517569636B204C61756E63685C557365722050696E6E65645C5461736B4261725C4C69627265576F6C662E6C6E6B000060000000030000A058000000000000006465736B746F702D666268387633650014B5BC69C2059D439B4347F5B6C636607B2FD17D40F8ED118157000C292F898514B5BC69C2059D439B4347F5B6C636607B2FD17D40F8ED118157000C292F898545000000090000A03900000031535053B1166D44AD8D7048A748402EA43D788C1D000000680000000048000000A3E237A16911924EA5DFB5374E1DB68A000000000000000000000000" /f
+)
+
+exit /b 0
+
+:setAssociations
+
+for /f "usebackq tokens=2 delims=\" %%A in (`reg query "HKEY_USERS" ^| findstr /r /x /c:"HKEY_USERS\\S-.*" /c:"HKEY_USERS\\AME_UserHive_[^_]*"`) do (
+	REM If the "Volatile Environment" key exists, that means it is a proper user. Built in accounts/SIDs don't have this key.
+	reg query "HKU\%%A" | findstr /c:"Volatile Environment" /c:"AME_UserHive_" > NUL 2>&1
+		if not errorlevel 1 (
+			PowerShell -NoP -ExecutionPolicy Bypass -File assoc.ps1 "Placeholder" "%%A" ".html:LibreWolfHTM" ".htm:LibreWolfHTM" "Proto:https:LibreWolfHTM" "Proto:http:LibreWolfHTM"
+	)
+)

src/Executables/OLDUI.bat

@@ -0,0 +1,63 @@
+@echo OFF
+
+for /f "usebackq tokens=2 delims=\" %%A in (`reg query "HKEY_USERS" ^| findstr /c:"Classes"`) do (
+		call :UICALL1 "%%A"
+)
+
+for /f "usebackq tokens=2 delims=\" %%A in (`reg query "HKEY_USERS" ^| findstr /r /x /c:"HKEY_USERS\\S-.*" /c:"HKEY_USERS\\AME_UserHive_[^_]*"`) do (
+	reg query "HKU\%%A" | findstr /c:"Volatile Environment" /c:"AME_UserHive_" > NUL 2>&1
+		if not errorlevel 1 call :UICALL2 "%%A"
+)
+
+@exit /b 0
+
+
+:UICALL1
+
+@echo ON
+:: Context Menu
+reg add "HKU\%~1\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}" /f
+reg add "HKU\%~1\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\InprocServer32" /t REG_SZ /d "" /f
+
+:: File Explorer Command Bar
+reg add "HKU\%~1\CLSID\{d93ed569-3b3e-4bff-8355-3c44f6a52bb5}" /f
+reg add "HKU\%~1\CLSID\{d93ed569-3b3e-4bff-8355-3c44f6a52bb5}\InprocServer32" /t REG_SZ /d "" /f
+
+:: Old Explorer Search
+reg add "HKU\%~1\CLSID\{1d64637d-31e9-4b06-9124-e83fb178ac6e}" /f
+reg add "HKU\%~1\CLSID\{1d64637d-31e9-4b06-9124-e83fb178ac6e}\TreatAs" /t REG_SZ /d "{64bc32b5-4eec-4de7-972d-bd8bd0324537}" /f
+@echo OFF
+exit /b 0
+
+:UICALL2
+
+@echo ON
+reg add "HKU\%~1\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "Start_ShowClassicMode" /t REG_DWORD /D 1 /f
+
+reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /f
+reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "OldTaskbar" /t REG_DWORD /D 0 /f
+reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "UpdatePolicy" /t REG_DWORD /D 2 /f
+reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "EnableSymbolDownload" /t REG_DWORD /D 0 /f
+reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "HideControlCenterButton" /t REG_DWORD /D 1 /f
+reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "StartDocked_DisableRecommendedSection" /t REG_DWORD /D 1 /f
+reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "TaskbarGlomLevel" /t REG_DWORD /D 2 /f
+reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "MMTaskbarGlomLevel" /t REG_DWORD /D 2 /f
+reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "OrbStyle" /t REG_DWORD /D 1 /f
+
+reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "FileExplorerCommandUI" /t REG_DWORD /D 2 /f
+reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "StartUI_EnableRoundedCorners" /t REG_DWORD /D 1 /f
+reg add "HKU\%~1\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ExplorerPatcher" /v "StartUI_EnableRoundedCorners" /t REG_DWORD /D 1 /f
+reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "ClockFlyoutOnWinC" /t REG_DWORD /D 1 /f
+reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "DisableOfficeHotkeys" /t REG_DWORD /D 1 /f
+reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "DisableWinFHotkey" /t REG_DWORD /D 1 /f
+reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "DoNotRedirectProgramsAndFeaturesToSettingsApp" /t REG_DWORD /D 1 /f
+
+reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "HideIconAndTitleInExplorer" /t REG_DWORD /D 3 /f
+reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "IMEStyle" /t REG_DWORD /D 4 /f
+
+reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "MicaEffectOnTitlebar" /t REG_DWORD /D 1 /f
+
+reg add "HKU\%~1\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize" /v "SystemUsesLightTheme" /t REG_DWORD /d 0 /f
+reg add "HKU\%~1\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize" /v "AppsUseLightTheme" /t REG_DWORD /d 1 /f
+@echo OFF
+exit /b 0

src/Executables/ONED.bat

@@ -14,8 +14,8 @@ taskkill /f /im "OneDrive.exe"
 for /f "usebackq delims=" %%a in (`dir /b /a:d "%SystemDrive%\Users"`) do (
 	echo rmdir /q /s "%SystemDrive%\Users\%%a\AppData\Local\Microsoft\OneDrive"
 	rmdir /q /s "%SystemDrive%\Users\%%a\AppData\Local\Microsoft\OneDrive"
-	echo rmdir /q /s "%SystemDrive%\Users\%%a\OneDrive"
-	rmdir /q /s "%SystemDrive%\Users\%%a\OneDrive"
+	::echo rmdir /q /s "%SystemDrive%\Users\%%a\OneDrive"
+	::rmdir /q /s "%SystemDrive%\Users\%%a\OneDrive"
 
 	echo del /q /f "%SystemDrive%\Users\%%a\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\OneDrive.lnk"
 	del /q /f "%SystemDrive%\Users\%%a\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\OneDrive.lnk"
@@ -24,7 +24,7 @@ for /f "usebackq delims=" %%a in (`dir /b /a:d "%SystemDrive%\Users"`) do (
 for /f "usebackq delims=" %%e in (`reg query "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\SyncRootManager" ^| findstr /i /c:"OneDrive"`) do echo reg delete "%%e" /f & reg delete "%%e" /f
 
 for /f "usebackq tokens=1* delims=\" %%A in (`schtasks /query /fo list ^| findstr /c:"\OneDrive Reporting Task" /c:"\OneDrive Standalone Update Task"`) do (
-	schtasks /delete /tn "%%b" /f
+	schtasks /delete /tn "%%B" /f
 )
 
 exit /b 0

src/Executables/REGI.bat

@@ -1,5 +1,7 @@
 :: Remove Windows Media Player from default apps list
 NSudoLC -U:T -P:E -M:S -Priority:RealTime -UseCurrentConsole -Wait CMD /c "for /f "usebackq delims=" %%A in (`reg query "HKCR" /f "WMP11*" ^| findstr /c:"WMP11"`) do reg delete "%%A" /f"
+reg delete "HKCR\Applications\wmplayer.exe" /f
+
 @echo off
 for /f "usebackq delims=" %%A in (`reg query "HKCR" /k /f "AppX" ^| findstr /c:"AppX"`) do (
 	reg query "%%A" /v "" | findstr /c:"DesktopStickerEditorCentennial" /c:"LogonWebHost" > NUL

src/Executables/SHRT.bat

@@ -1,36 +0,0 @@
-copy /y "amecs.exe" "%WINDIR%\System32"
-copy /y "ameck.exe" "%WINDIR%\System32"
-
-@echo OFF
-
-for /f "usebackq delims=" %%A in (`dir /b /a:d "%SYSTEMDRIVE%\Users" ^| findstr /v /i /x /c:"Public" /c:"Default User" /c:"All Users"`) do (
-	echo mkdir "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell"
-	mkdir "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell"
-	echo mkdir "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned"
-	mkdir "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned"
-
-	echo mkdir "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\nomacs"
-	mkdir "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\nomacs"
-
-	echo PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned\Terminal.lnk'); $S.TargetPath = '%PROGRAMDATA%\Scoop\GlobalScoopApps\apps\windows-terminal\current\WindowsTerminal.exe'; $S.Save(); $s = $ws.CreateShortcut('%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned\Thunderbird.lnk'); $S.TargetPath = '%HOMEDRIVE%\Program Files\Mozilla Thunderbird\thunderbird.exe'; $S.WorkingDirectory = 'C:\Program Files\Mozilla Thunderbird'; $S.Save(); $s = $ws.CreateShortcut('%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned\Firefox.lnk'); $S.TargetPath = '%HOMEDRIVE%\Program Files\Mozilla Firefox\firefox.exe'; $S.WorkingDirectory = 'C:\Program Files\Mozilla Firefox'; $S.Save(); $s = $ws.CreateShortcut('%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\nomacs\nomacs - Image Lounge.lnk'); $S.TargetPath = '%HOMEDRIVE%\Program Files\nomacs\bin\nomacs.exe'; $S.WorkingDirectory = 'C:\Program Files\nomacs; $S.Save(); $s = $ws.CreateShortcut('%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned\Central AME Script.lnk'); $S.TargetPath = '%WINDIR%\System32\amecs.exe'; $S.Save()"
-	PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned\Terminal.lnk'); $S.TargetPath = '%PROGRAMDATA%\Scoop\GlobalScoopApps\apps\windows-terminal\current\WindowsTerminal.exe'; $S.Save(); $s = $ws.CreateShortcut('%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned\Thunderbird.lnk'); $S.TargetPath = '%HOMEDRIVE%\Program Files\Mozilla Thunderbird\thunderbird.exe'; $S.WorkingDirectory = 'C:\Program Files\Mozilla Thunderbird'; $S.Save(); $s = $ws.CreateShortcut('%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned\Firefox.lnk'); $S.TargetPath = '%HOMEDRIVE%\Program Files\Mozilla Firefox\firefox.exe'; $S.WorkingDirectory = 'C:\Program Files\Mozilla Firefox'; $S.Save(); $s = $ws.CreateShortcut('%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\nomacs\nomacs - Image Lounge.lnk'); $S.TargetPath = '%HOMEDRIVE%\Program Files\nomacs\bin\nomacs.exe'; $S.WorkingDirectory = 'C:\Program Files\nomacs'; $S.Save(); $s = $ws.CreateShortcut('%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned\Central AME Script.lnk'); $S.TargetPath = '%WINDIR%\System32\amecs.exe'; $S.Save()"
-)
-
-@echo ON
-
-del /q /f "%SYSTEMDRIVE%\Users\Public\Desktop\Microsoft Edge.lnk"
-del /q /f "%ALLUSERSPROFILE%\Microsoft\Windows\Start Menu\Programs\Accessories\Windows Media Player.lnk"
-
-for /f "usebackq tokens=2 delims=\" %%A in (`reg query "HKEY_USERS" ^| findstr /r /x /c:"HKEY_USERS\\S-.*" /c:"HKEY_USERS\\AME_UserHive_[^_]*"`) do (
-	reg query "HKU\%%A" | findstr /c:"Volatile Environment" /c:"AME_UserHive_" > NUL 2>&1
-		if not errorlevel 1 (
-			for /f "usebackq tokens=2* delims= " %%B in (`reg query "HKU\%~1\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" /v "AppData" 2^>^&1 ^| findstr /R /X /C:".*AppData[ ]*REG_SZ[ ].*"`) do (
-				echo del "%%C\Microsoft\Windows\Start Menu\Programs\Accessories\Internet Explorer.lnk" /q /f
-				del "%%C\Microsoft\Windows\Start Menu\Programs\Accessories\Internet Explorer.lnk" /q /f
-				echo del "%%C\Microsoft\Internet Explorer\Quick Launch\Microsoft Edge.lnk" /q /f
-				del "%%C\Microsoft\Internet Explorer\Quick Launch\Microsoft Edge.lnk" /q /f
-				echo del "%%C\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar\Microsoft Edge.lnk" /q /f
-				del "%%C\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar\Microsoft Edge.lnk" /q /f
-			)
-		)
-)

src/Executables/SLNT.bat

@@ -8,7 +8,7 @@ for /f "usebackq tokens=2 delims=\" %%A in (`reg query "HKEY_USERS" ^| findstr /
 
 @echo ON
 
-OpenShellSetup_4_4_189.exe /qn /quiet ADDLOCAL=StartMenu
+OpenShellSetup_4_4_191.exe /qn /quiet ADDLOCAL=StartMenu
 
 copy /y Fluent-Metro.skin "%PROGRAMFILES%\Open-Shell\Skins"
 copy /y Fluent-AME.skin7 "%PROGRAMFILES%\Open-Shell\Skins"

src/Executables/SOFTSHRT.bat

@@ -0,0 +1,14 @@
+for /f "usebackq delims=" %%A in (`dir /b /a:d "%SYSTEMDRIVE%\Users" ^| findstr /v /i /x /c:"Public" /c:"Default User" /c:"All Users"`) do (
+	echo mkdir "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell"
+	mkdir "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell"
+	echo mkdir "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned"
+	mkdir "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned"
+
+	echo mkdir "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\nomacs"
+	mkdir "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\nomacs"
+
+	copy /y "Terminal.lnk" "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned\Terminal.lnk"
+
+	echo PowerShell -NoP -C "$s = $ws.CreateShortcut('%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\nomacs\nomacs - Image Lounge.lnk'); $S.TargetPath = '%HOMEDRIVE%\Program Files\nomacs\bin\nomacs.exe'; $S.WorkingDirectory = 'C:\Program Files\nomacs; $S.Save()"
+	PowerShell -NoP -C "$s = $ws.CreateShortcut('%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\nomacs\nomacs - Image Lounge.lnk'); $S.TargetPath = '%HOMEDRIVE%\Program Files\nomacs\bin\nomacs.exe'; $S.WorkingDirectory = 'C:\Program Files\nomacs'; $S.Save()"
+)

src/Executables/THUNDERBIRDSHRT.bat

@@ -0,0 +1,9 @@
+for /f "usebackq delims=" %%A in (`dir /b /a:d "%SYSTEMDRIVE%\Users" ^| findstr /v /i /x /c:"Public" /c:"Default User" /c:"All Users"`) do (
+	echo mkdir "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell"
+	mkdir "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell"
+	echo mkdir "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned"
+	mkdir "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned"
+
+	echo PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned\Thunderbird.lnk'); $S.TargetPath = '%HOMEDRIVE%\Program Files\Mozilla Thunderbird\thunderbird.exe'; $S.WorkingDirectory = 'C:\Program Files\Mozilla Thunderbird'; $S.Save()"
+	PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned\Thunderbird.lnk'); $S.TargetPath = '%HOMEDRIVE%\Program Files\Mozilla Thunderbird\thunderbird.exe'; $S.WorkingDirectory = 'C:\Program Files\Mozilla Thunderbird'; $S.Save()"
+)

src/Executables/TOOLS.bat

@@ -0,0 +1,11 @@
+copy /y "amecs.exe" "%WINDIR%\System32"
+copy /y "ameck.exe" "%WINDIR%\System32"
+
+@echo OFF
+
+for /f "usebackq delims=" %%A in (`dir /b /a:d "%SYSTEMDRIVE%\Users" ^| findstr /v /i /x /c:"Public" /c:"Default User" /c:"All Users"`) do (
+	if exist "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned" (
+		echo PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned\Central AME Script.lnk'); $S.TargetPath = '%WINDIR%\System32\amecs.exe'; $S.Save()"
+		PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned\Central AME Script.lnk'); $S.TargetPath = '%WINDIR%\System32\amecs.exe'; $S.Save()"
+	)
+)

src/Executables/UGC/UGC.bat

@@ -0,0 +1,148 @@
+@echo off
+
+if exist "%PROGRAMFILES%\UngoogledChromium\bin\chrome.exe" exit /b 0
+
+mkdir "%PROGRAMFILES%\UngoogledChromium"
+
+copy /y "UGC\chrlauncher.ini" "%PROGRAMFILES%\UngoogledChromium"
+copy /y "UGC\chrlauncher.exe" "%PROGRAMFILES%\UngoogledChromium"
+copy /y "UGC\chrome.exe" "%PROGRAMFILES%\UngoogledChromium"
+copy /y "UGC\ugc_uninstaller.exe" "%PROGRAMFILES%\UngoogledChromium\Ungoogled Uninstaller.exe"
+
+start "chrlauncher" /b /wait "%PROGRAMFILES%\UngoogledChromium\chrlauncher.exe"
+
+set "ICON=\"%PROGRAMFILES%\UngoogledChromium\bin\chrome.exe\",0"
+
+@echo on
+reg add "HKLM\SOFTWARE\Classes\ChromiumHTML" /ve /t REG_SZ /d "Chromium HTML Document" /f
+reg add "HKLM\SOFTWARE\Classes\ChromiumHTML" /v "AppUserModelId" /t REG_SZ /d "Chromium" /f
+reg add "HKLM\SOFTWARE\Classes\ChromiumHTML\Application" /v "AppUserModelId" /t REG_SZ /d "Chromium" /f
+reg add "HKLM\SOFTWARE\Classes\ChromiumHTML\Application" /v "ApplicationIcon" /t REG_SZ /d "%ICON%" /f
+reg add "HKLM\SOFTWARE\Classes\ChromiumHTML\Application" /v "ApplicationName" /t REG_SZ /d "Ungoogled Chromium" /f
+reg add "HKLM\SOFTWARE\Classes\ChromiumHTML\Application" /v "ApplicationDescription" /t REG_SZ /d "Ungoogled Chromium" /f
+reg add "HKLM\SOFTWARE\Classes\ChromiumHTML\Application" /v "ApplicationCompany" /t REG_SZ /d "Chromium" /f
+reg add "HKLM\SOFTWARE\Classes\ChromiumHTML\DefaultIcon" /ve /t REG_SZ /d "%ICON%" /f
+reg add "HKLM\SOFTWARE\Classes\ChromiumHTML\shell\open\command" /ve /t REG_SZ /d """%PROGRAMFILES%\UngoogledChromium\bin\chrome.exe"" --flag-switches-begin --no-default-browser-check --extension-mime-request-handling=always-prompt-for-install --flag-switches-end --single-argument %%1" /f
+
+::reg add "HKLM\SOFTWARE\Policies\Chromium" /v "DefaultBrowserSettingEnabled" /t REG_DWORD /d 0 /f
+
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium" /ve /t REG_SZ /d "Chromium" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities" /v "ApplicationDescription" /t REG_SZ /d "Ungoogled Chromium" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities" /v "ApplicationIcon" /t REG_SZ /d "%ICON%" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities" /v "ApplicationName" /t REG_SZ /d "Ungoogled Chromium" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\FileAssociations" /v ".htm" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\FileAssociations" /v ".html" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\FileAssociations" /v ".pdf" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\FileAssociations" /v ".shtml" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\FileAssociations" /v ".svg" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\FileAssociations" /v ".xht" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\FileAssociations" /v ".xhtml" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\FileAssociations" /v ".webp" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\Startmenu" /v "StartMenuInternet" /t REG_SZ /d "Chromium" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\URLAssociations" /v "http" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\URLAssociations" /v "https" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\URLAssociations" /v "irc" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\URLAssociations" /v "mailto" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\URLAssociations" /v "mms" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\URLAssociations" /v "news" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\URLAssociations" /v "nntp" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\URLAssociations" /v "sms" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\URLAssociations" /v "smsto" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\URLAssociations" /v "snews" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\URLAssociations" /v "tel" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\URLAssociations" /v "urn" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities\URLAssociations" /v "webcal" /t REG_SZ /d "ChromiumHTML" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\DefaultIcon" /ve /t REG_SZ /d "%ICON%" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\InstallInfo" /v "HideIconsCommand" /t REG_SZ /d """%PROGRAMFILES%\UngoogledChromium\bin\chrome.exe"" --hide-icons" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\InstallInfo" /v "ShowIconsCommand" /t REG_SZ /d """%PROGRAMFILES%\UngoogledChromium\bin\chrome.exe"" --show-icons" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\InstallInfo" /v "IconsVisible" /t REG_DWORD /d "1" /f
+reg add "HKLM\SOFTWARE\Clients\StartMenuInternet\Chromium\shell\open\command" /ve /t REG_SZ /d """%PROGRAMFILES%\UngoogledChromium\bin\chrome.exe"" /f
+
+reg add "HKCR\.htm\OpenWithProgids" /v "Chromium" /f
+reg add "HKCR\.html\OpenWithProgids" /v "Chromium" /f
+reg add "HKCR\.pdf\OpenWithProgids" /v "Chromium" /f
+reg add "HKCR\.shtml\OpenWithProgids" /v "Chromium" /f
+reg add "HKCR\.svg\OpenWithProgids" /v "Chromium" /f
+reg add "HKCR\.xht\OpenWithProgids" /v "Chromium" /f
+reg add "HKCR\.xhtml\OpenWithProgids" /v "Chromium" /f
+reg add "HKCR\.webp\OpenWithProgids" /v "Chromium" /f
+
+reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\chrome.exe" /ve /t REG_SZ /d "%PROGRAMFILES%\UngoogledChromium\bin\chrome.exe" /f
+reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\chrome.exe" /v "Path" /t REG_SZ /d "%PROGRAMFILES%\UngoogledChromium\bin" /f
+
+reg add "HKLM\SOFTWARE\RegisteredApplications" /v "Chromium" /d "SOFTWARE\Clients\StartMenuInternet\Chromium\Capabilities" /f
+
+copy /y "ugc_uninstaller.exe" "%ProgramData%\chocolatey\tools"
+
+reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\UGC-Uninstaller" /v "DisplayName" /t REG_SZ /d "Ungoogled Chromium" /f
+reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\UGC-Uninstaller" /v "DisplayIcon" /t REG_SZ /d "%ICON%" /f
+reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\UGC-Uninstaller" /v "UninstallString" /t REG_SZ /d """%PROGRAMFILES%\UngoogledChromium\Ungoogled Uninstaller.exe""" /f
+reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\UGC-Uninstaller" /v "QuietUninstallString" /t REG_SZ /d """%PROGRAMFILES%\UngoogledChromium\Ungoogled Uninstaller.exe""" /f
+reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\UGC-Uninstaller" /v "NoRepair" /t REG_DWORD /d "1" /f
+
+@echo off
+
+for /f "usebackq tokens=2 delims=\" %%A in (`reg query "HKEY_USERS" ^| findstr /r /x /c:"HKEY_USERS\\S-.*" /c:"HKEY_USERS\\AME_UserHive_[^_]*"`) do (
+	REM If the "Volatile Environment" key exists, that means it is a proper user. Built in accounts/SIDs don't have this key.
+	reg query "HKU\%%A" | findstr /c:"Volatile Environment" /c:"AME_UserHive_" > NUL 2>&1
+		if not errorlevel 1 (
+			PowerShell -NoP -ExecutionPolicy Bypass -File assoc.ps1 "Placeholder" "%%A" ".html:ChromiumHTML" ".htm:ChromiumHTML" "Proto:https:ChromiumHTML" "Proto:http:ChromiumHTML"
+	)
+)
+
+mkdir "%PROGRAMFILES%\UngoogledChromium\Extensions"
+
+copy /y "UGC\Chromium.Web.Store.crx" "%PROGRAMFILES%\UngoogledChromium\Extensions"
+copy /y "uBlock.Origin.crx" "%PROGRAMFILES%\UngoogledChromium\Extensions"
+
+copy /y "UGC\initial_preferences_ugc" "%PROGRAMFILES%\UngoogledChromium\bin\initial_preferences"
+
+reg add "HKLM\SOFTWARE\WOW6432Node\Google" /f
+reg add "HKLM\SOFTWARE\WOW6432Node\Google\Chrome" /f
+reg add "HKLM\SOFTWARE\WOW6432Node\Google\Chrome\Extensions" /f
+
+reg add "HKLM\SOFTWARE\WOW6432Node\Google\Chrome\Extensions\ocaahdebbfolfmndjeplogmgcagdmblk" /v "Path" /t REG_SZ /d "%PROGRAMFILES%\UngoogledChromium\Extensions\Chromium.Web.Store.crx" /f
+reg add "HKLM\SOFTWARE\WOW6432Node\Google\Chrome\Extensions\ocaahdebbfolfmndjeplogmgcagdmblk" /v "Version" /t REG_SZ /d "1.5.4" /f
+
+reg add "HKLM\SOFTWARE\WOW6432Node\Google\Chrome\Extensions\cjpalhdlnbpafiamejdnhcphjbkeiagm" /v "Path" /t REG_SZ /d "%PROGRAMFILES%\UngoogledChromium\Extensions\uBlock.Origin.crx" /f
+reg add "HKLM\SOFTWARE\WOW6432Node\Google\Chrome\Extensions\cjpalhdlnbpafiamejdnhcphjbkeiagm" /v "Version" /t REG_SZ /d "1.52.2" /f
+
+schtasks /create /tn "UGC Update" /tr "\"%PROGRAMFILES%\UngoogledChromium\chrlauncher.exe\"" /ru "SYSTEM" /sc ONLOGON /delay "0000:30" /it /rl HIGHEST /f > NUL
+PowerShell -NoP -C "$TaskSet = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries; Set-ScheduledTask -TaskName 'UGC Update' -Settings $TaskSet" > NUL
+
+for /f "usebackq delims=" %%A in (`dir /b /a:d "%SYSTEMDRIVE%\Users" ^| findstr /v /i /x /c:"Public" /c:"Default User" /c:"All Users"`) do (
+	echo 	PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%PUBLIC%\Desktop\Chromium.lnk'); $S.TargetPath = '%PROGRAMFILES%\UngoogledChromium\bin\chrome.exe'; $S.Arguments = '--flag-switches-begin --no-default-browser-check --extension-mime-request-handling=always-prompt-for-install --flag-switches-end'; $S.WorkingDirectory = '%PROGRAMFILES%\UngoogledChromium\bin'; $S.IconLocation = '%PROGRAMFILES%\UngoogledChromium\bin\chrome.exe, 0'; $S.Save()"
+	PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%PUBLIC%\Desktop\Chromium.lnk'); $S.TargetPath = '%PROGRAMFILES%\UngoogledChromium\bin\chrome.exe'; $S.Arguments = '--flag-switches-begin --no-default-browser-check --extension-mime-request-handling=always-prompt-for-install --flag-switches-end'; $S.WorkingDirectory = '%PROGRAMFILES%\UngoogledChromium\bin'; $S.IconLocation = '%PROGRAMFILES%\UngoogledChromium\bin\chrome.exe, 0'; $S.Save()"
+
+	copy /y "%PUBLIC%\Desktop\Chromium.lnk" "%SYSTEMDRIVE%\Users\%%A\AppData\Roaming\OpenShell\Pinned"
+)
+
+PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%ALLUSERSPROFILE%\Microsoft\Windows\Start Menu\Programs\Chromium.lnk'); $S.TargetPath = '%PROGRAMFILES%\UngoogledChromium\bin\chrome.exe'; $S.Arguments = '--flag-switches-begin --no-default-browser-check --extension-mime-request-handling=always-prompt-for-install --flag-switches-end'; $S.WorkingDirectory = '%PROGRAMFILES%\UngoogledChromium\bin'; $S.IconLocation = '%PROGRAMFILES%\UngoogledChromium\bin\chrome.exe, 0'; $S.Save()"
+PowerShell -NoP -C "$Content = (Get-Content '%~dp0\Layout.xml'); $Content = $Content -replace '%%ALLUSERSPROFILE%%\\Microsoft\\Windows\\Start Menu\\Programs\\Firefox.lnk', '%%ALLUSERSPROFILE%%\Microsoft\Windows\Start Menu\Programs\Chromium.lnk' | Set-Content '%~dp0\Layout.xml'"
+
+for /f "usebackq tokens=2 delims=\" %%A in (`reg query "HKEY_USERS" ^| findstr /r /x /c:"HKEY_USERS\\S-.*" /c:"HKEY_USERS\\AME_UserHive_[^_]*"`) do (
+	reg query "HKU\%%A" | findstr /c:"Volatile Environment" /c:"AME_UserHive_" > NUL 2>&1
+		if not errorlevel 1 (
+			if "%%A"=="AME_UserHive_Default" (
+				call :AFISCALL "%SYSTEMDRIVE%\Users\Default\AppData\Roaming" "%%A"
+			) else (
+				for /f "usebackq tokens=2* delims= " %%B in (`reg query "HKU\%%A\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" /v "AppData" 2^>^&1 ^| findstr /R /X /C:".*AppData[ ]*REG_SZ[ ].*"`) do (
+					call :AFISCALL "%%C" "%%A"
+				)
+			)
+	)
+)
+exit /b 0
+
+:AFISCALL
+
+setlocal
+
+if not "%~2"=="AME_UserHive_Default" (
+	del "%~1\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar\Chromium.lnk" /q /f
+	mkdir "%~1\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar"
+	PowerShell -NoP -C "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut('%~1\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar\Chromium.lnk'); $S.TargetPath = '%PROGRAMFILES%\UngoogledChromium\bin\chrome.exe'; $S.Arguments = '--flag-switches-begin --no-default-browser-check --extension-mime-request-handling=always-prompt-for-install --flag-switches-end'; $S.IconLocation = '%PROGRAMFILES%\UngoogledChromium\bin\chrome.exe, 0'; $S.Save()"
+
+	reg add "HKU\%~2\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Taskband" /v "Favorites" /t REG_BINARY /d "00a40100003a001f80c827341f105c1042aa032ee45287d668260001002600efbe120000001a1e97454eefd801757130704eefd8015eb737704eefd801140056003100000000006355693411005461736b42617200400009000400efbe63556934635569342e0000009d8a0100000001000000000000000000000000000000a29f33005400610073006b00420061007200000016001201320097010000a754662a200046494c4545587e312e4c4e4b00007c0009000400efbe63556934635569342e0000009e8a0100000001000000000000000000520000000000a413a200460069006c00650020004500780070006c006f007200650072002e006c006e006b00000040007300680065006c006c00330032002e0064006c006c002c002d003200320030003600370000001c00120000002b00efbe22283a704eefd8011c00420000001d00efbe02004d006900630072006f0073006f00660074002e00570069006e0064006f00770073002e004500780070006c006f0072006500720000001c00260000001e00efbe0200530079007300740065006d00500069006e006e006500640000001c00000000780300003a001f49471a0359723fa74489c55595fe6b30ee260001002600efbe10000000ce57fdd54defd8016b5d16a0300dda016d49df38310dda011400820074001c004346534616003100000000006355e033120041707044617461000000741a595e96dfd3488d671733bcee28bac5cdfadf9f6756418947c5c76bc0b67f400009000400efbe6355e0336257620b2e00000014070000000002000000000000000000000000000000c013870041007000700044006100740061000000420056003100000000006257b3101000526f616d696e6700400009000400efbe6355e0336257b3102e0000001907000000000200000000000000000000000000000045848a0052006f0061006d0069006e006700000016005c0031000000000093565c2714004d4943524f537e310000440009000400efbe6355e0336257640b2e0000001a0700000000020000000000000000000000000000008d3e04014d006900630072006f0073006f0066007400000018006c00310000000000635544341000494e5445524e7e310000540009000400efbe6355e0336257a20b2e0000002a070000000002000000000000000000000000000000f9f4e30049006e007400650072006e006500740020004500780070006c006f00720065007200000018006200310000000000635545341100515549434b4c7e3100004a0009000400efbe6355e0336257a20b2e0000002b070000000002000000000000000000000000000000db7ee80051007500690063006b0020004c00610075006e00630068000000180060003100000000006355693412005553455250497e310000480009000400efbe635544346257780c2e000000a68701000000020000000000000000000000000000008be53a0055007300650072002000500069006e006e00650064000000180056003100000000000000000010005461736b42617200400009000400efbe00000000000000002e00000000000000000000000000000000000000000000000000000000005400610073006b0042006100720000001600840032003209000062570e1120004368726f6d69756d2e6c6e6b00004a0009000400efbe62575b1062570e112e000000467a00000000080000000000000000000000000000005f89ee004300680072006f006d00690075006d002e006c006e006b0000001c001e0000001d00efbe02004300680072006f006d00690075006d0000001c000000ff" /f
+	reg add "HKU\%~2\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Taskband" /v "FavoritesResolve" /t REG_BINARY /d "330300004c0000000114020000000000c0000000000000468300800020000000e7e332704eefd80122283a704eefd8015cf4e1fbd161d801970100000000000001000000000000000000000000000000a0013a001f80c827341f105c1042aa032ee45287d668260001002600efbe120000001a1e97454eefd801757130704eefd8015eb737704eefd801140056003100000000006355693411005461736b42617200400009000400efbe63556934635569342e0000009d8a0100000001000000000000000000000000000000a29f33005400610073006b00420061007200000016000e01320097010000a754662a200046494c4545587e312e4c4e4b00007c0009000400efbe63556934635569342e0000009e8a0100000001000000000000000000520000000000a413a200460069006c00650020004500780070006c006f007200650072002e006c006e006b00000040007300680065006c006c00330032002e0064006c006c002c002d003200320030003600370000001c00220000001e00efbe02005500730065007200500069006e006e006500640000001c00120000002b00efbe22283a704eefd8011c00420000001d00efbe02004d006900630072006f0073006f00660074002e00570069006e0064006f00770073002e004500780070006c006f0072006500720000001c0000009c0000001c000000010000001c0000002d000000000000009b000000110000000300000013ebc8041000000000433a5c55736572735c4d634e696e5c417070446174615c526f616d696e675c4d6963726f736f66745c496e7465726e6574204578706c6f7265725c517569636b204c61756e63685c557365722050696e6e65645c5461736b4261725c46696c65204578706c6f7265722e6c6e6b000060000000030000a058000000000000006465736b746f702d666a63716f626d00a84d9f7c73d4f344bf15faa23dfd8b4733f18e66405bed11aa54000c29341e2ea84d9f7c73d4f344bf15faa23dfd8b4733f18e66405bed11aa54000c29341e2e45000000090000a03900000031535053b1166d44ad8d7048a748402ea43d788c1d0000006800000000480000009b7b87bf89df6547b6a80dc335f1c9bf000000000000000000000000060500004c0000000114020000000000c00000000000004683008000200000006d6c53b0300dda01ed0c2d77310dda01a1ac2577310dda0132090000000000000100000000000000000000000000000078033a001f49471a0359723fa74489c55595fe6b30ee260001002600efbe10000000ce57fdd54defd8016b5d16a0300dda016d49df38310dda011400820074001c004346534616003100000000006355e033120041707044617461000000741a595e96dfd3488d671733bcee28bac5cdfadf9f6756418947c5c76bc0b67f400009000400efbe6355e0336257620b2e00000014070000000002000000000000000000000000000000c013870041007000700044006100740061000000420056003100000000006257b3101000526f616d696e6700400009000400efbe6355e0336257b3102e0000001907000000000200000000000000000000000000000045848a0052006f0061006d0069006e006700000016005c0031000000000093565c2714004d4943524f537e310000440009000400efbe6355e0336257640b2e0000001a0700000000020000000000000000000000000000008d3e04014d006900630072006f0073006f0066007400000018006c00310000000000635544341000494e5445524e7e310000540009000400efbe6355e0336257a20b2e0000002a070000000002000000000000000000000000000000f9f4e30049006e007400650072006e006500740020004500780070006c006f00720065007200000018006200310000000000635545341100515549434b4c7e3100004a0009000400efbe6355e0336257a20b2e0000002b070000000002000000000000000000000000000000db7ee80051007500690063006b0020004c00610075006e00630068000000180060003100000000006355693412005553455250497e310000480009000400efbe635544346257780c2e000000a68701000000020000000000000000000000000000008be53a0055007300650072002000500069006e006e00650064000000180056003100000000000000000010005461736b42617200400009000400efbe00000000000000002e00000000000000000000000000000000000000000000000000000000005400610073006b0042006100720000001600840032003209000062570e1120004368726f6d69756d2e6c6e6b00004a0009000400efbe62575b1062570e112e000000467a00000000080000000000000000000000000000005f89ee004300680072006f006d00690075006d002e006c006e006b0000001c001e0000001d00efbe02004300680072006f006d00690075006d0000001c000000970000001c000000010000001c0000002d0000000000000096000000110000000300000013ebc8041000000000433a5c55736572735c4d634e696e5c417070446174615c526f616d696e675c4d6963726f736f66745c496e7465726e6574204578706c6f7265725c517569636b204c61756e63685c557365722050696e6e65645c5461736b4261725c4368726f6d69756d2e6c6e6b000060000000030000a058000000000000006465736b746f702d666a63716f626d00a84d9f7c73d4f344bf15faa23dfd8b476a5169c1e978ee11aa63000c290b7f7ca84d9f7c73d4f344bf15faa23dfd8b476a5169c1e978ee11aa63000c290b7f7c45000000090000a03900000031535053b1166d44ad8d7048a748402ea43d788c1d0000006800000000480000009b7b87bf89df6547b6a80dc335f1c9bf000000000000000000000000" /f
+)

src/Executables/UGC/chrlauncher.ini

@@ -0,0 +1,96 @@
+[chrlauncher]
+
+# Custom Chromium update URL (string):
+#ChromiumUpdateUrl=https://chromium.woolyss.com/api/v3/?os=windows&bit=%d&type=%s&out=string
+
+# Command line for Chromium (string):
+# See here: https://peter.sh/experiments/chromium-command-line-switches/
+ChromiumCommandLine=--flag-switches-begin --no-default-browser-check --flag-switches-end
+
+# Chromium executable file name (string):
+ChromiumBinary=chrome.exe
+
+# Chromium binaries directory (string):
+# Relative (to chrlauncher directory) or full path (env. variables supported).
+ChromiumDirectory=.\bin
+
+# Set Chromium binaries architecture (integer):
+#
+# 0		-> 	autodetect (default)
+# 64	-> 64-bit
+# 32	-> 32-bit
+ChromiumArchitecture=0
+
+# Auto download updates if found (boolean)
+#
+# false	-> show tray tip if update found, downloading manually (default)
+# true	-> auto download update and install it!
+ChromiumAutoDownload=true
+
+# Bring chrlauncher window when download started (boolean)
+#
+# false	-> don't bring main window to front automatically
+# true	-> bring chrlauncher window to front when download started (default)
+ChromiumBringToFront=false
+
+# Set download in foreground mode (boolean):
+#
+# false	-> start browser and check/download/install update in background
+# true	-> start browser only when check/download/install update complete (default)
+ChromiumWaitForDownloadEnd=false
+
+# Use chrlauncher as updater, but does not start Chromium (boolean):
+#
+# false	-> update & start Chromium (default)
+# true	-> download & install Chromium update without start
+ChromiumUpdateOnly=true
+
+# Type of Chromium builds:
+#
+# dev-official
+#	Official development builds from snapshots repository
+#	"storage.googleapis.com/chromium-browser-snapshots/index.html" (32/64 bit)
+#
+# stable-codecs-sync
+#	Unofficial stable builds with codecs
+#	"github.com/Hibbiki/chromium-win64/releases" (64 bit)
+#	"github.com/Hibbiki/chromium-win32/releases" (32 bit)
+#
+# dev-nosync
+#	Unofficial development builds without Google services
+#	"github.com/RobRich999/Chromium_Clang/releases" (32/64 bit)
+#
+# dev-codecs-sync
+#	Unofficial development builds with codecs and without Google services
+#	"github.com/macchrome/winchrome/releases" (64 bit)
+#
+# dev-codecs-nosync
+#	Unofficial development builds with codecs and without Google services
+#	"github.com/macchrome/winchrome/releases" (64 bit)
+#
+# ungoogled-chromium
+#	Unofficial builds without Google integration and enhanced privacy (based on Eloston project)
+#	"github.com/macchrome/winchrome/releases/" (32/64 bit)
+#	"github.com/Eloston/ungoogled-chromium"
+#
+# stable-codecs-nosync
+#	Unofficial stable builds with codecs and without google services
+#	!!! DISCONTINUED since June 2018 !!!
+ChromiumType=ungoogled-chromium
+
+# Check for new Chromium version once in X days (integer):
+#
+# 2	-> check updates once in a X days (default)
+# 0	-> disable update checking
+# -1	-> force update checking
+ChromiumCheckPeriod=-1
+
+# Last cached update checking timestamp (integer):
+ChromiumLastCheck=0
+
+#
+# Internal settings (SDK)
+#
+
+# Set custom useragent (string):
+#UserAgent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.0.0 Safari/537.36

src/Executables/UGC/initial_preferences_ugc

@@ -0,0 +1,182 @@
+{
+    "https_only_mode_enabled": true,
+    "skip_first_run_ui" : true,
+    "show_welcome_page" : false,
+    "extensions": {
+        "settings": {
+            "ocaahdebbfolfmndjeplogmgcagdmblk": {
+                "location": 1,
+                "manifest": {
+                    "content_scripts": [
+                        {
+                            "matches": [
+                                "https://chrome.google.com/webstore*",
+                                "https://addons.opera.com/*extensions/details/*",
+                                "https://microsoftedge.microsoft.com/addons/*"
+                            ],
+                            "js": ["scripts/util.js", "scripts/inject.js"],
+                            "run_at": "document_end"
+                        }
+                    ],
+                    "host_permissions": ["https://clients2.google.com/service/*"],
+                    "optional_host_permissions": ["<all_urls>"],
+                    "background": {
+                        "service_worker": "scripts/background.js"
+                    },
+                    "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqF/d41Q7agjkUzYq8ZGbQr8XW8mmEIMXOnR1uCTnYLL+Dm9Z+LO50xZukOISNy6zFxpI8ts/OGLsm+I2x9+UprUU4/EVdmxuwegFE6NBoEhHoRNYY0gbXZkaU8YY/XwzjVY/k18DDhl5NYPEnF6uq4Oyidg+xtd3W4+iGYczuOLER1Tp5y614zOTphcvFYhvUkCijQ6HT1TtRq/34SlFoRQqo4SFiLriK451xWIcfwiMLIekWrdoQa1v8dqIlMA3r6CKc0QykJpSYbiyormWiZ0hl2HLpkZ85mD9V0eDQ5RCtb6vkybK7INcq4yKQV4YkXhr9NpX9U4re4dlFQjEJQIDAQAB",
+                    "name": "Chromium Web Store (Installing...)",
+                    "permissions": [
+                        "management",
+                        "storage",
+                        "alarms",
+                        "contextMenus",
+                        "downloads"
+                    ],
+                    "update_url": "https://raw.githubusercontent.com/NeverDecaf/chromium-web-store/master/updates.xml",
+                    "version": "0.0",
+                    "manifest_version": 3
+                },
+                "path": "ocaahdebbfolfmndjeplogmgcagdmblk\\0.0",
+                "state": 1,
+                "granted_permissions":{
+                    "api": [
+                        "alarms",
+                        "contextMenus",
+                        "downloads",
+                        "management",
+                        "storage"
+                    ],
+                    "explicit_host":["https://clients2.google.com/*"],
+                    "manifest_permissions":[],
+                    "scriptable_host": [
+                        "https://addons.opera.com/*extensions/details/*",
+                        "https://chrome.google.com/webstore*",
+                        "https://microsoftedge.microsoft.com/addons/*"
+                    ]
+                }
+            },
+            "cjpalhdlnbpafiamejdnhcphjbkeiagm": {
+                "location": 1,
+                "manifest": {
+                    "content_scripts": [
+                        {
+                          "all_frames": true,
+                          "js": [
+                            "/js/vapi.js",
+                            "/js/vapi-client.js",
+                            "/js/contentscript.js"
+                          ],
+                          "match_about_blank": true,
+                          "matches": [
+                            "http://*/*",
+                            "https://*/*"
+                          ],
+                          "run_at": "document_start"
+                        },
+                        {
+                          "all_frames": false,
+                          "js": [
+                            "/js/scriptlets/subscriber.js"
+                          ],
+                          "matches": [
+                            "https://easylist.to/*",
+                            "https://*.fanboy.co.nz/*",
+                            "https://filterlists.com/*",
+                            "https://forums.lanik.us/*",
+                            "https://github.com/*",
+                            "https://*.github.io/*",
+                            "https://*.letsblock.it/*"
+                          ],
+                          "run_at": "document_idle"
+                        }
+                    ],
+                    "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmJNzUNVjS6Q1qe0NRqpmfX/oSJdgauSZNdfeb5RV1Hji21vX0TivpP5gq0fadwmvmVCtUpOaNUopgejiUFm/iKHPs0o3x7hyKk/eX0t2QT3OZGdXkPiYpTEC0f0p86SQaLoA2eHaOG4uCGi7sxLJmAXc6IsxGKVklh7cCoLUgWEMnj8ZNG2Y8UKG3gBdrpES5hk7QyFDMraO79NmSlWRNgoJHX6XRoY66oYThFQad8KL8q3pf3Oe8uBLKywohU0ZrDPViWHIszXoE9HEvPTFAbHZ1umINni4W/YVs+fhqHtzRJcaKJtsTaYy+cholu5mAYeTZqtHf6bcwJ8t9i2afwIDAQAB",
+                    "name": "uBlock Origin (Installing...)",
+                    "permissions": [
+                        "contextMenus",
+                        "privacy",
+                        "storage",
+                        "tabs",
+                        "unlimitedStorage",
+                        "webNavigation",
+                        "webRequest",
+                        "webRequestBlocking",
+                        "<all_urls>"
+                    ],
+                    "update_url": "https://clients2.google.com/service/update2/crx",
+                    "version": "0.0",
+                    "manifest_version": 2
+                },
+                "path": "cjpalhdlnbpafiamejdnhcphjbkeiagm\\0.0",
+                "state": 1,
+                "granted_permissions": {
+                    "api": [
+                        "contextMenus",
+                        "privacy",
+                        "storage",
+                        "tabs",
+                        "unlimitedStorage",
+                        "webNavigation",
+                        "webRequest",
+                        "webRequestBlocking"
+                    ],
+                    "explicit_host": [
+                        "\u003Call_urls>",
+                        "chrome://favicon/*"
+                    ],
+                    "manifest_permissions":[],
+                    "scriptable_host": [
+                        "http://*/*",
+                        "https://*.fanboy.co.nz/*",
+                        "https://*.github.io/*",
+                        "https://*.letsblock.it/*",
+                        "https://*/*",
+                        "https://easylist.to/*",
+                        "https://filterlists.com/*",
+                        "https://forums.lanik.us/*",
+                        "https://github.com/*"
+                    ]
+                },
+                "incognito": true
+            }
+        }
+    },
+    "default_search_provider_data": {
+        "template_url_data": {
+            "alternate_urls": [],
+            "contextual_search_url": "",
+            "created_by_policy": false,
+            "created_from_play_api": false,
+            "doodle_url": "",
+            "favicon_url": "https://start.duckduckgo.com/favicon.ico",
+            "id": "10",
+            "image_search_branding_label": "",
+            "image_translate_source_language_param_key": "",
+            "image_translate_target_language_param_key": "",
+            "image_translate_url": "",
+            "image_url": "",
+            "image_url_post_params": "",
+            "input_encodings": [],
+            "is_active": 1,
+            "keyword": "start.duckduckgo.com",
+            "logo_url": "",
+            "new_tab_url": "",
+            "originating_url": "",
+            "preconnect_to_search_url": false,
+            "prefetch_likely_navigations": false,
+            "prepopulate_id": 0,
+            "safe_for_autoreplace": false,
+            "search_intent_params": [],
+            "search_url_post_params": "",
+            "short_name": "DuckDuckGo",
+            "side_image_search_param": "",
+            "side_search_param": "",
+            "starter_pack_id": 0,
+            "suggestions_url": "https://start.duckduckgo.com/ac/?q={searchTerms}&type=list",
+            "suggestions_url_post_params": "",
+            "url": "https://start.duckduckgo.com/?q={searchTerms}",
+            "usage_count": 0
+        }
+    }
+}
+

src/Executables/UI.bat

@@ -1,17 +1,5 @@
-
-cmd /c "del /q /f "%WINDIR%\HelpPane.exe""
-
-ame-hexer "%WINDIR%\Resources\Themes\aero\Shell\NormalColor\shellstyle.dll" "3c69662069643d2261746f6d2848656c70427574746f6e29223e" "3c69662069643d2261746f6d282d2d2d52454d4f56454429223e" 120000
-ame-hexer "%WINDIR%\Resources\Themes\aero\Shell\NormalColor\shellstyle.dll" "3c69662069643d2261746f6d2848656c70427574746f6e29223e" "3c69662069643d2261746f6d282d2d2d52454d4f56454429223e" 120000
-
-
 @echo OFF
 
-for /f "usebackq delims=" %%A in (`dir /b "%WINDIR%\SystemApps\*Client.CBS*"`) do (
-	echo del /q /f "%WINDIR%\SystemApps\%%A\SystemSettingsExtensions.dll"
-	del /q /f "%WINDIR%\SystemApps\%%A\SystemSettingsExtensions.dll"
-)
-
 for /f "usebackq tokens=2 delims=\" %%A in (`reg query "HKEY_USERS" ^| findstr /c:"Classes"`) do (
 		call :UICALL1 "%%A"
 )
@@ -21,8 +9,6 @@ for /f "usebackq tokens=2 delims=\" %%A in (`reg query "HKEY_USERS" ^| findstr /
 		if not errorlevel 1 call :UICALL2 "%%A"
 )
 
-for /f "usebackq delims=" %%E in (`reg query "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall" ^| findstr /i /c:"ExplorerPatcher"`) do reg delete "%%E" /f
-
 @exit /b 0
 
 
@@ -33,10 +19,6 @@ for /f "usebackq delims=" %%E in (`reg query "HKLM\SOFTWARE\Microsoft\Windows\Cu
 reg add "HKU\%~1\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}" /f
 reg add "HKU\%~1\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\InprocServer32" /t REG_SZ /d "" /f
 
-:: File Explorer Command Bar
-reg add "HKU\%~1\CLSID\{d93ed569-3b3e-4bff-8355-3c44f6a52bb5}" /f
-reg add "HKU\%~1\CLSID\{d93ed569-3b3e-4bff-8355-3c44f6a52bb5}\InprocServer32" /t REG_SZ /d "" /f
-
 :: Old Explorer Search
 reg add "HKU\%~1\CLSID\{1d64637d-31e9-4b06-9124-e83fb178ac6e}" /f
 reg add "HKU\%~1\CLSID\{1d64637d-31e9-4b06-9124-e83fb178ac6e}\TreatAs" /t REG_SZ /d "{64bc32b5-4eec-4de7-972d-bd8bd0324537}" /f
@@ -46,30 +28,6 @@ exit /b 0
 :UICALL2
 
 @echo ON
-reg add "HKU\%~1\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "Start_ShowClassicMode" /t REG_DWORD /D 1 /f
-
-reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /f
-reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "OldTaskbar" /t REG_DWORD /D 0 /f
-reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "UpdatePolicy" /t REG_DWORD /D 2 /f
-reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "EnableSymbolDownload" /t REG_DWORD /D 0 /f
-reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "HideControlCenterButton" /t REG_DWORD /D 1 /f
-reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "StartDocked_DisableRecommendedSection" /t REG_DWORD /D 1 /f
-reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "TaskbarGlomLevel" /t REG_DWORD /D 2 /f
-reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "MMTaskbarGlomLevel" /t REG_DWORD /D 2 /f
-reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "OrbStyle" /t REG_DWORD /D 1 /f
-
-reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "FileExplorerCommandUI" /t REG_DWORD /D 2 /f
-reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "StartUI_EnableRoundedCorners" /t REG_DWORD /D 1 /f
-reg add "HKU\%~1\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ExplorerPatcher" /v "StartUI_EnableRoundedCorners" /t REG_DWORD /D 1 /f
-reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "ClockFlyoutOnWinC" /t REG_DWORD /D 1 /f
-reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "DisableOfficeHotkeys" /t REG_DWORD /D 1 /f
-reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "DisableWinFHotkey" /t REG_DWORD /D 1 /f
-reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "DoNotRedirectProgramsAndFeaturesToSettingsApp" /t REG_DWORD /D 1 /f
-
-reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "HideIconAndTitleInExplorer" /t REG_DWORD /D 3 /f
-reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "IMEStyle" /t REG_DWORD /D 4 /f
-
-reg add "HKU\%~1\SOFTWARE\ExplorerPatcher" /v "MicaEffectOnTitlebar" /t REG_DWORD /D 1 /f
 
 reg add "HKU\%~1\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize" /v "SystemUsesLightTheme" /t REG_DWORD /d 0 /f
 reg add "HKU\%~1\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize" /v "AppsUseLightTheme" /t REG_DWORD /d 1 /f

src/Executables/VLCASSOC.bat

@@ -0,0 +1,8 @@
+@echo OFF
+for /f "usebackq tokens=2 delims=\" %%A in (`reg query "HKEY_USERS" ^| findstr /r /x /c:"HKEY_USERS\\S-.*" /c:"HKEY_USERS\\AME_UserHive_[^_]*"`) do (
+	REM If the "Volatile Environment" key exists, that means it is a proper user. Built in accounts/SIDs don't have this key.
+	reg query "HKU\%%A" | findstr /c:"Volatile Environment" /c:"AME_UserHive_" > NUL 2>&1
+		if not errorlevel 1 (
+			PowerShell -NoP -ExecutionPolicy Bypass -File assoc.ps1 "Placeholder" "%%A" ".3g2:VLC.3g2" ".3gp:VLC.3gp" ".3gp2:VLC.3gp2" ".3gpp:VLC.3gpp" ".aac:VLC.aac" ".adts:VLC.adts" ".aif:VLC.aif" ".aifc:VLC.aifc" ".aiff:VLC.aiff" ".amr:VLC.amr" ".asf:VLC.asf" ".asx:VLC.asx" ".au:VLC.au" ".avi:VLC.avi" ".cda:VLC.cda" ".flac:VLC.flac" ".m1v:VLC.m1v" ".m2t:VLC.m2t" ".m2ts:VLC.m2ts" ".m3u:VLC.m3u" ".m4a:VLC.m4a" ".m4p:VLC.m4p" ".m4v:VLC.m4v" ".mid:VLC.mid" ".mka:VLC.mka" ".mkv:VLC.mkv" ".mov:VLC.mov" ".MP2:VLC.mp2" ".mp2v:VLC.mp2v" ".mp3:VLC.mp3" ".mp4:VLC.mp4" ".mp4v:VLC.mp4v" ".mpa:VLC.mpa" ".MPE:VLC.mpe" ".mpeg:VLC.mpeg" ".mpg:VLC.mpg" ".mpv2:VLC.mpv2" ".mts:VLC.mts" ".ra:VLC.ra" ".ram:VLC.ram" ".rmi:VLC.rmi" ".s3m:VLC.s3m" ".snd:VLC.snd" ".TS:VLC.ts" ".TTS:VLC.tts" ".voc:VLC.voc" ".wav:VLC.wav" ".wma:VLC.wma" ".wmv:VLC.wmv" ".WPL:VLC.wpl" ".wvx:VLC.wvx" ".xm:VLC.xm" ".zpl:VLC.zpl" 
+	)
+)

src/Executables/initial_preferences_brave

@@ -0,0 +1,135 @@
+{
+    "https_only_mode_enabled": true,
+    "skip_first_run_ui" : true,
+    "show_welcome_page" : false,
+    "new_tab_page": {
+        "hide_all_widgets": true,
+        "shows_options": 0
+    },
+    "extensions": {
+        "settings": {
+            "cjpalhdlnbpafiamejdnhcphjbkeiagm": {
+                "location": 1,
+                "manifest": {
+                    "content_scripts": [
+                        {
+                          "all_frames": true,
+                          "js": [
+                            "/js/vapi.js",
+                            "/js/vapi-client.js",
+                            "/js/contentscript.js"
+                          ],
+                          "match_about_blank": true,
+                          "matches": [
+                            "http://*/*",
+                            "https://*/*"
+                          ],
+                          "run_at": "document_start"
+                        },
+                        {
+                          "all_frames": false,
+                          "js": [
+                            "/js/scriptlets/subscriber.js"
+                          ],
+                          "matches": [
+                            "https://easylist.to/*",
+                            "https://*.fanboy.co.nz/*",
+                            "https://filterlists.com/*",
+                            "https://forums.lanik.us/*",
+                            "https://github.com/*",
+                            "https://*.github.io/*",
+                            "https://*.letsblock.it/*"
+                          ],
+                          "run_at": "document_idle"
+                        }
+                    ],
+                    "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmJNzUNVjS6Q1qe0NRqpmfX/oSJdgauSZNdfeb5RV1Hji21vX0TivpP5gq0fadwmvmVCtUpOaNUopgejiUFm/iKHPs0o3x7hyKk/eX0t2QT3OZGdXkPiYpTEC0f0p86SQaLoA2eHaOG4uCGi7sxLJmAXc6IsxGKVklh7cCoLUgWEMnj8ZNG2Y8UKG3gBdrpES5hk7QyFDMraO79NmSlWRNgoJHX6XRoY66oYThFQad8KL8q3pf3Oe8uBLKywohU0ZrDPViWHIszXoE9HEvPTFAbHZ1umINni4W/YVs+fhqHtzRJcaKJtsTaYy+cholu5mAYeTZqtHf6bcwJ8t9i2afwIDAQAB",
+                    "name": "uBlock Origin (Installing...)",
+                    "permissions": [
+                        "contextMenus",
+                        "privacy",
+                        "storage",
+                        "tabs",
+                        "unlimitedStorage",
+                        "webNavigation",
+                        "webRequest",
+                        "webRequestBlocking",
+                        "<all_urls>"
+                    ],
+                    "update_url": "https://clients2.google.com/service/update2/crx",
+                    "version": "0.0",
+                    "manifest_version": 2
+                },
+                "path": "cjpalhdlnbpafiamejdnhcphjbkeiagm\\0.0",
+                "state": 1,
+                "granted_permissions": {
+                    "api": [
+                        "contextMenus",
+                        "privacy",
+                        "storage",
+                        "tabs",
+                        "unlimitedStorage",
+                        "webNavigation",
+                        "webRequest",
+                        "webRequestBlocking"
+                    ],
+                    "explicit_host": [
+                        "\u003Call_urls>",
+                        "chrome://favicon/*"
+                    ],
+                    "manifest_permissions":[],
+                    "scriptable_host": [
+                        "http://*/*",
+                        "https://*.fanboy.co.nz/*",
+                        "https://*.github.io/*",
+                        "https://*.letsblock.it/*",
+                        "https://*/*",
+                        "https://easylist.to/*",
+                        "https://filterlists.com/*",
+                        "https://forums.lanik.us/*",
+                        "https://github.com/*"
+                    ]
+                },
+                "incognito": true
+            }
+        }
+    },
+    "default_search_provider_data": {
+        "template_url_data": {
+            "alternate_urls": [],
+            "contextual_search_url": "",
+            "created_by_policy": false,
+            "created_from_play_api": false,
+            "doodle_url": "",
+            "favicon_url": "https://start.duckduckgo.com/favicon.ico",
+            "id": "10",
+            "image_search_branding_label": "",
+            "image_translate_source_language_param_key": "",
+            "image_translate_target_language_param_key": "",
+            "image_translate_url": "",
+            "image_url": "",
+            "image_url_post_params": "",
+            "input_encodings": [],
+            "is_active": 1,
+            "keyword": "start.duckduckgo.com",
+            "logo_url": "",
+            "new_tab_url": "",
+            "originating_url": "",
+            "preconnect_to_search_url": false,
+            "prefetch_likely_navigations": false,
+            "prepopulate_id": 0,
+            "safe_for_autoreplace": false,
+            "search_intent_params": [],
+            "search_url_post_params": "",
+            "short_name": "DuckDuckGo",
+            "side_image_search_param": "",
+            "side_search_param": "",
+            "starter_pack_id": 0,
+            "suggestions_url": "https://start.duckduckgo.com/ac/?q={searchTerms}&type=list",
+            "suggestions_url_post_params": "",
+            "url": "https://start.duckduckgo.com/?q={searchTerms}",
+            "usage_count": 0
+        }
+    }
+}
+

src/Executables/install.ps1

@@ -1,588 +0,0 @@
-# Issue Tracker: https://github.com/ScoopInstaller/Install/issues
-# Unlicense License:
-#
-# This is free and unencumbered software released into the public domain.
-#
-# Anyone is free to copy, modify, publish, use, compile, sell, or
-# distribute this software, either in source code form or as a compiled
-# binary, for any purpose, commercial or non-commercial, and by any
-# means.
-#
-# In jurisdictions that recognize copyright laws, the author or authors
-# of this software dedicate any and all copyright interest in the
-# software to the public domain. We make this dedication for the benefit
-# of the public at large and to the detriment of our heirs and
-# successors. We intend this dedication to be an overt act of
-# relinquishment in perpetuity of all present and future rights to this
-# software under copyright law.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-#
-# For more information, please refer to <http://unlicense.org/>
-
-<#
-.SYNOPSIS
-    Scoop installer.
-.DESCRIPTION
-    The installer of Scoop. For details please check the website and wiki.
-.PARAMETER ScoopDir
-    Specifies Scoop root path.
-    If not specified, Scoop will be installed to '$env:USERPROFILE\scoop'.
-.PARAMETER ScoopGlobalDir
-    Specifies directory to store global apps.
-    If not specified, global apps will be installed to '$env:ProgramData\scoop'.
-.PARAMETER ScoopCacheDir
-    Specifies cache directory.
-    If not specified, caches will be downloaded to '$ScoopDir\cache'.
-.PARAMETER NoProxy
-    Bypass system proxy during the installation.
-.PARAMETER Proxy
-    Specifies proxy to use during the installation.
-.PARAMETER ProxyCredential
-    Specifies credential for the given prxoy.
-.PARAMETER ProxyUseDefaultCredentials
-    Use the credentials of the current user for the proxy server that is specified by the -Proxy parameter.
-.PARAMETER RunAsAdmin
-    Force to run the installer as administrator.
-.LINK
-    https://scoop.sh
-.LINK
-    https://github.com/ScoopInstaller/Scoop/wiki
-#>
-param(
-    [String] $ScoopDir,
-    [String] $ScoopGlobalDir,
-    [String] $ScoopCacheDir,
-    [Switch] $NoProxy,
-    [Uri] $Proxy,
-    [System.Management.Automation.PSCredential] $ProxyCredential,
-    [Switch] $ProxyUseDefaultCredentials,
-    [Switch] $RunAsAdmin
-)
-
-# Disable StrictMode in this script
-Set-StrictMode -Off
-
-function Write-InstallInfo {
-    param(
-        [Parameter(Mandatory = $True, Position = 0)]
-        [String] $String,
-        [Parameter(Mandatory = $False, Position = 1)]
-        [System.ConsoleColor] $ForegroundColor = $host.UI.RawUI.ForegroundColor
-    )
-
-    $backup = $host.UI.RawUI.ForegroundColor
-
-    if ($ForegroundColor -ne $host.UI.RawUI.ForegroundColor) {
-        $host.UI.RawUI.ForegroundColor = $ForegroundColor
-    }
-
-    Write-Output "$String"
-
-    $host.UI.RawUI.ForegroundColor = $backup
-}
-
-function Deny-Install {
-    param(
-        [String] $message,
-        [Int] $errorCode = 1
-    )
-
-    Write-InstallInfo -String $message -ForegroundColor DarkRed
-    Write-InstallInfo "Abort."
-
-    # Don't abort if invoked with iex that would close the PS session
-    if ($IS_EXECUTED_FROM_IEX) {
-        break
-    } else {
-        exit $errorCode
-    }
-}
-
-function Test-ValidateParameter {
-    if ($null -eq $Proxy -and ($null -ne $ProxyCredential -or $ProxyUseDefaultCredentials)) {
-        Deny-Install "Provide a valid proxy URI for the -Proxy parameter when using the -ProxyCredential or -ProxyUseDefaultCredentials."
-    }
-
-    if ($ProxyUseDefaultCredentials -and $null -ne $ProxyCredential) {
-        Deny-Install "ProxyUseDefaultCredentials is conflict with ProxyCredential. Don't use the -ProxyCredential and -ProxyUseDefaultCredentials together."
-    }
-}
-
-function Test-IsAdministrator {
-    return ([Security.Principal.WindowsPrincipal]`
-            [Security.Principal.WindowsIdentity]::GetCurrent()`
-    ).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
-}
-
-function Test-Prerequisite {
-    # Scoop requires PowerShell 5 at least
-    if (($PSVersionTable.PSVersion.Major) -lt 5) {
-        Deny-Install "PowerShell 5 or later is required to run Scoop. Go to https://microsoft.com/powershell to get the latest version of PowerShell."
-    }
-
-    # Scoop requires TLS 1.2 SecurityProtocol, which exists in .NET Framework 4.5+
-    if ([System.Enum]::GetNames([System.Net.SecurityProtocolType]) -notcontains 'Tls12') {
-        Deny-Install "Scoop requires .NET Framework 4.5+ to work. Go to https://microsoft.com/net/download to get the latest version of .NET Framework."
-    }
-
-    # Ensure Robocopy.exe is accessible
-    if (!([bool](Get-Command -Name 'robocopy' -ErrorAction SilentlyContinue))) {
-        Deny-Install "Scoop requires 'C:\Windows\System32\Robocopy.exe' to work. Please make sure 'C:\Windows\System32' is in your PATH."
-    }
-
-    # Detect if RunAsAdministrator, there is no need to run as administrator when installing Scoop.
-    if (!$RunAsAdmin -and (Test-IsAdministrator)) {
-        Deny-Install "Running the installer as administrator is disabled by default, see https://github.com/ScoopInstaller/Install#for-admin for details."
-    }
-
-    # Show notification to change execution policy
-    $allowedExecutionPolicy = @('Unrestricted', 'RemoteSigned', 'ByPass')
-    if ((Get-ExecutionPolicy).ToString() -notin $allowedExecutionPolicy) {
-        Deny-Install "PowerShell requires an execution policy in [$($allowedExecutionPolicy -join ", ")] to run Scoop. For example, to set the execution policy to 'RemoteSigned' please run 'Set-ExecutionPolicy RemoteSigned -Scope CurrentUser'."
-    }
-
-    # Test if scoop is installed, by checking if scoop command exists.
-    if ([bool](Get-Command -Name 'scoop' -ErrorAction SilentlyContinue)) {
-        Deny-Install "Scoop is already installed. Run 'scoop update' to get the latest version."
-    }
-}
-
-function Optimize-SecurityProtocol {
-    # .NET Framework 4.7+ has a default security protocol called 'SystemDefault',
-    # which allows the operating system to choose the best protocol to use.
-    # If SecurityProtocolType contains 'SystemDefault' (means .NET4.7+ detected)
-    # and the value of SecurityProtocol is 'SystemDefault', just do nothing on SecurityProtocol,
-    # 'SystemDefault' will use TLS 1.2 if the webrequest requires.
-    $isNewerNetFramework = ([System.Enum]::GetNames([System.Net.SecurityProtocolType]) -contains 'SystemDefault')
-    $isSystemDefault = ([System.Net.ServicePointManager]::SecurityProtocol.Equals([System.Net.SecurityProtocolType]::SystemDefault))
-
-    # If not, change it to support TLS 1.2
-    if (!($isNewerNetFramework -and $isSystemDefault)) {
-        # Set to TLS 1.2 (3072), then TLS 1.1 (768), and TLS 1.0 (192). Ssl3 has been superseded,
-        # https://docs.microsoft.com/en-us/dotnet/api/system.net.securityprotocoltype?view=netframework-4.5
-        [System.Net.ServicePointManager]::SecurityProtocol = 3072 -bor 768 -bor 192
-        Write-Verbose "SecurityProtocol has been updated to support TLS 1.2"
-    }
-}
-
-function Get-Downloader {
-    $downloadSession = New-Object System.Net.WebClient
-
-    # Set proxy to null if NoProxy is specificed
-    if ($NoProxy) {
-        $downloadSession.Proxy = $null
-    } elseif ($Proxy) {
-        # Prepend protocol if not provided
-        if (!$Proxy.IsAbsoluteUri) {
-            $Proxy = New-Object System.Uri("http://" + $Proxy.OriginalString)
-        }
-
-        $Proxy = New-Object System.Net.WebProxy($Proxy)
-
-        if ($null -ne $ProxyCredential) {
-            $Proxy.Credentials = $ProxyCredential.GetNetworkCredential()
-        } elseif ($ProxyUseDefaultCredentials) {
-            $Proxy.UseDefaultCredentials = $true
-        }
-
-        $downloadSession.Proxy = $Proxy
-    }
-
-    return $downloadSession
-}
-
-function Test-isFileLocked {
-    param(
-        [String] $path
-    )
-
-    $file = New-Object System.IO.FileInfo $path
-
-    if (!(Test-Path $path)) {
-        return $false
-    }
-
-    try {
-        $stream = $file.Open(
-            [System.IO.FileMode]::Open,
-            [System.IO.FileAccess]::ReadWrite,
-            [System.IO.FileShare]::None
-        )
-        if ($stream) {
-            $stream.Close()
-        }
-        return $false
-    } catch {
-        # The file is locked by a process.
-        return $true
-    }
-}
-
-function Expand-ZipArchive {
-    param(
-        [String] $path,
-        [String] $to
-    )
-
-    if (!(Test-Path $path)) {
-        Deny-Install "Unzip failed: can't find $path to unzip."
-    }
-
-    # Check if the zip file is locked, by antivirus software for example
-    $retries = 0
-    while ($retries -le 10) {
-        if ($retries -eq 10) {
-            Deny-Install "Unzip failed: can't unzip because a process is locking the file."
-        }
-        if (Test-isFileLocked $path) {
-            Write-InstallInfo "Waiting for $path to be unlocked by another process... ($retries/10)"
-            $retries++
-            Start-Sleep -Seconds 2
-        } else {
-            break
-        }
-    }
-
-    # Workaround to suspend Expand-Archive verbose output,
-    # upstream issue: https://github.com/PowerShell/Microsoft.PowerShell.Archive/issues/98
-    $oldVerbosePreference = $VerbosePreference
-    $global:VerbosePreference = 'SilentlyContinue'
-    # PowerShell 5+: use Expand-Archive to extract zip files
-    Microsoft.PowerShell.Archive\Expand-Archive -Path $path -DestinationPath $to -Force
-    $global:VerbosePreference = $oldVerbosePreference
-}
-
-function Out-UTF8File {
-    param(
-        [Parameter(Mandatory = $True, Position = 0)]
-        [Alias("Path")]
-        [String] $FilePath,
-        [Switch] $Append,
-        [Switch] $NoNewLine,
-        [Parameter(ValueFromPipeline = $True)]
-        [PSObject] $InputObject
-    )
-    process {
-        if ($Append) {
-            [System.IO.File]::AppendAllText($FilePath, $InputObject)
-        } else {
-            if (!$NoNewLine) {
-                # Ref: https://stackoverflow.com/questions/5596982
-                # Performance Note: `WriteAllLines` throttles memory usage while
-                # `WriteAllText` needs to keep the complete string in memory.
-                [System.IO.File]::WriteAllLines($FilePath, $InputObject)
-            } else {
-                # However `WriteAllText` does not add ending newline.
-                [System.IO.File]::WriteAllText($FilePath, $InputObject)
-            }
-        }
-    }
-}
-
-function Import-ScoopShim {
-    Write-InstallInfo "Creating shim..."
-    # The scoop executable
-    $path = "$SCOOP_APP_DIR\bin\scoop.ps1"
-
-    if (!(Test-Path $SCOOP_SHIMS_DIR)) {
-        New-Item -Type Directory $SCOOP_SHIMS_DIR | Out-Null
-    }
-
-    # The scoop shim
-    $shim = "$SCOOP_SHIMS_DIR\scoop"
-
-    # Convert to relative path
-    Push-Location $SCOOP_SHIMS_DIR
-    $relativePath = Resolve-Path -Relative $path
-    Pop-Location
-    $absolutePath = Resolve-Path $path
-
-    # if $path points to another drive resolve-path prepends .\ which could break shims
-    $ps1text = if ($relativePath -match '^(\.\\)?\w:.*$') {
-        @(
-            "# $absolutePath",
-            "`$path = `"$path`"",
-            "if (`$MyInvocation.ExpectingInput) { `$input | & `$path $arg @args } else { & `$path $arg @args }",
-            "exit `$LASTEXITCODE"
-        )
-    } else {
-        @(
-            "# $absolutePath",
-            "`$path = Join-Path `$PSScriptRoot `"$relativePath`"",
-            "if (`$MyInvocation.ExpectingInput) { `$input | & `$path $arg @args } else { & `$path $arg @args }",
-            "exit `$LASTEXITCODE"
-        )
-    }
-    $ps1text -join "`r`n" | Out-UTF8File "$shim.ps1"
-
-    # make ps1 accessible from cmd.exe
-    @(
-        "@rem $absolutePath",
-        "@echo off",
-        "setlocal enabledelayedexpansion",
-        "set args=%*",
-        ":: replace problem characters in arguments",
-        "set args=%args:`"='%",
-        "set args=%args:(=``(%",
-        "set args=%args:)=``)%",
-        "set invalid=`"='",
-        "if !args! == !invalid! ( set args= )",
-        "where /q pwsh.exe",
-        "if %errorlevel% equ 0 (",
-        "    pwsh -noprofile -ex unrestricted -file `"$absolutePath`" $arg %args%",
-        ") else (",
-        "    powershell -noprofile -ex unrestricted -file `"$absolutePath`" $arg %args%",
-        ")"
-    ) -join "`r`n" | Out-UTF8File "$shim.cmd"
-
-    @(
-        "#!/bin/sh",
-        "# $absolutePath",
-        "if command -v pwsh.exe > /dev/null 2>&1; then",
-        "    pwsh.exe -noprofile -ex unrestricted -file `"$absolutePath`" $arg `"$@`"",
-        "else",
-        "    powershell.exe -noprofile -ex unrestricted -file `"$absolutePath`" $arg `"$@`"",
-        "fi"
-    ) -join "`n" | Out-UTF8File $shim -NoNewLine
-}
-
-function Get-Env {
-    param(
-        [String] $name,
-        [Switch] $global
-    )
-
-    $target = if ($global) { 'Machine' } else { 'User' }
-    return [Environment]::GetEnvironmentVariable($name, $target)
-}
-
-function Add-ShimsDirToPath {
-    # Get $env:PATH of current user
-    $userEnvPath = Get-Env 'PATH'
-
-    if ($userEnvPath -notmatch [Regex]::Escape($SCOOP_SHIMS_DIR)) {
-        $h = (Get-PSProvider 'FileSystem').Home
-        if (!$h.EndsWith('\')) {
-            $h += '\'
-        }
-
-        if (!($h -eq '\')) {
-            $friendlyPath = "$SCOOP_SHIMS_DIR" -Replace ([Regex]::Escape($h)), "~\"
-            Write-InstallInfo "Adding $friendlyPath to your path."
-        } else {
-            Write-InstallInfo "Adding $SCOOP_SHIMS_DIR to your path."
-        }
-
-        # For future sessions
-        [System.Environment]::SetEnvironmentVariable('PATH', "$SCOOP_SHIMS_DIR;$userEnvPath", 'User')
-        # For current session
-        $env:PATH = "$SCOOP_SHIMS_DIR;$env:PATH"
-    }
-}
-
-function Use-Config {
-    if (!(Test-Path $SCOOP_CONFIG_FILE)) {
-        return $null
-    }
-
-    try {
-        return (Get-Content $SCOOP_CONFIG_FILE -Raw | ConvertFrom-Json -ErrorAction Stop)
-    } catch {
-        Deny-Install "ERROR loading $SCOOP_CONFIG_FILE`: $($_.Exception.Message)"
-    }
-}
-
-function Add-Config {
-    param (
-        [Parameter(Mandatory = $True, Position = 0)]
-        [String] $Name,
-        [Parameter(Mandatory = $True, Position = 1)]
-        [String] $Value
-    )
-
-    $scoopConfig = Use-Config
-
-    if ($scoopConfig -is [System.Management.Automation.PSObject]) {
-        if ($Value -eq [bool]::TrueString -or $Value -eq [bool]::FalseString) {
-            $Value = [System.Convert]::ToBoolean($Value)
-        }
-        if ($null -eq $scoopConfig.$Name) {
-            $scoopConfig | Add-Member -MemberType NoteProperty -Name $Name -Value $Value
-        } else {
-            $scoopConfig.$Name = $Value
-        }
-    } else {
-        $baseDir = Split-Path -Path $SCOOP_CONFIG_FILE
-        if (!(Test-Path $baseDir)) {
-            New-Item -Type Directory $baseDir | Out-Null
-        }
-
-        $scoopConfig = New-Object PSObject
-        $scoopConfig | Add-Member -MemberType NoteProperty -Name $Name -Value $Value
-    }
-
-    if ($null -eq $Value) {
-        $scoopConfig.PSObject.Properties.Remove($Name)
-    }
-
-    ConvertTo-Json $scoopConfig | Set-Content $SCOOP_CONFIG_FILE -Encoding ASCII
-    return $scoopConfig
-}
-
-function Add-DefaultConfig {
-    # If user-level SCOOP env not defined, save to rootPath
-    if (!(Get-Env 'SCOOP')) {
-        if ($SCOOP_DIR -ne "$env:USERPROFILE\scoop") {
-            Write-Verbose "Adding config rootPath: $SCOOP_DIR"
-            Add-Config -Name 'rootPath' -Value $SCOOP_DIR | Out-Null
-        }
-    }
-
-    # Use system SCOOP_GLOBAL, or set system SCOOP_GLOBAL
-    # with $env:SCOOP_GLOBAL if RunAsAdmin, otherwise save to globalPath
-    if (!(Get-Env 'SCOOP_GLOBAL' -global)) {
-        if ((Test-IsAdministrator) -and $env:SCOOP_GLOBAL) {
-            Write-Verbose "Setting System Environment Variable SCOOP_GLOBAL: $env:SCOOP_GLOBAL"
-            [Environment]::SetEnvironmentVariable('SCOOP_GLOBAL', $env:SCOOP_GLOBAL, 'Machine')
-        } else {
-            if ($SCOOP_GLOBAL_DIR -ne "$env:ProgramData\scoop") {
-                Write-Verbose "Adding config globalPath: $SCOOP_GLOBAL_DIR"
-                Add-Config -Name 'globalPath' -Value $SCOOP_GLOBAL_DIR | Out-Null
-            }
-        }
-    }
-
-    # Use system SCOOP_CACHE, or set system SCOOP_CACHE
-    # with $env:SCOOP_CACHE if RunAsAdmin, otherwise save to cachePath
-    if (!(Get-Env 'SCOOP_CACHE' -global)) {
-        if ((Test-IsAdministrator) -and $env:SCOOP_CACHE) {
-            Write-Verbose "Setting System Environment Variable SCOOP_CACHE: $env:SCOOP_CACHE"
-            [Environment]::SetEnvironmentVariable('SCOOP_CACHE', $env:SCOOP_CACHE, 'Machine')
-        } else {
-            if ($SCOOP_CACHE_DIR -ne "$SCOOP_DIR\cache") {
-                Write-Verbose "Adding config cachePath: $SCOOP_CACHE_DIR"
-                Add-Config -Name 'cachePath' -Value $SCOOP_CACHE_DIR | Out-Null
-            }
-        }
-    }
-
-    # save current datatime to lastUpdate
-    Add-Config -Name 'lastUpdate' -Value ([System.DateTime]::Now.ToString('o')) | Out-Null
-}
-
-function Install-Scoop {
-    Write-InstallInfo "Initializing..."
-    # Validate install parameters
-    Test-ValidateParameter
-    # Check prerequisites
-    Test-Prerequisite
-    # Enable TLS 1.2
-    Optimize-SecurityProtocol
-
-    # Download scoop zip from GitHub
-    Write-InstallInfo "Downloading..."
-    $downloader = Get-Downloader
-    # 1. download scoop
-    $scoopZipfile = "$SCOOP_APP_DIR\scoop.zip"
-    if (!(Test-Path $SCOOP_APP_DIR)) {
-        New-Item -Type Directory $SCOOP_APP_DIR | Out-Null
-    }
-    Write-Verbose "Downloading $SCOOP_PACKAGE_REPO to $scoopZipfile"
-    $downloader.downloadFile($SCOOP_PACKAGE_REPO, $scoopZipfile)
-    # 2. download scoop main bucket
-    $scoopMainZipfile = "$SCOOP_MAIN_BUCKET_DIR\scoop-main.zip"
-    if (!(Test-Path $SCOOP_MAIN_BUCKET_DIR)) {
-        New-Item -Type Directory $SCOOP_MAIN_BUCKET_DIR | Out-Null
-    }
-    Write-Verbose "Downloading $SCOOP_MAIN_BUCKET_REPO to $scoopMainZipfile"
-    $downloader.downloadFile($SCOOP_MAIN_BUCKET_REPO, $scoopMainZipfile)
-
-    # Extract files from downloaded zip
-    Write-InstallInfo "Extracting..."
-    # 1. extract scoop
-    $scoopUnzipTempDir = "$SCOOP_APP_DIR\_tmp"
-    Write-Verbose "Extracting $scoopZipfile to $scoopUnzipTempDir"
-    Expand-ZipArchive $scoopZipfile $scoopUnzipTempDir
-    Copy-Item "$scoopUnzipTempDir\scoop-*\*" $SCOOP_APP_DIR -Recurse -Force
-    # 2. extract scoop main bucket
-    $scoopMainUnzipTempDir = "$SCOOP_MAIN_BUCKET_DIR\_tmp"
-    Write-Verbose "Extracting $scoopMainZipfile to $scoopMainUnzipTempDir"
-    Expand-ZipArchive $scoopMainZipfile $scoopMainUnzipTempDir
-    Copy-Item "$scoopMainUnzipTempDir\Main-*\*" $SCOOP_MAIN_BUCKET_DIR -Recurse -Force
-
-    # Cleanup
-    Remove-Item $scoopUnzipTempDir -Recurse -Force
-    Remove-Item $scoopZipfile
-    Remove-Item $scoopMainUnzipTempDir -Recurse -Force
-    Remove-Item $scoopMainZipfile
-
-    # Create the scoop shim
-    Import-ScoopShim
-    # Finially ensure scoop shims is in the PATH
-    Add-ShimsDirToPath
-    # Setup initial configuration of Scoop
-    Add-DefaultConfig
-
-    Write-InstallInfo "Scoop was installed successfully!" -ForegroundColor DarkGreen
-    Write-InstallInfo "Type 'scoop help' for instructions."
-}
-
-function Write-DebugInfo {
-    param($BoundArgs)
-
-    Write-Verbose "-------- PSBoundParameters --------"
-    $BoundArgs.GetEnumerator() | ForEach-Object { Write-Verbose $_ }
-    Write-Verbose "-------- Environment Variables --------"
-    Write-Verbose "`$env:USERPROFILE: $env:USERPROFILE"
-    Write-Verbose "`$env:ProgramData: $env:ProgramData"
-    Write-Verbose "`$env:SCOOP: $env:SCOOP"
-    Write-Verbose "`$env:SCOOP_CACHE: $SCOOP_CACHE"
-    Write-Verbose "`$env:SCOOP_GLOBAL: $env:SCOOP_GLOBAL"
-    Write-Verbose "-------- Selected Variables --------"
-    Write-Verbose "SCOOP_DIR: $SCOOP_DIR"
-    Write-Verbose "SCOOP_CACHE_DIR: $SCOOP_CACHE_DIR"
-    Write-Verbose "SCOOP_GLOBAL_DIR: $SCOOP_GLOBAL_DIR"
-    Write-Verbose "SCOOP_CONFIG_HOME: $SCOOP_CONFIG_HOME"
-}
-
-# Prepare variables
-$IS_EXECUTED_FROM_IEX = ($null -eq $MyInvocation.MyCommand.Path)
-
-# Scoop root directory
-$SCOOP_DIR = $ScoopDir, $env:SCOOP, "$env:USERPROFILE\scoop" | Where-Object { -not [String]::IsNullOrEmpty($_) } | Select-Object -First 1
-# Scoop global apps directory
-$SCOOP_GLOBAL_DIR = $ScoopGlobalDir, $env:SCOOP_GLOBAL, "$env:ProgramData\scoop" | Where-Object { -not [String]::IsNullOrEmpty($_) } | Select-Object -First 1
-# Scoop cache directory
-$SCOOP_CACHE_DIR = $ScoopCacheDir, $env:SCOOP_CACHE, "$SCOOP_DIR\cache" | Where-Object { -not [String]::IsNullOrEmpty($_) } | Select-Object -First 1
-# Scoop shims directory
-$SCOOP_SHIMS_DIR = "$SCOOP_DIR\shims"
-# Scoop itself directory
-$SCOOP_APP_DIR = "$SCOOP_DIR\apps\scoop\current"
-# Scoop main bucket directory
-$SCOOP_MAIN_BUCKET_DIR = "$SCOOP_DIR\buckets\main"
-# Scoop config file location
-$SCOOP_CONFIG_HOME = $env:XDG_CONFIG_HOME, "$env:USERPROFILE\.config" | Select-Object -First 1
-$SCOOP_CONFIG_FILE = "$SCOOP_CONFIG_HOME\scoop\config.json"
-
-# TODO: Use a specific version of Scoop and the main bucket
-$SCOOP_PACKAGE_REPO = "https://github.com/ScoopInstaller/Scoop/archive/master.zip"
-$SCOOP_MAIN_BUCKET_REPO = "https://github.com/ScoopInstaller/Main/archive/master.zip"
-
-# Quit if anything goes wrong
-$oldErrorActionPreference = $ErrorActionPreference
-$ErrorActionPreference = 'Stop'
-
-# Logging debug info
-Write-DebugInfo $PSBoundParameters
-# Bootstrap function
-Install-Scoop
-
-# Reset $ErrorActionPreference to original value
-$ErrorActionPreference = $oldErrorActionPreference

src/Executables/librewolf.overrides.cfg

@@ -0,0 +1,8 @@
+defaultPref("privacy.clearOnShutdown.cache", false);
+defaultPref("privacy.clearOnShutdown.cookies", false);
+defaultPref("privacy.clearOnShutdown.offlineApps", false);
+defaultPref("privacy.clearOnShutdown.downloads", false);
+defaultPref("privacy.clearOnShutdown.formdata", false);
+defaultPref("privacy.clearOnShutdown.history", false);
+defaultPref("privacy.clearOnShutdown.sessions", false);
+defaultPref("privacy.sanitize.sanitizeOnShutdown", false);

src/Executables/scoop.ps1

@@ -12,7 +12,6 @@ icacls "$env:ProgramData\Scoop" /grant Users:F /t | Out-Null
 
 scoop install git --global
 scoop bucket add extras
-scoop install windows-terminal --global
 $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")
 $forwardData = $env:ProgramData.Replace('\','/')
 git config --global --add safe.directory "$forwardData/Scoop/buckets/extras"

src/playbook.conf

@@ -6,18 +6,21 @@
 	<Title>Windows 11 Amelioration Playbook</Title>
 	<Description>This Playbook will ameliorate your installation&#xD;&#xA;&#xD;&#xA;The amelioration process makes heavy alterations to your installation. This Playbook assists you in quickly deploying AME with a default configuration.</Description>
 	<Details>Official Ameliorated Playbook for Windows 11. Cutting the tumor out of your OS.</Details>
-	<Version>0.4</Version>
+	<Version>0.6</Version>
+	<Overhaul>true</Overhaul>
 	<SupportedBuilds>
 		<string>22000</string>
 		<string>22621</string>
+		<string>22631</string>
 	</SupportedBuilds>
 	<Requirements>
 		<Requirement>Internet</Requirement>
 		<Requirement>NoPendingUpdates</Requirement>
+		<Requirement>NoTweakware</Requirement>
 		<Requirement>Activation</Requirement>
 		<Requirement>DefenderDisabled</Requirement>
 		<Requirement>NoAntivirus</Requirement>
-		<Requirement>PasswordSet</Requirement>
+		<Requirement>LocalAccounts</Requirement>
 		<Requirement>AdministratorPasswordSet</Requirement>
 		<Requirement>PluggedIn</Requirement>
 	</Requirements>
@@ -26,4 +29,148 @@
 	<Git>https://git.ameliorated.info/Styris/AME-11</Git>
 	<DonateLink>https://www.patreon.com/Ameliorated</DonateLink>
 	<Website>https://ameliorated.io</Website>
+	<FeaturePages>
+		<CheckboxPage Description="Please select which features you would like to include or exclude with this Playbook.">
+			<TopLine Text="We strongly recommend keeping all options!"/>
+			<Options>
+				<CheckboxOption>
+					<Text>Install open-source replacement software</Text>
+					<Name>software</Name>
+				</CheckboxOption>
+				<CheckboxOption>
+					<Text>Modify Windows UI</Text>
+					<Name>ui</Name>
+				</CheckboxOption>
+				<CheckboxOption>
+					<Text>Include Ameliorated tools</Text>
+					<Name>ame-tools</Name>
+				</CheckboxOption>
+			</Options>
+		</CheckboxPage>
+		<RadioPage DefaultOption="security-enhanced" Description="Please select the security model. This affects how authentication and permissions work.">
+			<TopLine Text="We strongly recommend enhanced security!"/>
+			<Options>
+				<RadioOption>
+					<Text>Enhanced security (recommended)</Text>
+					<Name>security-enhanced</Name>
+				</RadioOption>
+				<RadioOption>
+					<Text>Windows default</Text>
+					<Name>security-default</Name>
+				</RadioOption>
+			</Options>
+			<BottomLine Text="Learn more" Link="https://docs.ameliorated.io/general/enhanced-security.html"/>
+		</RadioPage>
+		<RadioImagePage CheckDefaultBrowser="true" DependsOn="software" DefaultOption="browser-firefox" Description="Please select a preferred browser. We can only provide a curated experience for some options.">
+			<TopLine Text="We strongly recommend Firefox"/>
+			<Options>
+				<RadioImageOption>
+					<Text>Firefox</Text>
+					<Name>browser-firefox</Name>
+					<FileName>firefox</FileName>
+					<GradientTopColor>#FF3647</GradientTopColor>
+					<GradientBottomColor>#FFC742</GradientBottomColor>
+				</RadioImageOption>
+				<RadioImageOption>
+					<Text>UGC</Text>
+					<Name>browser-ugc</Name>
+					<FileName>chromium</FileName>
+					<GradientTopColor>#14305E</GradientTopColor>
+					<GradientBottomColor>#3577E6</GradientBottomColor>
+				</RadioImageOption>
+				<RadioImageOption>
+					<Text>Librewolf</Text>
+					<Name>browser-librewolf</Name>
+					<FileName>librewolf</FileName>
+					<GradientTopColor>#057DB6</GradientTopColor>
+					<GradientBottomColor>#86D8FF</GradientBottomColor>
+				</RadioImageOption>
+				<RadioImageOption>
+					<Text>Brave</Text>
+					<Name>browser-brave</Name>
+					<FileName>brave</FileName>
+					<GradientTopColor>#A33401</GradientTopColor>
+					<GradientBottomColor>#FFC481</GradientBottomColor>
+				</RadioImageOption>
+			</Options>
+			<BottomLine Text="Learn more" Link="https://docs.ameliorated.io/general/browsers.html"/>
+		</RadioImagePage>
+		<RadioImagePage DependsOn="software" DefaultOption="media-vlc" Description="Please select a preferred media player. VLC is simpler to use, and mpv offers more options.">
+			<TopLine Text="Note that mpv has a better playback quality"/>
+			<Options>
+				<RadioImageOption None="true"/>
+				<RadioImageOption>
+					<Text>VLC</Text>
+					<Name>media-vlc</Name>
+					<FileName>vlc</FileName>
+					<GradientTopColor>#9D1D00</GradientTopColor>
+					<GradientBottomColor>#F0C557</GradientBottomColor>
+				</RadioImageOption>
+				<RadioImageOption>
+					<Text>mpv</Text>
+					<Name>media-mpv</Name>
+					<FileName>mpv</FileName>
+					<GradientTopColor>#420143</GradientTopColor>
+					<GradientBottomColor>#B88FB9</GradientBottomColor>
+				</RadioImageOption>
+			</Options>
+			<BottomLine Text="Learn more" Link="https://docs.ameliorated.io/general/media-players.html"/>
+		</RadioImagePage>
+		<RadioImagePage DependsOn="software" DefaultOption="email-thunderbird" Description="Please select a preferred e-mail client. Send and receive e-mails via IMAP/POP.">
+			<TopLine Text="We recommend Thunderbird"/>
+			<Options>
+				<RadioImageOption None="true"/>
+				<RadioImageOption>
+					<Text>Thunderbird</Text>
+					<Name>email-thunderbird</Name>
+					<FileName>thunderbird</FileName>
+					<GradientTopColor>#0E5395</GradientTopColor>
+					<GradientBottomColor>#ACA2F1</GradientBottomColor>
+				</RadioImageOption>
+				<RadioImageOption>
+					<Text>Spark</Text>
+					<Name>email-spark</Name>
+					<FileName>spark</FileName>
+					<GradientTopColor>#0942A1</GradientTopColor>
+					<GradientBottomColor>#90C0FF</GradientBottomColor>
+				</RadioImageOption>
+				<RadioImageOption>
+					<Text>Mailspring</Text>
+					<Name>email-mailspring</Name>
+					<FileName>mailspring</FileName>
+					<GradientTopColor>#389AC2</GradientTopColor>
+					<GradientBottomColor>#87F1DD</GradientBottomColor>
+				</RadioImageOption>
+			</Options>
+			<BottomLine Text="Learn more" Link="https://docs.ameliorated.io/general/email-clients.html"/>
+		</RadioImagePage>
+		<RadioImagePage DependsOn="software" DefaultOption="office-onlyoffice" Description="Please select a preferred office suite. Create and edit Microsoft Office documents.">
+			<TopLine Text="We recommend OnlyOffice"/>
+			<Options>
+				<RadioImageOption None="true"/>
+				<RadioImageOption>
+					<Text>OnlyOffice</Text>
+					<Name>office-onlyoffice</Name>
+					<FileName>onlyoffice</FileName>
+					<GradientTopColor>#d9d6d6</GradientTopColor>
+					<GradientBottomColor>#ebc2b5</GradientBottomColor>
+				</RadioImageOption>
+				<RadioImageOption>
+					<Text>FreeOffice</Text>
+					<Name>office-freeoffice</Name>
+					<FileName>freeoffice</FileName>
+					<GradientTopColor>#d8d6d6</GradientTopColor>
+					<GradientBottomColor>#ecd09a</GradientBottomColor>
+				</RadioImageOption>
+				<RadioImageOption>
+					<Text>LibreOffice</Text>
+					<Name>office-libreoffice</Name>
+					<FileName>libreoffice</FileName>
+					<GradientTopColor>#d8d6d6</GradientTopColor>
+					<GradientBottomColor>#84b994</GradientBottomColor>
+				</RadioImageOption>
+			</Options>
+			<BottomLine Text="Learn more" Link="https://docs.ameliorated.io/general/office-suites.html"/>
+		</RadioImagePage>
+	</FeaturePages>
 </Playbook>