Bump softprops/action-gh-release from 2 to 3

Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 2 to 3.
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/v2...v3)

---
updated-dependencies:
- dependency-name: softprops/action-gh-release
  dependency-version: '3'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/CONTRIBUTING.md

@@ -21,12 +21,14 @@
 
 * Pull requests are now handled directly on the **MAIN branch**. This was done since we can now select specific releases to launch via releases in GitHub.
 
-* If you're doing code changes, then you can submit a PR to the `main` branch, but I am very selective about these.
+* If you're doing code changes, then you can submit a PR to the `main` branch.
 
 !!! warning "Important"
 
      Do not use a code formatter, make massive amounts of line changes, or make multiple feature changes. EACH FEATURE CHANGE SHOULD BE IT'S OWN PULL REQUEST!
 
+     Do not open a pull request that adds support for other languages to WinUtil for now, until we decide how we want to move forward with language support.
+
 * When creating pull requests, it is essential to thoroughly document all changes made. This includes, but is not limited to, documenting any additions made to the `tweaks` section and corresponding `undo tweak`, so users are able to remove the newly added tweaks if necessary, and comprehensive documentation is required for all code changes. Document your changes and briefly explain why you made your changes in your Pull Request Description. Failure to adhere to this format may result in the denial of the pull request. Additionally, any code lacking sufficient documentation may also be denied.
 
 * By following these guidelines, we can maintain a high standard of quality and ensure that the codebase remains organized and well-documented.

.github/workflows/pre-release.yaml

@@ -83,7 +83,7 @@ jobs:
         shell: pwsh
 
       - name: Upload compiled script
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: winutil-ps1
           path: ./winutil.ps1
@@ -93,7 +93,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download compiled script
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: winutil-ps1
 
@@ -111,7 +111,7 @@ jobs:
 
       - name: Create and Upload Release
         id: create_release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         with:
           tag_name: ${{ env.VERSION }}
           name: Pre-Release ${{ env.VERSION }}

config/applications.json

@@ -257,6 +257,15 @@
         "link": "https://www.advancedrenamer.com/",
         "winget": "HulubuluSoftware.AdvancedRenamer"
     },
+    "cryptomator": {
+        "category": "Utilities",
+        "choco": "cryptomator",
+        "content": "Cryptomator",
+        "description": "Cryptomator for Windows, macOS, and Linux: Secure client-side encryption for your cloud storage, ensuring privacy and control over your data.",
+        "link": "https://github.com/cryptomator/cryptomator/",
+        "winget": "Cryptomator.Cryptomator",
+        "foss": true
+    },
     "citrixworkspaceapp": {
         "category": "Utilities",
         "choco": "citrix-workspace",
@@ -519,6 +528,15 @@
         "link": "https://ntlite.com",
         "winget": "Nlitesoft.NTLite"
     },
+    "dorion": {
+        "category": "Communications",
+        "choco": "na",
+        "content": "Dorion",
+        "description": "Tiny alternative Discord client with a smaller footprint, snappier startup, themes, plugins and more!",
+        "link": "https://github.com/SpikeHD/Dorion",
+        "winget": "SpikeHD.Dorion",
+        "foss": true
+    },
     "ditto": {
         "category": "Utilities",
         "choco": "ditto",
@@ -1038,6 +1056,15 @@
         "link": "https://gerardog.github.io/gsudo/",
         "winget": "gerardog.gsudo"
     },
+    "hugo": {
+        "category": "Utilities",
+        "choco": "hugo-extended",
+        "content": "Hugo",
+        "description": "The world’s fastest framework for building websites.",
+        "link": "https://github.com/gohugoio/hugo/",
+        "winget": "Hugo.Hugo.Extended",
+        "foss": true
+    },
     "handbrake": {
         "category": "Multimedia Tools",
         "choco": "handbrake",
@@ -2762,6 +2789,15 @@
         "link": "https://unity.com/",
         "winget": "Unity.UnityHub"
     },
+    "veravrypt": {
+        "category": "Utilities",
+        "choco": "veracrypt",
+        "content": "VeraCrypt",
+        "description": "Disk encryption with strong security based on TrueCrypt.",
+        "link": "https://github.com/veracrypt/VeraCrypt/",
+        "winget": "IDRIX.VeraCrypt",
+        "foss": true
+    },
     "vagrant": {
         "category": "Development",
         "choco": "vagrant",
@@ -3218,6 +3254,15 @@
         "winget": "Intel.PresentMon.Beta",
         "foss": true
     },
+    "uv": {
+        "category": "Development",
+        "choco": "na",
+        "content": "uv",
+        "description": "uv is a fast Python package and project manager written in Rust.",
+        "link": "https://docs.astral.sh/uv/getting-started/installation/",
+        "winget": "astral-sh.uv",
+        "foss": true
+    },
     "pyenvwin": {
         "category": "Development",
         "choco": "pyenv-win",

config/tweaks.json

@@ -140,6 +140,13 @@
     "Description": "Disables Location Tracking.",
     "category": "Essential Tweaks",
     "panel": "1",
+    "service": [
+      {
+        "Name": "lfsvc",
+        "StartupType": "Disable",
+        "OriginalType": "Manual"
+      }
+    ],
     "registry": [
       {
         "Path": "HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\CapabilityAccessManager\\ConsentStore\\location",
@@ -155,13 +162,6 @@
         "Type": "DWord",
         "OriginalValue": "1"
       },
-      {
-        "Path": "HKLM:\\SYSTEM\\CurrentControlSet\\Services\\lfsvc\\Service\\Configuration",
-        "Name": "Status",
-        "Value": "0",
-        "Type": "DWord",
-        "OriginalValue": "1"
-      },
       {
         "Path": "HKLM:\\SYSTEM\\Maps",
         "Name": "AutoUpdateEnabled",
@@ -1674,78 +1674,30 @@
     "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/xboxremoval"
   },
   "WPFTweaksDeBloat": {
-    "Content": "Remove all Microsoft Store apps",
+    "Content": "Remove Unwanted Pre-Installed Apps",
     "Description": "This will remove a bunch of Windows pre-installed applications which most people dont want on there system.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "appx": [
-      "Microsoft.Microsoft3DViewer",
+      "Microsoft.WindowsFeedbackHub",
-      "Microsoft.AppConnector",
-      "Microsoft.BingFinance",
       "Microsoft.BingNews",
-      "Microsoft.BingSports",
+      "Microsoft.BingSearch",
-      "Microsoft.BingTranslator",
       "Microsoft.BingWeather",
-      "Microsoft.BingFoodAndDrink",
-      "Microsoft.BingHealthAndFitness",
-      "Microsoft.BingTravel",
       "Clipchamp.Clipchamp",
       "Microsoft.Todos",
-      "MicrosoftCorporationII.QuickAssist",
+      "Microsoft.PowerAutomateDesktop",
-      "Microsoft.MicrosoftStickyNotes",
-      "Microsoft.GetHelp",
-      "Microsoft.GetStarted",
-      "Microsoft.Messaging",
       "Microsoft.MicrosoftSolitaireCollection",
-      "Microsoft.NetworkSpeedTest",
-      "Microsoft.News",
-      "Microsoft.Office.Lens",
-      "Microsoft.Office.Sway",
-      "Microsoft.Office.OneNote",
-      "Microsoft.OneConnect",
-      "Microsoft.People",
-      "Microsoft.Print3D",
-      "Microsoft.SkypeApp",
-      "Microsoft.Wallet",
-      "Microsoft.Whiteboard",
-      "Microsoft.WindowsAlarms",
-      "Microsoft.WindowsCommunicationsApps",
-      "Microsoft.WindowsFeedbackHub",
-      "Microsoft.WindowsMaps",
       "Microsoft.WindowsSoundRecorder",
-      "Microsoft.ConnectivityStore",
+      "Microsoft.MicrosoftStickyNotes",
-      "Microsoft.ScreenSketch",
+      "Microsoft.Windows.DevHome",
-      "Microsoft.MixedReality.Portal",
+      "Microsoft.Paint",
+      "Microsoft.OutlookForWindows",
+      "Microsoft.WindowsAlarms",
+      "Microsoft.StartExperiencesApp",
+      "Microsoft.GetHelp",
       "Microsoft.ZuneMusic",
-      "Microsoft.ZuneVideo",
+      "MicrosoftCorporationII.QuickAssist",
-      "Microsoft.MicrosoftOfficeHub",
+      "MSTeams"
-      "MsTeams",
-      "*EclipseManager*",
-      "*ActiproSoftwareLLC*",
-      "*AdobeSystemsIncorporated.AdobePhotoshopExpress*",
-      "*Duolingo-LearnLanguagesforFree*",
-      "*PandoraMediaInc*",
-      "*CandyCrush*",
-      "*BubbleWitch3Saga*",
-      "*Wunderlist*",
-      "*Flipboard*",
-      "*Twitter*",
-      "*Facebook*",
-      "*Royal Revolt*",
-      "*Sway*",
-      "*Speed Test*",
-      "*Dolby*",
-      "*Viber*",
-      "*ACGMediaPlayer*",
-      "*Netflix*",
-      "*OneCalendar*",
-      "*LinkedInForWindows*",
-      "*HiddenCityMysteryofShadows*",
-      "*Hulu*",
-      "*HiddenCity*",
-      "*AdobePhotoshopExpress*",
-      "*HotspotShieldFreeVPN*",
-      "*Microsoft.Advertising.Xaml*"
     ],
     "InvokeScript": [
       "
@@ -1835,84 +1787,27 @@
     "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/storage"
   },
   "WPFTweaksRemoveCopilot": {
-    "Content": "Disable Microsoft Copilot",
+    "Content": "Remove Microsoft Copilot",
-    "Description": "Disables MS Copilot AI built into Windows since 23H2.",
+    "Description": "Removes Copilot AppXPackages and related ai packages",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
-    "registry": [
-      {
-        "Path": "HKLM:\\SOFTWARE\\Policies\\Microsoft\\Windows\\WindowsCopilot",
-        "Name": "TurnOffWindowsCopilot",
-        "Value": "1",
-        "Type": "DWord",
-        "OriginalValue": "<RemoveEntry>"
-      },
-      {
-        "Path": "HKCU:\\Software\\Policies\\Microsoft\\Windows\\WindowsCopilot",
-        "Name": "TurnOffWindowsCopilot",
-        "Value": "1",
-        "Type": "DWord",
-        "OriginalValue": "<RemoveEntry>"
-      },
-      {
-        "Path": "HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced",
-        "Name": "ShowCopilotButton",
-        "Value": "0",
-        "Type": "DWord",
-        "OriginalValue": "1"
-      },
-      {
-        "Path": "HKLM:\\SOFTWARE\\Microsoft\\Windows\\Shell\\Copilot",
-        "Name": "IsCopilotAvailable",
-        "Value": "0",
-        "Type": "DWord",
-        "OriginalValue": "<RemoveEntry>"
-      },
-      {
-        "Path": "HKLM:\\SOFTWARE\\Microsoft\\Windows\\Shell\\Copilot",
-        "Name": "CopilotDisabledReason",
-        "Value": "IsEnabledForGeographicRegionFailed",
-        "Type": "String",
-        "OriginalValue": "<RemoveEntry>"
-      },
-      {
-        "Path": "HKCU:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\WindowsCopilot",
-        "Name": "AllowCopilotRuntime",
-        "Value": "0",
-        "Type": "DWord",
-        "OriginalValue": "<RemoveEntry>"
-      },
-      {
-        "Path": "HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Blocked",
-        "Name": "{CB3B0003-8088-4EDE-8769-8B354AB2FF8C}",
-        "Value": "",
-        "Type": "String",
-        "OriginalValue": "<RemoveEntry>"
-      },
-      {
-        "Path": "HKLM:\\SOFTWARE\\Microsoft\\Windows\\Shell\\Copilot\\BingChat",
-        "Name": "IsUserEligible",
-        "Value": "0",
-        "Type": "DWord",
-        "OriginalValue": "<RemoveEntry>"
-      }
-    ],
     "InvokeScript": [
       "
-      Write-Host \"Remove Copilot\"
       Get-AppxPackage -AllUsers *Copilot* | Remove-AppxPackage -AllUsers
       Get-AppxPackage -AllUsers Microsoft.MicrosoftOfficeHub | Remove-AppxPackage -AllUsers
 
       $Appx = (Get-AppxPackage MicrosoftWindows.Client.CoreAI).PackageFullName
-
       $Sid = (Get-LocalUser $Env:UserName).Sid.Value
+
       New-Item \"HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Appx\\AppxAllUserStore\\EndOfLife\\$Sid\\$Appx\" -Force
       Remove-AppxPackage $Appx
+
+      Write-Host \"Copilot Removed\"
       "
     ],
     "UndoScript": [
       "
-      Write-Host \"Install Copilot\"
+      Write-Host \"Installing Copilot...\"
       winget install --name Copilot --source msstore --accept-package-agreements --accept-source-agreements --silent
       "
     ],
@@ -1961,8 +1856,7 @@
 
       if (Test-Path $RazerPath) {
         Remove-Item $RazerPath\\* -Recurse -Force
-      }
+      } else {
-      else {
         New-Item -Path $RazerPath -ItemType Directory
       }
 
@@ -2258,7 +2152,7 @@
         "Path": "HKU:\\.Default\\Control Panel\\Keyboard",
         "Name": "InitialKeyboardIndicators",
         "Value": "2",
-        "Type": "DWord",
+        "Type": "String",
         "OriginalValue": "0",
         "DefaultState": "false"
       },
@@ -2266,7 +2160,7 @@
         "Path": "HKCU:\\Control Panel\\Keyboard",
         "Name": "InitialKeyboardIndicators",
         "Value": "2",
-        "Type": "DWord",
+        "Type": "String",
         "OriginalValue": "0",
         "DefaultState": "false"
       }

docs/content/dev/tweaks/Customize-Preferences/BingSearch.md

@@ -3,7 +3,7 @@ title: "Bing Search in Start Menu"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2214}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2108}
   "WPFToggleBingSearch": {
     "Content": "Bing Search in Start Menu",
     "Description": "If enabled, Bing web search results will be included in your Start Menu search.",

docs/content/dev/tweaks/Customize-Preferences/DarkMode.md

@@ -3,7 +3,7 @@ title: "Dark Theme for Windows"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2172}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2066}
   "WPFToggleDarkMode": {
     "Content": "Dark Theme for Windows",
     "Description": "Enable/Disable Dark Mode.",

docs/content/dev/tweaks/Customize-Preferences/DetailedBSoD.md

@@ -3,7 +3,7 @@ title: "Detailed BSoD"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2588}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2482}
   "WPFToggleDetailedBSoD": {
     "Content": "Detailed BSoD",
     "Description": "If enabled, you will see a detailed Blue Screen of Death (BSOD) with more information.",

docs/content/dev/tweaks/Customize-Preferences/DisableCrossDeviceResume.md

@@ -3,7 +3,7 @@ title: "Cross-Device Resume"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2718}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2612}
   "WPFToggleDisableCrossDeviceResume": {
     "Content": "Cross-Device Resume",
     "Description": "This tweak controls the Resume function in Windows 11 24H2 and later, which allows you to resume an activity from a mobile device and vice-versa.",

docs/content/dev/tweaks/Customize-Preferences/HiddenFiles.md

@@ -3,7 +3,7 @@ title: "Show Hidden Files"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2468}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2362}
   "WPFToggleHiddenFiles": {
     "Content": "Show Hidden Files",
     "Description": "If enabled, Hidden Files will be shown.",

docs/content/dev/tweaks/Customize-Preferences/HideSettingsHome.md

@@ -3,7 +3,7 @@ title: "Remove Settings Home Page"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2338}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2232}
   "WPFToggleHideSettingsHome": {
     "Content": "Remove Settings Home Page",
     "Description": "Removes the Home Page in the Windows Settings app.",

docs/content/dev/tweaks/Customize-Preferences/MouseAcceleration.md

@@ -3,7 +3,7 @@ title: "Mouse Acceleration"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2356}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2250}
   "WPFToggleMouseAcceleration": {
     "Content": "Mouse Acceleration",
     "Description": "If enabled, the Cursor movement is affected by the speed of your physical mouse movements.",

docs/content/dev/tweaks/Customize-Preferences/MultiplaneOverlay.md

@@ -3,7 +3,7 @@ title: "Disable Multiplane Overlay"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2450}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2344}
   "WPFToggleMultiplaneOverlay": {
     "Content": "Disable Multiplane Overlay",
     "Description": "Disable the Multiplane Overlay which can sometimes cause issues with Graphics Cards.",

docs/content/dev/tweaks/Customize-Preferences/NewOutlook.md

@@ -3,7 +3,7 @@ title: "New Outlook"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2408}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2302}
   "WPFToggleNewOutlook": {
     "Content": "New Outlook",
     "Description": "If disabled, it removes the new Outlook toggle, disables the new Outlook migration, and ensures the classic Outlook application is used.",

docs/content/dev/tweaks/Customize-Preferences/NumLock.md

@@ -3,7 +3,7 @@ title: "Num Lock on Startup"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2250}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2144}
   "WPFToggleNumLock": {
     "Content": "Num Lock on Startup",
     "Description": "Toggle the Num Lock key state when your computer starts.",
@@ -15,7 +15,7 @@ description: ""
         "Path": "HKU:\\.Default\\Control Panel\\Keyboard",
         "Name": "InitialKeyboardIndicators",
         "Value": "2",
-        "Type": "DWord",
+        "Type": "String",
         "OriginalValue": "0",
         "DefaultState": "false"
       },
@@ -23,7 +23,7 @@ description: ""
         "Path": "HKCU:\\Control Panel\\Keyboard",
         "Name": "InitialKeyboardIndicators",
         "Value": "2",
-        "Type": "DWord",
+        "Type": "String",
         "OriginalValue": "0",
         "DefaultState": "false"
       }

docs/content/dev/tweaks/Customize-Preferences/S3Sleep.md

@@ -3,7 +3,7 @@ title: "S3 Sleep"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2614}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2508}
   "WPFToggleS3Sleep": {
     "Content": "S3 Sleep",
     "Description": "Toggles between Modern Standby and S3 Sleep.",

docs/content/dev/tweaks/Customize-Preferences/ShowExt.md

@@ -3,7 +3,7 @@ title: "Show File Extensions"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2496}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2390}
   "WPFToggleShowExt": {
     "Content": "Show File Extensions",
     "Description": "If enabled, File extensions (e.g., .txt, .jpg) are visible.",

docs/content/dev/tweaks/Customize-Preferences/StandbyFix.md

@@ -3,7 +3,7 @@ title: "Modern Standby fix"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2232}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2126}
   "WPFToggleStandbyFix": {
     "Content": "Modern Standby fix",
     "Description": "Disable network connection during S0 Sleep. If network connectivity is turned on during S0 Sleep it could cause overheating on modern laptops.",

docs/content/dev/tweaks/Customize-Preferences/StartMenuRecommendations.md

@@ -3,7 +3,7 @@ title: "Recommendations in Start Menu"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2294}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2188}
   "WPFToggleStartMenuRecommendations": {
     "Content": "Recommendations in Start Menu",
     "Description": "If disabled, then you will not see recommendations in the Start Menu. WARNING: This will also disable Windows Spotlight on your Lock Screen as a side effect.",

docs/content/dev/tweaks/Customize-Preferences/StickyKeys.md

@@ -3,7 +3,7 @@ title: "Sticky Keys"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2390}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2284}
   "WPFToggleStickyKeys": {
     "Content": "Sticky Keys",
     "Description": "If enabled, Sticky Keys is activated. Sticky keys is an accessibility feature of some graphical user interfaces which assists users who have physical disabilities or help users reduce repetitive strain injury.",

docs/content/dev/tweaks/Customize-Preferences/TaskView.md

@@ -3,7 +3,7 @@ title: "Task View Button in Taskbar"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2542}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2436}
   "WPFToggleTaskView": {
     "Content": "Task View Button in Taskbar",
     "Description": "If enabled, Task View Button in Taskbar will be shown.",

docs/content/dev/tweaks/Customize-Preferences/TaskbarAlignment.md

@@ -3,7 +3,7 @@ title: "Center Taskbar Items"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2560}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2454}
   "WPFToggleTaskbarAlignment": {
     "Content": "Center Taskbar Items",
     "Description": "[Windows 11] If enabled, the Taskbar Items will be shown on the Center, otherwise the Taskbar Items will be shown on the Left.",

docs/content/dev/tweaks/Customize-Preferences/TaskbarSearch.md

@@ -3,7 +3,7 @@ title: "Search Button in Taskbar"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2524}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2418}
   "WPFToggleTaskbarSearch": {
     "Content": "Search Button in Taskbar",
     "Description": "If enabled, Search Button will be on the Taskbar.",

docs/content/dev/tweaks/Customize-Preferences/VerboseLogon.md

@@ -3,7 +3,7 @@ title: "Verbose Messages During Logon"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2276}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2170}
   "WPFToggleVerboseLogon": {
     "Content": "Verbose Messages During Logon",
     "Description": "Show detailed messages during the login process for troubleshooting and diagnostics.",

docs/content/dev/tweaks/Essential-Tweaks/DeleteTempFiles.md

@@ -3,7 +3,7 @@ title: "Delete Temporary Files"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2067}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=1961}
   "WPFTweaksDeleteTempFiles": {
     "Content": "Delete Temporary Files",
     "Description": "Erases TEMP Folders.",

docs/content/dev/tweaks/Essential-Tweaks/DisableExplorerAutoDiscovery.md

@@ -3,7 +3,7 @@ title: "Disable Explorer Automatic Folder Discovery"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2663}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2557}
   "WPFTweaksDisableExplorerAutoDiscovery": {
     "Content": "Disable Explorer Automatic Folder Discovery",
     "Description": "Windows Explorer automatically tries to guess the type of the folder based on its contents, slowing down the browsing experience. WARNING! Will disable File Explorer grouping.",

docs/content/dev/tweaks/Essential-Tweaks/DiskCleanup.md

@@ -3,7 +3,7 @@ title: "Run Disk Cleanup"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2054}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=1948}
   "WPFTweaksDiskCleanup": {
     "Content": "Run Disk Cleanup",
     "Description": "Runs Disk Cleanup on Drive C: and removes old Windows Updates.",

docs/content/dev/tweaks/Essential-Tweaks/EndTaskOnTaskbar.md

@@ -3,7 +3,7 @@ title: "Enable End Task With Right Click"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=1792}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=1744}
   "WPFTweaksEndTaskOnTaskbar": {
     "Content": "Enable End Task With Right Click",
     "Description": "Enables option to end task when right clicking a program in the taskbar.",

docs/content/dev/tweaks/Essential-Tweaks/Location.md

@@ -9,6 +9,13 @@ description: ""
     "Description": "Disables Location Tracking.",
     "category": "Essential Tweaks",
     "panel": "1",
+    "service": [
+      {
+        "Name": "lfsvc",
+        "StartupType": "Disable",
+        "OriginalType": "Manual"
+      }
+    ],
     "registry": [
       {
         "Path": "HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\CapabilityAccessManager\\ConsentStore\\location",
@@ -24,13 +31,6 @@ description: ""
         "Type": "DWord",
         "OriginalValue": "1"
       },
-      {
-        "Path": "HKLM:\\SYSTEM\\CurrentControlSet\\Services\\lfsvc\\Service\\Configuration",
-        "Name": "Status",
-        "Value": "0",
-        "Type": "DWord",
-        "OriginalValue": "1"
-      },
       {
         "Path": "HKLM:\\SYSTEM\\Maps",
         "Name": "AutoUpdateEnabled",

docs/content/dev/tweaks/Essential-Tweaks/Powershell7Tele.md

@@ -3,7 +3,7 @@ title: "Disable PowerShell 7 Telemetry"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=1808}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=1760}
   "WPFTweaksPowershell7Tele": {
     "Content": "Disable PowerShell 7 Telemetry",
     "Description": "Creates an Environment Variable called 'POWERSHELL_TELEMETRY_OPTOUT' with a value of '1' which will tell PowerShell 7 to not send Telemetry Data.",

docs/content/dev/tweaks/Essential-Tweaks/RestorePoint.md

@@ -3,7 +3,7 @@ title: "Create Restore Point"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=1765}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=1717}
   "WPFTweaksRestorePoint": {
     "Content": "Create Restore Point",
     "Description": "Creates a restore point at runtime in case a revert is needed from WinUtil modifications.",

docs/content/dev/tweaks/Essential-Tweaks/WPBT.md

@@ -3,7 +3,7 @@ title: "Disable Windows Platform Binary Table (WPBT)"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=1921}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=1816}
   "WPFTweaksWPBT": {
     "Content": "Disable Windows Platform Binary Table (WPBT)",
     "Description": "If enabled, WPBT allows your computer vendor to execute programs at boot time, such as anti-theft software, software drivers, as well as force install software without user consent. Poses potential security risk.",

docs/content/dev/tweaks/Performance-Plans/AddUltPerf.md

@@ -4,88 +4,39 @@ description: ""
 ---
 
 ```powershell {filename="functions/public/Invoke-WPFUltimatePerformance.ps1",linenos=inline,linenostart=1}
-Function Invoke-WPFUltimatePerformance {
+function Invoke-WPFUltimatePerformance {
-    <#
-
-    .SYNOPSIS
-        Enables or disables the Ultimate Performance power scheme based on its GUID.
-
-    .PARAMETER State
-        Specifies whether to "Enable" or "Disable" the Ultimate Performance power scheme.
-
-    #>
     param(
-        [Parameter(Mandatory = $true)]
+        [switch]$Do
-        [ValidateSet("Enable", "Disable")]
-        [string]$State
     )
 
-    try {
+    if ($Do) {
-        # GUID of the Ultimate Performance power plan
+        if (-not (powercfg /list | Select-String "ChrisTitus - Ultimate Power Plan")) {
-        $ultimateGUID = "e9a42b02-d5df-448d-aa00-03f14749eb61"
+            if (-not (powercfg /list | Select-String "8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c")) {
-
+                powercfg /restoredefaultschemes
-        switch ($State) {
+                if (-not (powercfg /list | Select-String "8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c")) {
-            "Enable" {
+                    Write-Host "Failed to restore High Performance plan. Default plans do not include high performance. If you are on a laptop, do NOT use High Performance or Ultimate Performance plans." -ForegroundColor Red
-                # Duplicate the Ultimate Performance power plan using its GUID
+                    return
-                $duplicateOutput = powercfg /duplicatescheme $ultimateGUID
-
-                $guid = $null
-                $nameFromFile = "ChrisTitus - Ultimate Power Plan"
-                $description = "Ultimate Power Plan, added via WinUtils"
-
-                # Extract the new GUID from the duplicateOutput
-                foreach ($line in $duplicateOutput) {
-                    if ($line -match "\b[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\b") {
-                        $guid = $matches[0]  # $matches[0] will contain the first match, which is the GUID
-                        Write-Output "GUID: $guid has been extracted and stored in the variable."
-                        break
-                    }
-                }
-
-                if (-not $guid) {
-                    Write-Output "No GUID found in the duplicateOutput. Check the output format."
-                    exit 1
-                }
-
-                # Change the name of the power plan and set its description
-                $changeNameOutput = powercfg /changename $guid "$nameFromFile" "$description"
-                Write-Output "The power plan name and description have been changed. Output:"
-                Write-Output $changeNameOutput
-
-                # Set the duplicated Ultimate Performance plan as active
-                $setActiveOutput = powercfg /setactive $guid
-                Write-Output "The power plan has been set as active. Output:"
-                Write-Output $setActiveOutput
-
-                Write-Host "> Ultimate Performance plan installed and set as active."
-            }
-            "Disable" {
-                # Check if the Ultimate Performance plan is installed by GUID
-                $installedPlan = powercfg -list | Select-String -Pattern "ChrisTitus - Ultimate Power Plan"
-
-                if ($installedPlan) {
-                    # Extract the GUID of the installed Ultimate Performance plan
-                    $ultimatePlanGUID = $installedPlan.Line.Split()[3]
-
-                    # Set a different power plan as active before deleting the Ultimate Performance plan
-                    $balancedPlanGUID = "381b4222-f694-41f0-9685-ff5bb260df2e"
-                    powercfg -setactive $balancedPlanGUID
-
-                    # Delete the Ultimate Performance plan by GUID
-                    powercfg -delete $ultimatePlanGUID
-
-                    Write-Host "Ultimate Performance plan has been uninstalled."
-                    Write-Host "> Balanced plan is now active."
-                } else {
-                    Write-Host "Ultimate Performance plan is not installed."
                 }
             }
-            default {
+            $guid = ((powercfg /duplicatescheme 8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c) -split '\s+')[3]
-                Write-Host "Invalid state. Please use 'Enable' or 'Disable'."
+            powercfg /changename $guid "ChrisTitus - Ultimate Power Plan"
-            }
+            powercfg /setacvalueindex $guid SUB_PROCESSOR IDLEDISABLE 1
+            powercfg /setacvalueindex $guid 54533251-82be-4824-96c1-47b60b740d00 4d2b0152-7d5c-498b-88e2-34345392a2c5 1
+            powercfg /setacvalueindex $guid SUB_PROCESSOR PROCTHROTTLEMIN 100
+            powercfg /setactive $guid
+            Write-Host "ChrisTitus - Ultimate Power Plan plan installed and activated." -ForegroundColor Green
+        } else {
+            Write-Host "ChrisTitus - Ultimate Power Plan plan is already installed." -ForegroundColor Red
+            return
+        }
+    } else {
+        if (powercfg /list | Select-String "ChrisTitus - Ultimate Power Plan") {
+            powercfg /setactive SCHEME_BALANCED
+            powercfg /delete ((powercfg /list | Select-String "ChrisTitus - Ultimate Power Plan").ToString().Split()[3])
+            Write-Host "ChrisTitus - Ultimate Power Plan plan was removed." -ForegroundColor Red
+        } else {
+            Write-Host "ChrisTitus - Ultimate Power Plan plan is not installed." -ForegroundColor Yellow
         }
-    } catch {
-        Write-Error "Error occurred: $_"
     }
 }
 ```

docs/content/dev/tweaks/Performance-Plans/RemoveUltPerf.md

@@ -4,88 +4,39 @@ description: ""
 ---
 
 ```powershell {filename="functions/public/Invoke-WPFUltimatePerformance.ps1",linenos=inline,linenostart=1}
-Function Invoke-WPFUltimatePerformance {
+function Invoke-WPFUltimatePerformance {
-    <#
-
-    .SYNOPSIS
-        Enables or disables the Ultimate Performance power scheme based on its GUID.
-
-    .PARAMETER State
-        Specifies whether to "Enable" or "Disable" the Ultimate Performance power scheme.
-
-    #>
     param(
-        [Parameter(Mandatory = $true)]
+        [switch]$Do
-        [ValidateSet("Enable", "Disable")]
-        [string]$State
     )
 
-    try {
+    if ($Do) {
-        # GUID of the Ultimate Performance power plan
+        if (-not (powercfg /list | Select-String "ChrisTitus - Ultimate Power Plan")) {
-        $ultimateGUID = "e9a42b02-d5df-448d-aa00-03f14749eb61"
+            if (-not (powercfg /list | Select-String "8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c")) {
-
+                powercfg /restoredefaultschemes
-        switch ($State) {
+                if (-not (powercfg /list | Select-String "8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c")) {
-            "Enable" {
+                    Write-Host "Failed to restore High Performance plan. Default plans do not include high performance. If you are on a laptop, do NOT use High Performance or Ultimate Performance plans." -ForegroundColor Red
-                # Duplicate the Ultimate Performance power plan using its GUID
+                    return
-                $duplicateOutput = powercfg /duplicatescheme $ultimateGUID
-
-                $guid = $null
-                $nameFromFile = "ChrisTitus - Ultimate Power Plan"
-                $description = "Ultimate Power Plan, added via WinUtils"
-
-                # Extract the new GUID from the duplicateOutput
-                foreach ($line in $duplicateOutput) {
-                    if ($line -match "\b[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\b") {
-                        $guid = $matches[0]  # $matches[0] will contain the first match, which is the GUID
-                        Write-Output "GUID: $guid has been extracted and stored in the variable."
-                        break
-                    }
-                }
-
-                if (-not $guid) {
-                    Write-Output "No GUID found in the duplicateOutput. Check the output format."
-                    exit 1
-                }
-
-                # Change the name of the power plan and set its description
-                $changeNameOutput = powercfg /changename $guid "$nameFromFile" "$description"
-                Write-Output "The power plan name and description have been changed. Output:"
-                Write-Output $changeNameOutput
-
-                # Set the duplicated Ultimate Performance plan as active
-                $setActiveOutput = powercfg /setactive $guid
-                Write-Output "The power plan has been set as active. Output:"
-                Write-Output $setActiveOutput
-
-                Write-Host "> Ultimate Performance plan installed and set as active."
-            }
-            "Disable" {
-                # Check if the Ultimate Performance plan is installed by GUID
-                $installedPlan = powercfg -list | Select-String -Pattern "ChrisTitus - Ultimate Power Plan"
-
-                if ($installedPlan) {
-                    # Extract the GUID of the installed Ultimate Performance plan
-                    $ultimatePlanGUID = $installedPlan.Line.Split()[3]
-
-                    # Set a different power plan as active before deleting the Ultimate Performance plan
-                    $balancedPlanGUID = "381b4222-f694-41f0-9685-ff5bb260df2e"
-                    powercfg -setactive $balancedPlanGUID
-
-                    # Delete the Ultimate Performance plan by GUID
-                    powercfg -delete $ultimatePlanGUID
-
-                    Write-Host "Ultimate Performance plan has been uninstalled."
-                    Write-Host "> Balanced plan is now active."
-                } else {
-                    Write-Host "Ultimate Performance plan is not installed."
                 }
             }
-            default {
+            $guid = ((powercfg /duplicatescheme 8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c) -split '\s+')[3]
-                Write-Host "Invalid state. Please use 'Enable' or 'Disable'."
+            powercfg /changename $guid "ChrisTitus - Ultimate Power Plan"
-            }
+            powercfg /setacvalueindex $guid SUB_PROCESSOR IDLEDISABLE 1
+            powercfg /setacvalueindex $guid 54533251-82be-4824-96c1-47b60b740d00 4d2b0152-7d5c-498b-88e2-34345392a2c5 1
+            powercfg /setacvalueindex $guid SUB_PROCESSOR PROCTHROTTLEMIN 100
+            powercfg /setactive $guid
+            Write-Host "ChrisTitus - Ultimate Power Plan plan installed and activated." -ForegroundColor Green
+        } else {
+            Write-Host "ChrisTitus - Ultimate Power Plan plan is already installed." -ForegroundColor Red
+            return
+        }
+    } else {
+        if (powercfg /list | Select-String "ChrisTitus - Ultimate Power Plan") {
+            powercfg /setactive SCHEME_BALANCED
+            powercfg /delete ((powercfg /list | Select-String "ChrisTitus - Ultimate Power Plan").ToString().Split()[3])
+            Write-Host "ChrisTitus - Ultimate Power Plan plan was removed." -ForegroundColor Red
+        } else {
+            Write-Host "ChrisTitus - Ultimate Power Plan plan is not installed." -ForegroundColor Yellow
         }
-    } catch {
-        Write-Error "Error occurred: $_"
     }
 }
 ```

docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/BlockAdobeNet.md

@@ -3,7 +3,7 @@ title: "Adobe Network Block"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2002}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=1896}
   "WPFTweaksBlockAdobeNet": {
     "Content": "Adobe Network Block",
     "Description": "Reduces user interruptions by selectively blocking connections to Adobe's activation and telemetry servers. Credit: Ruddernation-Designs",

docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/DeBloat.md

@@ -1,82 +1,34 @@
 ---
-title: "Remove all Microsoft Store apps"
+title: "Remove Unwanted Pre-Installed Apps"
 description: ""
 ---
 
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=1676}
   "WPFTweaksDeBloat": {
-    "Content": "Remove all Microsoft Store apps",
+    "Content": "Remove Unwanted Pre-Installed Apps",
     "Description": "This will remove a bunch of Windows pre-installed applications which most people dont want on there system.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "appx": [
-      "Microsoft.Microsoft3DViewer",
+      "Microsoft.WindowsFeedbackHub",
-      "Microsoft.AppConnector",
-      "Microsoft.BingFinance",
       "Microsoft.BingNews",
-      "Microsoft.BingSports",
+      "Microsoft.BingSearch",
-      "Microsoft.BingTranslator",
       "Microsoft.BingWeather",
-      "Microsoft.BingFoodAndDrink",
-      "Microsoft.BingHealthAndFitness",
-      "Microsoft.BingTravel",
       "Clipchamp.Clipchamp",
       "Microsoft.Todos",
-      "MicrosoftCorporationII.QuickAssist",
+      "Microsoft.PowerAutomateDesktop",
-      "Microsoft.MicrosoftStickyNotes",
-      "Microsoft.GetHelp",
-      "Microsoft.GetStarted",
-      "Microsoft.Messaging",
       "Microsoft.MicrosoftSolitaireCollection",
-      "Microsoft.NetworkSpeedTest",
-      "Microsoft.News",
-      "Microsoft.Office.Lens",
-      "Microsoft.Office.Sway",
-      "Microsoft.Office.OneNote",
-      "Microsoft.OneConnect",
-      "Microsoft.People",
-      "Microsoft.Print3D",
-      "Microsoft.SkypeApp",
-      "Microsoft.Wallet",
-      "Microsoft.Whiteboard",
-      "Microsoft.WindowsAlarms",
-      "Microsoft.WindowsCommunicationsApps",
-      "Microsoft.WindowsFeedbackHub",
-      "Microsoft.WindowsMaps",
       "Microsoft.WindowsSoundRecorder",
-      "Microsoft.ConnectivityStore",
+      "Microsoft.MicrosoftStickyNotes",
-      "Microsoft.ScreenSketch",
+      "Microsoft.Windows.DevHome",
-      "Microsoft.MixedReality.Portal",
+      "Microsoft.Paint",
+      "Microsoft.OutlookForWindows",
+      "Microsoft.WindowsAlarms",
+      "Microsoft.StartExperiencesApp",
+      "Microsoft.GetHelp",
       "Microsoft.ZuneMusic",
-      "Microsoft.ZuneVideo",
+      "MicrosoftCorporationII.QuickAssist",
-      "Microsoft.MicrosoftOfficeHub",
+      "MSTeams"
-      "MsTeams",
-      "*EclipseManager*",
-      "*ActiproSoftwareLLC*",
-      "*AdobeSystemsIncorporated.AdobePhotoshopExpress*",
-      "*Duolingo-LearnLanguagesforFree*",
-      "*PandoraMediaInc*",
-      "*CandyCrush*",
-      "*BubbleWitch3Saga*",
-      "*Wunderlist*",
-      "*Flipboard*",
-      "*Twitter*",
-      "*Facebook*",
-      "*Royal Revolt*",
-      "*Sway*",
-      "*Speed Test*",
-      "*Dolby*",
-      "*Viber*",
-      "*ACGMediaPlayer*",
-      "*Netflix*",
-      "*OneCalendar*",
-      "*LinkedInForWindows*",
-      "*HiddenCityMysteryofShadows*",
-      "*Hulu*",
-      "*HiddenCity*",
-      "*AdobePhotoshopExpress*",
-      "*HotspotShieldFreeVPN*",
-      "*Microsoft.Advertising.Xaml*"
     ],
     "InvokeScript": [
       "

docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableBGapps.md

@@ -3,7 +3,7 @@ title: "Disable Background Apps"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2140}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2034}
   "WPFTweaksDisableBGapps": {
     "Content": "Disable Background Apps",
     "Description": "Disables all Microsoft Store apps from running in the background, which has to be done individually since Windows 11.",

docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableFSO.md

@@ -3,7 +3,7 @@ title: "Disable Fullscreen Optimizations"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2156}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2050}
   "WPFTweaksDisableFSO": {
     "Content": "Disable Fullscreen Optimizations",
     "Description": "Disables FSO in all applications. NOTE: This will disable Color Management in Exclusive Fullscreen.",

docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableIPv6.md

@@ -3,7 +3,7 @@ title: "Disable IPv6"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2118}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2012}
   "WPFTweaksDisableIPv6": {
     "Content": "Disable IPv6",
     "Description": "Disables IPv6.",

docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableNotifications.md

@@ -3,7 +3,7 @@ title: "Disable Notification Tray/Calendar"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=1979}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=1873}
   "WPFTweaksDisableNotifications": {
     "Content": "Disable Notification Tray/Calendar",
     "Description": "Disables all Notifications INCLUDING Calendar.",

docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/IPv46.md

@@ -3,7 +3,7 @@ title: "Prefer IPv4 over IPv6"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2080}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=1974}
   "WPFTweaksIPv46": {
     "Content": "Prefer IPv4 over IPv6",
     "Description": "Setting the IPv4 preference can have latency and security benefits on private networks where IPv6 is not configured.",

docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/RazerBlock.md

@@ -3,7 +3,7 @@ title: "Block Razer Software Installs"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=1937}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=1832}
   "WPFTweaksRazerBlock": {
     "Content": "Block Razer Software Installs",
     "Description": "Blocks ALL Razer Software installations. The hardware works fine without any software.",
@@ -31,8 +31,7 @@ description: ""
 
       if (Test-Path $RazerPath) {
         Remove-Item $RazerPath\\* -Recurse -Force
-      }
+      } else {
-      else {
         New-Item -Path $RazerPath -ItemType Directory
       }
 

docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveCopilot.md

@@ -1,95 +1,32 @@
 ---
-title: "Disable Microsoft Copilot"
+title: "Remove Microsoft Copilot"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=1837}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=1789}
   "WPFTweaksRemoveCopilot": {
-    "Content": "Disable Microsoft Copilot",
+    "Content": "Remove Microsoft Copilot",
-    "Description": "Disables MS Copilot AI built into Windows since 23H2.",
+    "Description": "Removes Copilot AppXPackages and related ai packages",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
-    "registry": [
-      {
-        "Path": "HKLM:\\SOFTWARE\\Policies\\Microsoft\\Windows\\WindowsCopilot",
-        "Name": "TurnOffWindowsCopilot",
-        "Value": "1",
-        "Type": "DWord",
-        "OriginalValue": "<RemoveEntry>"
-      },
-      {
-        "Path": "HKCU:\\Software\\Policies\\Microsoft\\Windows\\WindowsCopilot",
-        "Name": "TurnOffWindowsCopilot",
-        "Value": "1",
-        "Type": "DWord",
-        "OriginalValue": "<RemoveEntry>"
-      },
-      {
-        "Path": "HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced",
-        "Name": "ShowCopilotButton",
-        "Value": "0",
-        "Type": "DWord",
-        "OriginalValue": "1"
-      },
-      {
-        "Path": "HKLM:\\SOFTWARE\\Microsoft\\Windows\\Shell\\Copilot",
-        "Name": "IsCopilotAvailable",
-        "Value": "0",
-        "Type": "DWord",
-        "OriginalValue": "<RemoveEntry>"
-      },
-      {
-        "Path": "HKLM:\\SOFTWARE\\Microsoft\\Windows\\Shell\\Copilot",
-        "Name": "CopilotDisabledReason",
-        "Value": "IsEnabledForGeographicRegionFailed",
-        "Type": "String",
-        "OriginalValue": "<RemoveEntry>"
-      },
-      {
-        "Path": "HKCU:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\WindowsCopilot",
-        "Name": "AllowCopilotRuntime",
-        "Value": "0",
-        "Type": "DWord",
-        "OriginalValue": "<RemoveEntry>"
-      },
-      {
-        "Path": "HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Blocked",
-        "Name": "{CB3B0003-8088-4EDE-8769-8B354AB2FF8C}",
-        "Value": "",
-        "Type": "String",
-        "OriginalValue": "<RemoveEntry>"
-      },
-      {
-        "Path": "HKLM:\\SOFTWARE\\Microsoft\\Windows\\Shell\\Copilot\\BingChat",
-        "Name": "IsUserEligible",
-        "Value": "0",
-        "Type": "DWord",
-        "OriginalValue": "<RemoveEntry>"
-      }
-    ],
     "InvokeScript": [
       "
-      Write-Host \"Remove Copilot\"
       Get-AppxPackage -AllUsers *Copilot* | Remove-AppxPackage -AllUsers
       Get-AppxPackage -AllUsers Microsoft.MicrosoftOfficeHub | Remove-AppxPackage -AllUsers
 
       $Appx = (Get-AppxPackage MicrosoftWindows.Client.CoreAI).PackageFullName
-
       $Sid = (Get-LocalUser $Env:UserName).Sid.Value
+
       New-Item \"HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Appx\\AppxAllUserStore\\EndOfLife\\$Sid\\$Appx\" -Force
       Remove-AppxPackage $Appx
+
+      Write-Host \"Copilot Removed\"
       "
     ],
     "UndoScript": [
       "
-      Write-Host \"Install Copilot\"
+      Write-Host \"Installing Copilot...\"
       winget install --name Copilot --source msstore --accept-package-agreements --accept-source-agreements --silent
       "
     ],
 ```
-
-## Registry Changes
-
-Applications and System Components store and retrieve configuration data to modify Windows settings, so we can use the registry to change many settings in one place.
-
-You can find information about the registry on [Wikipedia](https://www.wikiwand.com/en/Windows_Registry) and [Microsoft's Website](https://learn.microsoft.com/en-us/windows/win32/sysinfo/registry).

docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/RightClickMenu.md

@@ -3,7 +3,7 @@ title: "Set Classic Right-Click Menu"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2032}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=1926}
   "WPFTweaksRightClickMenu": {
     "Content": "Set Classic Right-Click Menu",
     "Description": "Restores the classic context menu when right-clicking in File Explorer, replacing the simplified Windows 11 version.",

docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/Storage.md

@@ -3,7 +3,7 @@ title: "Disable Storage Sense"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=1821}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=1773}
   "WPFTweaksStorage": {
     "Content": "Disable Storage Sense",
     "Description": "Storage Sense deletes temp files automatically.",

docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/Teredo.md

@@ -3,7 +3,7 @@ title: "Disable Teredo"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2096}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=1990}
   "WPFTweaksTeredo": {
     "Content": "Disable Teredo",
     "Description": "Teredo network tunneling is an IPv6 feature that can cause additional latency, but may cause problems with some games.",

docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/changedns.md

@@ -3,7 +3,7 @@ title: "DNS"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2639}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2533}
   "WPFchangedns": {
     "Content": "DNS",
     "category": "z__Advanced Tweaks - CAUTION",

docs/content/userguide/_index.md

@@ -1,6 +1,12 @@
 ---
 title: User Guide
 weight: 2
+breadcrumbs: false
+cascade:
+  type: docs
+  params:
+    reversePagination: false
+    breadcrumbs: false
 ---
 
 Welcome to the official User Guide for **Winutil**, your all-in-one Windows toolkit.
@@ -31,13 +37,15 @@ Winutil is designed for:
 
 ## Getting Started
 
-New to Winutil? Start here:
+New to Winutil? Follow the guides below in order to get up and running quickly:
 
-1. **[Getting Started Guide](getting-started/)** - Installation and first steps
+1. **[Getting Started](getting-started/)** - Learn how to launch Winutil and understand the basics.
-2. **[Applications Guide](application/)** - Learn to install, upgrade, and uninstall software
+2. **[Applications](application/)** - Install, update, and remove apps with ease.
-3. **[Tweaks Guide](tweaks/)** - Optimize your system
+3. **[Tweaks](tweaks/)** - Apply performance, privacy, and usability improvements.
-4. **[Features & Fixes](features/)** - Troubleshoot common issues
+4. **[Features](features/)** - Explore built-in tools and common Windows fixes.
-5. **[Win11 Creator](win11creator/)** - Build a custom debloated Windows 11 ISO
+5. **[Updates](updates/)** - Configure how Windows Update behaves on your system.
+6. **[Automation](automation/)** - Automate setups and reuse configurations across PCs.
+7. **[Win11 Creator](win11creator/)** - Build a custom debloated Windows 11 ISO.
 
 ## Main Features
 
@@ -87,19 +95,7 @@ Automate Winutil configurations for:
 
 Build a custom Windows 11 ISO with bloatware removed, telemetry disabled, and hardware requirement checks bypassed. You can then export it as an ISO file or write it directly to a USB drive.
 
-**[Read the Win11 Creator Guide →](win11Creator/)**
+**[Read the Win11 Creator Guide →](win11creator/)**
-
-## Quick Links
-
-| I want to... | Go to... |
-|--------------|----------|
-| Install Winutil for the first time | [Getting Started](getting-started/) |
-| Install, upgrade, or uninstall apps | [Applications Guide](application/) |
-| Speed up my computer | [Tweaks Guide](tweaks/) |
-| Fix Windows Update problems | [Features - Fixes](features/) |
-| Automate setup for multiple PCs | [Automation](automation/) |
-| Understand what tweaks do | [Tweaks Guide](tweaks/) |
-| Build a custom Windows 11 ISO | [Win11 Creator](win11Creator/) |
 
 ## Safety and Best Practices
 
@@ -149,18 +145,6 @@ Want to help improve Winutil?
 
 **[Read Contributing Guide →](../contributing/)**
 
-## What's in This Guide?
-
-This User Guide covers everything you need to know:
-
-1. **[Getting Started](getting-started/)** - Installation, first run, basic usage
-2. **[Applications](application/)** - Installing, upgrading, and uninstalling software
-3. **[Tweaks](tweaks/)** - System optimizations and customizations
-4. **[Features & Fixes](features/)** - Troubleshooting tools and utilities
-5. **[Win11 Creator](win11Creator/)** - Build a custom debloated Windows 11 ISO
-6. **[Updates](updates/)** - Managing Windows Update behavior
-7. **[Automation](automation/)** - Scripting and batch deployments
-
 ## Video Tutorial
 
 Watch the complete Winutil overview:
@@ -168,3 +152,11 @@ Watch the complete Winutil overview:
 {{< youtube id=6UQZ5oQg8XA loading=lazy >}}
 
 Ready to get started? Head to the **[Getting Started Guide](getting-started/)**.
+
+## Next
+
+Dive right into the following section to get started:
+
+{{< cards >}}
+  {{< card link="getting-started" title="Getting Started" icon="document-text" subtitle="Learn how to use winutil." >}}
+{{< /cards >}}

docs/content/userguide/application/_index.md

@@ -1,6 +1,8 @@
 ---
 title: Applications
 weight: 3
+prev: /userguide/getting-started/
+next: /userguide/tweaks/
 ---
 
 {{< tabs >}}

docs/content/userguide/automation/_index.md

@@ -1,6 +1,8 @@
 ---
 title: Automation
 weight: 7
+prev: /userguide/updates/
+next: /userguide/win11Creator/
 ---
 
 Use Automation to run Winutil from an exported configuration file.

docs/content/userguide/features/_index.md

@@ -1,6 +1,8 @@
 ---
 title: Features
 weight: 5
+prev: /userguide/tweaks/
+next: /userguide/updates/
 ---
 
 Use the **Features** and **Fixes** sections to install optional Windows components and run common repair tasks.

docs/content/userguide/getting-started/_index.md

@@ -1,6 +1,8 @@
 ---
 title: Getting Started
 weight: 2
+prev: /userguide/
+next: /userguide/application/
 ---
 
 ## Welcome to Winutil!

docs/content/userguide/tweaks/_index.md

@@ -1,6 +1,8 @@
 ---
 title: Tweaks
 weight: 4
+prev: /userguide/application/
+next: /userguide/features/
 ---
 
 {{< image src="images/Tweaks-Tab" alt="Image of Tweaks Tab" >}}

docs/content/userguide/updates/_index.md

@@ -1,6 +1,8 @@
 ---
 title: Updates
 weight: 6
+prev: /userguide/features/
+next: /userguide/automation/
 ---
 
 Winutil provides three update modes so you can choose how aggressively Windows Update is managed on your system:

docs/content/userguide/win11Creator/_index.md

@@ -1,6 +1,7 @@
 ---
 title: Win11 Creator
 weight: 8
+prev: /userguide/automation/
 ---
 
 ## Using Winutil's Win11 Creator

functions/private/Install-WinUtilWinget.ps1

@@ -12,10 +12,8 @@ function Install-WinUtilWinget {
     }
 
     Write-Host "WinGet is not installed. Installing now..." -ForegroundColor Red
-    Set-PSRepository -Name PSGallery -InstallationPolicy Trusted
 
     Install-PackageProvider -Name NuGet -Force
-    Install-Module Microsoft.WinGet.Client -Force
+    Install-Module -Name Microsoft.WinGet.Client -Force
-    Import-Module Microsoft.WinGet.Client
+    Repair-WinGetPackageManager -AllUsers
-    Repair-WinGetPackageManager
 }

functions/private/Invoke-WinUtilISO.ps1

@@ -540,6 +540,9 @@ function Invoke-WinUtilISOExport {
     if (-not $oscdimg) {
         Write-Win11ISOLog "oscdimg.exe not found. Attempting to install via winget..."
         try {
+            # First ensure winget is installed and operational
+            Install-WinUtilWinget
+
             $winget = Get-Command winget -ErrorAction Stop
             $result = & $winget install -e --id Microsoft.OSCDIMG --accept-package-agreements --accept-source-agreements 2>&1
             Write-Win11ISOLog "winget output: $result"

functions/private/Invoke-WinUtilISOScript.ps1

@@ -50,7 +50,6 @@ function Invoke-WinUtilISOScript {
     .NOTES
         Author  : Chris Titus @christitustech
         GitHub  : https://github.com/ChrisTitusTech
-        Version : 26.03.02
     #>
     param (
         [Parameter(Mandatory)][string]$ScratchDir,
@@ -116,48 +115,25 @@ function Invoke-WinUtilISOScript {
         ForEach-Object { if ($_ -match 'PackageName : (.*)') { $matches[1] } }
 
     $packagePrefixes = @(
-        'AppUp.IntelManagementandSecurityStatus',
         'Clipchamp.Clipchamp',
-        'DolbyLaboratories.DolbyAccess',
-        'DolbyLaboratories.DolbyDigitalPlusDecoderOEM',
         'Microsoft.BingNews',
         'Microsoft.BingSearch',
         'Microsoft.BingWeather',
-        'Microsoft.Copilot',
-        'Microsoft.Windows.CrossDevice',
         'Microsoft.GetHelp',
-        'Microsoft.Getstarted',
-        'Microsoft.Microsoft3DViewer',
         'Microsoft.MicrosoftOfficeHub',
         'Microsoft.MicrosoftSolitaireCollection',
         'Microsoft.MicrosoftStickyNotes',
-        'Microsoft.MixedReality.Portal',
-        'Microsoft.MSPaint',
-        'Microsoft.Office.OneNote',
-        'Microsoft.OfficePushNotificationUtility',
         'Microsoft.OutlookForWindows',
         'Microsoft.Paint',
-        'Microsoft.People',
         'Microsoft.PowerAutomateDesktop',
-        'Microsoft.SkypeApp',
         'Microsoft.StartExperiencesApp',
         'Microsoft.Todos',
-        'Microsoft.Wallet',
         'Microsoft.Windows.DevHome',
-        'Microsoft.Windows.Copilot',
-        'Microsoft.Windows.Teams',
-        'Microsoft.WindowsAlarms',
-        'Microsoft.WindowsCamera',
-        'microsoft.windowscommunicationsapps',
         'Microsoft.WindowsFeedbackHub',
-        'Microsoft.WindowsMaps',
         'Microsoft.WindowsSoundRecorder',
         'Microsoft.ZuneMusic',
-        'Microsoft.ZuneVideo',
-        'MicrosoftCorporationII.MicrosoftFamily',
         'MicrosoftCorporationII.QuickAssist',
-        'MSTeams',
+        'MSTeams'
-        'MicrosoftTeams'
     )
 
     $packages | Where-Object { $pkg = $_; $packagePrefixes | Where-Object { $pkg -like "*$_*" } } |
@@ -199,9 +175,6 @@ function Invoke-WinUtilISOScript {
     & icacls    "$ScratchDir\Windows\System32\OneDriveSetup.exe" /grant "$($adminGroup.Value):(F)" /T /C | Out-Null
     Remove-Item -Path "$ScratchDir\Windows\System32\OneDriveSetup.exe" -Force -ErrorAction SilentlyContinue
 
-    # Remove OneDrive from startup registry
-    Remove-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\Windows\CurrentVersion\Run\OneDrive'
-
     # ── 4. Registry tweaks ────────────────────────────────────────────────────
     & $Log "Loading offline registry hives..."
     reg load HKLM\zCOMPONENTS "$ScratchDir\Windows\System32\config\COMPONENTS"

functions/public/Invoke-WPFButton.ps1

@@ -56,14 +56,12 @@ function Invoke-WPFButton {
         "WPFClearInstallSelection" {Invoke-WPFPresets -imported $true -checkboxfilterpattern "WPFInstall*"}
         "WPFtweaksbutton" {Invoke-WPFtweaksbutton}
         "WPFOOSUbutton" {Invoke-WPFOOSU}
-        "WPFAddUltPerf" {Invoke-WPFUltimatePerformance -State "Enable"}
+        "WPFAddUltPerf" {Invoke-WPFUltimatePerformance -Do}
-        "WPFRemoveUltPerf" {Invoke-WPFUltimatePerformance -State "Disable"}
+        "WPFRemoveUltPerf" {Invoke-WPFUltimatePerformance}
         "WPFundoall" {Invoke-WPFundoall}
         "WPFUpdatesdefault" {Invoke-WPFUpdatesdefault}
-        "WPFRunAdobeCCCleanerTool" {Invoke-WPFRunAdobeCCCleanerTool}
         "WPFUpdatesdisable" {Invoke-WPFUpdatesdisable}
         "WPFUpdatessecurity" {Invoke-WPFUpdatessecurity}
-        "WPFWinUtilShortcut" {Invoke-WPFShortcut -ShortcutToAdd "WinUtil" -RunAsAdmin $true}
         "WPFGetInstalled" {Invoke-WPFGetInstalled -CheckBox "winget"}
         "WPFGetInstalledTweaks" {Invoke-WPFGetInstalled -CheckBox "tweaks"}
         "WPFCloseButton" {$sync.Form.Close(); Write-Host "Bye bye!"}

functions/public/Invoke-WPFUltimatePerformance.ps1

@@ -1,84 +1,35 @@
-Function Invoke-WPFUltimatePerformance {
+function Invoke-WPFUltimatePerformance {
-    <#
-
-    .SYNOPSIS
-        Enables or disables the Ultimate Performance power scheme based on its GUID.
-
-    .PARAMETER State
-        Specifies whether to "Enable" or "Disable" the Ultimate Performance power scheme.
-
-    #>
     param(
-        [Parameter(Mandatory = $true)]
+        [switch]$Do
-        [ValidateSet("Enable", "Disable")]
-        [string]$State
     )
 
-    try {
+    if ($Do) {
-        # GUID of the Ultimate Performance power plan
+        if (-not (powercfg /list | Select-String "ChrisTitus - Ultimate Power Plan")) {
-        $ultimateGUID = "e9a42b02-d5df-448d-aa00-03f14749eb61"
+            if (-not (powercfg /list | Select-String "8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c")) {
-
+                powercfg /restoredefaultschemes
-        switch ($State) {
+                if (-not (powercfg /list | Select-String "8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c")) {
-            "Enable" {
+                    Write-Host "Failed to restore High Performance plan. Default plans do not include high performance. If you are on a laptop, do NOT use High Performance or Ultimate Performance plans." -ForegroundColor Red
-                # Duplicate the Ultimate Performance power plan using its GUID
+                    return
-                $duplicateOutput = powercfg /duplicatescheme $ultimateGUID
-
-                $guid = $null
-                $nameFromFile = "ChrisTitus - Ultimate Power Plan"
-                $description = "Ultimate Power Plan, added via WinUtils"
-
-                # Extract the new GUID from the duplicateOutput
-                foreach ($line in $duplicateOutput) {
-                    if ($line -match "\b[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\b") {
-                        $guid = $matches[0]  # $matches[0] will contain the first match, which is the GUID
-                        Write-Output "GUID: $guid has been extracted and stored in the variable."
-                        break
-                    }
-                }
-
-                if (-not $guid) {
-                    Write-Output "No GUID found in the duplicateOutput. Check the output format."
-                    exit 1
-                }
-
-                # Change the name of the power plan and set its description
-                $changeNameOutput = powercfg /changename $guid "$nameFromFile" "$description"
-                Write-Output "The power plan name and description have been changed. Output:"
-                Write-Output $changeNameOutput
-
-                # Set the duplicated Ultimate Performance plan as active
-                $setActiveOutput = powercfg /setactive $guid
-                Write-Output "The power plan has been set as active. Output:"
-                Write-Output $setActiveOutput
-
-                Write-Host "> Ultimate Performance plan installed and set as active."
-            }
-            "Disable" {
-                # Check if the Ultimate Performance plan is installed by GUID
-                $installedPlan = powercfg -list | Select-String -Pattern "ChrisTitus - Ultimate Power Plan"
-
-                if ($installedPlan) {
-                    # Extract the GUID of the installed Ultimate Performance plan
-                    $ultimatePlanGUID = $installedPlan.Line.Split()[3]
-
-                    # Set a different power plan as active before deleting the Ultimate Performance plan
-                    $balancedPlanGUID = "381b4222-f694-41f0-9685-ff5bb260df2e"
-                    powercfg -setactive $balancedPlanGUID
-
-                    # Delete the Ultimate Performance plan by GUID
-                    powercfg -delete $ultimatePlanGUID
-
-                    Write-Host "Ultimate Performance plan has been uninstalled."
-                    Write-Host "> Balanced plan is now active."
-                } else {
-                    Write-Host "Ultimate Performance plan is not installed."
                 }
             }
-            default {
+            $guid = ((powercfg /duplicatescheme 8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c) -split '\s+')[3]
-                Write-Host "Invalid state. Please use 'Enable' or 'Disable'."
+            powercfg /changename $guid "ChrisTitus - Ultimate Power Plan"
-            }
+            powercfg /setacvalueindex $guid SUB_PROCESSOR IDLEDISABLE 1
+            powercfg /setacvalueindex $guid 54533251-82be-4824-96c1-47b60b740d00 4d2b0152-7d5c-498b-88e2-34345392a2c5 1
+            powercfg /setacvalueindex $guid SUB_PROCESSOR PROCTHROTTLEMIN 100
+            powercfg /setactive $guid
+            Write-Host "ChrisTitus - Ultimate Power Plan plan installed and activated." -ForegroundColor Green
+        } else {
+            Write-Host "ChrisTitus - Ultimate Power Plan plan is already installed." -ForegroundColor Red
+            return
+        }
+    } else {
+        if (powercfg /list | Select-String "ChrisTitus - Ultimate Power Plan") {
+            powercfg /setactive SCHEME_BALANCED
+            powercfg /delete ((powercfg /list | Select-String "ChrisTitus - Ultimate Power Plan").ToString().Split()[3])
+            Write-Host "ChrisTitus - Ultimate Power Plan plan was removed." -ForegroundColor Red
+        } else {
+            Write-Host "ChrisTitus - Ultimate Power Plan plan is not installed." -ForegroundColor Yellow
         }
-    } catch {
-        Write-Error "Error occurred: $_"
     }
 }

tools/autounattend.xml

@@ -423,16 +423,17 @@ $scripts = @(
         ) -Recurse -Force -ErrorAction 'SilentlyContinue';
     };
     {
-        reg.exe delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v NoAutoUpdate              /f;
+        reg.exe delete "HKCU\Software\Microsoft\Windows\CurrentVersion\Run" /v OneDriveSetup /f;
-        reg.exe delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v AUOptions                 /f;
+        reg.exe delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v NoAutoUpdate /f;
-        reg.exe delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v UseWUServer               /f;
+        reg.exe delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v AUOptions /f;
-        reg.exe delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate"    /v DisableWindowsUpdateAccess /f;
+        reg.exe delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v UseWUServer /f;
-        reg.exe delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate"    /v WUServer                  /f;
+        reg.exe delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate" /v DisableWindowsUpdateAccess /f;
-        reg.exe delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate"    /v WUStatusServer            /f;
+        reg.exe delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate" /v WUServer /f;
+        reg.exe delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate" /v WUStatusServer /f;
         reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\DeliveryOptimization\Config" /v DODownloadMode /f;
-        reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\BITS"         /v Start /t REG_DWORD /d 3 /f;
+        reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\BITS" /v Start /t REG_DWORD /d 3 /f;
-        reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\wuauserv"     /v Start /t REG_DWORD /d 3 /f;
+        reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\wuauserv" /v Start /t REG_DWORD /d 3 /f;
-        reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\UsoSvc"       /v Start /t REG_DWORD /d 2 /f;
+        reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\UsoSvc" /v Start /t REG_DWORD /d 2 /f;
         reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\WaaSMedicSvc" /v Start /t REG_DWORD /d 3 /f;
     };
     {