diff --git a/docs/registry-opts.md b/docs/registry-opts.md
index b556771..6f5b73a 100644
--- a/docs/registry-opts.md
+++ b/docs/registry-opts.md
@@ -3,36 +3,36 @@
 ## Disable Windows Update
 
 ```
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update]
-"SetupWizardLaunchTime"=- ; 9600 and earlier
-"AUOptions"=dword:00000001 ; 9600 and earlier
-"AcceleratedInstallRequired"=- ; 9600 and earlier
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Device Metadata]
-"PreventDeviceMetadataFromNetwork"=dword:00000001
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]
+"NoAutoUpdate"=dword:00000001
+"UseWUServer"=dword:00000001
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\DriverSearching]
 "SearchOrderConfig"=dword:00000000
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DriverSearching]
-"SearchOrderConfig"=dword:00000000
-"DontSearchWindowsUpdate"=dword:00000001
-
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\WindowsUpdate\UX\Settings]
 "ExcludeWUDriversInQualityUpdate"=dword:00000001
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate]
-"UpdateServiceUrlAlternate"=" "
-"WUServer"=" "
-"SetDisableUXWUAccess"=dword:00000001 ; 10240 or later
+"ExcludeWUDriversInQualityUpdate"=dword:00000001 ;Windows 10 10240 or later
+"DisableOSUpgrade"=dword:00000001 ;Windows 8 9200 or later
 "DisableWindowsUpdateAccess"=dword:00000001
-"DisableOSUpgrade"=dword:00000001 ; 9200 or later
-"ExcludeWUDriversInQualityUpdate"=dword:00000001 ; 10240 or later
 "WUStatusServer"=" "
+"SetDisableUXWUAccess"=dword:00000001 ;Windows 10 10240 or later
+"WUServer"=" "
+"UpdateServiceUrlAlternate"=" "
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU]
-"UseWUServer"=dword:00000001
-"NoAutoUpdate"=dword:00000001
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update]
+"AUOptions"=dword:00000001 ;Windows 8.1 9600 and earlier
+"AcceleratedInstallRequired"=- ;Windows 8.1 9600 and earlier
+"SetupWizardLaunchTime"=- ;Windows 8.1 9600 and earlier
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DriverSearching]
+"SearchOrderConfig"=dword:00000000
+"DontSearchWindowsUpdate"=dword:00000001
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Device Metadata]
+"PreventDeviceMetadataFromNetwork"=dword:00000001
 ```
 
 ## Disable Automatic Windows Updates
@@ -46,7 +46,7 @@
 
 ```
 [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate]
-"ExcludeWUDriversInQualityUpdate"=dword:00000001 ; 10240 or later
+"ExcludeWUDriversInQualityUpdate"=dword:00000001 ;Windows 10 10240 or later
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Device Metadata]
 "PreventDeviceMetadataFromNetwork"=dword:00000001
@@ -66,7 +66,7 @@
 
 ```
 [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\WindowsStore]
-"AutoDownload"=dword:00000004 ; 9600 or later
+"AutoDownload"=dword:00000004 ;Windows 8.1 9600 or later
 ```
 
 ## Disable User Account Control
@@ -86,66 +86,66 @@
 ## Disable Windows Defender
 
 ```
-[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WdBoot]
-"Start"=dword:00000004 ; 9200 or later
-
-[HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\AppHost]
-"EnableWebContentEvaluation"=dword:00000000 ; 10240 or later
-
-[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WdNisDrv]
-"Start"=dword:00000004 ; 9200 or later
-
-[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WdFilter]
-"Start"=dword:00000004 ; 9200 or later
-
-[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\SecurityHealthService]
-"Start"=dword:00000004 ; 10240 or later
-
-[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WdNisSvc]
-"Start"=dword:00000004 ; 9200 or later
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\DeviceGuard\Scenarios\HypervisorEnforcedCodeIntegrity]
+"Enabled"=dword:00000000 ;Windows 10 10240 or later
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender]
 "DisableAntiSpyware"=dword:00000001
 
+[HKEY_CURRENT_USER\SOFTWARE\Microsoft\Edge\SmartScreenEnabled]
+@=dword:00000000 ;Windows 10 10240 or later
+
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Sense]
+"Start"=dword:00000004 ;Windows 10 10240 or later
+
 [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender\Real-Time Protection]
 "DisableScanOnRealtimeEnable"=dword:00000001
-"DisableBehaviorMonitoring"=dword:00000001 ; 9200 or later
+"DisableBehaviorMonitoring"=dword:00000001 ;Windows 8 9200 or later
 
 [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\CI\Policy]
-"VerifiedAndReputablePolicyState"=dword:00000000 ; 22000 or later
+"VerifiedAndReputablePolicyState"=dword:00000000 ;Windows 11 22000 or later
 
-[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\wscsvc]
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WinDefend]
 "Start"=dword:00000004
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Defender\Spynet]
-"SpyNetReporting"=dword:00000000 ; 10240 or later
-"SubmitSamplesConsent"=dword:00000000 ; 10240 or later
+"SpyNetReporting"=dword:00000000 ;Windows 10 10240 or later
+"SubmitSamplesConsent"=dword:00000000 ;Windows 10 10240 or later
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Run]
-"WindowsDefender"=- ; 10240 or later
-"SecurityHealth"=- ; 10240 or later
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WdNisSvc]
+"Start"=dword:00000004 ;Windows 8 9200 or later
 
-[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Sense]
-"Start"=dword:00000004 ; 10240 or later
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WdBoot]
+"Start"=dword:00000004 ;Windows 8 9200 or later
 
-[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\DeviceGuard\Scenarios\HypervisorEnforcedCodeIntegrity]
-"Enabled"=dword:00000000 ; 10240 or later
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WTDS\Components]
+"ServiceEnabled"=dword:00000000 ;Windows 11 22000 or later
+
+[HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\AppHost]
+"EnableWebContentEvaluation"=dword:00000000 ;Windows 10 10240 or later
+
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\SecurityHealthService]
+"Start"=dword:00000004 ;Windows 10 10240 or later
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Microsoft Antimalware\Real-Time Protection]
 "DisableOnAccessProtection"=dword:00000001
 "DisableScanOnRealtimeEnable"=dword:00000001
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer]
-"SmartScreenEnabled"="Off" ; 10240 or later
+"SmartScreenEnabled"="Off" ;Windows 10 10240 or later
 
-[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WinDefend]
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WdNisDrv]
+"Start"=dword:00000004 ;Windows 8 9200 or later
+
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\wscsvc]
 "Start"=dword:00000004
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WTDS\Components]
-"ServiceEnabled"=dword:00000000 ; 22000 or later
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Run]
+"WindowsDefender"=- ;Windows 10 10240 or later
+"SecurityHealth"=- ;Windows 10 10240 or later
 
-[HKEY_CURRENT_USER\SOFTWARE\Microsoft\Edge\SmartScreenEnabled]
-@=dword:00000000 ; 10240 or later
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WdFilter]
+"Start"=dword:00000004 ;Windows 8 9200 or later
 ```
 
 ## Disable Malicious Software Removal Tool Updates
@@ -166,9 +166,9 @@
 
 ```
 [HKEY_CURRENT_USER\Control Panel\Mouse]
+"MouseThreshold2"="0"
 "MouseSpeed"="0"
 "MouseThreshold1"="0"
-"MouseThreshold2"="0"
 ```
 
 ## Disable Fast Startup
@@ -203,14 +203,14 @@
 
 ```
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\WindowsRuntime\ActivatableClassId\Windows.Gaming.GameBar.PresenceServer.Internal.PresenceWriter]
-"ActivationType"=dword:00000000 ; 10240 or later
+"ActivationType"=dword:00000000 ;Windows 10 10240 or later
 ```
 
 ## Disable Background Apps
 
 ```
 [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy]
-"LetAppsRunInBackground"=dword:00000002 ; 10240 or later
+"LetAppsRunInBackground"=dword:00000002 ;Windows 10 10240 or later
 ```
 
 ## Disable Remote Assistance
@@ -224,7 +224,7 @@
 
 ```
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System]
-"DisableAutomaticRestartSignOn"=dword:00000001 ; 18362 or later
+"DisableAutomaticRestartSignOn"=dword:00000001 ;Windows 10 18362 or later
 ```
 
 ## Show File Extensions
@@ -238,7 +238,7 @@
 
 ```
 [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Dsh]
-"AllowNewsAndInterests"=dword:00000000 ; 10240 or later
+"AllowNewsAndInterests"=dword:00000000 ;Windows 10 10240 or later
 ```
 
 ## Disable Customer Experience Improvement Program
@@ -247,11 +247,11 @@
 [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\SQMClient\Windows]
 "CEIPEnable"=dword:00000000
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\SQMClient\Windows]
-"CEIPEnable"=dword:00000000
-
 [HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VSCommon\15.0\SQM]
 "OptIn"=dword:00000000
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\SQMClient\Windows]
+"CEIPEnable"=dword:00000000
 ```
 
 ## Disable Windows Error Reporting
@@ -268,61 +268,61 @@
 
 ```
 [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Windows Search]
-"ConnectedSearchUseWeb"=dword:00000000 ; 9600 or later
+"ConnectedSearchUseWeb"=dword:00000000 ;Windows 8.1 9600 or later
 ```
 
 ## Disable Notifications Network Usage
 
 ```
 [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\PushNotifications]
-"NoCloudApplicationNotification"=dword:00000001 ; 9200 or later
+"NoCloudApplicationNotification"=dword:00000001 ;Windows 8 9200 or later
 ```
 
 ## Disable Telemetry
 
 ```
-[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\DiagTrack]
-"Start"=dword:00000004 ; 10240 or later
-
 [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment]
 "POWERSHELL_TELEMETRY_OPTOUT"="1"
 
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\DiagTrack]
+"Start"=dword:00000004 ;Windows 10 10240 or later
+
 [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\DataCollection]
-"AllowTelemetry"=dword:00000000 ; 10240 or later
+"AllowTelemetry"=dword:00000000 ;Windows 10 10240 or later
 ```
 
 ## Disable Retrieval of Online Tips and Help in the Immersive Control Panel
 
 ```
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer]
-"AllowOnlineTips"=dword:00000000 ; 16299 or later
+"AllowOnlineTips"=dword:00000000 ;Windows 10 16299 or later
 ```
 
 ## Disable Typing Insights
 
 ```
 [HKEY_CURRENT_USER\SOFTWARE\Microsoft\input\Settings]
-"InsightsEnabled"=dword:00000000 ; 10240 or later
+"InsightsEnabled"=dword:00000000 ;Windows 10 10240 or later
 ```
 
 ## Disable Suggestions in the Search Box and in Search Home
 
 ```
 [HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\SearchSettings]
-"IsDynamicSearchBoxEnabled"=dword:00000000 ; 22000 or later
+"IsDynamicSearchBoxEnabled"=dword:00000000 ;Windows 11 22000 or later
 ```
 
 ## Disable Computer Is Out of Support Message
 
 ```
 [HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\EOSNotify]
-"DiscontinueEOS"=dword:00000001 ; 9600 and earlier
+"DiscontinueEOS"=dword:00000001 ;Windows 8.1 9600 and earlier
 ```
 
 ## Disable Transparency Effects
 
 ```
 [HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize]
-"EnableTransparency"=dword:00000000 ; 10240 or later
+"EnableTransparency"=dword:00000000 ;Windows 10 10240 or later
 ```