fixed mangled line endings

removed Search the system path option from Open Shell

BASH/ameliorate_20H2.sh → BASH/SnD_21H1_2021-10-13.sh

@@ -17,7 +17,7 @@ read -p "To continue press [ENTER], or Ctrl-C to exit"
 title_bar() {
 	clear
 	echo "╔═════════════════════════════════════════════════════╗"
-	echo "║ AMEliorate Windows 10 20H2               2021.04.01 ║"
+	echo "║ AMEliorate Windows 10 21H1               2021.10.13 ║"
 	echo "╚═════════════════════════════════════════════════════╝"
 	echo ""
 }

BATCH/amelioration_20H2.bat → BATCH/amelioration_21H1_2021-10-13.bat

@@ -1,5 +1,5 @@
 :: Windows 10 AME BATCH Script
-:: v2004.2021.04.01
+:: v21H1.2021.10.13
 
 @echo off
 pushd "%~dp0"
@@ -25,11 +25,11 @@ goto menu
 :menu
 cls
 echo.
-echo  :: WINDOWS 10 AME SETUP SCRIPT Version 2021.04.01
+echo  :: WINDOWS 10 AME SETUP SCRIPT Version 2021.10.13
 echo. 
 echo     This script gives you a list-style overview to execute many commands
 echo. 
-echo  :: NOTE: For Windows 10 Build 20H2 Only
+echo  :: NOTE: For Windows 10 Build 21H1 Only
 echo. 
 echo     1. Run Pre-Amelioration
 echo     2. Run Post-Amelioration
@@ -93,7 +93,7 @@ echo  :: Disabling Data Logging Services
 timeout /t 2 /nobreak > NUL
 taskkill /f /im explorer.exe
 
-:: Disabling Tracking Services and Data Collection
+:: Disable Tracking Services and Data Collection
 cls
 reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection" /v AllowTelemetry /t REG_DWORD /d 0 /f > NUL 2>&1
 reg add "HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Policies\DataCollection" /v AllowTelemetry /t REG_DWORD /d 0 /f > NUL 2>&1
@@ -293,7 +293,7 @@ reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\AppHost" /v ContentEvalu
 reg delete "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Device Metadata" /f > NUL 2>&1
 
 :: New Control Panel cleanup - List of commands: https://winaero.com/ms-settings-commands-in-windows-10/
-reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer" /v SettingsPageVisibility /t REG_SZ /d "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;netowrk-vpn;network-airplanemode;network-mobilehotspot;datausage;network-proxy;personalization-background;personalization-start;fonts;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;cortana-windowssearch;search-moredetails" /f > NUL 2>&1
+reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer" /v SettingsPageVisibility /t REG_SZ /d "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;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;cortana-windowssearch;search-moredetails" /f > NUL 2>&1
 
 :: Decrease shutdown time
 reg add "HKCU\Control Panel\Desktop" /v WaitToKillAppTimeOut /t REG_SZ /d 2000 /f > NUL 2>&1
@@ -339,12 +339,6 @@ sc config WMPNetworkSvc start= disabled
 cls
 sc config wscsvc start= disabled
 cls
-sc config XblAuthManager start= disabled
-cls
-sc config XblGameSave start= disabled
-cls
-sc config XboxNetApiSvc start= disabled
-cls
 net stop wlidsvc
 sc config wlidsvc start= disabled
 cls
@@ -434,7 +428,7 @@ echo  :: Setup Windows Explorer
 timeout /t 2 /nobreak
 :: Removes the shake to minimze all other windows gesture
 ::reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "DisallowShaking" /t REG_DWORD /d 1 /f > NUL 2>&1
-reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "NavPaneShowAllFolders" /t REG_DWORD /d 1 /f > NUL 2>&1
+reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "NavPaneShowAllFolders" /t REG_DWORD /d 0 /f > NUL 2>&1
 reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v LaunchTo /t REG_DWORD /d 1 /f > NUL 2>&1
 reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v HideFileExt /t REG_DWORD /d 0 /f > NUL 2>&1
 reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v Hidden /t REG_DWORD /d 1 /f > NUL 2>&1
@@ -456,7 +450,7 @@ reg delete "HKLM\SOFTWARE\Classes\SystemFileAssociations\.tiff\Shell\3D Edit" /f
 
 :: Clear PageFile at shutdown and ActiveProbing, commented out due to long shutdown time
 ::reg add "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management" /v ClearPageFileAtShutdown /t REG_DWORD /d 1 /f > NUL 2>&1
-reg add "HKLM\SYSTEM\CurrentControlSet\Services\NlaSvc\Parameters\Internet" /v EnableActiveProbing /t REG_DWORD /d 0 /f > NUL 2>&1
+reg add "HKLM\SYSTEM\CurrentControlSet\Services\NlaSvc\Parameters\Internet" /v EnableActiveProbing /t REG_DWORD /d 1 /f > NUL 2>&1
 
 :: Set Time to UTC
 reg add "HKLM\SYSTEM\CurrentControlSet\Control\TimeZoneInformation" /v RealTimeIsUniversal /t REG_DWORD /d 1 /f > NUL 2>&1
@@ -475,7 +469,6 @@ call :title_remove_appx_packages
 :: Remove Cortana from all users
 PowerShell -Command "Get-AppxPackage -allusers *Microsoft.549981C3F5F10* | Remove-AppxPackage"
 call :title_remove_appx_packages
-:: Wildcard removal for the rest of the apps
 PowerShell -Command "Get-AppxPackage *3DViewer* | Remove-AppxPackage"
 call :title_remove_appx_packages
 PowerShell -Command "Get-AppxPackage *AssignedAccessLockApp* | Remove-AppxPackage"
@@ -484,8 +477,6 @@ PowerShell -Command "Get-AppxPackage *PinningConfirmationDialog* | Remove-AppxPa
 call :title_remove_appx_packages
 PowerShell -Command "Get-AppxPackage *SecureAssessmentBrowser* | Remove-AppxPackage"
 call :title_remove_appx_packages
-PowerShell -Command "Get-AppxPackage *Windows.SecHealth* | Remove-AppxPackage"
-call :title_remove_appx_packages
 PowerShell -Command "Get-AppxPackage *FeedbackHub* | Remove-AppxPackage"
 call :title_remove_appx_packages
 PowerShell -Command "Get-AppxPackage *MixedReality* | Remove-AppxPackage"
@@ -500,8 +491,6 @@ PowerShell -Command "Get-AppxPackage *Getstarted* | Remove-AppxPackage"
 call :title_remove_appx_packages
 PowerShell -Command "Get-AppxPackage *Microsoft.OneConnect* | Remove-AppxPackage"
 call :title_remove_appx_packages
-PowerShell -Command "Get-AppxPackage *WindowsAlarms* | Remove-AppxPackage"
-call :title_remove_appx_packages
 PowerShell -Command "Get-AppxPackage *WindowsCamera* | Remove-AppxPackage"
 call :title_remove_appx_packages
 PowerShell -Command "Get-AppxPackage *bing* | Remove-AppxPackage"
@@ -512,19 +501,13 @@ PowerShell -Command "Get-AppxPackage *Store* | Remove-AppxPackage"
 call :title_remove_appx_packages
 PowerShell -Command "Get-AppxPackage *MicrosoftOfficeHub* | Remove-AppxPackage"
 call :title_remove_appx_packages
-PowerShell -Command "Get-AppxPackage *ECApp* | Remove-AppxPackage"
-call :title_remove_appx_packages
-PowerShell -Command "Get-AppxPackage *MSPaint* | Remove-AppxPackage"
+PowerShell -Command "Get-AppxPackage *Paint* | Remove-AppxPackage"
 call :title_remove_appx_packages
 PowerShell -Command "Get-AppxPackage *wallet* | Remove-AppxPackage"
 call :title_remove_appx_packages
 PowerShell -Command "Get-AppxPackage *OneNote* | Remove-AppxPackage"
 call :title_remove_appx_packages
-PowerShell -Command "Get-AppxPackage *people* | Remove-AppxPackage"
-call :title_remove_appx_packages
-PowerShell -Command "Get-AppxPackage *LockApp* | Remove-AppxPackage"
-call :title_remove_appx_packages
-PowerShell -Command "Get-AppxPackage *MicrosoftEdgeDevToolsClient* | Remove-AppxPackage"
+PowerShell -Command "Get-AppxPackage *Microsoft.People* | Remove-AppxPackage"
 call :title_remove_appx_packages
 PowerShell -Command "Get-AppxPackage *WindowsPhone* | Remove-AppxPackage"
 call :title_remove_appx_packages
@@ -538,8 +521,6 @@ PowerShell -Command "Get-AppxPackage *solit* | Remove-AppxPackage"
 call :title_remove_appx_packages
 PowerShell -Command "Get-AppxPackage *WindowsSoundRecorder* | Remove-AppxPackage"
 call :title_remove_appx_packages
-PowerShell -Command "Get-AppxPackage *xbox* | Remove-AppxPackage"
-call :title_remove_appx_packages
 PowerShell -Command "Get-AppxPackage *windowscommunicationsapps* | Remove-AppxPackage"
 call :title_remove_appx_packages
 PowerShell -Command "Get-AppxPackage *zune* | Remove-AppxPackage"
@@ -556,10 +537,16 @@ PowerShell -Command "Get-AppxPackage *ConnectivityStore* | Remove-AppxPackage"
 call :title_remove_appx_packages
 PowerShell -Command "Get-AppxPackage *Microsoft.Messaging* | Remove-AppxPackage"
 call :title_remove_appx_packages
-PowerShell -Command "Get-AppxPackage *ContentDeliveryManager* | Remove-AppxPackage"
-call :title_remove_appx_packages
 PowerShell -Command "Get-AppxPackage *Microsoft.WindowsStore* | Remove-AppxPackage"
 call :title_remove_appx_packages
+PowerShell -Command "Get-AppxPackage *XboxApp* | Remove-AppxPackage"
+call :title_remove_appx_packages
+PowerShell -Command "Get-AppxPackage *XboxSpeechToTextOverlay* | Remove-AppxPackage"
+call :title_remove_appx_packages
+PowerShell -Command "Get-AppxPackage *XboxGamingOverlay* | Remove-AppxPackage"
+call :title_remove_appx_packages
+PowerShell -Command "Get-AppxPackage *XboxGameOverlay* | Remove-AppxPackage"
+call :title_remove_appx_packages
 :: Remove Edge, both the new and old version
 cd "C:\Program Files (x86)\Microsoft\Edge\Application\8*\Installer"
 start setup.exe --uninstall --system-level --verbose-logging --force-uninstall
@@ -785,12 +772,17 @@ echo.
 PowerShell -Command "wget -O PSTools.zip https://download.sysinternals.com/files/PSTools.zip"
 PowerShell -Command "wget -O remove_SecHealthUI_stub.py https://git.ameliorated.info/malte/scripts/raw/branch/master/PYTHON/remove_SecHealthUI_stub.py"
 7z e PSTools.zip psexec.exe -y
-start psexec.exe -i -s cmd.exe /c %CD%\remove_SecHealthUI_stub.py
+start psexec.exe -i -s cmd.exe /c "C:\Python39\python.exe" %CD%\remove_SecHealthUI_stub.py
 timeout /t 5 /nobreak > NUL
 @powershell -NoProfile -ExecutionPolicy Bypass -Command "Get-AppxPackage -all *Microsoft.Windows.SecHealthUI* | Remove-AppPackage -AllUsers"
 del psexec.exe
 del PSTools.zip
 del remove_SecHealthUI_stub.py
+PowerShell -Command "wget -O Fluent-Metro_1.5.2.zip https://github.com/bonzibudd/Fluent-Metro/releases/download/v1.5.2/Fluent-Metro_1.5.2.zip"
+7z e Fluent-Metro_1.5.2.zip -y
+copy Fluent-Metro.skin "C:\Program Files\Open-Shell\Skins\" /y
+copy Fluent-Metro.skin7 "C:\Program Files\Open-Shell\Skins\" /y
+
 
 :: Configure Open-Shell
 :testos
@@ -842,7 +834,7 @@ reg add "HKEY_USERS\%currentusername%\SOFTWARE\OpenShell\StartMenu\Settings" /v
 reg add "HKEY_USERS\%currentusername%\SOFTWARE\OpenShell\StartMenu\Settings" /v "SearchInternet" /t REG_DWORD /d 0 /f > NUL 2>&1
 reg add "HKEY_USERS\%currentusername%\SOFTWARE\OpenShell\StartMenu\Settings" /v "GlassOverride" /t REG_DWORD /d 1 /f > NUL 2>&1
 reg add "HKEY_USERS\%currentusername%\SOFTWARE\OpenShell\StartMenu\Settings" /v "GlassColor" /t REG_DWORD /d 0 /f > NUL 2>&1
-reg add "HKEY_USERS\%currentusername%\SOFTWARE\OpenShell\StartMenu\Settings" /v "SkinW7" /t REG_SZ /d "Midnight" /f > NUL 2>&1
+reg add "HKEY_USERS\%currentusername%\SOFTWARE\OpenShell\StartMenu\Settings" /v "SkinW7" /t REG_SZ /d "Fluent-Metro" /f > NUL 2>&1
 reg add "HKEY_USERS\%currentusername%\SOFTWARE\OpenShell\StartMenu\Settings" /v "SkinVariationW7" /t REG_SZ /f > NUL 2>&1
 reg add "HKEY_USERS\%currentusername%\SOFTWARE\OpenShell\StartMenu\Settings" /v "SkinOptionsW7" /t REG_MULTI_SZ /d "USER_IMAGE=1"\0"SMALL_ICONS=0"\0"LARGE_FONT=0"\0"DISABLE_MASK=0"\0"OPAQUE=0"\0"TRANSPARENT_LESS=0"\0"TRANSPARENT_MORE=1"\0"WHITE_SUBMENUS2=0" /f > NUL 2>&1
 reg add "HKEY_USERS\%currentusername%\SOFTWARE\OpenShell\StartMenu\Settings" /v "SkipMetro" /t REG_DWORD /d 1 /f > NUL 2>&1
@@ -866,7 +858,7 @@ DEL !cSctVBS! /f /q
 
 SETLOCAL ENABLEDELAYEDEXPANSION
 SET LinkName=Mozilla Thunderbird
-SET Esc_LinkDest=%%HOMEDRIVE%%\Users\user\AppData\Roaming\OpenShell\Pinned\!LinkName!.lnk
+SET Esc_LinkDest=%%HOMEDRIVE%%\Users\%username%\AppData\Roaming\OpenShell\Pinned\!LinkName!.lnk
 SET Esc_LinkTarget=%%HOMEDRIVE%%\Program Files\Mozilla Thunderbird\Thunderbird.exe
 SET cSctVBS=CreateShortcut.vbs
 (
@@ -1004,6 +996,7 @@ copy img0.jpg C:\Windows\Web\Wallpaper\Windows\ /Y > NUL 2>&1
 copy img0_*.jpg C:\Windows\Web\4K\Wallpaper\Windows\ /Y > NUL 2>&1
 copy *.bmp C:\Windows\Web\Wallpaper\Windows\ /Y > NUL 2>&1
 reg add "HKEY_CURRENT_USER\Control Panel\Desktop" /v Wallpaper /t REG_SZ /d C:\Windows\Web\Wallpaper\Windows\ame_wallpaper_1440.bmp /f > NUL 2>&1
+start RUNDLL32.EXE user32.dll,UpdatePerUserSystemParameters
 
 :: Delete Cache
 takeown /f C:\ProgramData\Microsoft\Windows\SystemData > NUL 2>&1
@@ -1043,7 +1036,7 @@ goto menu
 
 :reboot
 echo.
-echo  :: WINDOWS 10 AME SETUP SCRIPT Version 2021.03.27
+echo  :: WINDOWS 10 AME SETUP SCRIPT Version 2021.10.13
 echo.
 cls
 echo A reboot is required to complete setup.
@@ -2040,4 +2033,4 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAAAAAAA==
------END CERTIFICATE-----
+-----END CERTIFICATE-----

README.md

@@ -6,7 +6,7 @@ These scripts are used in conjunction with each other to, in part, create an Ame
 
 ## Download
 
-If you are following the [documentation](https://wiki.ameliorated.info/doku.php?id=documentation_20H2), simply download the latest [release](https://git.ameliorated.info/malte/scripts/releases) for the version of Windows 10 you are using.
+If you are following the [documentation](https://wiki.ameliorated.info/doku.php?id=documentation_21H1), simply download the latest [release](https://git.ameliorated.info/malte/scripts/releases) for the version of Windows 10 you are using.
 
 ## How to use these scripts
 
@@ -20,7 +20,7 @@ The main script in the folder is the "amelioration" script, this is the script t
 
 This folder holds both the main "ameliorate" script and auxiliary scripts. The auxiliary scripts are helpful in setting up Windows and can be ran in Windows with Cygwin. As with all BASH scripts, the file permissions may be need to be changed so that they can be executed, example below.
 
-`chmod +x ameliorated_20H2.sh`
+`chmod +x ameliorated_21H1.sh`
 
 ## FAQ