v2.4, 2017-06-08

- Add "Hide taskbar People icon" - Add "Hide recent + frequent shortcuts" - Add "Install Hyper-V" (disabled by default) - Replace dism commands with native cmdlets
Add presets used for development and testing
2026-01-12 07:28:29 -05:00 · 2017-06-08 14:13:20 +02:00 · 2017-06-08 14:05:59 +02:00 · 2017-06-08 14:03:42 +02:00 · 2017-05-16 08:50:17 +02:00 · 2017-05-08 17:57:33 +02:00
6 changed files with 666 additions and 187 deletions
--- a/README.md
+++ b/README.md
@@ -2,17 +2,32 @@

 This is a PowerShell script for automation of routine tasks done after fresh installations of Windows 10. This is by no means any complete set of all existing Windows tweaks and neither is it another "antispying" type of script. It's simply a setting which I like to use and which in my opinion make the system less obtrusive.

-This repository has been originaly created as complementary to article https://www.dasm.cz/clanek/jak-z-windows-10-udelat-desktopovy-system (written in czech) which explains the respective snippets a bit more in detail. The article was last updated on 2016-08-15 and will not be updated further. All development and discussion has been moved here.
+This repository has been originally created as complementary to article https://www.dasm.cz/clanek/jak-z-windows-10-udelat-desktopovy-system (written in Czech) which explains the respective snippets a bit more in detail. The article was last updated on 2016-08-15 and will not be updated further. All development and discussion has been moved here.

 ## Usage
-If you just want to run the script with default preset, simply right click on the *Win10.ps1* file, choose *Run with PowerShell*, and confirm execution policy change. Make sure your account is a member of Administrators group as the script attempts to run with elevated privileges.
+If you just want to run the script with default preset, simply right click on the *Win10.ps1* file, choose *Run with PowerShell*, and confirm execution policy change. Make sure your account is a member of *Administrators* group as the script attempts to run with elevated privileges.

 ### Advanced usage
-The script supports customized presets where you can specify which tweaks should be applied. You can either pass the function names directly as parameters.  
-`powershell.exe -NoProfile -ExecutionPolicy Bypass -File Win10.ps1 EnableFirewall EnableDefender`
+The script consists of separate functions, each of which contains one tweak. The functions can be grouped to *presets*. Preset is simply a list of function names which should be called. If you don't supply any specific preset, the default preset defined by `$preset` array in the beginning of the script will be applied. Any function which is not present or is commented in a preset will not be called, thus the corresponding tweak will not be applied. If you choose to fork the script and adjust the defaults instead of creating a customized preset file, then all you have to modify is the `$preset` array.

-Or you can create a file where you write the function names (one function per line) and then pass the filename using *-preset* parameter. Don't forget that the script will try to run with elevated privileges and will use different working directory, therefore use of absolute paths is recommended.  
-`powershell.exe -NoProfile -ExecutionPolicy Bypass -File Win10.ps1 -preset D:\Install\mypreset.txt`
+To supply a customized preset, you can either pass the function names directly as parameters.
+
+    powershell.exe -NoProfile -ExecutionPolicy Bypass -File Win10.ps1 EnableFirewall EnableDefender
+
+Or you can create a file where you write the function names (one function name per line, no commas, whitespaces allowed, comments on separate lines starting with `#`) and then pass the filename using *-preset* parameter. Don't forget that the script will try to run with elevated privileges and will use different working directory, therefore use of absolute paths is recommended.  
+Example of a preset file `mypreset.txt`:
+
+    # Security tweaks
+    EnableFirewall
+    EnableDefender
+
+    # UI tweaks
+    ShowKnownExtensions
+    ShowHiddenFiles
+
+Command using the preset file above:
+
+    powershell.exe -NoProfile -ExecutionPolicy Bypass -File Win10.ps1 -preset D:\Install\mypreset.txt

 ## FAQ

@@ -22,6 +37,9 @@ Or you can create a file where you write the function names (one function per li
 **Q:** Can I run the script repeatedly?  
 **A:** Yes! In fact the script has been written to support exactly this as it's not uncommon that big Windows Updates reset some of the settings.

+**Q:** Can I run the script in multi-user environment?  
+**A:** Yes, to certain extent. Some tweaks (most notably UI tweaks) are set only for the user currently executing the script. As stated above, the script can be run repeatedly; therefore it's possible to run it multiple times, each time as different user. Due to the nature of authentication and privilege escalation mechanisms in Windows, the script can be successfully applied only for users belonging to *Administrators* group. Standard users will get an UAC prompt asking for admin credentials which then causes the tweaks to be applied to the given admin account instead of the original non-privileged one. To circumvent this, add the standard user to the *Administrators* group, run the script, and then remove the user from *Administrators* group again. There are a few ways how the same functionality can be achieved programmatically, but I'm not planning to include any of them as it would negatively impact code complexity and readability.
+
 **Q:** Did you test the script?  
 **A:** Yes. I'm testing new additions on up-to-date Home and Enterprise editions in VMs. I'm also regularly using it for all my home installations after all bigger updates.

@@ -35,7 +53,7 @@ Or you can create a file where you write the function names (one function per li
 **A:** Submit a PR or drop me a message. If I find the functionality simple, useful and not dependent on any 3rd party modules or executables, I might add it.

 **Q:** Can I use the script or modify it for my / my company's needs?  
-**A:** Sure, knock yourself out. Just don't forget to include copyright notice as per MIT license requirements. I'd also suggest including a link to this github repo as it's very likely that something will be changed, added or improved to keep track with future versions of Windows 10.
+**A:** Sure, knock yourself out. Just don't forget to include copyright notice as per MIT license requirements. I'd also suggest including a link to this GitHub repo as it's very likely that something will be changed, added or improved to keep track with future versions of Windows 10.

 **Q:** Why are there repeated pieces of code throughout some functions?  
 **A:** So you can directly take the function block and use it elsewhere, without elaborating on any dependencies.
--- a/Win10.ps1
+++ b/Win10.ps1
@@ -1,7 +1,7 @@
 ##########
 # Win10 Initial Setup Script
 # Author: Disassembler <disassembler@dasm.cz>
-# Version: 2.0, 2017-01-08
+# Version: 2.4, 2017-06-08
 ##########

 # Ask for elevated permissions if required
@@ -12,68 +12,88 @@ If (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]:

 # Default preset
 $preset = @(
-	"DisableTelemetry",
-	"DisableWiFiSense",
-	"DisableSmartScreen",
-	"DisableWebSearch",
-	"DisableStartSuggestions",
-	"DisableLocationTracking",
-	"DisableFeedback",
-	"DisableAdvertisingID",
-	"DisableCortana",
-	"DisableErrorReporting",
-	"RestrictUpdateP2P",
-	"DisableAutoLogger",
-	"DisableDiagTrack",
-	"DisableWAPPush",
+	### Privacy Settings ###
+	"DisableTelemetry",             # "EnableTelemetry",
+	"DisableWiFiSense",             # "EnableWiFiSense",
+	# "DisableSmartScreen",         # "EnableSmartScreen",
+	"DisableWebSearch",             # "EnableWebSearch",
+	"DisableStartSuggestions",      # "EnableStartSuggestions",
+	"DisableLocationTracking",      # "EnableLocationTracking",
+	"DisableFeedback",              # "EnableFeedback",
+	"DisableAdvertisingID",         # "EnableAdvertisingID",
+	"DisableCortana",               # "EnableCortana",
+	"DisableErrorReporting",        # "EnableErrorReporting",
+	"RestrictUpdateP2P",            # "UnrestrictUpdateP2P",
+	"DisableAutoLogger",            # "EnableAutoLogger",
+	"DisableDiagTrack",             # "EnableDiagTrack",
+	"DisableWAPPush",               # "EnableWAPPush",

-	# "LowerUAC",
-	# "EnableSharingMappedDrives",
-	"DisableAdminShares",
-	"DisableFirewall",
-	# "DisableDefender",
-	# "DisableUpdateMSRT",
-	# "DisableUpdateDriver",
-	"DisableUpdateRestart",
-	"DisableHomeGroups",
-	"DisableRemoteAssistance",
-	"EnableRemoteDesktop",
+	### Service Tweaks ###
+	# "LowerUAC",                   # "RaiseUAC",
+	# "EnableSharingMappedDrives",  # "DisableSharingMappedDrives",
+	"DisableAdminShares",           # "EnableAdminShares",
+	"SetCurrentNetworkPrivate",     # "SetCurrentNetworkPublic",
+	# "SetUnknownNetworksPrivate",  # "SetUnknownNetworksPublic",
+	# "DisableFirewall",            # "EnableFirewall",
+	# "DisableDefender",            # "EnableDefender",
+	# "DisableUpdateMSRT",          # "EnableUpdateMSRT",
+	# "DisableUpdateDriver",        # "EnableUpdateDriver",
+	"DisableUpdateRestart",         # "EnableUpdateRestart",
+	"DisableHomeGroups",            # "EnableHomeGroups",
+	"DisableRemoteAssistance",      # "EnableRemoteAssistance",
+	"EnableRemoteDesktop",          # "DisableRemoteDesktop",
+	"DisableAutoplay",              # "EnableAutoplay",
+	"DisableAutorun",               # "EnableAutorun",
+	# "DisableDefragmentation",     # "EnableDefragmentation",
+	# "SetBIOSTimeUTC",             # "SetBIOSTimeLocal",

-	"DisableActionCenter",
-	"DisableLockScreen",
-	# "DisableLockScreenWorkaround",
-	"DisableAutoplay",
-	"DisableAutorun",
-	"DisableStickyKeys",
-	"HideTaskbarSearchBox",
-	"HideTaskView",
-	"ShowSmallTaskbarIcons",
-	"ShowTaskbarTitles",
-	"ShowTrayIcons",
-	"ShowKnownExtensions",
-	"ShowHiddenFiles",
-	"ExplorerThisPC",
-	"ShowThisPCOnDesktop",
-	"HideDesktopFromThisPC",
-	"HideDocumentsFromThisPC",
-	"HideDownloadsFromThisPC",
-	"HideMusicFromThisPC",
-	"HidePicturesFromThisPC",
-	"HideVideosFromThisPC",
-	# "AddENKeyboard",
-	# "EnableNumlock",
+	### UI Tweaks ###
+	"DisableActionCenter",          # "EnableActionCenter",
+	"DisableLockScreen",            # "EnableLockScreen",
+	# "DisableLockScreenRS1",       # "EnableLockScreenRS1",
+	"DisableStickyKeys",            # "EnableStickyKeys",
+	"ShowTaskManagerDetails"        # "HideTaskManagerDetails",
+	"ShowFileOperationsDetails",    # "HideFileOperationsDetails",
+	"HideTaskbarSearchBox",         # "ShowTaskbarSearchBox",
+	"HideTaskView",                 # "ShowTaskView",
+	"ShowSmallTaskbarIcons",        # "ShowLargeTaskbarIcons",
+	"ShowTaskbarTitles",            # "HideTaskbarTitles",
+	"HideTaskbarPeopleIcon",        # "ShowTaskbarPeopleIcon",
+	"ShowTrayIcons",                # "HideTrayIcons",
+	"ShowKnownExtensions",          # "HideKnownExtensions",
+	"ShowHiddenFiles",              # "HideHiddenFiles",
+	"HideSyncNotifications"         # "ShowSyncNotifications",
+	"HideRecentShortcuts",          # "ShowRecentShortcuts",
+	"ExplorerThisPC",               # "ExplorerQuickAccess",
+	"ShowThisPCOnDesktop",          # "HideThisPCFromDesktop",
+	"HideDesktopFromThisPC",        # "ShowDesktopInThisPC",
+	"HideDocumentsFromThisPC",      # "ShowDocumentsInThisPC",
+	"HideDownloadsFromThisPC",      # "ShowDownloadsInThisPC",
+	"HideMusicFromThisPC",          # "ShowMusicInThisPC",
+	"HidePicturesFromThisPC",       # "ShowPicturesInThisPC",
+	"HideVideosFromThisPC",         # "ShowVideosInThisPC",
+	# "AddENKeyboard",              # "RemoveENKeyboard",
+	# "EnableNumlock",              # "DisableNumlock",

-	"DisableOneDrive",
-	"UninstallOneDrive",
-	"UninstallBloatware",
-	"DisableXboxDVR",
-	# "UninstallMediaPlayer",
-	# "UninstallWorkFolders",
-	# "InstallLinuxSubsystem",
-	"SetPhotoViewerAssociation",
-	"AddPhotoViewerOpenWith",
-	"EnableF8BootMenu",
+	### Application Tweaks ###
+	"DisableOneDrive",              # "EnableOneDrive",
+	"UninstallOneDrive",            # "InstallOneDrive",
+	"UninstallBloatware",           # "InstallBloatware",
+	# "UninstallWindowsStore",      # "InstallWindowsStore",
+	"DisableConsumerApps",          # "EnableConsumerApps",
+	"DisableXboxFeatures",          # "EnableXboxFeatures",
+	# "UninstallMediaPlayer",       # "InstallMediaPlayer",
+	# "UninstallWorkFolders",       # "InstallWorkFolders",
+	# "InstallHyperV",              # "UninstallHyperV",
+	# "InstallLinuxSubsystem",      # "UninstallLinuxSubsystem",
+	"SetPhotoViewerAssociation",    # "UnsetPhotoViewerAssociation",
+	"AddPhotoViewerOpenWith",       # "RemovePhotoViewerOpenWith",
+	"DisableSearchAppInStore",      # "EnableSearchAppInStore",
+	"DisableNewAppPrompt",          # "EnableNewAppPrompt",
+	"EnableF8BootMenu",             # "DisableF8BootMenu",
+	# "SetDEPOptOut",               # "SetDEPOptIn",

+	### Auxiliary Functions ###
 	"WaitForKey",
 	"Restart"
 )
@@ -130,13 +150,22 @@ Function DisableSmartScreen {
 	Write-Host "Disabling SmartScreen Filter..."
 	Set-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer" -Name "SmartScreenEnabled" -Type String -Value "Off"
 	Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\AppHost" -Name "EnableWebContentEvaluation" -Type DWord -Value 0
+	$edge = (Get-AppxPackage -AllUsers "Microsoft.MicrosoftEdge").PackageFamilyName
+	If (!(Test-Path "HKCU:\SOFTWARE\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppContainer\Storage\$edge\MicrosoftEdge\PhishingFilter")) {
+		New-Item -Path "HKCU:\SOFTWARE\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppContainer\Storage\$edge\MicrosoftEdge\PhishingFilter" -Force | Out-Null
+	}
+	Set-ItemProperty -Path "HKCU:\SOFTWARE\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppContainer\Storage\$edge\MicrosoftEdge\PhishingFilter" -Name "EnabledV9" -Type DWord -Value 0
+	Set-ItemProperty -Path "HKCU:\SOFTWARE\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppContainer\Storage\$edge\MicrosoftEdge\PhishingFilter" -Name "PreventOverride" -Type DWord -Value 0
 }

 # Enable SmartScreen Filter
 Function EnableSmartScreen {
 	Write-Host "Enabling SmartScreen Filter..."
 	Set-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer" -Name "SmartScreenEnabled" -Type String -Value "RequireAdmin"
-	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\AppHost" -Name "EnableWebContentEvaluation"
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\AppHost" -Name "EnableWebContentEvaluation" -ErrorAction SilentlyContinue
+	$edge = (Get-AppxPackage -AllUsers "Microsoft.MicrosoftEdge").PackageFamilyName
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppContainer\Storage\$edge\MicrosoftEdge\PhishingFilter" -Name "EnabledV9" -ErrorAction SilentlyContinue
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppContainer\Storage\$edge\MicrosoftEdge\PhishingFilter" -Name "PreventOverride" -ErrorAction SilentlyContinue
 }

 # Disable Web Search in Start Menu
@@ -152,8 +181,8 @@ Function DisableWebSearch {
 # Enable Web Search in Start Menu
 Function EnableWebSearch {
 	Write-Host "Enabling Bing Search in Start Menu..."
-	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" -Name "BingSearchEnabled"
-	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Windows Search" -Name "DisableWebSearch"
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" -Name "BingSearchEnabled" -ErrorAction SilentlyContinue
+	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Windows Search" -Name "DisableWebSearch" -ErrorAction SilentlyContinue
 }

 # Disable Start Menu suggestions
@@ -196,7 +225,7 @@ Function DisableFeedback {
 # Enable Feedback
 Function EnableFeedback {
 	Write-Host "Enabling Feedback..."
-	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Siuf\Rules" -Name "NumberOfSIUFInPeriod"
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Siuf\Rules" -Name "NumberOfSIUFInPeriod" -ErrorAction SilentlyContinue
 }

 # Disable Advertising ID
@@ -211,7 +240,7 @@ Function DisableAdvertisingID {
 # Enable Advertising ID
 Function EnableAdvertisingID {
 	Write-Host "Enabling Advertising ID..."
-	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\AdvertisingInfo" -Name "Enabled"
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\AdvertisingInfo" -Name "Enabled" -ErrorAction SilentlyContinue
 }

 # Disable Cortana
@@ -239,11 +268,11 @@ Function DisableCortana {
 # Enable Cortana
 Function EnableCortana {
 	Write-Host "Enabling Cortana..."
-	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Personalization\Settings" -Name "AcceptedPrivacyPolicy"
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Personalization\Settings" -Name "AcceptedPrivacyPolicy" -ErrorAction SilentlyContinue
 	Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\InputPersonalization" -Name "RestrictImplicitTextCollection" -Type DWord -Value 0
 	Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\InputPersonalization" -Name "RestrictImplicitInkCollection" -Type DWord -Value 0
-	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\InputPersonalization\TrainedDataStore" -Name "HarvestContacts"
-	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Windows Search" -Name "AllowCortana"
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\InputPersonalization\TrainedDataStore" -Name "HarvestContacts" -ErrorAction SilentlyContinue
+	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Windows Search" -Name "AllowCortana" -ErrorAction SilentlyContinue
 }

 # Disable Error reporting
@@ -255,7 +284,7 @@ Function DisableErrorReporting {
 # Enable Error reporting
 Function EnableErrorReporting {
 	Write-Host "Enabling Error reporting..."
-	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting" -Name "Disabled"
+	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting" -Name "Disabled" -ErrorAction SilentlyContinue
 }

 # Restrict Windows Update P2P only to local network
@@ -271,8 +300,8 @@ Function RestrictUpdateP2P {
 # Unrestrict Windows Update P2P
 Function UnrestrictUpdateP2P {
 	Write-Host "Unrestricting Windows Update P2P to internet..."
-	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\DeliveryOptimization\Config" -Name "DODownloadMode"
-	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\DeliveryOptimization" -Name "SystemSettingsDownloadMode"
+	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\DeliveryOptimization\Config" -Name "DODownloadMode" -ErrorAction SilentlyContinue
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\DeliveryOptimization" -Name "SystemSettingsDownloadMode" -ErrorAction SilentlyContinue
 }

 # Remove AutoLogger file and restrict directory
@@ -350,7 +379,7 @@ Function EnableSharingMappedDrives {
 # Disable sharing mapped drives between users
 Function DisableSharingMappedDrives {
 	Write-Host "Disabling sharing mapped drives between users..."
-	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System" -Name "EnableLinkedConnections"
+	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System" -Name "EnableLinkedConnections" -ErrorAction SilentlyContinue
 }

 # Disable implicit administrative shares
@@ -362,33 +391,63 @@ Function DisableAdminShares {
 # Enable implicit administrative shares
 Function EnableAdminShares {
 	Write-Host "Enabling implicit administrative shares..."
-	Remove-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters" -Name "AutoShareWks"
+	Remove-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Services\LanmanServer\Parameters" -Name "AutoShareWks" -ErrorAction SilentlyContinue
+}
+
+# Set current network profile to private (allow file sharing, device discovery, etc.)
+Function SetCurrentNetworkPrivate {
+	Write-Host "Setting current network profile to private..."
+	Set-NetConnectionProfile -NetworkCategory Private
+}
+
+# Set current network profile to public (deny file sharing, device discovery, etc.)
+Function SetCurrentNetworkPublic {
+	Write-Host "Setting current network profile to public..."
+	Set-NetConnectionProfile -NetworkCategory Public
+}
+
+# Set unknown networks profile to private (allow file sharing, device discovery, etc.)
+Function SetUnknownNetworksPrivate {
+	Write-Host "Setting unknown networks profile to private..."
+	If (!(Test-Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\NetworkList\Signatures\010103000F0000F0010000000F0000F0C967A3643C3AD745950DA7859209176EF5B87C875FA20DF21951640E807D7C24")) {
+		New-Item -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\NetworkList\Signatures\010103000F0000F0010000000F0000F0C967A3643C3AD745950DA7859209176EF5B87C875FA20DF21951640E807D7C24" -Force | Out-Null
+	}
+	Set-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\NetworkList\Signatures\010103000F0000F0010000000F0000F0C967A3643C3AD745950DA7859209176EF5B87C875FA20DF21951640E807D7C24" -Name "Category" -Type DWord -Value 1
+}
+
+# Set unknown networks profile to public (deny file sharing, device discovery, etc.)
+Function SetUnknownNetworksPublic {
+	Write-Host "Setting unknown networks profile to public..."
+	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\NetworkList\Signatures\010103000F0000F0010000000F0000F0C967A3643C3AD745950DA7859209176EF5B87C875FA20DF21951640E807D7C24" -Name "Category" -ErrorAction SilentlyContinue
 }

 # Disable Firewall
 Function DisableFirewall {
 	Write-Host "Disabling Firewall..."
-	Set-NetFirewallProfile -Profile * -Enabled False
+	If (!(Test-Path "HKLM:\SOFTWARE\Policies\Microsoft\WindowsFirewall\StandardProfile")) {
+		New-Item -Path "HKLM:\SOFTWARE\Policies\Microsoft\WindowsFirewall\StandardProfile" -Force | Out-Null
+	}
+	Set-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\WindowsFirewall\StandardProfile" -Name "EnableFirewall" -Type DWord -Value 0
 }

 # Enable Firewall
 Function EnableFirewall {
 	Write-Host "Enabling Firewall..."
-	Set-NetFirewallProfile -Profile * -Enabled True
+	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\WindowsFirewall\StandardProfile" -Name "EnableFirewall" -ErrorAction SilentlyContinue
 }

 # Disable Windows Defender
 Function DisableDefender {
 	Write-Host "Disabling Windows Defender..."
 	Set-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows Defender" -Name "DisableAntiSpyware" -Type DWord -Value 1
-	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" -Name "WindowsDefender" -ErrorAction SilentlyContinue
+	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" -Name "SecurityHealth" -ErrorAction SilentlyContinue
 }

 # Enable Windows Defender
 Function EnableDefender {
 	Write-Host "Enabling Windows Defender..."
-	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows Defender" -Name "DisableAntiSpyware"
-	Set-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" -Name "WindowsDefender" -Type ExpandString -Value "`"%ProgramFiles%\Windows Defender\MSASCuiL.exe`""
+	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows Defender" -Name "DisableAntiSpyware" -ErrorAction SilentlyContinue
+	Set-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" -Name "SecurityHealth" -Type ExpandString -Value "`"%ProgramFiles%\Windows Defender\MSASCuiL.exe`""
 }

 # Disable offering of Malicious Software Removal Tool through Windows Update
@@ -403,7 +462,7 @@ Function DisableUpdateMSRT {
 # Enable offering of Malicious Software Removal Tool through Windows Update
 Function EnableUpdateMSRT {
 	Write-Host "Enabling Malicious Software Removal Tool offering..."
-	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\MRT" -Name "DontOfferThroughWUAU"
+	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\MRT" -Name "DontOfferThroughWUAU" -ErrorAction SilentlyContinue
 }

 # Disable offering of drivers through Windows Update
@@ -420,7 +479,7 @@ Function DisableUpdateDriver {
 Function EnableUpdateDriver {
 	Write-Host "Enabling driver offering through Windows Update..."
 	Set-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\DriverSearching" -Name "SearchOrderConfig" -Type DWord -Value 1
-	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate" -Name "ExcludeWUDriversInQualityUpdate"
+	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate" -Name "ExcludeWUDriversInQualityUpdate" -ErrorAction SilentlyContinue
 }

 # Disable Windows Update automatic restart
@@ -437,7 +496,7 @@ Function DisableUpdateRestart {
 Function EnableUpdateRestart {
 	Write-Host "Enabling Windows Update automatic restart..."
 	Set-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\WindowsUpdate\UX\Settings" -Name "UxOption" -Type DWord -Value 0
-	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" -Name "NoAutoRebootWithLoggedOnUsers"
+	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" -Name "NoAutoRebootWithLoggedOnUsers" -ErrorAction SilentlyContinue
 }

 # Stop and disable Home Groups services
@@ -483,6 +542,57 @@ Function DisableRemoteDesktop {
 	Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp" -Name "UserAuthentication" -Type DWord -Value 1
 }

+# Disable Autoplay
+Function DisableAutoplay {
+	Write-Host "Disabling Autoplay..."
+	Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers" -Name "DisableAutoplay" -Type DWord -Value 1
+}
+
+# Enable Autoplay
+Function EnableAutoplay {
+	Write-Host "Enabling Autoplay..."
+	Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers" -Name "DisableAutoplay" -Type DWord -Value 0
+}
+
+# Disable Autorun for all drives
+Function DisableAutorun {
+	Write-Host "Disabling Autorun for all drives..."
+	If (!(Test-Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer")) {
+		New-Item -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer" | Out-Null
+	}
+	Set-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer" -Name "NoDriveTypeAutoRun" -Type DWord -Value 255
+}
+
+# Enable Autorun for removable drives
+Function EnableAutorun {
+	Write-Host "Enabling Autorun for all drives..."
+	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer" -Name "NoDriveTypeAutoRun" -ErrorAction SilentlyContinue
+}
+
+# Disable scheduled defragmentation
+Function DisableDefragmentation {
+	Write-Host "Disabling scheduled defragmentation..."
+	Disable-ScheduledTask -TaskName "\Microsoft\Windows\Defrag\ScheduledDefrag" | Out-Null
+}
+
+# Enable scheduled defragmentation
+Function EnableDefragmentation {
+	Write-Host "Enabling scheduled defragmentation..."
+	Enable-ScheduledTask -TaskName "\Microsoft\Windows\Defrag\ScheduledDefrag" | Out-Null
+}
+
+# Set BIOS time to UTC
+Function SetBIOSTimeUTC {
+	Write-Host "Setting BIOS time to UTC..."
+	Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\TimeZoneInformation" -Name "RealTimeIsUniversal" -Type DWord -Value 1
+}
+
+# Set BIOS time to local time
+Function SetBIOSTimeLocal {
+	Write-Host "Setting BIOS time to Local time..."
+	Remove-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\TimeZoneInformation" -Name "RealTimeIsUniversal" -ErrorAction SilentlyContinue
+}
+


 ##########
@@ -502,8 +612,8 @@ Function DisableActionCenter {
 # Enable Action Center
 Function EnableActionCenter {
 	Write-Host "Enabling Action Center..."
-	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Policies\Microsoft\Windows\Explorer" -Name "DisableNotificationCenter"
-	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\PushNotifications" -Name "ToastEnabled"
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Policies\Microsoft\Windows\Explorer" -Name "DisableNotificationCenter" -ErrorAction SilentlyContinue
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\PushNotifications" -Name "ToastEnabled" -ErrorAction SilentlyContinue
 }

 # Disable Lock screen
@@ -518,11 +628,11 @@ Function DisableLockScreen {
 # Enable Lock screen
 Function EnableLockScreen {
 	Write-Host "Enabling Lock screen..."
-	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Personalization" -Name "NoLockScreen"
+	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Personalization" -Name "NoLockScreen" -ErrorAction SilentlyContinue
 }

 # Disable Lock screen (Anniversary Update workaround) - Applicable to RS1 or newer
-Function DisableLockScreenWorkaround {
+Function DisableLockScreenRS1 {
 	Write-Host "Disabling Lock screen using scheduler workaround..."
 	$service = New-Object -com Schedule.Service
 	$service.Connect()
@@ -538,38 +648,11 @@ Function DisableLockScreenWorkaround {
 }

 # Enable Lock screen (Anniversary Update workaround) - Applicable to RS1 or newer
-Function EnableLockScreenWorkaround {
+Function EnableLockScreenRS1 {
 	Write-Host "Enabling Lock screen (removing scheduler workaround)..."
 	Unregister-ScheduledTask -TaskName "Disable LockScreen" -Confirm:$false -ErrorAction SilentlyContinue
 }

-# Disable Autoplay
-Function DisableAutoplay {
-	Write-Host "Disabling Autoplay..."
-	Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers" -Name "DisableAutoplay" -Type DWord -Value 1
-}
-
-# Enable Autoplay
-Function EnableAutoplay {
-	Write-Host "Enabling Autoplay..."
-	Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers" -Name "DisableAutoplay" -Type DWord -Value 0
-}
-
-# Disable Autorun for all drives
-Function DisableAutorun {
-	Write-Host "Disabling Autorun for all drives..."
-	If (!(Test-Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer")) {
-		New-Item -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer" | Out-Null
-	}
-	Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer" -Name "NoDriveTypeAutoRun" -Type DWord -Value 255
-}
-
-# Enable Autorun
-Function EnableAutorun {
-	Write-Host "Enabling Autorun for all drives..."
-	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer" -Name "NoDriveTypeAutoRun"
-}
-
 # Disable Sticky keys prompt
 Function DisableStickyKeys {
 	Write-Host "Disabling Sticky keys prompt..."
@@ -582,6 +665,50 @@ Function EnableStickyKeys {
 	Set-ItemProperty -Path "HKCU:\Control Panel\Accessibility\StickyKeys" -Name "Flags" -Type String -Value "510"
 }

+# Show Task Manager details
+Function ShowTaskManagerDetails {
+	Write-Host "Showing task manager details..."
+	If (!(Test-Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\TaskManager")) {
+		New-Item -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\TaskManager" -Force | Out-Null
+	}
+	$preferences = Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\TaskManager" -Name "Preferences" -ErrorAction SilentlyContinue
+	If (!($preferences)) {
+		$taskmgr = Start-Process -WindowStyle Hidden -FilePath taskmgr.exe -PassThru
+		While (!($preferences)) {
+			Start-Sleep -m 250
+			$preferences = Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\TaskManager" -Name "Preferences" -ErrorAction SilentlyContinue
+		}
+		Stop-Process $taskmgr
+	}
+	$preferences.Preferences[28] = 0
+	Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\TaskManager" -Name "Preferences" -Type Binary -Value $preferences.Preferences
+}
+
+# Hide Task Manager details
+Function HideTaskManagerDetails {
+	Write-Host "Hiding task manager details..."
+	$preferences = Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\TaskManager" -Name "Preferences" -ErrorAction SilentlyContinue
+	If ($preferences) {
+		$preferences.Preferences[28] = 1
+		Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\TaskManager" -Name "Preferences" -Type Binary -Value $preferences.Preferences
+	}
+}
+
+# Show file operations details
+Function ShowFileOperationsDetails {
+	Write-Host "Showing file operations details..."
+	If (!(Test-Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\OperationStatusManager")) {
+		New-Item -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\OperationStatusManager" | Out-Null
+	}
+	Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\OperationStatusManager" -Name "EnthusiastMode" -Type DWord -Value 1
+}
+
+# Hide file operations details
+Function HideFileOperationsDetails {
+	Write-Host "Hiding file operations details..."
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\OperationStatusManager" -Name "EnthusiastMode" -ErrorAction SilentlyContinue
+}
+
 # Hide Taskbar Search button / box
 Function HideTaskbarSearchBox {
 	Write-Host "Hiding Taskbar Search box / button..."
@@ -591,7 +718,7 @@ Function HideTaskbarSearchBox {
 # Show Taskbar Search button / box
 Function ShowTaskbarSearchBox {
 	Write-Host "Showing Taskbar Search box / button..."
-	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" -Name "SearchboxTaskbarMode"
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" -Name "SearchboxTaskbarMode" -ErrorAction SilentlyContinue
 }

 # Hide Task View button
@@ -603,7 +730,7 @@ Function HideTaskView {
 # Show Task View button
 Function ShowTaskView {
 	Write-Host "Showing Task View button..."
-	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" -Name "ShowTaskViewButton"
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" -Name "ShowTaskViewButton" -ErrorAction SilentlyContinue
 }

 # Show small icons in taskbar
@@ -615,7 +742,7 @@ Function ShowSmallTaskbarIcons {
 # Show large icons in taskbar
 Function ShowLargeTaskbarIcons {
 	Write-Host "Showing large icons in taskbar..."
-	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" -Name "TaskbarSmallIcons"
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" -Name "TaskbarSmallIcons" -ErrorAction SilentlyContinue
 }

 # Show titles in taskbar
@@ -627,7 +754,22 @@ Function ShowTaskbarTitles {
 # Hide titles in taskbar
 Function HideTaskbarTitles {
 	Write-Host "Hiding titles in taskbar..."
-	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" -Name "TaskbarGlomLevel"
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" -Name "TaskbarGlomLevel" -ErrorAction SilentlyContinue
+}
+
+# Hide Taskbar People icon
+Function HideTaskbarPeopleIcon {
+	Write-Host "Hiding People icon..."
+	If (!(Test-Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\People")) {
+		New-Item -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\People" | Out-Null
+	}
+	Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\People" -Name "PeopleBand" -Type DWord -Value 0
+}
+
+# Show Taskbar People icon
+Function ShowTaskbarPeopleIcon {
+	Write-Host "Showing People icon..."
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\People" -Name "PeopleBand" -ErrorAction SilentlyContinue
 }

 # Show all tray icons
@@ -639,7 +781,7 @@ Function ShowTrayIcons {
 # Hide tray icons as needed
 Function HideTrayIcons {
 	Write-Host "Hiding tray icons..."
-	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer" -Name "EnableAutoTray"
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer" -Name "EnableAutoTray" -ErrorAction SilentlyContinue
 }

 # Show known file extensions
@@ -666,6 +808,32 @@ Function HideHiddenFiles {
 	Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" -Name "Hidden" -Type DWord -Value 2
 }

+# Hide sync provider notifications
+Function HideSyncNotifications {
+	Write-Host "Hiding sync provider notifications..."
+	Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" -Name "ShowSyncProviderNotifications" -Type DWord -Value 0
+}
+
+# Show sync provider notifications
+Function ShowSyncNotifications {
+	Write-Host "Showing sync provider notifications..."
+	Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" -Name "ShowSyncProviderNotifications" -Type DWord -Value 1
+}
+
+# Hide recently and frequently used item shortcuts in Explorer
+Function HideRecentShortcuts {
+	Write-Host "Hiding recent shortcuts..."
+	Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer" -Name "ShowRecent" -Type DWord -Value 0
+	Set-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer" -Name "ShowFrequent" -Type DWord -Value 0
+}
+
+# Show recently and frequently used item shortcuts in Explorer
+Function ShowRecentShortcuts {
+	Write-Host "Showing recent shortcuts..."
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer" -Name "ShowRecent" -ErrorAction SilentlyContinue
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer" -Name "ShowFrequent" -ErrorAction SilentlyContinue
+}
+
 # Change default Explorer view to This PC
 Function ExplorerThisPC {
 	Write-Host "Changing default Explorer view to This PC..."
@@ -675,7 +843,7 @@ Function ExplorerThisPC {
 # Change default Explorer view to Quick Access
 Function ExplorerQuickAccess {
 	Write-Host "Changing default Explorer view to Quick Access..."
-	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" -Name "LaunchTo"
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" -Name "LaunchTo" -ErrorAction SilentlyContinue
 }

 # Show This PC shortcut on desktop
@@ -691,8 +859,8 @@ Function ShowThisPCOnDesktop {
 # Hide This PC shortcut from desktop
 Function HideThisPCFromDesktop {
 	Write-Host "Hiding This PC shortcut from desktop..."
-	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu" -Name "{20D04FE0-3AEA-1069-A2D8-08002B30309D}"
-	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\NewStartPanel" -Name "{20D04FE0-3AEA-1069-A2D8-08002B30309D}"
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu" -Name "{20D04FE0-3AEA-1069-A2D8-08002B30309D}" -ErrorAction SilentlyContinue
+	Remove-ItemProperty -Path "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\NewStartPanel" -Name "{20D04FE0-3AEA-1069-A2D8-08002B30309D}" -ErrorAction SilentlyContinue
 }

 # Hide Desktop icon from This PC
@@ -801,6 +969,11 @@ Function EnableNumlock {
 		New-PSDrive -Name HKU -PSProvider Registry -Root HKEY_USERS | Out-Null
 	}
 	Set-ItemProperty -Path "HKU:\.DEFAULT\Control Panel\Keyboard" -Name "InitialKeyboardIndicators" -Type DWord -Value 2147483650
+	Add-Type -AssemblyName System.Windows.Forms
+	If (!([System.Windows.Forms.Control]::IsKeyLocked('NumLock'))) {
+		$wsh = New-Object -ComObject WScript.Shell
+		$wsh.SendKeys('{NUMLOCK}')
+	}
 }

 # Disable NumLock after startup
@@ -810,12 +983,17 @@ Function DisableNumlock {
 		New-PSDrive -Name HKU -PSProvider Registry -Root HKEY_USERS | Out-Null
 	}
 	Set-ItemProperty -Path "HKU:\.DEFAULT\Control Panel\Keyboard" -Name "InitialKeyboardIndicators" -Type DWord -Value 2147483648
+	Add-Type -AssemblyName System.Windows.Forms
+	If ([System.Windows.Forms.Control]::IsKeyLocked('NumLock')) {
+		$wsh = New-Object -ComObject WScript.Shell
+		$wsh.SendKeys('{NUMLOCK}')
+	}
 }



 ##########
-# Remove unwanted applications
+# Application Tweaks
 ##########

 # Disable OneDrive
@@ -830,7 +1008,7 @@ Function DisableOneDrive {
 # Enable OneDrive
 Function EnableOneDrive {
 	Write-Host "Enabling OneDrive..."
-	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\OneDrive" -Name "DisableFileSyncNGSC"
+	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\OneDrive" -Name "DisableFileSyncNGSC" -ErrorAction SilentlyContinue
 }

 # Uninstall OneDrive
@@ -849,9 +1027,7 @@ Function UninstallOneDrive {
 	Remove-Item "$env:USERPROFILE\OneDrive" -Force -Recurse -ErrorAction SilentlyContinue
 	Remove-Item "$env:LOCALAPPDATA\Microsoft\OneDrive" -Force -Recurse -ErrorAction SilentlyContinue
 	Remove-Item "$env:PROGRAMDATA\Microsoft OneDrive" -Force -Recurse -ErrorAction SilentlyContinue
-	If (Test-Path "$env:SYSTEMDRIVE\OneDriveTemp") {
-		Remove-Item "$env:SYSTEMDRIVE\OneDriveTemp" -Force -Recurse -ErrorAction SilentlyContinue
-	}
+	Remove-Item "$env:SYSTEMDRIVE\OneDriveTemp" -Force -Recurse -ErrorAction SilentlyContinue
 	If (!(Test-Path "HKCR:")) {
 		New-PSDrive -Name HKCR -PSProvider Registry -Root HKEY_CLASSES_ROOT | Out-Null
 	}
@@ -890,7 +1066,6 @@ Function UninstallBloatware {
 	Get-AppxPackage "Microsoft.WindowsMaps" | Remove-AppxPackage
 	Get-AppxPackage "Microsoft.WindowsPhone" | Remove-AppxPackage
 	Get-AppxPackage "Microsoft.WindowsSoundRecorder" | Remove-AppxPackage
-	Get-AppxPackage "Microsoft.XboxApp" | Remove-AppxPackage
 	Get-AppxPackage "Microsoft.ZuneMusic" | Remove-AppxPackage
 	Get-AppxPackage "Microsoft.ZuneVideo" | Remove-AppxPackage
 	Get-AppxPackage "Microsoft.AppConnector" | Remove-AppxPackage
@@ -907,46 +1082,71 @@ Function UninstallBloatware {
 	Get-AppxPackage "D52A8D61.FarmVille2CountryEscape" | Remove-AppxPackage
 	Get-AppxPackage "GAMELOFTSA.Asphalt8Airborne" | Remove-AppxPackage
 	Get-AppxPackage "Microsoft.WindowsFeedbackHub" | Remove-AppxPackage
+	Get-AppxPackage "Microsoft.MinecraftUWP" | Remove-AppxPackage
+	Get-AppxPackage "flaregamesGmbH.RoyalRevolt2" | Remove-AppxPackage
+	Get-AppxPackage "AdobeSystemsIncorporated.AdobePhotoshopExpress" | Remove-AppxPackage
+	Get-AppxPackage "ActiproSoftwareLLC.562882FEEB491" | Remove-AppxPackage
+	Get-AppxPackage "D5EA27B7.Duolingo-LearnLanguagesforFree" | Remove-AppxPackage
+	Get-AppxPackage "Facebook.Facebook" | Remove-AppxPackage
+	Get-AppxPackage "46928bounde.EclipseManager" | Remove-AppxPackage
+	Get-AppxPackage "A278AB0D.MarchofEmpires" | Remove-AppxPackage
+	Get-AppxPackage "Microsoft.MicrosoftPowerBIForWindows" | Remove-AppxPackage
+	Get-AppxPackage "Microsoft.NetworkSpeedTest" | Remove-AppxPackage
+	Get-AppxPackage "Microsoft.MSPaint" | Remove-AppxPackage
+	Get-AppxPackage "Microsoft.Microsoft3DViewer" | Remove-AppxPackage
+	Get-AppxPackage "Microsoft.RemoteDesktop" | Remove-AppxPackage
 }

 # Install default Microsoft applications
 Function InstallBloatware {
 	Write-Host "Installing default Microsoft applications..."
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.3DBuilder").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.BingFinance").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.BingNews").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.BingSports").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.BingWeather").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.Getstarted").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.MicrosoftOfficeHub").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.MicrosoftSolitaireCollection").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.Office.OneNote").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.People").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.SkypeApp").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.Windows.Photos").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.WindowsAlarms").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.WindowsCamera").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.windowscommunicationsapps").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.WindowsMaps").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.WindowsPhone").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.WindowsSoundRecorder").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.XboxApp").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.ZuneMusic").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.ZuneVideo").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.AppConnector").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.ConnectivityStore").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.Office.Sway").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.Messaging").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.CommsPhone").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "9E2F88E3.Twitter").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "king.com.CandyCrushSodaSaga").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "4DF9E0F8.Netflix").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Drawboard.DrawboardPDF").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.MicrosoftStickyNotes").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.OneConnect").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "D52A8D61.FarmVille2CountryEscape").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "GAMELOFTSA.Asphalt8Airborne").InstallLocation)\AppXManifest.xml"
-	Add-AppxPackage -DisableDevelopmentMode -Register "$($(Get-AppXPackage -AllUsers "Microsoft.WindowsFeedbackHub").InstallLocation)\AppXManifest.xml"
+	Get-AppxPackage -AllUsers "Microsoft.3DBuilder" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.BingFinance" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.BingNews" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.BingSports" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.BingWeather" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.Getstarted" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.MicrosoftOfficeHub" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.MicrosoftSolitaireCollection" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.Office.OneNote" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.People" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.SkypeApp" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.Windows.Photos" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.WindowsAlarms" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.WindowsCamera" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.windowscommunicationsapps" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.WindowsMaps" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.WindowsPhone" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.WindowsSoundRecorder" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.ZuneMusic" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.ZuneVideo" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.AppConnector" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.ConnectivityStore" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.Office.Sway" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.Messaging" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.CommsPhone" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "9E2F88E3.Twitter" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "king.com.CandyCrushSodaSaga" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "4DF9E0F8.Netflix" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Drawboard.DrawboardPDF" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.MicrosoftStickyNotes" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.OneConnect" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "D52A8D61.FarmVille2CountryEscape" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "GAMELOFTSA.Asphalt8Airborne" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.WindowsFeedbackHub" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.MinecraftUWP" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "flaregamesGmbH.RoyalRevolt2" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "AdobeSystemsIncorporated.AdobePhotoshopExpress" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "ActiproSoftwareLLC.562882FEEB491" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "D5EA27B7.Duolingo-LearnLanguagesforFree" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Facebook.Facebook" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "46928bounde.EclipseManager" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "A278AB0D.MarchofEmpires" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.MicrosoftPowerBIForWindows" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.NetworkSpeedTest" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.MSPaint" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.Microsoft3DViewer" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.RemoteDesktop" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
 }
 # In case you have removed them for good, you can try to restore the files using installation medium as follows
 # New-Item C:\Mnt -Type Directory | Out-Null
@@ -955,9 +1155,42 @@ Function InstallBloatware {
 # dism /Unmount-Image /Discard /MountDir:C:\Mnt
 # Remove-Item -Path C:\Mnt -Recurse

-# Disable Xbox DVR
-Function DisableXboxDVR {
-	Write-Host "Disabling Xbox DVR..."
+# Uninstall Windows Store
+Function UninstallWindowsStore {
+	Write-Host "Uninstalling Windows Store..."
+	Get-AppxPackage "Microsoft.DesktopAppInstaller" | Remove-AppxPackage
+	Get-AppxPackage "Microsoft.WindowsStore" | Remove-AppxPackage
+}
+
+# Install Windows Store
+Function InstallWindowsStore {
+	Write-Host "Installing Windows Store..."
+	Get-AppxPackage -AllUsers "Microsoft.DesktopAppInstaller" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.WindowsStore" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+}
+
+# Disable installation of consumer experience applications
+Function DisableConsumerApps {
+	Write-Host "Disabling installation of consumer experience applications..."
+	If (!(Test-Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\CloudContent")) {
+		New-Item -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\CloudContent" -Force | Out-Null
+	}
+	Set-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\CloudContent" -Name "DisableWindowsConsumerFeatures" -Type DWord -Value 1
+}
+
+# Enable installation of consumer experience applications
+Function EnableConsumerApps {
+	Write-Host "Enabling installation of consumer experience applications..."
+	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\CloudContent" -Name "DisableWindowsConsumerFeatures" -ErrorAction SilentlyContinue
+}
+
+# Disable Xbox features
+Function DisableXboxFeatures {
+	Write-Host "Disabling Xbox features..."
+	Get-AppxPackage "Microsoft.XboxApp" | Remove-AppxPackage
+	Get-AppxPackage "Microsoft.XboxIdentityProvider" | Remove-AppxPackage
+	Get-AppxPackage "Microsoft.XboxSpeechToTextOverlay" | Remove-AppxPackage
+	Get-AppxPackage "Microsoft.XboxGameOverlay" | Remove-AppxPackage
 	Set-ItemProperty -Path "HKCU:\System\GameConfigStore" -Name "GameDVR_Enabled" -Type DWord -Value 0
 	If (!(Test-Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\GameDVR")) {
 		New-Item -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\GameDVR" | Out-Null
@@ -965,9 +1198,13 @@ Function DisableXboxDVR {
 	Set-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\GameDVR" -Name "AllowGameDVR" -Type DWord -Value 0
 }

-# Enable Xbox DVR
-Function EnableXboxDVR {
-	Write-Host "Enabling Xbox DVR..."
+# Enable Xbox features
+Function EnableXboxFeatures {
+	Write-Host "Enabling Xbox features..."
+	Get-AppxPackage -AllUsers "Microsoft.XboxApp" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.XboxIdentityProvider" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.XboxSpeechToTextOverlay" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
+	Get-AppxPackage -AllUsers "Microsoft.XboxGameOverlay" | ForEach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
 	Set-ItemProperty -Path "HKCU:\System\GameConfigStore" -Name "GameDVR_Enabled" -Type DWord -Value 1
 	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\GameDVR" -Name "AllowGameDVR" -ErrorAction SilentlyContinue
 }
@@ -975,25 +1212,37 @@ Function EnableXboxDVR {
 # Uninstall Windows Media Player
 Function UninstallMediaPlayer {
 	Write-Host "Uninstalling Windows Media Player..."
-	dism /online /Disable-Feature /FeatureName:MediaPlayback /Quiet /NoRestart
+	Disable-WindowsOptionalFeature -Online -FeatureName "WindowsMediaPlayer" -NoRestart -WarningAction SilentlyContinue | Out-Null
 }

 # Install Windows Media Player
 Function InstallMediaPlayer {
 	Write-Host "Installing Windows Media Player..."
-	dism /online /Enable-Feature /FeatureName:MediaPlayback /Quiet /NoRestart
+	Enable-WindowsOptionalFeature -Online -FeatureName "WindowsMediaPlayer" -NoRestart -WarningAction SilentlyContinue | Out-Null
 }

 # Uninstall Work Folders Client
 Function UninstallWorkFolders {
 	Write-Host "Uninstalling Work Folders Client..."
-	dism /online /Disable-Feature /FeatureName:WorkFolders-Client /Quiet /NoRestart
+	Disable-WindowsOptionalFeature -Online -FeatureName "WorkFolders-Client" -NoRestart -WarningAction SilentlyContinue | Out-Null
 }

 # Install Work Folders Client
 Function InstallWorkFolders {
 	Write-Host "Installing Work Folders Client..."
-	dism /online /Enable-Feature /FeatureName:WorkFolders-Client /Quiet /NoRestart
+	Enable-WindowsOptionalFeature -Online -FeatureName "WorkFolders-Client" -NoRestart -WarningAction SilentlyContinue | Out-Null
+}
+
+# Install Hyper-V - Applicable to Pro, Ent, Edu editions
+Function InstallHyperV {
+	Write-Host "Installing Hyper-V..."
+	Enable-WindowsOptionalFeature -Online -FeatureName "Microsoft-Hyper-V" -All -NoRestart -WarningAction SilentlyContinue | Out-Null
+}
+
+# Uninstall Hyper-V
+Function UninstallHyperV {
+	Write-Host "Uninstalling Hyper-V..."
+	Disable-WindowsOptionalFeature -Online -FeatureName "Microsoft-Hyper-V-All" -NoRestart -WarningAction SilentlyContinue | Out-Null
 }

 # Install Linux Subsystem - Applicable to RS1 or newer
@@ -1001,7 +1250,7 @@ Function InstallLinuxSubsystem {
 	Write-Host "Installing Linux Subsystem..."
 	Set-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock" -Name "AllowDevelopmentWithoutDevLicense" -Type DWord -Value 1
 	Set-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock" -Name "AllowAllTrustedApps" -Type DWord -Value 1
-	dism /online /Enable-Feature /FeatureName:Microsoft-Windows-Subsystem-Linux /Quiet /NoRestart
+	Enable-WindowsOptionalFeature -Online -FeatureName "Microsoft-Windows-Subsystem-Linux" -NoRestart -WarningAction SilentlyContinue | Out-Null
 }

 # Uninstall Linux Subsystem - Applicable to RS1 or newer
@@ -1009,7 +1258,7 @@ Function UninstallLinuxSubsystem {
 	Write-Host "Uninstalling Linux Subsystem..."
 	Set-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock" -Name "AllowDevelopmentWithoutDevLicense" -Type DWord -Value 0
 	Set-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock" -Name "AllowAllTrustedApps" -Type DWord -Value 0
-	dism /online /Disable-Feature /FeatureName:Microsoft-Windows-Subsystem-Linux /Quiet /NoRestart
+	Disable-WindowsOptionalFeature -Online -FeatureName "Microsoft-Windows-Subsystem-Linux" -NoRestart -WarningAction SilentlyContinue | Out-Null
 }

 # Set Photo Viewer association for bmp, gif, jpg, png and tif
@@ -1032,13 +1281,13 @@ Function UnsetPhotoViewerAssociation {
 	If (!(Test-Path "HKCR:")) {
 		New-PSDrive -Name HKCR -PSProvider Registry -Root HKEY_CLASSES_ROOT | Out-Null
 	}
-	Remove-Item -Path "HKCR:\Paint.Picture\shell\open" -Recurse
-	Remove-ItemProperty -Path "HKCR:\giffile\shell\open" -Name "MuiVerb"
+	Remove-Item -Path "HKCR:\Paint.Picture\shell\open" -Recurse -ErrorAction SilentlyContinue
+	Remove-ItemProperty -Path "HKCR:\giffile\shell\open" -Name "MuiVerb" -ErrorAction SilentlyContinue
 	Set-ItemProperty -Path "HKCR:\giffile\shell\open" -Name "CommandId" -Type String -Value "IE.File"
 	Set-ItemProperty -Path "HKCR:\giffile\shell\open\command" -Name "(Default)" -Type String -Value "`"$env:SystemDrive\Program Files\Internet Explorer\iexplore.exe`" %1"
 	Set-ItemProperty -Path "HKCR:\giffile\shell\open\command" -Name "DelegateExecute" -Type String -Value "{17FE9752-0B5A-4665-84CD-569794602F5C}"
-	Remove-Item -Path "HKCR:\jpegfile\shell\open" -Recurse
-	Remove-Item -Path "HKCR:\pngfile\shell\open" -Recurse
+	Remove-Item -Path "HKCR:\jpegfile\shell\open" -Recurse -ErrorAction SilentlyContinue
+	Remove-Item -Path "HKCR:\pngfile\shell\open" -Recurse -ErrorAction SilentlyContinue
 }

 # Add Photo Viewer to "Open with..."
@@ -1060,7 +1309,37 @@ Function RemovePhotoViewerOpenWith {
 	If (!(Test-Path "HKCR:")) {
 		New-PSDrive -Name HKCR -PSProvider Registry -Root HKEY_CLASSES_ROOT | Out-Null
 	}
-	Remove-Item -Path "HKCR:\Applications\photoviewer.dll\shell\open" -Recurse
+	Remove-Item -Path "HKCR:\Applications\photoviewer.dll\shell\open" -Recurse -ErrorAction SilentlyContinue
+}
+
+# Disable search for app in store for unknown extensions
+Function DisableSearchAppInStore {
+	Write-Host "Disabling search for app in store for unknown extensions..."
+	If (!(Test-Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Explorer")) {
+		New-Item -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Explorer" | Out-Null
+	}
+	Set-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Explorer" -Name "NoUseStoreOpenWith" -Type DWord -Value 1
+}
+
+# Enable search for app in store for unknown extensions
+Function EnableSearchAppInStore {
+	Write-Host "Enabling search for app in store for unknown extensions..."
+	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Explorer" -Name "NoUseStoreOpenWith" -ErrorAction SilentlyContinue
+}
+
+# Disable 'How do you want to open this file?' prompt
+Function DisableNewAppPrompt {
+	Write-Host "Disabling 'How do you want to open this file?' prompt..."
+	If (!(Test-Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Explorer")) {
+		New-Item -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Explorer" | Out-Null
+	}
+	Set-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Explorer" -Name "NoNewAppAlert" -Type DWord -Value 1
+}
+
+# Enable 'How do you want to open this file?' prompt
+Function EnableNewAppPrompt {
+	Write-Host "Enabling 'How do you want to open this file?' prompt..."
+	Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Explorer" -Name "NoNewAppAlert" -ErrorAction SilentlyContinue
 }

 # Enable F8 boot menu options
@@ -1075,16 +1354,28 @@ Function DisableF8BootMenu {
 	bcdedit /set `{current`} bootmenupolicy Standard | Out-Null
 }

+# Set Data Execution Prevention (DEP) policy to OptOut
+Function SetDEPOptOut {
+	Write-Host "Setting Data Execution Prevention (DEP) policy to OptOut..."
+	bcdedit /set `{current`} nx OptOut | Out-Null
+}
+
+# Set Data Execution Prevention (DEP) policy to OptIn
+Function SetDEPOptIn {
+	Write-Host "Setting Data Execution Prevention (DEP) policy to OptIn..."
+	bcdedit /set `{current`} nx OptIn | Out-Null
+}
+


 ##########
-# Auxiliary
+# Auxiliary Functions
 ##########

 Function WaitForKey {
 	Write-Host
 	Write-Host "Press any key to continue..." -ForegroundColor Black -BackgroundColor White
-	$key = $host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
+	[Console]::ReadKey($true) | Out-Null
 }

 Function Restart {
--- a/test/applyall.bat
+++ b/test/applyall.bat
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+powershell.exe -NoProfile -ExecutionPolicy Bypass -File %~dp0..\Win10.ps1 -preset "%~dp0applyall.preset"
--- a/test/applyall.preset
+++ b/test/applyall.preset
@@ -0,0 +1,82 @@
+
+	# Apply all
+
+	DisableTelemetry
+	DisableWiFiSense
+	DisableSmartScreen
+	DisableWebSearch
+	DisableStartSuggestions
+	DisableLocationTracking
+	DisableFeedback
+	DisableAdvertisingID
+	DisableCortana
+	DisableErrorReporting
+	RestrictUpdateP2P
+	DisableAutoLogger
+	DisableDiagTrack
+	DisableWAPPush
+	
+	LowerUAC
+	EnableSharingMappedDrives
+	DisableAdminShares
+	SetCurrentNetworkPrivate
+	SetUnknownNetworksPrivate
+	DisableFirewall
+	DisableDefender
+	DisableUpdateMSRT
+	DisableUpdateDriver
+	DisableUpdateRestart
+	DisableHomeGroups
+	DisableRemoteAssistance
+	EnableRemoteDesktop
+	DisableAutoplay
+	DisableAutorun
+	DisableDefragmentation
+	SetBIOSTimeUTC
+
+	DisableActionCenter
+	DisableLockScreen
+	DisableLockScreenRS1
+	DisableStickyKeys
+	ShowTaskManagerDetails
+	ShowFileOperationsDetails
+	HideTaskbarSearchBox
+	HideTaskView
+	ShowSmallTaskbarIcons
+	ShowTaskbarTitles
+	HideTaskbarPeopleIcon
+	ShowTrayIcons
+	ShowKnownExtensions
+	ShowHiddenFiles
+	HideSyncNotifications
+	HideRecentShortcuts
+	ExplorerThisPC
+	ShowThisPCOnDesktop
+	HideDesktopFromThisPC
+	HideDocumentsFromThisPC
+	HideDownloadsFromThisPC
+	HideMusicFromThisPC
+	HidePicturesFromThisPC
+	HideVideosFromThisPC
+	AddENKeyboard
+	EnableNumlock
+
+	DisableOneDrive
+	UninstallOneDrive
+	UninstallBloatware
+	UninstallWindowsStore
+	DisableConsumerApps
+	DisableXboxFeatures
+	UninstallMediaPlayer
+	UninstallWorkFolders
+	InstallHyperV
+	InstallLinuxSubsystem
+	SetPhotoViewerAssociation
+	AddPhotoViewerOpenWith
+	DisableSearchAppInStore
+	DisableNewAppPrompt
+	EnableF8BootMenu
+	SetDEPOptOut
+
+	WaitForKey
+	Restart
--- a/test/restoreall.bat
+++ b/test/restoreall.bat
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+powershell.exe -NoProfile -ExecutionPolicy Bypass -File %~dp0..\Win10.ps1 -preset "%~dp0restoreall.preset"
--- a/test/restoreall.preset
+++ b/test/restoreall.preset
@@ -0,0 +1,82 @@
+
+	# Restore all
+
+	EnableTelemetry
+	EnableWiFiSense
+	EnableSmartScreen
+	EnableWebSearch
+	EnableStartSuggestions
+	EnableLocationTracking
+	EnableFeedback
+	EnableAdvertisingID
+	EnableCortana
+	EnableErrorReporting
+	UnrestrictUpdateP2P
+	EnableAutoLogger
+	EnableDiagTrack
+	EnableWAPPush
+	
+	RaiseUAC
+	DisableSharingMappedDrives
+	EnableAdminShares
+	SetCurrentNetworkPublic
+	SetUnknownNetworksPublic
+	EnableFirewall
+	EnableDefender
+	EnableUpdateMSRT
+	EnableUpdateDriver
+	EnableUpdateRestart
+	EnableHomeGroups
+	EnableRemoteAssistance
+	DisableRemoteDesktop
+	EnableAutoplay
+	EnableAutorun
+	EnableDefragmentation
+	SetBIOSTimeLocal
+
+	EnableActionCenter
+	EnableLockScreen
+	EnableLockScreenRS1
+	EnableStickyKeys
+	HideTaskManagerDetails
+	HideFileOperationsDetails
+	ShowTaskbarSearchBox
+	ShowTaskView
+	ShowLargeTaskbarIcons
+	HideTaskbarTitles
+	ShowTaskbarPeopleIcon
+	HideTrayIcons
+	HideKnownExtensions
+	HideHiddenFiles
+	ShowSyncNotifications
+	ShowRecentShortcuts
+	ExplorerQuickAccess
+	HideThisPCFromDesktop
+	ShowDesktopInThisPC
+	ShowDocumentsInThisPC
+	ShowDownloadsInThisPC
+	ShowMusicInThisPC
+	ShowPicturesInThisPC
+	ShowVideosInThisPC
+	RemoveENKeyboard
+	DisableNumlock
+
+	EnableOneDrive
+	InstallOneDrive
+	InstallBloatware
+	InstallWindowsStore
+	EnableConsumerApps
+	EnableXboxFeatures
+	InstallMediaPlayer
+	InstallWorkFolders
+	UninstallHyperV
+	UninstallLinuxSubsystem
+	UnsetPhotoViewerAssociation
+	RemovePhotoViewerOpenWith
+	EnableSearchAppInStore
+	EnableNewAppPrompt
+	DisableF8BootMenu
+	SetDEPOptIn
+
+	WaitForKey
+	Restart
Author	SHA1	Message	Date
Disassembler	c0a3de5938	v2.4, 2017-06-08 - Add "Hide taskbar People icon" - Add "Hide recent + frequent shortcuts" - Add "Install Hyper-V" (disabled by default) - Replace dism commands with native cmdlets	2017-06-08 14:13:20 +02:00
Disassembler	f89ba71646	Add presets used for development and testing	2017-06-08 14:05:59 +02:00
Disassembler0	e1b8c5ca8b	Merge pull request #9 from Nerothos/master Add/remove part for people icon in taskbar	2017-06-08 14:03:42 +02:00
Nerothos	ca84acf781	Add/remove part for people icon in taskbar	2017-05-16 08:50:17 +02:00
Disassembler	a7afe5aabe	v2.3, 2017-05-08 - Add "Set current network profile to private" - Add "Set unknown networks profile to private" - Add "Show Task Manager details" - Add "Set Data Execution Prevention (DEP) policy to OptOut", closes #7 - Update "Disable Firewall" to use GPO, which doesn't cause Security and Maintenance Center to complain loudly. - Update "Uninstall OneDrive" to remove unnecessary directory check.	2017-05-08 17:57:33 +02:00
Disassembler	12cd8c522d	Clarify work with preset files in readme, as I see some confusion in some people's forks.	2017-05-08 13:45:41 +02:00
Disassembler	60c9237983	v2.2, 2017-04-08 - Add "Show file operations details" - Add "Hide sync provider notifications" - Add "Uninstall Windows Store" - Update "Disable SmartScreen" for Edge - Update "Disable Windows Defender" for Creators Update - Update "Uninstall default Microsoft application" to remove even more bloatware - Update (and rename) "Disable Xbox features" to uninstall corresponding Xbox packages - Update default preset to not apply settings decreasing security to make the new Defender Security Center happy {Advanced users use customized presets or have their own fork anyway)	2017-04-08 11:33:49 +02:00
Disassembler	6cdfc3292d	Add a FAQ about multi-user environments, addressing #5	2017-02-24 17:59:13 +01:00
Disassembler	d5bb4a6782	Convert indentation in preset list to spaces for better readability on tabsize != 4	2017-02-08 20:42:58 +01:00
Disassembler	7df79cac16	v 2.1 - Add "Disable scheduled defragmentation" (disabled by default), closes #3 - Add "Set BIOS time to UTC" (disabled by default) - Add "Disable installation of consumer experience applications" - Add "Disable search for app in store for unknown extensions" - Add "Disable 'How do you want to open this file?' prompt" - Move Autorun and Autoplay from UI tweaks to service tweaks - Update "Enable NumLock after startup" with a horrible hack which I'm ashamed of but gets the job done - Suppres errors while removing nonexistant keys during Photo Viewer tweak reverts - Change a way how the WaitForKey key press is handled	2017-02-08 20:32:57 +01:00
Disassembler	f3afde4551	Change a way of reinstalling provisioned packages to avoid errors on packages which were never installed	2017-02-08 20:04:19 +01:00
Disassembler	db7356151c	- Add commented restore function counterparts - Rename EnableLockScreenWorkaround to EnableLockScreenRS1 - Fix and clarify few more strings	2017-02-08 16:50:37 +01:00
Disassembler	e12cb11a0c	Suppress errors while removing nonexistent registry keys	2017-01-08 22:30:02 +01:00