Win11 ISO Creator (#4110 )

* Tab creation * scaffold outline for the iso tab * autounattended creation * inital modification success * iso save success * cleanup and iso improvements * fix startmenu on new 26h2 * remove old first startup * Fix run for use * fix unapproved verb * Keep step 4 output expanded * update auto-merge * Cleanup * remove out-null and trailing whitespace * explain modify and creator button * fix scroll to end * remove workflow change
chore: Update generated dev docs (#4105 )
2026-04-06 06:38:31 +00:00 · 2026-02-24 15:28:49 -06:00 · 2026-02-23 18:28:56 -06:00 · 2026-02-23 18:28:25 -06:00 · 2026-02-23 18:26:20 -06:00 · 2026-02-23 14:53:46 -06:00
109 changed files with 2757 additions and 801 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -68,9 +68,9 @@ graph TD
 ### Fork the Repo
 * Fork the WinUtil Repository [here](https://github.com/ChrisTitusTech/winutil) to create a copy that will be available in your repository list.

-![Fork Image](assets/Fork-Button-Dark.png#only-dark#gh-dark-mode-only)
+![Fork Image](/docs/assets/images/Fork-Button-Dark.png#gh-dark-mode-only)

-![Fork Image](assets/Fork-Button-Light.png#only-light#gh-light-mode-only)
+![Fork Image](/docs/assets/images/Fork-Button-Light.png#only-light#gh-light-mode-only)

 ### Clone the Fork
 !!! tip
@@ -94,22 +94,22 @@ graph TD
 * Run the following command to compile and run WinUtil:
 * `.\Compile.ps1 -run`

-![Compile](assets/Compile.png)
+![Compile](/docs/assets/images/Complie.png)

 * After seeing that your changes work properly, feel free to commit the changes to the repository and make a PR. For help on that, follow the documentation below.

 ### Committing the changes
 * Before committing your changes, please discard changes made to the `winutil.ps1` file, like the following:

-![Push Commit Image](assets/Discard-GHD.png)
+![Push Commit Image](/docs/assets/images/Discard-GHD.png)

 * Now, commit your changes once you are happy with the result.

-![Commit Image](assets/Commit-GHD.png)
+![Commit Image](/docs/assets/images/Commit-GHD.png)

 * Push the changes to upload them to your fork on github.com.

-![Push Commit Image](assets/Push-Commit.png)
+![Push Commit Image](/docs/assets/images/Push-Commit.png)

 ### Making a PR
 * To make a PR on your repo under a new branch linking to the main branch, a button will show and say Preview and Create pull request. Click that button and fill in all the information that is provided on the template. Once all the information is filled in correctly, check your PR to make sure there is not a WinUtil.ps1 file attached to the PR. Once everything is good, make the PR and wait for Chris (the maintainer) to accept or deny your PR. Once it is accepted by Chris, you will be able to see your changes in the "/windev" build.
--- a/.github/workflows/auto-merge-docs.yaml
+++ b/.github/workflows/auto-merge-docs.yaml
@@ -8,7 +8,7 @@ on:

 jobs:
  auto-merge:
-    if: github.event.pull_request.head.ref == 'docs-update' && github.event.pull_request.user.login == 'github-actions[bot]'
+    if: github.event.pull_request.head.ref == 'docs-update' && (github.event.pull_request.user.login == 'ChrisTitusTech' || github.event.pull_request.user.login == 'github-actions[bot]')
    runs-on: ubuntu-latest
    permissions:
      pull-requests: write
@@ -18,13 +18,14 @@ jobs:
        uses: actions/checkout@v6

      - name: Auto-approve PR
+        if: github.event.pull_request.user.login == 'github-actions[bot]'
        run: gh pr review "$PR_NUMBER" --approve
        env:
          PR_NUMBER: ${{ github.event.pull_request.number }}
          GH_TOKEN: ${{ secrets.AUTO_MERGE }}

      - name: Enable auto-merge
-        run: gh pr merge "$PR_NUMBER" --squash --auto --delete-branch
+        run: gh pr merge "$PR_NUMBER" --squash --delete-branch --admin
        env:
          PR_NUMBER: ${{ github.event.pull_request.number }}
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.AUTO_MERGE }}
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -12,7 +12,7 @@ on:
  workflow_dispatch:

 permissions:
-  contents: write
+  contents: read
  pages: write
  id-token: write
  pull-requests: write
@@ -47,23 +47,30 @@ jobs:
      - name: Setup Pages
        id: pages
        uses: actions/configure-pages@v5
+        
      - name: Generate Dev Docs from JSON
        shell: pwsh
        run: |
          Set-Location tools
          ./devdocs-generator.ps1

-      - name: Create Pull Request 🚀
+      - name: Create Pull Request
        id: cpr
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v8
        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: 'Update generated documentation'
+          token: ${{ secrets.AUTO_MERGE }}
+          commit-message: 'chore: Update generated dev docs'
          title: 'chore: Update Generated Dev Docs'
          body: 'Automated update of generated documentation from JSON sources'
          branch: docs-update
          delete-branch: true
-          labels: automated
+          add-paths: |
+            docs/content/dev/
+            config/tweaks.json
+            config/feature.json
+          labels: |
+            automated
+            documentation

      - name: Check outputs
        run: |
--- a/.github/workflows/pre-release.yaml
+++ b/.github/workflows/pre-release.yaml
@@ -3,6 +3,7 @@ name: Pre-Release WinUtil
 permissions:
  contents: write
  actions: read
+  pull-requests: write

 on:
  workflow_dispatch: # Manual trigger added
@@ -22,25 +23,35 @@ jobs:
          Set-Location tools
          ./devdocs-generator.ps1

-      - name: Commit Updated JSON Links
-        shell: pwsh
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git add config/tweaks.json config/feature.json
-          $changes = git diff --cached --quiet; if ($LASTEXITCODE -ne 0) {
-            git commit -m "Update documentation links in JSON configs"
-            git push
-          } else {
-            Write-Host "No JSON link changes to commit"
-          }
-
      - name: Compile project
        shell: pwsh
        run: |
          Set-ExecutionPolicy Bypass -Scope Process -Force; ./Compile.ps1
        continue-on-error: false # Directly fail the job on error, removing the need for a separate check

+      - name: Create Pull Request for Updated JSON Links
+        id: cpr
+        uses: peter-evans/create-pull-request@v8
+        with:
+          token: ${{ secrets.AUTO_MERGE }}
+          commit-message: 'chore: Update documentation links in JSON configs'
+          title: 'chore: Update Generated Dev Docs'
+          body: 'Automated update of documentation links in JSON configs from pre-release build'
+          branch: docs-update
+          delete-branch: true
+          add-paths: |
+            config/tweaks.json
+            config/feature.json
+          labels: |
+            automated
+            documentation
+
+      - name: Check outputs
+        shell: bash
+        run: |
+          echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
+          echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
+
      - name: Set Version to Todays Date
        id: extract_version
        run: |
--- a/.github/workflows/sponsors.yaml
+++ b/.github/workflows/sponsors.yaml
@@ -24,7 +24,7 @@ jobs:

      - name: Create Pull Request 🚀
        id: cpr
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v8
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
          commit-message: 'Update sponsors in README'
--- a/Compile.ps1
+++ b/Compile.ps1
@@ -1,5 +1,4 @@
 param (
-    [switch]$Debug,
    [switch]$Run,
    [string]$Arguments
 )
@@ -104,19 +103,26 @@ $xaml
 '@
 "@)

+Update-Progress "Adding: autounattend.xml" 95
+$autounattendRaw = Get-Content "$workingdir\tools\autounattend.xml" -Raw
+# Strip XML comments (<!-- ... -->, including multi-line)
+$autounattendRaw = [regex]::Replace($autounattendRaw, '<!--.*?-->', '', [System.Text.RegularExpressions.RegexOptions]::Singleline)
+# Drop blank lines and trim trailing whitespace per line
+$autounattendXml = ($autounattendRaw -split "`r?`n" |
+    Where-Object { $_.Trim() -ne '' } |
+    ForEach-Object { $_.TrimEnd() }) -join "`r`n"
+$script_content.Add(@"
+`$WinUtilAutounattendXml = @'
+$autounattendXml
+'@
+"@)
+
 $script_content.Add($(Get-Content "scripts\main.ps1"))

-if ($Debug) {
-    Update-Progress "Writing debug files" 95
-    $appXamlContent | Out-File -FilePath "xaml\inputApp.xaml" -Encoding ascii
-    $tweaksXamlContent | Out-File -FilePath "xaml\inputTweaks.xaml" -Encoding ascii
-    $featuresXamlContent | Out-File -FilePath "xaml\inputFeatures.xaml" -Encoding ascii
-} else {
-    Update-Progress "Removing temporary files" 99
-    Remove-Item "xaml\inputApp.xaml" -ErrorAction SilentlyContinue
-    Remove-Item "xaml\inputTweaks.xaml" -ErrorAction SilentlyContinue
-    Remove-Item "xaml\inputFeatures.xaml" -ErrorAction SilentlyContinue
-}
+Update-Progress "Removing temporary files" 99
+Remove-Item "xaml\inputApp.xaml" -ErrorAction SilentlyContinue
+Remove-Item "xaml\inputTweaks.xaml" -ErrorAction SilentlyContinue
+Remove-Item "xaml\inputFeatures.xaml" -ErrorAction SilentlyContinue

 Set-Content -Path "$scriptname" -Value ($script_content -join "`r`n") -Encoding ascii
 Write-Progress -Activity "Compiling" -Completed
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@

 This utility is a compilation of Windows tasks I perform on each Windows system I use. It is meant to streamline *installs*, debloat with *tweaks*, troubleshoot with *config*, and fix Windows *updates*. I am extremely picky about any contributions to keep this project clean and efficient.

-![screen-install](https://raw.githubusercontent.com/Chris-Titus-Docs/winutil-docs/refs/heads/main/assets/images/Title-Screen.png)
+![screen-install](/docs/assets/images/Title-Screen.png)

 ## 💡 Usage

@@ -76,7 +76,7 @@ You'll see a new file named `winutil.ps1`, which's created by `Compile.ps1` scri

 These are the sponsors that help keep this project alive with monthly contributions.

-<!-- sponsors --><a href="https://github.com/dwelfusius"><img src="https:&#x2F;&#x2F;github.com&#x2F;dwelfusius.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/mews-se"><img src="https:&#x2F;&#x2F;github.com&#x2F;mews-se.png" width="60px" alt="User avatar: Martin Stockzell" /></a><a href="https://github.com/jdiegmueller"><img src="https:&#x2F;&#x2F;github.com&#x2F;jdiegmueller.png" width="60px" alt="User avatar: Jason A. Diegmueller" /></a><a href="https://github.com/robertsandrock"><img src="https:&#x2F;&#x2F;github.com&#x2F;robertsandrock.png" width="60px" alt="User avatar: RMS" /></a><a href="https://github.com/KenichiQaz"><img src="https:&#x2F;&#x2F;github.com&#x2F;KenichiQaz.png" width="60px" alt="User avatar: Stefan" /></a><a href="https://github.com/paulsheets"><img src="https:&#x2F;&#x2F;github.com&#x2F;paulsheets.png" width="60px" alt="User avatar: Paul" /></a><a href="https://github.com/djones369"><img src="https:&#x2F;&#x2F;github.com&#x2F;djones369.png" width="60px" alt="User avatar: Dave J  (WhamGeek)" /></a><a href="https://github.com/anthonymendez"><img src="https:&#x2F;&#x2F;github.com&#x2F;anthonymendez.png" width="60px" alt="User avatar: Anthony Mendez" /></a><a href="https://github.com/FatBastard0"><img src="https:&#x2F;&#x2F;github.com&#x2F;FatBastard0.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/DursleyGuy"><img src="https:&#x2F;&#x2F;github.com&#x2F;DursleyGuy.png" width="60px" alt="User avatar: DursleyGuy" /></a><a href="https://github.com/quaszi"><img src="https:&#x2F;&#x2F;github.com&#x2F;quaszi.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/DwayneTheRockLobster1"><img src="https:&#x2F;&#x2F;github.com&#x2F;DwayneTheRockLobster1.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/KieraKujisawa"><img src="https:&#x2F;&#x2F;github.com&#x2F;KieraKujisawa.png" width="60px" alt="User avatar: Kiera Meredith" /></a><a href="https://github.com/andrewpayne68"><img src="https:&#x2F;&#x2F;github.com&#x2F;andrewpayne68.png" width="60px" alt="User avatar: Andrew P" /></a><!-- sponsors -->
+<!-- sponsors --><a href="https://github.com/dwelfusius"><img src="https:&#x2F;&#x2F;github.com&#x2F;dwelfusius.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/mews-se"><img src="https:&#x2F;&#x2F;github.com&#x2F;mews-se.png" width="60px" alt="User avatar: Martin Stockzell" /></a><a href="https://github.com/jdiegmueller"><img src="https:&#x2F;&#x2F;github.com&#x2F;jdiegmueller.png" width="60px" alt="User avatar: Jason A. Diegmueller" /></a><a href="https://github.com/robertsandrock"><img src="https:&#x2F;&#x2F;github.com&#x2F;robertsandrock.png" width="60px" alt="User avatar: RMS" /></a><a href="https://github.com/KenichiQaz"><img src="https:&#x2F;&#x2F;github.com&#x2F;KenichiQaz.png" width="60px" alt="User avatar: Stefan" /></a><a href="https://github.com/paulsheets"><img src="https:&#x2F;&#x2F;github.com&#x2F;paulsheets.png" width="60px" alt="User avatar: Paul" /></a><a href="https://github.com/djones369"><img src="https:&#x2F;&#x2F;github.com&#x2F;djones369.png" width="60px" alt="User avatar: Dave J  (WhamGeek)" /></a><a href="https://github.com/anthonymendez"><img src="https:&#x2F;&#x2F;github.com&#x2F;anthonymendez.png" width="60px" alt="User avatar: Anthony Mendez" /></a><a href="https://github.com/FatBastard0"><img src="https:&#x2F;&#x2F;github.com&#x2F;FatBastard0.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/DursleyGuy"><img src="https:&#x2F;&#x2F;github.com&#x2F;DursleyGuy.png" width="60px" alt="User avatar: DursleyGuy" /></a><a href="https://github.com/quaszi"><img src="https:&#x2F;&#x2F;github.com&#x2F;quaszi.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/DwayneTheRockLobster1"><img src="https:&#x2F;&#x2F;github.com&#x2F;DwayneTheRockLobster1.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/KieraKujisawa"><img src="https:&#x2F;&#x2F;github.com&#x2F;KieraKujisawa.png" width="60px" alt="User avatar: Kiera Meredith" /></a><a href="https://github.com/andrewpayne68"><img src="https:&#x2F;&#x2F;github.com&#x2F;andrewpayne68.png" width="60px" alt="User avatar: Andrew P" /></a><a href="https://github.com/nathanzilgo"><img src="https:&#x2F;&#x2F;github.com&#x2F;nathanzilgo.png" width="60px" alt="User avatar: Nathan Fernandes Pedroza" /></a><!-- sponsors -->

 ## 🏅 Thanks to all Contributors
 Thanks a lot for spending your time helping Winutil grow. Thanks a lot! Keep rocking 🍻.
--- a/config/applications.json
+++ b/config/applications.json
@@ -496,6 +496,14 @@
        "link": "https://dotnet.microsoft.com/download/dotnet/9.0",
        "winget": "Microsoft.DotNet.DesktopRuntime.9"
    },
+    "dotnet10": {
+        "category": "Microsoft Tools",
+        "choco": "dotnet-10.0-runtime",
+        "content": ".NET Desktop Runtime 10",
+        "description": ".NET Desktop Runtime 10 is a runtime environment required for running applications developed with .NET 10.",
+        "link": "https://dotnet.microsoft.com/download/dotnet/10.0",
+        "winget": "Microsoft.DotNet.DesktopRuntime.10"
+    },
    "dmt": {
        "winget": "GNE.DualMonitorTools",
        "choco": "dual-monitor-tools",
@@ -3226,5 +3234,23 @@
        "link": "https://zed.dev/",
        "winget": "ZedIndustries.Zed",
        "foss": true
+    },
+    "LLLVM": {
+        "category": "Development",
+        "choco": "llvm",
+        "winget": "LLVM.LLVM",
+        "description": "A collection of modular and reusable compiler and toolchain technologies.",
+        "content": "LLVM",
+        "link": "https://llvm.org",
+        "foss": true
+    },
+    "NASM": {
+        "category": "Development",
+        "choco": "nasm",
+        "winget": "NASM.NASM",
+        "description": "A powerful assembler for the x86 platform.",
+        "content": "NASM",
+        "link": "https://nasm.us",
+        "foss": true
    }
 }
--- a/config/feature.json
+++ b/config/feature.json
@@ -4,7 +4,6 @@
    "Description": ".NET and .NET Framework is a developer platform made up of tools, programming languages, and libraries for building many different types of applications.",
    "category": "Features",
    "panel": "1",
-    "Order": "a010_",
    "feature": [
      "NetFx4-AdvSrvs",
      "NetFx3"
@@ -17,7 +16,6 @@
    "Description": "Hyper-V is a hardware virtualization product developed by Microsoft that allows users to create and manage virtual machines.",
    "category": "Features",
    "panel": "1",
-    "Order": "a011_",
    "feature": [
      "Microsoft-Hyper-V-All"
    ],
@@ -31,7 +29,6 @@
    "Description": "Enables legacy programs from previous versions of windows",
    "category": "Features",
    "panel": "1",
-    "Order": "a012_",
    "feature": [
      "WindowsMediaPlayer",
      "MediaPlayback",
@@ -46,7 +43,6 @@
    "Description": "Windows Subsystem for Linux is an optional feature of Windows that allows Linux programs to run natively on Windows without the need for a separate virtual machine or dual booting.",
    "category": "Features",
    "panel": "1",
-    "Order": "a020_",
    "feature": [
      "VirtualMachinePlatform",
      "Microsoft-Windows-Subsystem-Linux"
@@ -59,7 +55,6 @@
    "Description": "Network File System (NFS) is a mechanism for storing files on a network.",
    "category": "Features",
    "panel": "1",
-    "Order": "a014_",
    "feature": [
      "ServicesForNFS-ClientOnly",
      "ClientForNFS-Infrastructure",
@@ -79,7 +74,6 @@
    "Description": "Enables daily registry backup, previously disabled by Microsoft in Windows 10 1803.",
    "category": "Features",
    "panel": "1",
-    "Order": "a017_",
    "feature": [],
    "InvokeScript": [
      "
@@ -97,7 +91,6 @@
    "Description": "Enables Advanced Boot Options screen that lets you start Windows in advanced troubleshooting modes.",
    "category": "Features",
    "panel": "1",
-    "Order": "a018_",
    "feature": [],
    "InvokeScript": [
      "bcdedit /set bootmenupolicy legacy"
@@ -109,7 +102,6 @@
    "Description": "Disables Advanced Boot Options screen that lets you start Windows in advanced troubleshooting modes.",
    "category": "Features",
    "panel": "1",
-    "Order": "a019_",
    "feature": [],
    "InvokeScript": [
      "bcdedit /set bootmenupolicy standard"
@@ -121,7 +113,6 @@
    "Description": "Windows Sandbox is a lightweight virtual machine that provides a temporary desktop environment to safely run applications and programs in isolation.",
    "category": "Features",
    "panel": "1",
-    "Order": "a021_",
    "feature": [
      "Containers-DisposableClientVM"
    ],
@@ -131,54 +122,54 @@
    "Content": "Install Features",
    "category": "Features",
    "panel": "1",
-    "Order": "a060_",
    "Type": "Button",
    "ButtonWidth": "300",
+    "function": "Invoke-WPFFeatureInstall",
    "link": "https://winutil.christitus.com/dev/features/features/install"
  },
  "WPFPanelAutologin": {
    "Content": "Set Up Autologin",
    "category": "Fixes",
-    "Order": "a040_",
    "panel": "1",
    "Type": "Button",
    "ButtonWidth": "300",
+    "function": "Invoke-WPFPanelAutologin",
    "link": "https://winutil.christitus.com/dev/features/fixes/autologin"
  },
  "WPFFixesUpdate": {
    "Content": "Reset Windows Update",
    "category": "Fixes",
    "panel": "1",
-    "Order": "a041_",
    "Type": "Button",
    "ButtonWidth": "300",
+    "function": "Invoke-WPFFixesUpdate",
    "link": "https://winutil.christitus.com/dev/features/fixes/update"
  },
  "WPFFixesNetwork": {
    "Content": "Reset Network",
    "category": "Fixes",
-    "Order": "a042_",
    "panel": "1",
    "Type": "Button",
    "ButtonWidth": "300",
+    "function": "Invoke-WPFFixesNetwork",
    "link": "https://winutil.christitus.com/dev/features/fixes/network"
  },
  "WPFPanelDISM": {
    "Content": "System Corruption Scan",
    "category": "Fixes",
    "panel": "1",
-    "Order": "a043_",
    "Type": "Button",
    "ButtonWidth": "300",
+    "function": "Invoke-WPFSystemRepair",
    "link": "https://winutil.christitus.com/dev/features/fixes/dism"
  },
  "WPFFixesWinget": {
    "Content": "WinGet Reinstall",
    "category": "Fixes",
    "panel": "1",
-    "Order": "a044_",
    "Type": "Button",
    "ButtonWidth": "300",
+    "function": "Invoke-WPFFixesWinget",
    "link": "https://winutil.christitus.com/dev/features/fixes/winget"
  },
  "WPFPanelControl": {
@@ -187,6 +178,9 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
+    "InvokeScript": [
+      "control"
+    ],
    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/control"
  },
  "WPFPanelComputer": {
@@ -195,6 +189,9 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
+    "InvokeScript": [
+      "compmgmt.msc"
+    ],
    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/computer"
  },
  "WPFPanelNetwork": {
@@ -203,6 +200,9 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
+    "InvokeScript": [
+      "ncpa.cpl"
+    ],
    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/network"
  },
  "WPFPanelPower": {
@@ -211,6 +211,9 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
+    "InvokeScript": [
+      "powercfg.cpl"
+    ],
    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/power"
  },
  "WPFPanelPrinter": {
@@ -219,6 +222,9 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
+    "InvokeScript": [
+      "Start-Process 'shell:::{A8A91A66-3A7D-4424-8D24-04E180695C7A}'"
+    ],
    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/printer"
  },
  "WPFPanelRegion": {
@@ -227,6 +233,9 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
+    "InvokeScript": [
+      "intl.cpl"
+    ],
    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/region"
  },
  "WPFPanelRestore": {
@@ -235,6 +244,9 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
+    "InvokeScript": [
+      "rstrui.exe"
+    ],
    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/restore"
  },
  "WPFPanelSound": {
@@ -243,6 +255,9 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
+    "InvokeScript": [
+      "mmsys.cpl"
+    ],
    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/sound"
  },
  "WPFPanelSystem": {
@@ -251,6 +266,9 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
+    "InvokeScript": [
+      "sysdm.cpl"
+    ],
    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/system"
  },
  "WPFPanelTimedate": {
@@ -259,33 +277,36 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
+    "InvokeScript": [
+      "timedate.cpl"
+    ],
    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/timedate"
  },
  "WPFWinUtilInstallPSProfile": {
    "Content": "Install CTT PowerShell Profile",
    "category": "Powershell Profile Powershell 7+ Only",
    "panel": "2",
-    "Order": "a083_",
    "Type": "Button",
    "ButtonWidth": "300",
+    "function": "Invoke-WinUtilInstallPSProfile",
    "link": "https://winutil.christitus.com/dev/features/powershell-profile-powershell-7--only/installpsprofile"
  },
  "WPFWinUtilUninstallPSProfile": {
    "Content": "Uninstall CTT PowerShell Profile",
    "category": "Powershell Profile Powershell 7+ Only",
    "panel": "2",
-    "Order": "a084_",
    "Type": "Button",
    "ButtonWidth": "300",
+    "function": "Invoke-WinUtilUninstallPSProfile",
    "link": "https://winutil.christitus.com/dev/features/powershell-profile-powershell-7--only/uninstallpsprofile"
  },
  "WPFWinUtilSSHServer": {
    "Content": "Enable OpenSSH Server",
    "category": "Remote Access",
    "panel": "2",
-    "Order": "a084_",
    "Type": "Button",
    "ButtonWidth": "300",
+    "function": "Invoke-WPFSSHServer",
    "link": "https://winutil.christitus.com/dev/features/remote-access/sshserver"
  }
 }
--- a/config/preset.json
+++ b/config/preset.json
@@ -16,7 +16,6 @@
  ],
  "Minimal": [
    "WPFTweaksConsumerFeatures",
-    "WPFTweaksDisableExplorerAutoDiscovery",
    "WPFTweaksWPBT",
    "WPFTweaksServices",
    "WPFTweaksTelemetry"
--- a/config/themes.json
+++ b/config/themes.json
@@ -65,10 +65,12 @@
        "ButtonTweaksBackgroundColor":  "#F7F7F7",
        "ButtonConfigBackgroundColor":  "#F7F7F7",
        "ButtonUpdatesBackgroundColor":  "#F7F7F7",
+        "ButtonWin11ISOBackgroundColor": "#F7F7F7",
        "ButtonInstallForegroundColor":  "#232629",
        "ButtonTweaksForegroundColor":  "#232629",
        "ButtonConfigForegroundColor":  "#232629",
        "ButtonUpdatesForegroundColor":  "#232629",
+        "ButtonWin11ISOForegroundColor": "#232629",
        "ButtonBackgroundColor":  "#F5F5F5",
        "ButtonBackgroundPressedColor":  "#1A1A1A",
        "ButtonBackgroundMouseoverColor":  "#C2C2C2",
@@ -105,10 +107,12 @@
        "ButtonTweaksBackgroundColor":  "#333333",
        "ButtonConfigBackgroundColor":  "#444444",
        "ButtonUpdatesBackgroundColor":  "#555555",
+        "ButtonWin11ISOBackgroundColor": "#666666",
        "ButtonInstallForegroundColor":  "#F7F7F7",
        "ButtonTweaksForegroundColor":  "#F7F7F7",
        "ButtonConfigForegroundColor":  "#F7F7F7",
        "ButtonUpdatesForegroundColor":  "#F7F7F7",
+        "ButtonWin11ISOForegroundColor": "#F7F7F7",
        "ButtonBackgroundColor":  "#1E3747",
        "ButtonBackgroundPressedColor":  "#F7F7F7",
        "ButtonBackgroundMouseoverColor":  "#3B4252",
--- a/config/tweaks.json
+++ b/config/tweaks.json
@@ -1907,7 +1907,7 @@
  },
  "WPFTweaksRazerBlock": {
    "Content": "Block Razer Software Installs",
-    "Description": "Blocks ALL Razer Software installations. The hardware works fine without any software. WARNING: this will also block all Windows third-party driver installations.",
+    "Description": "Blocks ALL Razer Software installations. The hardware works fine without any software.",
    "category": "z__Advanced Tweaks - CAUTION",
    "panel": "1",
    "registry": [
@@ -2246,7 +2246,7 @@
  },
  "WPFToggleStartMenuRecommendations": {
    "Content": "Recommendations in Start Menu",
-    "Description": "If disabled then you will not see recommendations in the 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.",
    "category": "Customize Preferences",
    "panel": "2",
    "Type": "Toggle",
@@ -2615,7 +2615,7 @@
  },
  "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.",
+    "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",
    "category": "Essential Tweaks",
    "panel": "1",
    "InvokeScript": [
--- a/docs/content/KnownIssues.md
+++ b/docs/content/KnownIssues.md
@@ -27,6 +27,14 @@ If you are still having issues, try using a **VPN**, or changing your **DNS prov
 | Cloudflare |  `1.1.1.1`  |   `1.0.0.1`   |
 |   Google   |  `8.8.8.8`  |   `8.8.4.4`   |

+### Script Won't Run
+
+If your PowerShell session is running in **Constrained Language Mode**, some scripts and commands may fail to execute. To check the current language mode, run:
+```powershell
+$ExecutionContext.SessionState.LanguageMode
+```
+If it returns `ConstrainedLanguage`, you may need to switch to `FullLanguage` mode or run the script in a session with administrative privileges. Be aware that some security policies may enforce Constrained Language Mode, especially in corporate or managed environments.
+
 ### Script blocked by Execution Policy

 1. Ensure you are running PowerShell as admin: Press `Windows Key`+`X` and select _PowerShell (Admin)_ in Windows 10, or `Windows Terminal (Admin)` in Windows 11.
--- a/docs/content/dev/_index.md
+++ b/docs/content/dev/_index.md
@@ -42,3 +42,11 @@ toc: false
 ### Features

 {{< autolinks section="dev/features/features" >}}
+
+### Remote Access
+
+{{< autolinks section="dev/features/remote-access" >}}
+
+### Powershell Profile Powershell 7+ Only
+
+{{< autolinks section="dev/features/powershell-profile-powershell-7--only" >}}
--- a/docs/content/dev/features/Features/DisableLegacyRecovery.md
+++ b/docs/content/dev/features/Features/DisableLegacyRecovery.md
@@ -3,13 +3,12 @@ title: "Disable Legacy F8 Boot Recovery"
 description: ""
 ---

-```json {filename="config/feature.json",linenos=inline,linenostart=107}
+```json {filename="config/feature.json",linenos=inline,linenostart=100}
  "WPFFeatureDisableLegacyRecovery": {
    "Content": "Disable Legacy F8 Boot Recovery",
    "Description": "Disables Advanced Boot Options screen that lets you start Windows in advanced troubleshooting modes.",
    "category": "Features",
    "panel": "1",
-    "Order": "a019_",
    "feature": [],
    "InvokeScript": [
      "bcdedit /set bootmenupolicy standard"
--- a/docs/content/dev/features/Features/EnableLegacyRecovery.md
+++ b/docs/content/dev/features/Features/EnableLegacyRecovery.md
@@ -3,13 +3,12 @@ title: "Enable Legacy F8 Boot Recovery"
 description: ""
 ---

-```json {filename="config/feature.json",linenos=inline,linenostart=95}
+```json {filename="config/feature.json",linenos=inline,linenostart=89}
  "WPFFeatureEnableLegacyRecovery": {
    "Content": "Enable Legacy F8 Boot Recovery",
    "Description": "Enables Advanced Boot Options screen that lets you start Windows in advanced troubleshooting modes.",
    "category": "Features",
    "panel": "1",
-    "Order": "a018_",
    "feature": [],
    "InvokeScript": [
      "bcdedit /set bootmenupolicy legacy"
--- a/docs/content/dev/features/Features/RegBackup.md
+++ b/docs/content/dev/features/Features/RegBackup.md
@@ -3,13 +3,12 @@ title: "Enable Daily Registry Backup Task 12.30am"
 description: ""
 ---

-```json {filename="config/feature.json",linenos=inline,linenostart=77}
+```json {filename="config/feature.json",linenos=inline,linenostart=72}
  "WPFFeatureRegBackup": {
    "Content": "Enable Daily Registry Backup Task 12.30am",
    "Description": "Enables daily registry backup, previously disabled by Microsoft in Windows 10 1803.",
    "category": "Features",
    "panel": "1",
-    "Order": "a017_",
    "feature": [],
    "InvokeScript": [
      "
--- a/docs/content/dev/features/Features/Sandbox.md
+++ b/docs/content/dev/features/Features/Sandbox.md
@@ -3,13 +3,12 @@ title: "Windows Sandbox"
 description: ""
 ---

-```json {filename="config/feature.json",linenos=inline,linenostart=119}
+```json {filename="config/feature.json",linenos=inline,linenostart=111}
  "WPFFeaturesSandbox": {
    "Content": "Windows Sandbox",
    "Description": "Windows Sandbox is a lightweight virtual machine that provides a temporary desktop environment to safely run applications and programs in isolation.",
    "category": "Features",
    "panel": "1",
-    "Order": "a021_",
    "feature": [
      "Containers-DisposableClientVM"
    ],
--- a/docs/content/dev/features/Features/dotnet.md
+++ b/docs/content/dev/features/Features/dotnet.md
@@ -9,7 +9,6 @@ description: ""
    "Description": ".NET and .NET Framework is a developer platform made up of tools, programming languages, and libraries for building many different types of applications.",
    "category": "Features",
    "panel": "1",
-    "Order": "a010_",
    "feature": [
      "NetFx4-AdvSrvs",
      "NetFx3"
--- a/docs/content/dev/features/Features/hyperv.md
+++ b/docs/content/dev/features/Features/hyperv.md
@@ -3,13 +3,12 @@ title: "HyperV Virtualization"
 description: ""
 ---

-```json {filename="config/feature.json",linenos=inline,linenostart=15}
+```json {filename="config/feature.json",linenos=inline,linenostart=14}
  "WPFFeatureshyperv": {
    "Content": "HyperV Virtualization",
    "Description": "Hyper-V is a hardware virtualization product developed by Microsoft that allows users to create and manage virtual machines.",
    "category": "Features",
    "panel": "1",
-    "Order": "a011_",
    "feature": [
      "Microsoft-Hyper-V-All"
    ],
--- a/docs/content/dev/features/Features/legacymedia.md
+++ b/docs/content/dev/features/Features/legacymedia.md
@@ -3,13 +3,12 @@ title: "Legacy Media (WMP, DirectPlay)"
 description: ""
 ---

-```json {filename="config/feature.json",linenos=inline,linenostart=29}
+```json {filename="config/feature.json",linenos=inline,linenostart=27}
  "WPFFeatureslegacymedia": {
    "Content": "Legacy Media (WMP, DirectPlay)",
    "Description": "Enables legacy programs from previous versions of windows",
    "category": "Features",
    "panel": "1",
-    "Order": "a012_",
    "feature": [
      "WindowsMediaPlayer",
      "MediaPlayback",
--- a/docs/content/dev/features/Features/nfs.md
+++ b/docs/content/dev/features/Features/nfs.md
@@ -3,13 +3,12 @@ title: "NFS - Network File System"
 description: ""
 ---

-```json {filename="config/feature.json",linenos=inline,linenostart=57}
+```json {filename="config/feature.json",linenos=inline,linenostart=53}
  "WPFFeaturenfs": {
    "Content": "NFS - Network File System",
    "Description": "Network File System (NFS) is a mechanism for storing files on a network.",
    "category": "Features",
    "panel": "1",
-    "Order": "a014_",
    "feature": [
      "ServicesForNFS-ClientOnly",
      "ClientForNFS-Infrastructure",
--- a/docs/content/dev/features/Features/wsl.md
+++ b/docs/content/dev/features/Features/wsl.md
@@ -3,13 +3,12 @@ title: "Windows Subsystem for Linux"
 description: ""
 ---

-```json {filename="config/feature.json",linenos=inline,linenostart=44}
+```json {filename="config/feature.json",linenos=inline,linenostart=41}
  "WPFFeaturewsl": {
    "Content": "Windows Subsystem for Linux",
    "Description": "Windows Subsystem for Linux is an optional feature of Windows that allows Linux programs to run natively on Windows without the need for a separate virtual machine or dual booting.",
    "category": "Features",
    "panel": "1",
-    "Order": "a020_",
    "feature": [
      "VirtualMachinePlatform",
      "Microsoft-Windows-Subsystem-Linux"
--- a/docs/content/dev/features/Fixes/DISM.md
+++ b/docs/content/dev/features/Fixes/DISM.md
@@ -8,13 +8,15 @@ function Invoke-WPFSystemRepair {
    <#
    .SYNOPSIS
        Checks for system corruption using SFC, and DISM
+        Checks for disk failure using Chkdsk

    .DESCRIPTION
-        1. SFC - Fixes system file corruption, and fixes DISM if it was corrupted
-        2. DISM - Fixes system image corruption, and fixes SFC's system image if it was corrupted
-        3. Chkdsk - Checks for disk errors, which can cause system file corruption and notifies of early disk failure
+        1. Chkdsk - Checks for disk errors, which can cause system file corruption and notifies of early disk failure
+        2. SFC - scans protected system files for corruption and fixes them
+        3. DISM - Repair a corrupted Windows operating system image
    #>
-    Start-Process cmd.exe -ArgumentList "/c chkdsk.exe /scan /perf" -NoNewWindow -Wait
+
+    Start-Process cmd.exe -ArgumentList "/c chkdsk /scan /perf" -NoNewWindow -Wait
    Start-Process cmd.exe -ArgumentList "/c sfc /scannow" -NoNewWindow -Wait
    Start-Process cmd.exe -ArgumentList "/c dism /online /cleanup-image /restorehealth" -NoNewWindow -Wait

--- a/docs/content/dev/features/Legacy-Windows-Panels/Computer.md
+++ b/docs/content/dev/features/Legacy-Windows-Panels/Computer.md
@@ -3,31 +3,14 @@ title: "Computer Management"
 description: ""
 ---

-```powershell {filename="functions/public/Invoke-WPFControlPanel.ps1",linenos=inline,linenostart=1}
-function Invoke-WPFControlPanel {
-    <#
-
-    .SYNOPSIS
-        Opens the requested legacy panel
-
-    .PARAMETER Panel
-        The panel to open
-
-    #>
-    param($Panel)
-
-    switch ($Panel) {
-        "WPFPanelControl" {control}
-        "WPFPanelComputer" {compmgmt.msc}
-        "WPFPanelNetwork" {ncpa.cpl}
-        "WPFPanelPower"   {powercfg.cpl}
-        "WPFPanelPrinter" {Start-Process "shell:::{A8A91A66-3A7D-4424-8D24-04E180695C7A}"}
-        "WPFPanelRegion"  {intl.cpl}
-        "WPFPanelRestore"  {rstrui.exe}
-        "WPFPanelSound"   {mmsys.cpl}
-        "WPFPanelSystem"  {sysdm.cpl}
-        "WPFPanelTimedate" {timedate.cpl}
-        "WPFPanelUser"    {control userpasswords2}
-    }
-}
+```json {filename="config/feature.json",linenos=inline,linenostart=186}
+  "WPFPanelComputer": {
+    "Content": "Computer Management",
+    "category": "Legacy Windows Panels",
+    "panel": "2",
+    "Type": "Button",
+    "ButtonWidth": "300",
+    "InvokeScript": [
+      "compmgmt.msc"
+    ],
 ```
--- a/docs/content/dev/features/Legacy-Windows-Panels/Control.md
+++ b/docs/content/dev/features/Legacy-Windows-Panels/Control.md
@@ -3,31 +3,14 @@ title: "Control Panel"
 description: ""
 ---

-```powershell {filename="functions/public/Invoke-WPFControlPanel.ps1",linenos=inline,linenostart=1}
-function Invoke-WPFControlPanel {
-    <#
-
-    .SYNOPSIS
-        Opens the requested legacy panel
-
-    .PARAMETER Panel
-        The panel to open
-
-    #>
-    param($Panel)
-
-    switch ($Panel) {
-        "WPFPanelControl" {control}
-        "WPFPanelComputer" {compmgmt.msc}
-        "WPFPanelNetwork" {ncpa.cpl}
-        "WPFPanelPower"   {powercfg.cpl}
-        "WPFPanelPrinter" {Start-Process "shell:::{A8A91A66-3A7D-4424-8D24-04E180695C7A}"}
-        "WPFPanelRegion"  {intl.cpl}
-        "WPFPanelRestore"  {rstrui.exe}
-        "WPFPanelSound"   {mmsys.cpl}
-        "WPFPanelSystem"  {sysdm.cpl}
-        "WPFPanelTimedate" {timedate.cpl}
-        "WPFPanelUser"    {control userpasswords2}
-    }
-}
+```json {filename="config/feature.json",linenos=inline,linenostart=175}
+  "WPFPanelControl": {
+    "Content": "Control Panel",
+    "category": "Legacy Windows Panels",
+    "panel": "2",
+    "Type": "Button",
+    "ButtonWidth": "300",
+    "InvokeScript": [
+      "control"
+    ],
 ```
--- a/docs/content/dev/features/Legacy-Windows-Panels/Network.md
+++ b/docs/content/dev/features/Legacy-Windows-Panels/Network.md
@@ -3,31 +3,14 @@ title: "Network Connections"
 description: ""
 ---

-```powershell {filename="functions/public/Invoke-WPFControlPanel.ps1",linenos=inline,linenostart=1}
-function Invoke-WPFControlPanel {
-    <#
-
-    .SYNOPSIS
-        Opens the requested legacy panel
-
-    .PARAMETER Panel
-        The panel to open
-
-    #>
-    param($Panel)
-
-    switch ($Panel) {
-        "WPFPanelControl" {control}
-        "WPFPanelComputer" {compmgmt.msc}
-        "WPFPanelNetwork" {ncpa.cpl}
-        "WPFPanelPower"   {powercfg.cpl}
-        "WPFPanelPrinter" {Start-Process "shell:::{A8A91A66-3A7D-4424-8D24-04E180695C7A}"}
-        "WPFPanelRegion"  {intl.cpl}
-        "WPFPanelRestore"  {rstrui.exe}
-        "WPFPanelSound"   {mmsys.cpl}
-        "WPFPanelSystem"  {sysdm.cpl}
-        "WPFPanelTimedate" {timedate.cpl}
-        "WPFPanelUser"    {control userpasswords2}
-    }
-}
+```json {filename="config/feature.json",linenos=inline,linenostart=197}
+  "WPFPanelNetwork": {
+    "Content": "Network Connections",
+    "category": "Legacy Windows Panels",
+    "panel": "2",
+    "Type": "Button",
+    "ButtonWidth": "300",
+    "InvokeScript": [
+      "ncpa.cpl"
+    ],
 ```
--- a/docs/content/dev/features/Legacy-Windows-Panels/Power.md
+++ b/docs/content/dev/features/Legacy-Windows-Panels/Power.md
@@ -3,31 +3,14 @@ title: "Power Panel"
 description: ""
 ---

-```powershell {filename="functions/public/Invoke-WPFControlPanel.ps1",linenos=inline,linenostart=1}
-function Invoke-WPFControlPanel {
-    <#
-
-    .SYNOPSIS
-        Opens the requested legacy panel
-
-    .PARAMETER Panel
-        The panel to open
-
-    #>
-    param($Panel)
-
-    switch ($Panel) {
-        "WPFPanelControl" {control}
-        "WPFPanelComputer" {compmgmt.msc}
-        "WPFPanelNetwork" {ncpa.cpl}
-        "WPFPanelPower"   {powercfg.cpl}
-        "WPFPanelPrinter" {Start-Process "shell:::{A8A91A66-3A7D-4424-8D24-04E180695C7A}"}
-        "WPFPanelRegion"  {intl.cpl}
-        "WPFPanelRestore"  {rstrui.exe}
-        "WPFPanelSound"   {mmsys.cpl}
-        "WPFPanelSystem"  {sysdm.cpl}
-        "WPFPanelTimedate" {timedate.cpl}
-        "WPFPanelUser"    {control userpasswords2}
-    }
-}
+```json {filename="config/feature.json",linenos=inline,linenostart=208}
+  "WPFPanelPower": {
+    "Content": "Power Panel",
+    "category": "Legacy Windows Panels",
+    "panel": "2",
+    "Type": "Button",
+    "ButtonWidth": "300",
+    "InvokeScript": [
+      "powercfg.cpl"
+    ],
 ```
--- a/docs/content/dev/features/Legacy-Windows-Panels/Printer.md
+++ b/docs/content/dev/features/Legacy-Windows-Panels/Printer.md
@@ -3,31 +3,14 @@ title: "Printer Panel"
 description: ""
 ---

-```powershell {filename="functions/public/Invoke-WPFControlPanel.ps1",linenos=inline,linenostart=1}
-function Invoke-WPFControlPanel {
-    <#
-
-    .SYNOPSIS
-        Opens the requested legacy panel
-
-    .PARAMETER Panel
-        The panel to open
-
-    #>
-    param($Panel)
-
-    switch ($Panel) {
-        "WPFPanelControl" {control}
-        "WPFPanelComputer" {compmgmt.msc}
-        "WPFPanelNetwork" {ncpa.cpl}
-        "WPFPanelPower"   {powercfg.cpl}
-        "WPFPanelPrinter" {Start-Process "shell:::{A8A91A66-3A7D-4424-8D24-04E180695C7A}"}
-        "WPFPanelRegion"  {intl.cpl}
-        "WPFPanelRestore"  {rstrui.exe}
-        "WPFPanelSound"   {mmsys.cpl}
-        "WPFPanelSystem"  {sysdm.cpl}
-        "WPFPanelTimedate" {timedate.cpl}
-        "WPFPanelUser"    {control userpasswords2}
-    }
-}
+```json {filename="config/feature.json",linenos=inline,linenostart=219}
+  "WPFPanelPrinter": {
+    "Content": "Printer Panel",
+    "category": "Legacy Windows Panels",
+    "panel": "2",
+    "Type": "Button",
+    "ButtonWidth": "300",
+    "InvokeScript": [
+      "Start-Process 'shell:::{A8A91A66-3A7D-4424-8D24-04E180695C7A}'"
+    ],
 ```
--- a/docs/content/dev/features/Legacy-Windows-Panels/Region.md
+++ b/docs/content/dev/features/Legacy-Windows-Panels/Region.md
@@ -3,31 +3,14 @@ title: "Region"
 description: ""
 ---

-```powershell {filename="functions/public/Invoke-WPFControlPanel.ps1",linenos=inline,linenostart=1}
-function Invoke-WPFControlPanel {
-    <#
-
-    .SYNOPSIS
-        Opens the requested legacy panel
-
-    .PARAMETER Panel
-        The panel to open
-
-    #>
-    param($Panel)
-
-    switch ($Panel) {
-        "WPFPanelControl" {control}
-        "WPFPanelComputer" {compmgmt.msc}
-        "WPFPanelNetwork" {ncpa.cpl}
-        "WPFPanelPower"   {powercfg.cpl}
-        "WPFPanelPrinter" {Start-Process "shell:::{A8A91A66-3A7D-4424-8D24-04E180695C7A}"}
-        "WPFPanelRegion"  {intl.cpl}
-        "WPFPanelRestore"  {rstrui.exe}
-        "WPFPanelSound"   {mmsys.cpl}
-        "WPFPanelSystem"  {sysdm.cpl}
-        "WPFPanelTimedate" {timedate.cpl}
-        "WPFPanelUser"    {control userpasswords2}
-    }
-}
+```json {filename="config/feature.json",linenos=inline,linenostart=230}
+  "WPFPanelRegion": {
+    "Content": "Region",
+    "category": "Legacy Windows Panels",
+    "panel": "2",
+    "Type": "Button",
+    "ButtonWidth": "300",
+    "InvokeScript": [
+      "intl.cpl"
+    ],
 ```
--- a/docs/content/dev/features/Legacy-Windows-Panels/Restore.md
+++ b/docs/content/dev/features/Legacy-Windows-Panels/Restore.md
@@ -3,31 +3,14 @@ title: "Windows Restore"
 description: ""
 ---

-```powershell {filename="functions/public/Invoke-WPFControlPanel.ps1",linenos=inline,linenostart=1}
-function Invoke-WPFControlPanel {
-    <#
-
-    .SYNOPSIS
-        Opens the requested legacy panel
-
-    .PARAMETER Panel
-        The panel to open
-
-    #>
-    param($Panel)
-
-    switch ($Panel) {
-        "WPFPanelControl" {control}
-        "WPFPanelComputer" {compmgmt.msc}
-        "WPFPanelNetwork" {ncpa.cpl}
-        "WPFPanelPower"   {powercfg.cpl}
-        "WPFPanelPrinter" {Start-Process "shell:::{A8A91A66-3A7D-4424-8D24-04E180695C7A}"}
-        "WPFPanelRegion"  {intl.cpl}
-        "WPFPanelRestore"  {rstrui.exe}
-        "WPFPanelSound"   {mmsys.cpl}
-        "WPFPanelSystem"  {sysdm.cpl}
-        "WPFPanelTimedate" {timedate.cpl}
-        "WPFPanelUser"    {control userpasswords2}
-    }
-}
+```json {filename="config/feature.json",linenos=inline,linenostart=241}
+  "WPFPanelRestore": {
+    "Content": "Windows Restore",
+    "category": "Legacy Windows Panels",
+    "panel": "2",
+    "Type": "Button",
+    "ButtonWidth": "300",
+    "InvokeScript": [
+      "rstrui.exe"
+    ],
 ```
--- a/docs/content/dev/features/Legacy-Windows-Panels/Sound.md
+++ b/docs/content/dev/features/Legacy-Windows-Panels/Sound.md
@@ -3,31 +3,14 @@ title: "Sound Settings"
 description: ""
 ---

-```powershell {filename="functions/public/Invoke-WPFControlPanel.ps1",linenos=inline,linenostart=1}
-function Invoke-WPFControlPanel {
-    <#
-
-    .SYNOPSIS
-        Opens the requested legacy panel
-
-    .PARAMETER Panel
-        The panel to open
-
-    #>
-    param($Panel)
-
-    switch ($Panel) {
-        "WPFPanelControl" {control}
-        "WPFPanelComputer" {compmgmt.msc}
-        "WPFPanelNetwork" {ncpa.cpl}
-        "WPFPanelPower"   {powercfg.cpl}
-        "WPFPanelPrinter" {Start-Process "shell:::{A8A91A66-3A7D-4424-8D24-04E180695C7A}"}
-        "WPFPanelRegion"  {intl.cpl}
-        "WPFPanelRestore"  {rstrui.exe}
-        "WPFPanelSound"   {mmsys.cpl}
-        "WPFPanelSystem"  {sysdm.cpl}
-        "WPFPanelTimedate" {timedate.cpl}
-        "WPFPanelUser"    {control userpasswords2}
-    }
-}
+```json {filename="config/feature.json",linenos=inline,linenostart=252}
+  "WPFPanelSound": {
+    "Content": "Sound Settings",
+    "category": "Legacy Windows Panels",
+    "panel": "2",
+    "Type": "Button",
+    "ButtonWidth": "300",
+    "InvokeScript": [
+      "mmsys.cpl"
+    ],
 ```
--- a/docs/content/dev/features/Legacy-Windows-Panels/System.md
+++ b/docs/content/dev/features/Legacy-Windows-Panels/System.md
@@ -3,31 +3,14 @@ title: "System Properties"
 description: ""
 ---

-```powershell {filename="functions/public/Invoke-WPFControlPanel.ps1",linenos=inline,linenostart=1}
-function Invoke-WPFControlPanel {
-    <#
-
-    .SYNOPSIS
-        Opens the requested legacy panel
-
-    .PARAMETER Panel
-        The panel to open
-
-    #>
-    param($Panel)
-
-    switch ($Panel) {
-        "WPFPanelControl" {control}
-        "WPFPanelComputer" {compmgmt.msc}
-        "WPFPanelNetwork" {ncpa.cpl}
-        "WPFPanelPower"   {powercfg.cpl}
-        "WPFPanelPrinter" {Start-Process "shell:::{A8A91A66-3A7D-4424-8D24-04E180695C7A}"}
-        "WPFPanelRegion"  {intl.cpl}
-        "WPFPanelRestore"  {rstrui.exe}
-        "WPFPanelSound"   {mmsys.cpl}
-        "WPFPanelSystem"  {sysdm.cpl}
-        "WPFPanelTimedate" {timedate.cpl}
-        "WPFPanelUser"    {control userpasswords2}
-    }
-}
+```json {filename="config/feature.json",linenos=inline,linenostart=263}
+  "WPFPanelSystem": {
+    "Content": "System Properties",
+    "category": "Legacy Windows Panels",
+    "panel": "2",
+    "Type": "Button",
+    "ButtonWidth": "300",
+    "InvokeScript": [
+      "sysdm.cpl"
+    ],
 ```
--- a/docs/content/dev/features/Legacy-Windows-Panels/Timedate.md
+++ b/docs/content/dev/features/Legacy-Windows-Panels/Timedate.md
@@ -3,31 +3,14 @@ title: "Time and Date"
 description: ""
 ---

-```powershell {filename="functions/public/Invoke-WPFControlPanel.ps1",linenos=inline,linenostart=1}
-function Invoke-WPFControlPanel {
-    <#
-
-    .SYNOPSIS
-        Opens the requested legacy panel
-
-    .PARAMETER Panel
-        The panel to open
-
-    #>
-    param($Panel)
-
-    switch ($Panel) {
-        "WPFPanelControl" {control}
-        "WPFPanelComputer" {compmgmt.msc}
-        "WPFPanelNetwork" {ncpa.cpl}
-        "WPFPanelPower"   {powercfg.cpl}
-        "WPFPanelPrinter" {Start-Process "shell:::{A8A91A66-3A7D-4424-8D24-04E180695C7A}"}
-        "WPFPanelRegion"  {intl.cpl}
-        "WPFPanelRestore"  {rstrui.exe}
-        "WPFPanelSound"   {mmsys.cpl}
-        "WPFPanelSystem"  {sysdm.cpl}
-        "WPFPanelTimedate" {timedate.cpl}
-        "WPFPanelUser"    {control userpasswords2}
-    }
-}
+```json {filename="config/feature.json",linenos=inline,linenostart=274}
+  "WPFPanelTimedate": {
+    "Content": "Time and Date",
+    "category": "Legacy Windows Panels",
+    "panel": "2",
+    "Type": "Button",
+    "ButtonWidth": "300",
+    "InvokeScript": [
+      "timedate.cpl"
+    ],
 ```
--- a/docs/content/dev/features/Powershell-Profile-Powershell-7--Only/InstallPSProfile.md
+++ b/docs/content/dev/features/Powershell-Profile-Powershell-7--Only/InstallPSProfile.md
@@ -0,0 +1,15 @@
+---
+title: "Install CTT PowerShell Profile"
+description: ""
+---
+
+```powershell {filename="functions/private/Invoke-WinUtilInstallPSProfile.ps1",linenos=inline,linenostart=1}
+function Invoke-WinUtilInstallPSProfile {
+
+    if (Test-Path $Profile) {
+        Rename-Item $Profile -NewName ($Profile + '.bak')
+    }
+
+    Start-Process pwsh -ArgumentList '-Command "irm https://github.com/ChrisTitusTech/powershell-profile/raw/main/setup.ps1 | iex"'
+}
+```
--- a/docs/content/dev/features/Powershell-Profile-Powershell-7--Only/UninstallPSProfile.md
+++ b/docs/content/dev/features/Powershell-Profile-Powershell-7--Only/UninstallPSProfile.md
@@ -0,0 +1,18 @@
+---
+title: "Uninstall CTT PowerShell Profile"
+description: ""
+---
+
+```powershell {filename="functions/private/Invoke-WinUtilUninstallPSProfile.ps1",linenos=inline,linenostart=1}
+function Invoke-WinUtilUninstallPSProfile {
+    if (Test-Path ($Profile + '.bak')) {
+        Remove-Item $Profile
+        Rename-Item ($Profile + '.bak') -NewName $Profile
+    }
+    else {
+        Remove-Item $Profile
+    }
+
+    Write-Host "Successfully uninstalled CTT Powershell Profile" -ForegroundColor Green
+}
+```
--- a/docs/content/dev/features/Powershell-Profile-Powershell-7--Only/_index.md
+++ b/docs/content/dev/features/Powershell-Profile-Powershell-7--Only/_index.md
@@ -0,0 +1,7 @@
+---
+title: "Powershell Profile Powershell 7+ Only"
+weight: 5
+toc: false
+---
+
+{{< autolinks section="dev/features/powershell-profile-powershell-7--only" >}}
--- a/docs/content/dev/features/Remote-Access/SSHServer.md
+++ b/docs/content/dev/features/Remote-Access/SSHServer.md
@@ -0,0 +1,24 @@
+---
+title: "Enable OpenSSH Server"
+description: ""
+---
+
+```powershell {filename="functions/public/Invoke-WPFSSHServer.ps1",linenos=inline,linenostart=1}
+function Invoke-WPFSSHServer {
+    <#
+
+    .SYNOPSIS
+        Invokes the OpenSSH Server install in a runspace
+
+  #>
+
+    Invoke-WPFRunspace -ScriptBlock {
+
+        Invoke-WinUtilSSHServer
+
+        Write-Host "======================================="
+        Write-Host "--     OpenSSH Server installed!    ---"
+        Write-Host "======================================="
+    }
+}
+```
--- a/docs/content/dev/features/Remote-Access/_index.md
+++ b/docs/content/dev/features/Remote-Access/_index.md
@@ -0,0 +1,7 @@
+---
+title: "Remote Access"
+weight: 4
+toc: false
+---
+
+{{< autolinks section="dev/features/remote-access" >}}
--- a/docs/content/dev/features/_index.md
+++ b/docs/content/dev/features/_index.md
@@ -15,3 +15,11 @@ toc: false
 ### Features

 {{< autolinks section="dev/features/features" >}}
+
+### Remote Access
+
+{{< autolinks section="dev/features/remote-access" >}}
+
+### Powershell Profile Powershell 7+ Only
+
+{{< autolinks section="dev/features/powershell-profile-powershell-7--only" >}}
--- a/docs/content/dev/tweaks/Customize-Preferences/BingSearch.md
+++ b/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=2186}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2185}
  "WPFToggleBingSearch": {
    "Content": "Bing Search in Start Menu",
    "Description": "If enable then includes web search results from Bing in your Start Menu search.",
--- a/docs/content/dev/tweaks/Customize-Preferences/DarkMode.md
+++ b/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=2144}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2143}
  "WPFToggleDarkMode": {
    "Content": "Dark Theme for Windows",
    "Description": "Enable/Disable Dark Mode.",
--- a/docs/content/dev/tweaks/Customize-Preferences/DetailedBSoD.md
+++ b/docs/content/dev/tweaks/Customize-Preferences/DetailedBSoD.md
@@ -3,7 +3,7 @@ title: "Detailed BSoD"
 description: ""
 ---

-```json {filename="config/tweaks.json",linenos=inline,linenostart=2537}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2541}
  "WPFToggleDetailedBSoD": {
    "Content": "Detailed BSoD",
    "Description": "If Enabled then you will see a detailed Blue Screen of Death (BSOD) with more information.",
--- a/docs/content/dev/tweaks/Customize-Preferences/DisableCrossDeviceResume.md
+++ b/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=2667}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2671}
  "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.",
--- a/docs/content/dev/tweaks/Customize-Preferences/HiddenFiles.md
+++ b/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=2422}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2421}
  "WPFToggleHiddenFiles": {
    "Content": "Show Hidden Files",
    "Description": "If Enabled then Hidden Files will be shown.",
--- a/docs/content/dev/tweaks/Customize-Preferences/HideSettingsHome.md
+++ b/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=2292}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2291}
  "WPFToggleHideSettingsHome": {
    "Content": "Remove Settings Home Page",
    "Description": "Removes the Home page in the Windows Settings app.",
--- a/docs/content/dev/tweaks/Customize-Preferences/MouseAcceleration.md
+++ b/docs/content/dev/tweaks/Customize-Preferences/MouseAcceleration.md
@@ -3,7 +3,7 @@ title: "Mouse Acceleration"
 description: ""
 ---

-```json {filename="config/tweaks.json",linenos=inline,linenostart=2310}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2309}
  "WPFToggleMouseAcceleration": {
    "Content": "Mouse Acceleration",
    "Description": "If Enabled then Cursor movement is affected by the speed of your physical mouse movements.",
--- a/docs/content/dev/tweaks/Customize-Preferences/MultiplaneOverlay.md
+++ b/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=2404}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2403}
  "WPFToggleMultiplaneOverlay": {
    "Content": "Disable Multiplane Overlay",
    "Description": "Disable the Multiplane Overlay which can sometimes cause issues with Graphics Cards.",
--- a/docs/content/dev/tweaks/Customize-Preferences/NewOutlook.md
+++ b/docs/content/dev/tweaks/Customize-Preferences/NewOutlook.md
@@ -3,7 +3,7 @@ title: "New Outlook"
 description: ""
 ---

-```json {filename="config/tweaks.json",linenos=inline,linenostart=2362}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2361}
  "WPFToggleNewOutlook": {
    "Content": "New Outlook",
    "Description": "If disabled it removes the toggle for new Outlook, disables the new Outlook migration and makes sure the Outlook Application actually uses the old Outlook.",
--- a/docs/content/dev/tweaks/Customize-Preferences/NumLock.md
+++ b/docs/content/dev/tweaks/Customize-Preferences/NumLock.md
@@ -3,7 +3,7 @@ title: "NumLock on Startup"
 description: ""
 ---

-```json {filename="config/tweaks.json",linenos=inline,linenostart=2204}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2203}
  "WPFToggleNumLock": {
    "Content": "NumLock on Startup",
    "Description": "Toggle the Num Lock key state when your computer starts.",
--- a/docs/content/dev/tweaks/Customize-Preferences/S3Sleep.md
+++ b/docs/content/dev/tweaks/Customize-Preferences/S3Sleep.md
@@ -3,7 +3,7 @@ title: "S3 Sleep"
 description: ""
 ---

-```json {filename="config/tweaks.json",linenos=inline,linenostart=2563}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2567}
  "WPFToggleS3Sleep": {
    "Content": "S3 Sleep",
    "Description": "Toggles between Modern Standby and S3 sleep.",
--- a/docs/content/dev/tweaks/Customize-Preferences/ShowExt.md
+++ b/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=2450}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2449}
  "WPFToggleShowExt": {
    "Content": "Show File Extensions",
    "Description": "If enabled then File extensions (e.g., .txt, .jpg) are visible.",
--- a/docs/content/dev/tweaks/Customize-Preferences/StartMenuRecommendations.md
+++ b/docs/content/dev/tweaks/Customize-Preferences/StartMenuRecommendations.md
@@ -3,10 +3,10 @@ title: "Recommendations in Start Menu"
 description: ""
 ---

-```json {filename="config/tweaks.json",linenos=inline,linenostart=2248}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2247}
  "WPFToggleStartMenuRecommendations": {
    "Content": "Recommendations in Start Menu",
-    "Description": "If disabled then you will not see recommendations in the 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.",
    "category": "Customize Preferences",
    "panel": "2",
    "Type": "Toggle",
--- a/docs/content/dev/tweaks/Customize-Preferences/StickyKeys.md
+++ b/docs/content/dev/tweaks/Customize-Preferences/StickyKeys.md
@@ -3,7 +3,7 @@ title: "Sticky Keys"
 description: ""
 ---

-```json {filename="config/tweaks.json",linenos=inline,linenostart=2344}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2343}
  "WPFToggleStickyKeys": {
    "Content": "Sticky Keys",
    "Description": "If Enabled then 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.",
--- a/docs/content/dev/tweaks/Customize-Preferences/TaskView.md
+++ b/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=2496}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2495}
  "WPFToggleTaskView": {
    "Content": "Task View Button in Taskbar",
    "Description": "If Enabled then Task View Button in Taskbar will be shown.",
--- a/docs/content/dev/tweaks/Customize-Preferences/TaskbarAlignment.md
+++ b/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=2514}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2513}
  "WPFToggleTaskbarAlignment": {
    "Content": "Center Taskbar Items",
    "Description": "[Windows 11] If Enabled then the Taskbar Items will be shown on the Center, otherwise the Taskbar Items will be shown on the Left.",
@@ -25,6 +25,11 @@ description: ""
      Invoke-WinUtilExplorerUpdate -action \"restart\"
      "
    ],
+    "UndoScript": [
+      "
+      Invoke-WinUtilExplorerUpdate -action \"restart\"
+      "
+    ],
 ```

 ## Registry Changes
--- a/docs/content/dev/tweaks/Customize-Preferences/TaskbarSearch.md
+++ b/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=2478}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2477}
  "WPFToggleTaskbarSearch": {
    "Content": "Search Button in Taskbar",
    "Description": "If Enabled Search Button will be on the taskbar.",
--- a/docs/content/dev/tweaks/Customize-Preferences/VerboseLogon.md
+++ b/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=2230}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2229}
  "WPFToggleVerboseLogon": {
    "Content": "Verbose Messages During Logon",
    "Description": "Show detailed messages during the login process for troubleshooting and diagnostics.",
--- a/docs/content/dev/tweaks/Essential-Tweaks/DeleteTempFiles.md
+++ b/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=2039}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2038}
  "WPFTweaksDeleteTempFiles": {
    "Content": "Delete Temporary Files",
    "Description": "Erases TEMP Folders",
--- a/docs/content/dev/tweaks/Essential-Tweaks/DisableExplorerAutoDiscovery.md
+++ b/docs/content/dev/tweaks/Essential-Tweaks/DisableExplorerAutoDiscovery.md
@@ -3,10 +3,10 @@ title: "Disable Explorer Automatic Folder Discovery"
 description: ""
 ---

-```json {filename="config/tweaks.json",linenos=inline,linenostart=2612}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2616}
  "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.",
+    "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",
    "category": "Essential Tweaks",
    "panel": "1",
    "InvokeScript": [
--- a/docs/content/dev/tweaks/Essential-Tweaks/DiskCleanup.md
+++ b/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=2026}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2025}
  "WPFTweaksDiskCleanup": {
    "Content": "Run Disk Cleanup",
    "Description": "Runs Disk Cleanup on Drive C: and removes old Windows Updates.",
--- a/docs/content/dev/tweaks/Essential-Tweaks/Services.md
+++ b/docs/content/dev/tweaks/Essential-Tweaks/Services.md
@@ -967,46 +967,3 @@ description: ""
      }
    ],
 ```
-#Function
-```powershell {filename="functions/private/Set-WinUtilService.ps1",linenos=inline,linenostart=1}
-Function Set-WinUtilService {
-    <#
-
-    .SYNOPSIS
-        Changes the startup type of the given service
-
-    .PARAMETER Name
-        The name of the service to modify
-
-    .PARAMETER StartupType
-        The startup type to set the service to
-
-    .EXAMPLE
-        Set-WinUtilService -Name "HomeGroupListener" -StartupType "Manual"
-
-    #>
-    param (
-        $Name,
-        $StartupType
-    )
-    try {
-        Write-Host "Setting Service $Name to $StartupType"
-
-        # Check if the service exists
-        $service = Get-Service -Name $Name -ErrorAction Stop
-
-        # Service exists, proceed with changing properties -- while handling auto delayed start for PWSH 5
-        if (($PSVersionTable.PSVersion.Major -lt 7) -and ($StartupType -eq "AutomaticDelayedStart")) {
-            sc.exe config $Name start=delayed-auto
-        } else {
-            $service | Set-Service -StartupType $StartupType -ErrorAction Stop
-        }
-    } catch [System.ServiceProcess.ServiceNotFoundException] {
-        Write-Warning "Service $Name was not found"
-    } catch {
-        Write-Warning "Unable to set $Name due to unhandled exception"
-        Write-Warning $_.Exception.Message
-    }
-
-}
-```
--- a/docs/content/dev/tweaks/Essential-Tweaks/WPBT.md
+++ b/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=1893}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=1892}
  "WPFTweaksWPBT": {
    "Content": "Disable Windows Platform Binary Table (WPBT)",
    "Description": "If enabled then allows your computer vendor to execute a program each time it boots. It enables computer vendors to force install anti-theft software, software drivers, or a software program conveniently. This could also be a security risk.",
--- a/docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/BlockAdobeNet.md
+++ b/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=1974}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=1973}
  "WPFTweaksBlockAdobeNet": {
    "Content": "Adobe Network Block",
    "Description": "Reduce user interruptions by selectively blocking connections to Adobe's activation and telemetry servers. Credit: Ruddernation-Designs",
--- a/docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableBGapps.md
+++ b/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=2112}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2111}
  "WPFTweaksDisableBGapps": {
    "Content": "Disable Background Apps",
    "Description": "Disables all Microsoft Store apps from running in the background, which has to be done individually since Win11",
--- a/docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableFSO.md
+++ b/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=2128}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2127}
  "WPFTweaksDisableFSO": {
    "Content": "Disable Fullscreen Optimizations",
    "Description": "Disables FSO in all applications. NOTE: This will disable Color Management in Exclusive Fullscreen",
--- a/docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableIPv6.md
+++ b/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=2090}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2089}
  "WPFTweaksDisableIPv6": {
    "Content": "Disable IPv6",
    "Description": "Disables IPv6.",
--- a/docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableNotifications.md
+++ b/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=1951}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=1950}
  "WPFTweaksDisableNotifications": {
    "Content": "Disable Notification Tray/Calendar",
    "Description": "Disables all Notifications INCLUDING Calendar",
--- a/docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/IPv46.md
+++ b/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=2052}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2051}
  "WPFTweaksIPv46": {
    "Content": "Prefer IPv4 over IPv6",
    "Description": "To set the IPv4 preference can have latency and security benefits on private networks where IPv6 is not configured.",
--- a/docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/RazerBlock.md
+++ b/docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/RazerBlock.md
@@ -3,10 +3,10 @@ title: "Block Razer Software Installs"
 description: ""
 ---

-```json {filename="config/tweaks.json",linenos=inline,linenostart=1909}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=1908}
  "WPFTweaksRazerBlock": {
    "Content": "Block Razer Software Installs",
-    "Description": "Blocks ALL Razer Software installations. The hardware works fine without any software. WARNING: this will also block all Windows third-party driver installations.",
+    "Description": "Blocks ALL Razer Software installations. The hardware works fine without any software.",
    "category": "z__Advanced Tweaks - CAUTION",
    "panel": "1",
    "registry": [
--- a/docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveCopilot.md
+++ b/docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveCopilot.md
@@ -78,7 +78,6 @@ description: ""
      $Sid = (Get-LocalUser $Env:UserName).Sid.Value
      New-Item \"HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Appx\\AppxAllUserStore\\EndOfLife\\$Sid\\$Appx\" -Force
      Remove-AppxPackage $Appx
-      }
      "
    ],
    "UndoScript": [
--- a/docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/RightClickMenu.md
+++ b/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=2004}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2003}
  "WPFTweaksRightClickMenu": {
    "Content": "Set Classic Right-Click Menu ",
    "Description": "Great Windows 11 tweak to bring back good context menus when right clicking things in explorer.",
--- a/docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/Teredo.md
+++ b/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=2068}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2067}
  "WPFTweaksTeredo": {
    "Content": "Disable Teredo",
    "Description": "Teredo network tunneling is a ipv6 feature that can cause additional latency, but may cause problems with some games",
--- a/docs/content/dev/tweaks/z--Advanced-Tweaks---CAUTION/changedns.md
+++ b/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=2588}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2592}
  "WPFchangedns": {
    "Content": "DNS",
    "category": "z__Advanced Tweaks - CAUTION",
--- a/functions/private/Get-WinUtilSelectedPackages.ps1
+++ b/functions/private/Get-WinUtilSelectedPackages.ps1
@@ -15,9 +15,9 @@ function Get-WinUtilSelectedPackages
    )

    if ($PackageList.count -eq 1) {
-        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
+        Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" }
    } else {
-        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" })
+        Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" }
    }

    $packages = [System.Collections.Hashtable]::new()
--- a/functions/private/Hide-WPFInstallAppBusy.ps1
+++ b/functions/private/Hide-WPFInstallAppBusy.ps1
@@ -4,9 +4,9 @@ function Hide-WPFInstallAppBusy {
        Hides the busy overlay in the install app area of the WPF form.
        This is used to indicate that an install or uninstall has finished.
    #>
-    $sync.form.Dispatcher.Invoke([action]{
+    Invoke-WPFUIThread -ScriptBlock {
        $sync.InstallAppAreaOverlay.Visibility = [Windows.Visibility]::Collapsed
        $sync.InstallAppAreaBorder.IsEnabled = $true
        $sync.InstallAppAreaScrollViewer.Effect.Radius = 0
-    })
+    }
 }
--- a/functions/private/Install-WinUtilProgramChoco.ps1
+++ b/functions/private/Install-WinUtilProgramChoco.ps1
@@ -113,7 +113,7 @@ function Install-WinUtilProgramChoco {
            [int]$totalPrograms
        )
        $progressState = if ($currentIndex -eq $totalPrograms) { "Normal" } else { "Error" }
-        $sync.form.Dispatcher.Invoke([action] { Set-WinUtilTaskbaritem -state $progressState -value ($currentIndex / $totalPrograms) })
+        Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state $progressState -value ($currentIndex / $totalPrograms) }
    }

    function Install-ChocoPackage {
@@ -234,7 +234,7 @@ function Install-WinUtilProgramChoco {
    for ($currentIndex = 0; $currentIndex -lt $totalPrograms; $currentIndex++) {
        $Program = $Programs[$currentIndex]
        Set-WinUtilProgressBar -label "$Action $($Program)" -percent ($currentIndex / $totalPrograms * 100)
-        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -value ($currentIndex / $totalPrograms)})
+        Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -value ($currentIndex / $totalPrograms)}

        switch ($Action) {
            "Install" {
--- a/functions/private/Install-WinUtilProgramWinget.ps1
+++ b/functions/private/Install-WinUtilProgramWinget.ps1
@@ -117,7 +117,7 @@ Function Install-WinUtilProgramWinget {
        $Program = $Programs[$i]
        $result = $false
        Set-WinUtilProgressBar -label "$Action $($Program)" -percent ($i / $count * 100)
-        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -value ($i / $count)})
+        Invoke-WPFUIThread -ScriptBlock{ Set-WinUtilTaskbaritem -value ($i / $count)}

        $result = switch ($Action) {
            "Install" {Invoke-Install -Program $Program}
--- a/functions/private/Invoke-WinUtilExplorerUpdate.ps1
+++ b/functions/private/Invoke-WinUtilExplorerUpdate.ps1
@@ -8,7 +8,7 @@ function Invoke-WinUtilExplorerUpdate {
    )

    if ($action -eq "refresh") {
-        Invoke-WPFRunspace -DebugPreference $DebugPreference -ScriptBlock {
+        Invoke-WPFRunspace -ScriptBlock {
            # Define the Win32 type only if it doesn't exist
            if (-not ([System.Management.Automation.PSTypeName]'Win32').Type) {
                Add-Type -TypeDefinition @"
--- a/functions/private/Invoke-WinUtilFeatureInstall.ps1
+++ b/functions/private/Invoke-WinUtilFeatureInstall.ps1
@@ -10,46 +10,40 @@ function Invoke-WinUtilFeatureInstall {
        $CheckBox
    )

-    $x = 0
+    if($sync.configs.feature.$CheckBox.feature) {
+        Foreach( $feature in $sync.configs.feature.$CheckBox.feature ) {
+            try {
+                Write-Host "Installing $feature"
+                Enable-WindowsOptionalFeature -Online -FeatureName $feature -All -NoRestart
+            } catch {
+                if ($CheckBox.Exception.Message -like "*requires elevation*") {
+                    Write-Warning "Unable to Install $feature due to permissions. Are you running as admin?"
+                    Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" }
+                } else {

-    $CheckBox | ForEach-Object {
-        if($sync.configs.feature.$psitem.feature) {
-            Foreach( $feature in $sync.configs.feature.$psitem.feature ) {
-                try {
-                    Write-Host "Installing $feature"
-                    Enable-WindowsOptionalFeature -Online -FeatureName $feature -All -NoRestart
-                } catch {
-                    if ($psitem.Exception.Message -like "*requires elevation*") {
-                        Write-Warning "Unable to Install $feature due to permissions. Are you running as admin?"
-                        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" })
-                    } else {
-
-                        Write-Warning "Unable to Install $feature due to unhandled exception"
-                        Write-Warning $psitem.Exception.StackTrace
-                    }
+                    Write-Warning "Unable to Install $feature due to unhandled exception"
+                    Write-Warning $CheckBox.Exception.StackTrace
                }
            }
        }
-        if($sync.configs.feature.$psitem.InvokeScript) {
-            Foreach( $script in $sync.configs.feature.$psitem.InvokeScript ) {
-                try {
-                    $Scriptblock = [scriptblock]::Create($script)
+    }
+    if($sync.configs.feature.$CheckBox.InvokeScript) {
+        Foreach( $script in $sync.configs.feature.$CheckBox.InvokeScript ) {
+            try {
+                $Scriptblock = [scriptblock]::Create($script)

-                    Write-Host "Running Script for $psitem"
-                    Invoke-Command $scriptblock -ErrorAction stop
-                } catch {
-                    if ($psitem.Exception.Message -like "*requires elevation*") {
-                        Write-Warning "Unable to Install $feature due to permissions. Are you running as admin?"
-                        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" })
-                    } else {
-                        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" })
-                        Write-Warning "Unable to Install $feature due to unhandled exception"
-                        Write-Warning $psitem.Exception.StackTrace
-                    }
+                Write-Host "Running Script for $CheckBox"
+                Invoke-Command $scriptblock -ErrorAction stop
+            } catch {
+                if ($CheckBox.Exception.Message -like "*requires elevation*") {
+                    Write-Warning "Unable to Install $feature due to permissions. Are you running as admin?"
+                    Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" }
+                } else {
+                    Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" }
+                    Write-Warning "Unable to Install $feature due to unhandled exception"
+                    Write-Warning $CheckBox.Exception.StackTrace
                }
            }
        }
-        $X++
-        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -value ($x/$CheckBox.Count) })
    }
 }
--- a/functions/private/Invoke-WinUtilGPU.ps1
+++ b/functions/private/Invoke-WinUtilGPU.ps1
@@ -1,23 +0,0 @@
-function Invoke-WinUtilGPU {
-    $gpuInfo = Get-CimInstance Win32_VideoController
-
-    # GPUs to blacklist from using Demanding Theming
-    $lowPowerGPUs = (
-        "*NVIDIA GeForce*M*",
-        "*NVIDIA GeForce*Laptop*",
-        "*NVIDIA GeForce*GT*",
-        "*AMD Radeon(TM)*",
-        "*Intel(R) HD Graphics*",
-        "*UHD*"
-
-    )
-
-    foreach ($gpu in $gpuInfo) {
-        foreach ($gpuPattern in $lowPowerGPUs) {
-            if ($gpu.Name -like $gpuPattern) {
-                return $false
-            }
-        }
-    }
-    return $true
-}
--- a/functions/private/Invoke-WinUtilISO.ps1
+++ b/functions/private/Invoke-WinUtilISO.ps1
@@ -0,0 +1,779 @@
+function Write-Win11ISOLog {
+    <#
+    .SYNOPSIS
+        Appends a timestamped message to the Win11ISO status log TextBox.
+    .PARAMETER Message
+        The message to append.
+    #>
+    param([string]$Message)
+    $timestamp = (Get-Date).ToString("HH:mm:ss")
+    $sync["WPFWin11ISOStatusLog"].Dispatcher.Invoke([action]{
+        $current = $sync["WPFWin11ISOStatusLog"].Text
+        if ($current -eq "Ready. Please select a Windows 11 ISO to begin.") {
+            $sync["WPFWin11ISOStatusLog"].Text = "[$timestamp] $Message"
+        } else {
+            $sync["WPFWin11ISOStatusLog"].Text += "`n[$timestamp] $Message"
+        }
+        $sync["WPFWin11ISOStatusLog"].CaretIndex = $sync["WPFWin11ISOStatusLog"].Text.Length
+        $sync["WPFWin11ISOStatusLog"].ScrollToEnd()
+    })
+}
+
+function Invoke-WinUtilISOBrowse {
+    <#
+    .SYNOPSIS
+        Opens an OpenFileDialog so the user can choose a Windows 11 ISO file.
+        Populates WPFWin11ISOPath and reveals the Mount & Verify section (Step 2).
+    #>
+    Add-Type -AssemblyName System.Windows.Forms
+
+    $dlg = [System.Windows.Forms.OpenFileDialog]::new()
+    $dlg.Title  = "Select Windows 11 ISO"
+    $dlg.Filter = "ISO files (*.iso)|*.iso|All files (*.*)|*.*"
+    $dlg.InitialDirectory = [System.Environment]::GetFolderPath("Desktop")
+
+    if ($dlg.ShowDialog() -ne [System.Windows.Forms.DialogResult]::OK) { return }
+
+    $isoPath = $dlg.FileName
+
+    # ── Basic size sanity-check (a Win11 ISO is typically > 4 GB) ──
+    $fileSizeGB = [math]::Round((Get-Item $isoPath).Length / 1GB, 2)
+
+    $sync["WPFWin11ISOPath"].Text = $isoPath
+    $sync["WPFWin11ISOFileInfo"].Text      = "File size: $fileSizeGB GB"
+    $sync["WPFWin11ISOFileInfo"].Visibility = "Visible"
+
+    # Reveal Step 2
+    $sync["WPFWin11ISOMountSection"].Visibility = "Visible"
+
+    # Collapse all later steps whenever a new ISO is chosen
+    $sync["WPFWin11ISOVerifyResultPanel"].Visibility = "Collapsed"
+    $sync["WPFWin11ISOModifySection"].Visibility     = "Collapsed"
+    $sync["WPFWin11ISOOutputSection"].Visibility     = "Collapsed"
+
+    Write-Win11ISOLog "ISO selected: $isoPath  ($fileSizeGB GB)"
+}
+
+function Invoke-WinUtilISOMountAndVerify {
+    <#
+    .SYNOPSIS
+        Mounts the selected ISO, verifies it is a valid Windows 11 image,
+        and populates the edition list.  Reveals Step 3 on success.
+    #>
+    $isoPath = $sync["WPFWin11ISOPath"].Text
+
+    if ([string]::IsNullOrWhiteSpace($isoPath) -or $isoPath -eq "No ISO selected...") {
+        [System.Windows.MessageBox]::Show(
+            "Please select an ISO file first.",
+            "No ISO Selected", "OK", "Warning")
+        return
+    }
+
+    Write-Win11ISOLog "Mounting ISO: $isoPath"
+    Set-WinUtilProgressBar -Label "Mounting ISO..." -Percent 10
+
+    try {
+        # Mount the ISO
+        $diskImage = Mount-DiskImage -ImagePath $isoPath -PassThru -ErrorAction Stop
+        $driveLetter = ($diskImage | Get-Volume).DriveLetter + ":"
+        Write-Win11ISOLog "Mounted at drive $driveLetter"
+
+        Set-WinUtilProgressBar -Label "Verifying ISO contents..." -Percent 30
+
+        # ── Verify install.wim / install.esd presence ──
+        $wimPath = Join-Path $driveLetter "sources\install.wim"
+        $esdPath = Join-Path $driveLetter "sources\install.esd"
+
+        if (-not (Test-Path $wimPath) -and -not (Test-Path $esdPath)) {
+            Dismount-DiskImage -ImagePath $isoPath | Out-Null
+            Write-Win11ISOLog "ERROR: install.wim/install.esd not found — not a valid Windows ISO."
+            [System.Windows.MessageBox]::Show(
+                "This does not appear to be a valid Windows ISO.`n`ninstall.wim / install.esd was not found.",
+                "Invalid ISO", "OK", "Error")
+            Set-WinUtilProgressBar -Label "" -Percent 0
+            return
+        }
+
+        $activeWim = if (Test-Path $wimPath) { $wimPath } else { $esdPath }
+
+        # ── Read edition / architecture info ──
+        Set-WinUtilProgressBar -Label "Reading image metadata..." -Percent 55
+
+        $imageInfo = Get-WindowsImage -ImagePath $activeWim | Select-Object ImageIndex, ImageName
+
+        # ── Verify at least one Win11 edition is present ──
+        $isWin11 = $imageInfo | Where-Object { $_.ImageName -match "Windows 11" }
+        if (-not $isWin11) {
+            Dismount-DiskImage -ImagePath $isoPath | Out-Null
+            Write-Win11ISOLog "ERROR: No 'Windows 11' edition found in the image."
+            [System.Windows.MessageBox]::Show(
+                "No Windows 11 edition was found in this ISO.`n`nOnly official Windows 11 ISOs are supported.",
+                "Not a Windows 11 ISO", "OK", "Error")
+            Set-WinUtilProgressBar -Label "" -Percent 0
+            return
+        }
+
+        # Store edition info for later index lookup
+        $sync["Win11ISOImageInfo"] = $imageInfo
+
+        # ── Populate UI ──
+        $sync["WPFWin11ISOMountDriveLetter"].Text = "Mounted at: $driveLetter   |   Image file: $(Split-Path $activeWim -Leaf)"
+        $sync["WPFWin11ISOEditionComboBox"].Dispatcher.Invoke([action]{
+            $sync["WPFWin11ISOEditionComboBox"].Items.Clear()
+            foreach ($img in $imageInfo) {
+                [void]$sync["WPFWin11ISOEditionComboBox"].Items.Add("$($img.ImageIndex): $($img.ImageName)")
+            }
+            if ($sync["WPFWin11ISOEditionComboBox"].Items.Count -gt 0) {
+                $sync["WPFWin11ISOEditionComboBox"].SelectedIndex = 0
+            }
+        })
+        $sync["WPFWin11ISOVerifyResultPanel"].Visibility = "Visible"
+
+        # Store for later steps
+        $sync["Win11ISODriveLetter"] = $driveLetter
+        $sync["Win11ISOWimPath"]     = $activeWim
+        $sync["Win11ISOImagePath"]   = $isoPath
+
+        # Reveal Step 3
+        $sync["WPFWin11ISOModifySection"].Visibility = "Visible"
+
+        Set-WinUtilProgressBar -Label "ISO verified ✔" -Percent 100
+        Write-Win11ISOLog "ISO verified OK.  Editions found: $($imageInfo.Count)"
+    }
+    catch {
+        Write-Win11ISOLog "ERROR during mount/verify: $_"
+        [System.Windows.MessageBox]::Show(
+            "An error occurred while mounting or verifying the ISO:`n`n$_",
+            "Error", "OK", "Error")
+    }
+    finally {
+        Start-Sleep -Milliseconds 800
+        Set-WinUtilProgressBar -Label "" -Percent 0
+    }
+}
+
+function Invoke-WinUtilISOModify {
+    <#
+    .SYNOPSIS
+        Extracts ISO contents to a temp working directory, modifies install.wim,
+        then repackages the image.  Reveals Step 4 (output options) on success.
+
+    .NOTES
+        This function runs inside a PowerShell runspace so the UI stays responsive.
+        Placeholder modification logic is provided; extend as needed.
+    #>
+
+    $isoPath    = $sync["Win11ISOImagePath"]
+    $driveLetter= $sync["Win11ISODriveLetter"]
+    $wimPath    = $sync["Win11ISOWimPath"]
+
+    if (-not $isoPath) {
+        [System.Windows.MessageBox]::Show(
+            "No verified ISO found.  Please complete Steps 1 and 2 first.",
+            "Not Ready", "OK", "Warning")
+        return
+    }
+
+    # ── Resolve selected edition index from the ComboBox ──
+    $selectedItem = $sync["WPFWin11ISOEditionComboBox"].SelectedItem
+    $selectedWimIndex = 1  # default fallback
+    if ($selectedItem -and $selectedItem -match '^(\d+):') {
+        $selectedWimIndex = [int]$Matches[1]
+    } elseif ($sync["Win11ISOImageInfo"]) {
+        $selectedWimIndex = $sync["Win11ISOImageInfo"][0].ImageIndex
+    }
+    $selectedEditionName = if ($selectedItem) { ($selectedItem -replace '^\d+:\s*', '') } else { "Unknown" }
+    Write-Win11ISOLog "Selected edition: $selectedEditionName (Index $selectedWimIndex)"
+
+    # Disable the modify button to prevent double-click
+    $sync["WPFWin11ISOModifyButton"].IsEnabled = $false
+
+    $existingWorkDir = Get-Item -Path (Join-Path $env:TEMP "WinUtil_Win11ISO*") -ErrorAction SilentlyContinue |
+        Where-Object { $_.PSIsContainer } |
+        Sort-Object LastWriteTime -Descending |
+        Select-Object -First 1
+
+    $workDir = if ($existingWorkDir) {
+        Write-Win11ISOLog "Reusing existing temp directory: $($existingWorkDir.FullName)"
+        $existingWorkDir.FullName
+    } else {
+        Join-Path $env:TEMP "WinUtil_Win11ISO_$(Get-Date -Format 'yyyyMMdd_HHmmss')"
+    }
+
+    # ── Resolve autounattend.xml content ──────────────────────────────────────
+    # Compiled winutil.ps1 sets $WinUtilAutounattendXml before main.ps1 runs.
+    # In dev/source mode fall back to reading tools\autounattend.xml directly.
+    $autounattendContent = if ($WinUtilAutounattendXml) {
+        $WinUtilAutounattendXml
+    } else {
+        $toolsXml = Join-Path $PSScriptRoot "..\..\tools\autounattend.xml"
+        if (Test-Path $toolsXml) { Get-Content $toolsXml -Raw } else { "" }
+    }
+
+    # ── Run modification in a background runspace ──
+    $runspace = [Management.Automation.Runspaces.RunspaceFactory]::CreateRunspace()
+    $runspace.ApartmentState = "STA"
+    $runspace.ThreadOptions  = "ReuseThread"
+    $runspace.Open()
+    $runspace.SessionStateProxy.SetVariable("sync",                $sync)
+    $runspace.SessionStateProxy.SetVariable("isoPath",             $isoPath)
+    $runspace.SessionStateProxy.SetVariable("driveLetter",         $driveLetter)
+    $runspace.SessionStateProxy.SetVariable("wimPath",             $wimPath)
+    $runspace.SessionStateProxy.SetVariable("workDir",             $workDir)
+    $runspace.SessionStateProxy.SetVariable("selectedWimIndex",    $selectedWimIndex)
+    $runspace.SessionStateProxy.SetVariable("selectedEditionName", $selectedEditionName)
+    $runspace.SessionStateProxy.SetVariable("autounattendContent", $autounattendContent)
+
+    # Serialize functions so they are available inside the runspace
+    $isoScriptFuncDef = "function Invoke-WinUtilISOScript {`n" + `
+        ${function:Invoke-WinUtilISOScript}.ToString() + "`n}"
+    $runspace.SessionStateProxy.SetVariable("isoScriptFuncDef", $isoScriptFuncDef)
+
+    $win11ISOLogFuncDef = "function Write-Win11ISOLog {`n" + `
+        ${function:Write-Win11ISOLog}.ToString() + "`n}"
+    $runspace.SessionStateProxy.SetVariable("win11ISOLogFuncDef", $win11ISOLogFuncDef)
+
+    $refreshUSBFuncDef = "function Invoke-WinUtilISORefreshUSBDrives {`n" + `
+        ${function:Invoke-WinUtilISORefreshUSBDrives}.ToString() + "`n}"
+    $runspace.SessionStateProxy.SetVariable("refreshUSBFuncDef", $refreshUSBFuncDef)
+
+    $script = [Management.Automation.PowerShell]::Create()
+    $script.Runspace = $runspace
+    $script.AddScript({
+
+        # Import helper functions into this runspace
+        . ([scriptblock]::Create($isoScriptFuncDef))
+        . ([scriptblock]::Create($win11ISOLogFuncDef))
+        . ([scriptblock]::Create($refreshUSBFuncDef))
+
+        function Log($msg) {
+            $ts = (Get-Date).ToString("HH:mm:ss")
+            $sync["WPFWin11ISOStatusLog"].Dispatcher.Invoke([action]{
+                $sync["WPFWin11ISOStatusLog"].Text += "`n[$ts] $msg"
+                $sync["WPFWin11ISOStatusLog"].CaretIndex = $sync["WPFWin11ISOStatusLog"].Text.Length
+                $sync["WPFWin11ISOStatusLog"].ScrollToEnd()
+            })
+        }
+
+        function SetProgress($label, $pct) {
+            $sync["WPFWin11ISOStatusLog"].Dispatcher.Invoke([action]{
+                $sync.progressBarTextBlock.Text    = $label
+                $sync.progressBarTextBlock.ToolTip = $label
+                $sync.ProgressBar.Value            = [Math]::Max($pct, 5)
+            })
+        }
+
+        try {
+            # ── Hide Steps 1-3 while modification is running; expand log to fill screen ──
+            $sync["WPFWin11ISOStatusLog"].Dispatcher.Invoke([action]{
+                $sync["WPFWin11ISOSelectSection"].Visibility  = "Collapsed"
+                $sync["WPFWin11ISOMountSection"].Visibility   = "Collapsed"
+                $sync["WPFWin11ISOModifySection"].Visibility  = "Collapsed"
+                $expandedHeight = [Math]::Max(400, $sync["Form"].ActualHeight - 100)
+                $sync["WPFWin11ISOStatusLog"].Height = $expandedHeight
+                $sync["Win11ISOLogExpanded"] = $true
+                # Register the resize handler once so the log tracks window resizes
+                if (-not $sync["Win11ISOResizeHandlerAdded"]) {
+                    $sync["Form"].add_SizeChanged({
+                        if ($sync["Win11ISOLogExpanded"]) {
+                            $sync["WPFWin11ISOStatusLog"].Height = [Math]::Max(400, $sync["Form"].ActualHeight - 100)
+                            $sync["WPFWin11ISOStatusLog"].CaretIndex = $sync["WPFWin11ISOStatusLog"].Text.Length
+                            $sync["WPFWin11ISOStatusLog"].ScrollToEnd()
+                        }
+                    })
+                    $sync["Win11ISOResizeHandlerAdded"] = $true
+                }
+            })
+
+            # ── 1. Create working directory structure ──
+            Log "Creating working directory: $workDir"
+            $isoContents = Join-Path $workDir "iso_contents"
+            $mountDir     = Join-Path $workDir "wim_mount"
+            New-Item -ItemType Directory -Path $isoContents, $mountDir -Force | Out-Null
+            SetProgress "Copying ISO contents..." 10
+
+            # ── 2. Copy all ISO contents to the working directory ──
+            Log "Copying ISO contents from $driveLetter to $isoContents..."
+            $robocopyArgs = @($driveLetter, $isoContents, "/E", "/NFL", "/NDL", "/NJH", "/NJS")
+            & robocopy @robocopyArgs | Out-Null
+            Log "ISO contents copied."
+            SetProgress "Mounting install.wim..." 25
+
+            # ── 3. Copy install.wim to working dir (it may be read-only on the DVD) ──
+            $localWim = Join-Path $isoContents "sources\install.wim"
+            if (-not (Test-Path $localWim)) {
+                # ESD path
+                $localWim = Join-Path $isoContents "sources\install.esd"
+            }
+            # Ensure the file is writable
+            Set-ItemProperty -Path $localWim -Name IsReadOnly -Value $false
+
+            # ── 4. Mount the selected edition of install.wim ──
+            Log "Mounting install.wim (Index ${selectedWimIndex}: $selectedEditionName) at $mountDir..."
+            Mount-WindowsImage -ImagePath $localWim -Index $selectedWimIndex -Path $mountDir -ErrorAction Stop | Out-Null
+            SetProgress "Modifying install.wim..." 45
+
+            # ── Apply all WinUtil modifications via Invoke-WinUtilISOScript ──
+            Log "Applying WinUtil modifications to install.wim..."
+            Invoke-WinUtilISOScript -ScratchDir $mountDir -ISOContentsDir $isoContents -AutoUnattendXml $autounattendContent -Log { param($m) Log $m }
+
+            # ── 4b. DISM component store cleanup ──
+            # /ResetBase removes all superseded component versions from WinSxS,
+            # which is the single largest space saving possible (typically 300–800 MB).
+            # This must be done while the image is still mounted.
+            SetProgress "Cleaning up component store (WinSxS)..." 56
+            Log "Running DISM component store cleanup (/ResetBase)..."
+            & dism /English "/image:$mountDir" /Cleanup-Image /StartComponentCleanup /ResetBase | ForEach-Object { Log $_ }
+            Log "Component store cleanup complete."
+
+            # ── 5. Save and dismount the WIM ──
+            SetProgress "Saving modified install.wim..." 65
+            Log "Dismounting and saving install.wim. This will take several minutes..."
+            Dismount-WindowsImage -Path $mountDir -Save -ErrorAction Stop | Out-Null
+            Log "install.wim saved."
+
+            # ── 5b. Strip unused editions — export only the selected index ──
+            # A standard multi-edition install.wim can be 4–5 GB; exporting a
+            # single index typically drops it to ~3 GB, saving 1–2 GB in the ISO.
+            SetProgress "Removing unused editions from install.wim..." 70
+            Log "Exporting edition '$selectedEditionName' (Index $selectedWimIndex) to a single-edition install.wim..."
+            $exportWim = Join-Path $isoContents "sources\install_export.wim"
+            Export-WindowsImage `
+                -SourceImagePath $localWim `
+                -SourceIndex     $selectedWimIndex `
+                -DestinationImagePath $exportWim `
+                -ErrorAction Stop | Out-Null
+            Remove-Item -Path $localWim -Force
+            Rename-Item -Path $exportWim -NewName "install.wim" -Force
+            # Update local path so later steps (e.g. ISO build) reference the new file
+            $localWim = Join-Path $isoContents "sources\install.wim"
+            Log "Unused editions removed.  install.wim now contains only '$selectedEditionName'."
+
+            SetProgress "Dismounting source ISO..." 80
+
+            # ── 6. Dismount the original ISO ──
+            Log "Dismounting original ISO..."
+            Dismount-DiskImage -ImagePath $isoPath | Out-Null
+
+            # Store work directory for output steps
+            $sync["Win11ISOWorkDir"]      = $workDir
+            $sync["Win11ISOContentsDir"]  = $isoContents
+
+            SetProgress "Modification complete ✔" 100
+            Log "install.wim modification complete.  Choose an output option in Step 4."
+
+            # ── Reveal Step 4 on the UI thread ──
+            # Note: USB drive enumeration (Get-Disk) is intentionally deferred to
+            # when the user explicitly selects the USB option, to avoid blocking
+            # the UI thread here.
+            $sync["WPFWin11ISOOutputSection"].Dispatcher.Invoke([action]{
+                $sync["WPFWin11ISOOutputSection"].Visibility = "Visible"
+            })
+        }
+        catch {
+            Log "ERROR during modification: $_"
+
+            # ── Cleanup: dismount WIM if still mounted ──
+            try {
+                if (Test-Path $mountDir) {
+                    $mountedImages = Get-WindowsImage -Mounted -ErrorAction SilentlyContinue |
+                                     Where-Object { $_.Path -eq $mountDir }
+                    if ($mountedImages) {
+                        Log "Cleaning up: dismounting install.wim (discarding changes)..."
+                        Dismount-WindowsImage -Path $mountDir -Discard -ErrorAction SilentlyContinue | Out-Null
+                    }
+                }
+            } catch {
+                Log "Warning: could not dismount install.wim during cleanup: $_"
+            }
+
+            # ── Cleanup: dismount the source ISO ──
+            try {
+                $mountedISO = Get-DiskImage -ImagePath $isoPath -ErrorAction SilentlyContinue
+                if ($mountedISO -and $mountedISO.Attached) {
+                    Log "Cleaning up: dismounting source ISO..."
+                    Dismount-DiskImage -ImagePath $isoPath -ErrorAction SilentlyContinue | Out-Null
+                }
+            } catch {
+                Log "Warning: could not dismount ISO during cleanup: $_"
+            }
+
+            # ── Cleanup: remove temp working directory ──
+            try {
+                if (Test-Path $workDir) {
+                    Log "Cleaning up: removing temp directory $workDir..."
+                    Remove-Item -Path $workDir -Recurse -Force -ErrorAction SilentlyContinue
+                }
+            } catch {
+                Log "Warning: could not remove temp directory during cleanup: $_"
+            }
+
+            $sync["WPFWin11ISOStatusLog"].Dispatcher.Invoke([action]{
+                [System.Windows.MessageBox]::Show(
+                    "An error occurred during install.wim modification:`n`n$_",
+                    "Modification Error", "OK", "Error")
+            })
+        }
+        finally {
+            Start-Sleep -Milliseconds 800
+            $sync["WPFWin11ISOStatusLog"].Dispatcher.Invoke([action]{
+                $sync.progressBarTextBlock.Text = ""
+                $sync.progressBarTextBlock.ToolTip = ""
+                $sync.ProgressBar.Value = 0
+                $sync["WPFWin11ISOModifyButton"].IsEnabled = $true
+                # ── Only restore steps 1-3 if Step 4 was NOT successfully shown ──
+                # When modification succeeds, Step 4 is visible and steps 1-3 stay
+                # hidden until the user clicks Clean & Reset.
+                if ($sync["WPFWin11ISOOutputSection"].Visibility -ne "Visible") {
+                    $sync["WPFWin11ISOSelectSection"].Visibility = "Visible"
+                    $sync["WPFWin11ISOMountSection"].Visibility  = "Visible"
+                    $sync["WPFWin11ISOModifySection"].Visibility = "Visible"
+                }
+                $sync["Win11ISOLogExpanded"] = $false
+                $sync["WPFWin11ISOStatusLog"].Height = 140
+            })
+        }
+    }) | Out-Null
+
+    $script.BeginInvoke() | Out-Null
+}
+
+function Invoke-WinUtilISOCleanAndReset {
+    <#
+    .SYNOPSIS
+        Deletes the temporary working directory created during ISO modification
+        and resets the entire ISO UI back to its initial state (Step 1 only).
+    #>
+
+    $workDir = $sync["Win11ISOWorkDir"]
+
+    if ($workDir -and (Test-Path $workDir)) {
+        $confirm = [System.Windows.MessageBox]::Show(
+            "This will delete the temporary working directory:`n`n$workDir`n`nAnd reset the interface back to the start.`n`nContinue?",
+            "Clean & Reset", "YesNo", "Warning")
+        if ($confirm -ne "Yes") { return }
+
+        try {
+            Write-Win11ISOLog "Deleting temp directory: $workDir"
+            Remove-Item -Path $workDir -Recurse -Force -ErrorAction Stop
+            Write-Win11ISOLog "Temp directory deleted."
+        } catch {
+            Write-Win11ISOLog "WARNING: could not fully delete temp directory: $_"
+        }
+    }
+
+    # Clear all stored ISO state
+    $sync["Win11ISOWorkDir"]     = $null
+    $sync["Win11ISOContentsDir"] = $null
+    $sync["Win11ISOImagePath"]   = $null
+    $sync["Win11ISODriveLetter"] = $null
+    $sync["Win11ISOWimPath"]     = $null
+    $sync["Win11ISOImageInfo"]   = $null
+    $sync["Win11ISOUSBDisks"]    = $null
+
+    # Reset the UI to the initial state
+    $sync["WPFWin11ISOPath"].Text                     = "No ISO selected..."
+    $sync["WPFWin11ISOFileInfo"].Visibility            = "Collapsed"
+    $sync["WPFWin11ISOVerifyResultPanel"].Visibility   = "Collapsed"
+    $sync["WPFWin11ISOOptionUSB"].Visibility           = "Collapsed"
+    $sync["WPFWin11ISOOutputSection"].Visibility       = "Collapsed"
+    $sync["WPFWin11ISOModifySection"].Visibility       = "Collapsed"
+    $sync["WPFWin11ISOMountSection"].Visibility        = "Collapsed"
+    $sync["WPFWin11ISOSelectSection"].Visibility       = "Visible"
+    $sync["WPFWin11ISOStatusLog"].Text                 = "Ready. Please select a Windows 11 ISO to begin."
+    $sync["WPFWin11ISOStatusLog"].Height               = 140
+    $sync["WPFWin11ISOModifyButton"].IsEnabled         = $true
+}
+
+function Invoke-WinUtilISOExport {
+    <#
+    .SYNOPSIS
+        Saves the modified ISO contents as a new bootable ISO file.
+        Uses oscdimg.exe (part of the Windows ADK) if present; falls back
+        to a reminder message if not installed.
+    #>
+    $contentsDir = $sync["Win11ISOContentsDir"]
+
+    if (-not $contentsDir -or -not (Test-Path $contentsDir)) {
+        [System.Windows.MessageBox]::Show(
+            "No modified ISO content found.  Please complete Steps 1–3 first.",
+            "Not Ready", "OK", "Warning")
+        return
+    }
+
+    Add-Type -AssemblyName System.Windows.Forms
+
+    $dlg = [System.Windows.Forms.SaveFileDialog]::new()
+    $dlg.Title            = "Save Modified Windows 11 ISO"
+    $dlg.Filter           = "ISO files (*.iso)|*.iso"
+    $dlg.FileName         = "Win11_Modified_$(Get-Date -Format 'yyyyMMdd').iso"
+    $dlg.InitialDirectory = [System.Environment]::GetFolderPath("Desktop")
+
+    if ($dlg.ShowDialog() -ne [System.Windows.Forms.DialogResult]::OK) { return }
+
+    $outputISO = $dlg.FileName
+    Write-Win11ISOLog "Exporting to ISO: $outputISO"
+    Set-WinUtilProgressBar -Label "Building ISO..." -Percent 10
+
+    # Locate oscdimg.exe (Windows ADK)
+    $oscdimg = Get-ChildItem "C:\Program Files (x86)\Windows Kits" -Recurse -Filter "oscdimg.exe" -ErrorAction SilentlyContinue |
+               Select-Object -First 1 -ExpandProperty FullName
+
+    if (-not $oscdimg) {
+        Write-Win11ISOLog "oscdimg.exe not found.  Attempting to install via winget..."
+        Set-WinUtilProgressBar -Label "Installing oscdimg..." -Percent 5
+        try {
+            $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"
+            # Re-scan for oscdimg after install
+            $oscdimg = Get-ChildItem "C:\Program Files (x86)\Windows Kits" -Recurse -Filter "oscdimg.exe" -ErrorAction SilentlyContinue |
+                       Select-Object -First 1 -ExpandProperty FullName
+        } catch {
+            Write-Win11ISOLog "winget not available or install failed: $_"
+        }
+
+        if (-not $oscdimg) {
+            Set-WinUtilProgressBar -Label "" -Percent 0
+            Write-Win11ISOLog "oscdimg.exe still not found after install attempt."
+            [System.Windows.MessageBox]::Show(
+                "oscdimg.exe could not be found or installed automatically.`n`nPlease install it manually:`n  winget install -e --id Microsoft.OSCDIMG`n`nOr install the Windows ADK from:`nhttps://learn.microsoft.com/windows-hardware/get-started/adk-install",
+                "oscdimg Not Found", "OK", "Warning")
+            return
+        }
+        Write-Win11ISOLog "oscdimg.exe installed successfully."
+    }
+
+    # Build boot parameters (BIOS + UEFI dual-boot)
+    $bootData   = "2#p0,e,b`"$contentsDir\boot\etfsboot.com`"#pEF,e,b`"$contentsDir\efi\microsoft\boot\efisys.bin`""
+    $oscdimgArgs = @(
+        "-m",           # ignore source path max size
+        "-o",           # optimise storage
+        "-u2",          # UDF 2.01
+        "-udfver102",
+        "-bootdata:$bootData",
+        "-l`"CTOS_MODIFIED`"",
+        "`"$contentsDir`"",
+        "`"$outputISO`""
+    )
+
+    try {
+        Write-Win11ISOLog "Running oscdimg..."
+        $proc = Start-Process -FilePath $oscdimg -ArgumentList $oscdimgArgs -Wait -PassThru -NoNewWindow
+        if ($proc.ExitCode -eq 0) {
+            Set-WinUtilProgressBar -Label "ISO exported ✔" -Percent 100
+            Write-Win11ISOLog "ISO exported successfully: $outputISO"
+            [System.Windows.MessageBox]::Show(
+                "ISO exported successfully!`n`n$outputISO",
+                "Export Complete", "OK", "Info")
+        } else {
+            Write-Win11ISOLog "oscdimg exited with code $($proc.ExitCode)."
+            [System.Windows.MessageBox]::Show(
+                "oscdimg exited with code $($proc.ExitCode).`nCheck the status log for details.",
+                "Export Error", "OK", "Error")
+        }
+    }
+    catch {
+        Write-Win11ISOLog "ERROR during ISO export: $_"
+        [System.Windows.MessageBox]::Show("ISO export failed:`n`n$_","Error","OK","Error")
+    }
+    finally {
+        Start-Sleep -Milliseconds 800
+        Set-WinUtilProgressBar -Label "" -Percent 0
+    }
+}
+
+function Invoke-WinUtilISORefreshUSBDrives {
+    <#
+    .SYNOPSIS
+        Populates the USB drive ComboBox with all currently attached removable drives.
+    #>
+    $combo = $sync["WPFWin11ISOUSBDriveComboBox"]
+    $combo.Items.Clear()
+
+    $removable = Get-Disk | Where-Object { $_.BusType -eq "USB" } | Sort-Object Number
+
+    if ($removable.Count -eq 0) {
+        $combo.Items.Add("No USB drives detected")
+        $combo.SelectedIndex = 0
+        Write-Win11ISOLog "No USB drives detected."
+        return
+    }
+
+    foreach ($disk in $removable) {
+        $sizeGB    = [math]::Round($disk.Size / 1GB, 1)
+        $label     = "Disk $($disk.Number): $($disk.FriendlyName)  [$sizeGB GB]  — $($disk.PartitionStyle)"
+        $combo.Items.Add($label)
+    }
+    $combo.SelectedIndex = 0
+    Write-Win11ISOLog "Found $($removable.Count) USB drive(s)."
+
+    # Store disk objects for later use
+    $sync["Win11ISOUSBDisks"] = $removable
+}
+
+function Invoke-WinUtilISOWriteUSB {
+    <#
+    .SYNOPSIS
+        Erases the selected USB drive and writes the modified Windows 11 ISO
+        content as a bootable installation drive (using DISM / robocopy approach).
+    #>
+    $contentsDir = $sync["Win11ISOContentsDir"]
+    $usbDisks    = $sync["Win11ISOUSBDisks"]
+
+    if (-not $contentsDir -or -not (Test-Path $contentsDir)) {
+        [System.Windows.MessageBox]::Show(
+            "No modified ISO content found.  Please complete Steps 1–3 first.",
+            "Not Ready", "OK", "Warning")
+        return
+    }
+
+    $selectedIndex = $sync["WPFWin11ISOUSBDriveComboBox"].SelectedIndex
+    if ($selectedIndex -lt 0 -or -not $usbDisks -or $selectedIndex -ge $usbDisks.Count) {
+        [System.Windows.MessageBox]::Show(
+            "Please select a USB drive from the dropdown.",
+            "No Drive Selected", "OK", "Warning")
+        return
+    }
+
+    $targetDisk = $usbDisks[$selectedIndex]
+    $diskNum    = $targetDisk.Number
+    $sizeGB     = [math]::Round($targetDisk.Size / 1GB, 1)
+
+    $confirm = [System.Windows.MessageBox]::Show(
+        "ALL data on Disk $diskNum ($($targetDisk.FriendlyName), $sizeGB GB) will be PERMANENTLY ERASED.`n`nAre you sure you want to continue?",
+        "Confirm USB Erase", "YesNo", "Warning")
+
+    if ($confirm -ne "Yes") {
+        Write-Win11ISOLog "USB write cancelled by user."
+        return
+    }
+
+    $sync["WPFWin11ISOWriteUSBButton"].IsEnabled = $false
+    Write-Win11ISOLog "Starting USB write to Disk $diskNum..."
+
+    $runspace = [Management.Automation.Runspaces.RunspaceFactory]::CreateRunspace()
+    $runspace.ApartmentState = "STA"
+    $runspace.ThreadOptions  = "ReuseThread"
+    $runspace.Open()
+    $runspace.SessionStateProxy.SetVariable("sync",         $sync)
+    $runspace.SessionStateProxy.SetVariable("diskNum",      $diskNum)
+    $runspace.SessionStateProxy.SetVariable("contentsDir",  $contentsDir)
+
+    $script = [Management.Automation.PowerShell]::Create()
+    $script.Runspace = $runspace
+    $script.AddScript({
+
+        function Log($msg) {
+            $ts = (Get-Date).ToString("HH:mm:ss")
+            $sync["WPFWin11ISOStatusLog"].Dispatcher.Invoke([action]{
+                $sync["WPFWin11ISOStatusLog"].Text += "`n[$ts] $msg"
+                $sync["WPFWin11ISOStatusLog"].CaretIndex = $sync["WPFWin11ISOStatusLog"].Text.Length
+                $sync["WPFWin11ISOStatusLog"].ScrollToEnd()
+            })
+        }
+        function SetProgress($label, $pct) {
+            $sync["WPFWin11ISOStatusLog"].Dispatcher.Invoke([action]{
+                $sync.progressBarTextBlock.Text    = $label
+                $sync.progressBarTextBlock.ToolTip = $label
+                $sync.ProgressBar.Value            = [Math]::Max($pct, 5)
+            })
+        }
+
+        try {
+            SetProgress "Formatting USB drive..." 10
+
+            # ── Diskpart script: clean, GPT, create ESP + data partitions ──
+            $dpScript = @"
+select disk $diskNum
+clean
+convert gpt
+create partition efi size=512
+format quick fs=fat32 label="SYSTEM"
+assign
+create partition primary
+format quick fs=fat32 label="WINPE"
+assign
+exit
+"@
+            $dpFile = Join-Path $env:TEMP "winutil_diskpart_$(Get-Random).txt"
+            $dpScript | Set-Content -Path $dpFile -Encoding ASCII
+            Log "Running diskpart on Disk $diskNum..."
+            diskpart /s $dpFile | Out-Null
+            Remove-Item $dpFile -Force
+
+            SetProgress "Identifying USB partitions..." 30
+            Start-Sleep -Seconds 3   # let Windows assign drive letters
+
+            # Find newly assigned drive letter for the data partition
+            $usbVol = Get-Partition -DiskNumber $diskNum |
+                      Where-Object { $_.Type -eq "Basic" } |
+                      Get-Volume |
+                      Where-Object { $_.FileSystemLabel -eq "WINPE" } |
+                      Select-Object -First 1
+
+            if (-not $usbVol) {
+                throw "Could not locate the formatted USB data partition.  Drive letter may not have been assigned automatically."
+            }
+
+            $usbDrive = "$($usbVol.DriveLetter):"
+            Log "USB data partition: $usbDrive"
+            SetProgress "Copying Windows 11 files to USB..." 45
+
+            # ── Copy files (split large install.wim if > 4 GB for FAT32) ──
+            $installWim = Join-Path $contentsDir "sources\install.wim"
+            if (Test-Path $installWim) {
+                $wimSizeMB = [math]::Round((Get-Item $installWim).Length / 1MB)
+                if ($wimSizeMB -gt 3800) {
+                    # FAT32 limit – split with DISM
+                    Log "install.wim is $wimSizeMB MB – splitting for FAT32 compatibility..."
+                    $splitDest = Join-Path $usbDrive "sources\install.swm"
+                    New-Item -ItemType Directory -Path (Split-Path $splitDest) -Force | Out-Null
+                    Split-WindowsImage -ImagePath $installWim `
+                                       -SplitImagePath $splitDest `
+                                       -FileSize 3800 -CheckIntegrity | Out-Null
+                    Log "install.wim split complete."
+
+                    # Copy everything else (exclude install.wim)
+                    $robocopyArgs = @($contentsDir, $usbDrive, "/E", "/XF", "install.wim", "/NFL", "/NDL", "/NJH", "/NJS")
+                    & robocopy @robocopyArgs | Out-Null
+                } else {
+                    & robocopy $contentsDir $usbDrive /E /NFL /NDL /NJH /NJS | Out-Null
+                }
+            } else {
+                & robocopy $contentsDir $usbDrive /E /NFL /NDL /NJH /NJS | Out-Null
+            }
+
+            SetProgress "Finalising USB drive..." 90
+            Log "Files copied to USB."
+
+            SetProgress "USB write complete ✔" 100
+            Log "USB drive is ready for use."
+
+            $sync["WPFWin11ISOStatusLog"].Dispatcher.Invoke([action]{
+                [System.Windows.MessageBox]::Show(
+                    "USB drive created successfully!`n`nYou can now boot from this drive to install Windows 11.",
+                    "USB Ready", "OK", "Info")
+            })
+        }
+        catch {
+            Log "ERROR during USB write: $_"
+            $sync["WPFWin11ISOStatusLog"].Dispatcher.Invoke([action]{
+                [System.Windows.MessageBox]::Show(
+                    "USB write failed:`n`n$_",
+                    "USB Write Error", "OK", "Error")
+            })
+        }
+        finally {
+            Start-Sleep -Milliseconds 800
+            $sync["WPFWin11ISOStatusLog"].Dispatcher.Invoke([action]{
+                $sync.progressBarTextBlock.Text = ""
+                $sync.progressBarTextBlock.ToolTip = ""
+                $sync.ProgressBar.Value = 0
+                $sync["WPFWin11ISOWriteUSBButton"].IsEnabled = $true
+            })
+        }
+    }) | Out-Null
+
+    $script.BeginInvoke() | Out-Null
+}
--- a/functions/private/Invoke-WinUtilISOScript.ps1
+++ b/functions/private/Invoke-WinUtilISOScript.ps1
@@ -0,0 +1,331 @@
+function Invoke-WinUtilISOScript {
+    <#
+    .SYNOPSIS
+        Applies WinUtil modifications to a mounted Windows 11 install.wim image.
+
+    .DESCRIPTION
+        Performs the following operations against an already-mounted WIM image:
+
+        1. Removes provisioned AppX bloatware packages via DISM.
+        2. Deletes Microsoft Edge program files.
+        3. Removes OneDriveSetup.exe from the system image.
+        4. Loads offline registry hives (COMPONENTS, DEFAULT, NTUSER, SOFTWARE, SYSTEM)
+           and applies the following tweaks:
+             - Bypasses hardware requirement checks (CPU, RAM, SecureBoot, Storage, TPM).
+             - Disables sponsored-app delivery and ContentDeliveryManager features.
+             - Enables local-account OOBE path (BypassNRO).
+             - Writes autounattend.xml to the Sysprep directory inside the WIM and,
+               optionally, to the ISO/USB root so Windows Setup picks it up at boot.
+             - Disables reserved storage.
+             - Disables BitLocker device encryption.
+             - Hides the Chat (Teams) taskbar icon.
+             - Removes Edge uninstall registry entries.
+             - Disables OneDrive folder backup (KFM).
+             - Disables telemetry, advertising ID, and input personalization.
+             - Blocks post-install delivery of DevHome, Outlook, and Teams.
+             - Disables Windows Copilot.
+             - Disables Windows Update during OOBE.
+        5. Deletes unwanted scheduled-task XML definition files (CEIP, Appraiser, etc.).
+        6. Removes the support\ folder from the ISO contents directory (if supplied).
+
+        Mounting and dismounting the WIM is the responsibility of the caller
+        (e.g. Invoke-WinUtilISO).
+
+    .PARAMETER ScratchDir
+        Mandatory. Full path to the directory where the Windows image is currently mounted.
+        Example: C:\Users\USERNAME\AppData\Local\Temp\WinUtil_Win11ISO_20260222\wim_mount
+
+    .PARAMETER ISOContentsDir
+        Optional. Root directory of the extracted ISO contents.
+        When supplied, autounattend.xml is also written here so Windows Setup picks it
+        up automatically at boot, and the support\ folder is deleted from that location.
+
+    .PARAMETER AutoUnattendXml
+        Optional. Full XML content for autounattend.xml.
+        In compiled winutil.ps1 this is the embedded $WinUtilAutounattendXml here-string;
+        in dev mode it is read from tools\autounattend.xml.
+        If empty, the OOBE bypass file is skipped and a warning is logged.
+
+    .PARAMETER Log
+        Optional ScriptBlock used for progress/status logging.
+        Receives a single [string] message argument.
+        Defaults to { param($m) Write-Output $m } when not supplied.
+
+    .EXAMPLE
+        Invoke-WinUtilISOScript -ScratchDir "C:\Temp\wim_mount"
+
+    .EXAMPLE
+        Invoke-WinUtilISOScript `
+            -ScratchDir      $mountDir `
+            -ISOContentsDir  $isoRoot `
+            -AutoUnattendXml (Get-Content .\tools\autounattend.xml -Raw) `
+            -Log             { param($m) Write-Host $m }
+
+    .NOTES
+        Author  : Chris Titus @christitustech
+        GitHub  : https://github.com/ChrisTitusTech
+        Version : 26.02.22
+    #>
+    param (
+        [Parameter(Mandatory)][string]$ScratchDir,
+        # Root directory of the extracted ISO contents. When supplied, autounattend.xml
+        # is written here so Windows Setup picks it up automatically at boot.
+        [string]$ISOContentsDir = "",
+        # Autounattend XML content. In compiled winutil.ps1 this comes from the embedded
+        # $WinUtilAutounattendXml here-string; in dev mode it is read from tools\autounattend.xml.
+        [string]$AutoUnattendXml = "",
+        [scriptblock]$Log = { param($m) Write-Output $m }
+    )
+
+    # ── Resolve admin group name (for takeown / icacls) ──────────────────────
+    $adminSID   = New-Object System.Security.Principal.SecurityIdentifier('S-1-5-32-544')
+    $adminGroup = $adminSID.Translate([System.Security.Principal.NTAccount])
+
+    # ── Local helpers ─────────────────────────────────────────────────────────
+    function Set-ISOScriptReg {
+        param ([string]$path, [string]$name, [string]$type, [string]$value)
+        try {
+            & reg add $path /v $name /t $type /d $value /f
+            & $Log "Set registry value: $path\$name"
+        } catch {
+            & $Log "Error setting registry value: $_"
+        }
+    }
+
+    function Remove-ISOScriptReg {
+        param ([string]$path)
+        try {
+            & reg delete $path /f
+            & $Log "Removed registry key: $path"
+        } catch {
+            & $Log "Error removing registry key: $_"
+        }
+    }
+
+    # ═════════════════════════════════════════════════════════════════════════
+    #  1. Remove provisioned AppX packages
+    # ═════════════════════════════════════════════════════════════════════════
+    & $Log "Removing provisioned AppX packages..."
+
+    $packages = & dism /English "/image:$ScratchDir" /Get-ProvisionedAppxPackages |
+        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.GamingApp',
+        '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',
+        'MicrosoftTeams'
+    )
+
+    $packagesToRemove = $packages | Where-Object {
+        $pkg = $_
+        $packagePrefixes | Where-Object { $pkg -like "*$_*" }
+    }
+    foreach ($package in $packagesToRemove) {
+        & dism /English "/image:$ScratchDir" /Remove-ProvisionedAppxPackage "/PackageName:$package"
+    }
+
+    # ═════════════════════════════════════════════════════════════════════════
+    #  2. Remove Edge
+    # ═════════════════════════════════════════════════════════════════════════
+    & $Log "Removing Edge..."
+    Remove-Item -Path "$ScratchDir\Program Files (x86)\Microsoft\Edge"       -Recurse -Force -ErrorAction SilentlyContinue
+
+    # ═════════════════════════════════════════════════════════════════════════
+    #  3. Remove OneDrive
+    # ═════════════════════════════════════════════════════════════════════════
+    & $Log "Removing OneDrive..."
+    & takeown /f "$ScratchDir\Windows\System32\OneDriveSetup.exe" | Out-Null
+    & 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
+
+    # ═════════════════════════════════════════════════════════════════════════
+    #  4. Registry tweaks
+    # ═════════════════════════════════════════════════════════════════════════
+    & $Log "Loading offline registry hives..."
+    reg load HKLM\zCOMPONENTS "$ScratchDir\Windows\System32\config\COMPONENTS"
+    reg load HKLM\zDEFAULT    "$ScratchDir\Windows\System32\config\default"
+    reg load HKLM\zNTUSER     "$ScratchDir\Users\Default\ntuser.dat"
+    reg load HKLM\zSOFTWARE   "$ScratchDir\Windows\System32\config\SOFTWARE"
+    reg load HKLM\zSYSTEM     "$ScratchDir\Windows\System32\config\SYSTEM"
+
+    & $Log "Bypassing system requirements..."
+    Set-ISOScriptReg 'HKLM\zDEFAULT\Control Panel\UnsupportedHardwareNotificationCache' 'SV1' 'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zDEFAULT\Control Panel\UnsupportedHardwareNotificationCache' 'SV2' 'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Control Panel\UnsupportedHardwareNotificationCache'  'SV1' 'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Control Panel\UnsupportedHardwareNotificationCache'  'SV2' 'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zSYSTEM\Setup\LabConfig' 'BypassCPUCheck'       'REG_DWORD' '1'
+    Set-ISOScriptReg 'HKLM\zSYSTEM\Setup\LabConfig' 'BypassRAMCheck'       'REG_DWORD' '1'
+    Set-ISOScriptReg 'HKLM\zSYSTEM\Setup\LabConfig' 'BypassSecureBootCheck' 'REG_DWORD' '1'
+    Set-ISOScriptReg 'HKLM\zSYSTEM\Setup\LabConfig' 'BypassStorageCheck'   'REG_DWORD' '1'
+    Set-ISOScriptReg 'HKLM\zSYSTEM\Setup\LabConfig' 'BypassTPMCheck'       'REG_DWORD' '1'
+    Set-ISOScriptReg 'HKLM\zSYSTEM\Setup\MoSetup'   'AllowUpgradesWithUnsupportedTPMOrCPU' 'REG_DWORD' '1'
+
+    & $Log "Disabling sponsored apps..."
+    Set-ISOScriptReg 'HKLM\zNTUSER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager' 'OemPreInstalledAppsEnabled'  'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zNTUSER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager' 'PreInstalledAppsEnabled'     'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zNTUSER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager' 'SilentInstalledAppsEnabled'  'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Policies\Microsoft\Windows\CloudContent' 'DisableWindowsConsumerFeatures' 'REG_DWORD' '1'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager' 'ContentDeliveryAllowed'      'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Microsoft\PolicyManager\current\device\Start' 'ConfigureStartPins' 'REG_SZ' '{"pinnedList": [{}]}'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager' 'FeatureManagementEnabled'    'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager' 'PreInstalledAppsEverEnabled' 'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager' 'SoftLandingEnabled'          'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager' 'SubscribedContentEnabled'    'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager' 'SubscribedContent-310093Enabled' 'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager' 'SubscribedContent-338388Enabled' 'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager' 'SubscribedContent-338389Enabled' 'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager' 'SubscribedContent-338393Enabled' 'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager' 'SubscribedContent-353694Enabled' 'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager' 'SubscribedContent-353696Enabled' 'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager' 'SystemPaneSuggestionsEnabled' 'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Policies\Microsoft\PushToInstall' 'DisablePushToInstall' 'REG_DWORD' '1'
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Policies\Microsoft\MRT'           'DontOfferThroughWUAU' 'REG_DWORD' '1'
+    Remove-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager\Subscriptions'
+    Remove-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager\SuggestedApps'
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Policies\Microsoft\Windows\CloudContent' 'DisableConsumerAccountStateContent' 'REG_DWORD' '1'
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Policies\Microsoft\Windows\CloudContent' 'DisableCloudOptimizedContent'       'REG_DWORD' '1'
+
+    & $Log "Enabling local accounts on OOBE..."
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\OOBE' 'BypassNRO' 'REG_DWORD' '1'
+
+    if ($AutoUnattendXml) {
+        # ── Place autounattend.xml inside the WIM (Sysprep) ──────────────────
+        $sysprepDest = "$ScratchDir\Windows\System32\Sysprep\autounattend.xml"
+        Set-Content -Path $sysprepDest -Value $AutoUnattendXml -Encoding UTF8 -Force
+        & $Log "Written autounattend.xml to Sysprep directory."
+
+        # ── Place autounattend.xml at the ISO / USB root ──────────────────────
+        # Windows Setup reads this file first (before booting into the OS),
+        # which is what drives the local-account / OOBE bypass at install time.
+        if ($ISOContentsDir -and (Test-Path $ISOContentsDir)) {
+            $isoDest = Join-Path $ISOContentsDir "autounattend.xml"
+            Set-Content -Path $isoDest -Value $AutoUnattendXml -Encoding UTF8 -Force
+            & $Log "Written autounattend.xml to ISO root ($isoDest)."
+        }
+    } else {
+        & $Log "Warning: autounattend.xml content is empty — skipping OOBE bypass file."
+    }
+
+    & $Log "Disabling reserved storage..."
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\ReserveManager' 'ShippedWithReserves' 'REG_DWORD' '0'
+
+    & $Log "Disabling BitLocker device encryption..."
+    Set-ISOScriptReg 'HKLM\zSYSTEM\ControlSet001\Control\BitLocker' 'PreventDeviceEncryption' 'REG_DWORD' '1'
+
+    & $Log "Disabling Chat icon..."
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Policies\Microsoft\Windows\Windows Chat' 'ChatIcon' 'REG_DWORD' '3'
+    Set-ISOScriptReg 'HKLM\zNTUSER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced' 'TaskbarMn' 'REG_DWORD' '0'
+
+    & $Log "Removing Edge registry entries..."
+    Remove-ISOScriptReg 'HKLM\zSOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge'
+    Remove-ISOScriptReg 'HKLM\zSOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge Update'
+
+    & $Log "Disabling OneDrive folder backup..."
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Policies\Microsoft\Windows\OneDrive' 'DisableFileSyncNGSC' 'REG_DWORD' '1'
+
+    & $Log "Disabling telemetry..."
+    Set-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\Windows\CurrentVersion\AdvertisingInfo' 'Enabled' 'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\Windows\CurrentVersion\Privacy' 'TailoredExperiencesWithDiagnosticDataEnabled' 'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\Speech_OneCore\Settings\OnlineSpeechPrivacy' 'HasAccepted' 'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\Input\TIPC' 'Enabled' 'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\InputPersonalization' 'RestrictImplicitInkCollection'  'REG_DWORD' '1'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\InputPersonalization' 'RestrictImplicitTextCollection' 'REG_DWORD' '1'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\InputPersonalization\TrainedDataStore' 'HarvestContacts' 'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zNTUSER\Software\Microsoft\Personalization\Settings' 'AcceptedPrivacyPolicy' 'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Policies\Microsoft\Windows\DataCollection' 'AllowTelemetry' 'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zSYSTEM\ControlSet001\Services\dmwappushservice' 'Start' 'REG_DWORD' '4'
+
+    & $Log "Preventing installation of DevHome and Outlook..."
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Orchestrator\UScheduler_Oobe\OutlookUpdate' 'workCompleted' 'REG_DWORD' '1'
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Orchestrator\UScheduler\OutlookUpdate'      'workCompleted' 'REG_DWORD' '1'
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Orchestrator\UScheduler\DevHomeUpdate'      'workCompleted' 'REG_DWORD' '1'
+    Remove-ISOScriptReg 'HKLM\zSOFTWARE\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\OutlookUpdate'
+    Remove-ISOScriptReg 'HKLM\zSOFTWARE\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\DevHomeUpdate'
+
+    & $Log "Disabling Copilot..."
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Policies\Microsoft\Windows\WindowsCopilot' 'TurnOffWindowsCopilot'    'REG_DWORD' '1'
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Policies\Microsoft\Edge'                   'HubsSidebarEnabled'        'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Policies\Microsoft\Windows\Explorer'       'DisableSearchBoxSuggestions' 'REG_DWORD' '1'
+
+    & $Log "Disabling Windows Update during OOBE (re-enabled on first logon via FirstLogon.ps1)..."
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU' 'NoAutoUpdate'              'REG_DWORD' '1'
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Policies\Microsoft\Windows\WindowsUpdate'    'DisableWindowsUpdateAccess' 'REG_DWORD' '1'
+
+    & $Log "Preventing installation of Teams..."
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Policies\Microsoft\Teams' 'DisableInstallation' 'REG_DWORD' '1'
+
+    & $Log "Preventing installation of new Outlook..."
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Policies\Microsoft\Windows\Windows Mail' 'PreventRun' 'REG_DWORD' '1'
+
+    & $Log "Unloading offline registry hives..."
+    reg unload HKLM\zCOMPONENTS
+    reg unload HKLM\zDEFAULT
+    reg unload HKLM\zNTUSER
+    reg unload HKLM\zSOFTWARE
+    reg unload HKLM\zSYSTEM
+
+    # ═════════════════════════════════════════════════════════════════════════
+    #  5. Delete scheduled task definition files
+    # ═════════════════════════════════════════════════════════════════════════
+    & $Log "Deleting scheduled task definition files..."
+    $tasksPath = "$ScratchDir\Windows\System32\Tasks"
+
+    Remove-Item "$tasksPath\Microsoft\Windows\Application Experience\Microsoft Compatibility Appraiser" -Force -ErrorAction SilentlyContinue
+    Remove-Item "$tasksPath\Microsoft\Windows\Customer Experience Improvement Program"                  -Recurse -Force -ErrorAction SilentlyContinue
+    Remove-Item "$tasksPath\Microsoft\Windows\Application Experience\ProgramDataUpdater"               -Force -ErrorAction SilentlyContinue
+    Remove-Item "$tasksPath\Microsoft\Windows\Chkdsk\Proxy"                                            -Force -ErrorAction SilentlyContinue
+    Remove-Item "$tasksPath\Microsoft\Windows\Windows Error Reporting\QueueReporting"                  -Force -ErrorAction SilentlyContinue
+
+    & $Log "Scheduled task files deleted."
+
+    # ═════════════════════════════════════════════════════════════════════════
+    #  6. Remove ISO support folder (fresh-install only; not needed)
+    # ═════════════════════════════════════════════════════════════════════════
+    if ($ISOContentsDir -and (Test-Path $ISOContentsDir)) {
+        & $Log "Removing ISO support\ folder..."
+        Remove-Item -Path (Join-Path $ISOContentsDir "support") -Recurse -Force -ErrorAction SilentlyContinue
+        & $Log "ISO support\ folder removed."
+    }
+}
--- a/functions/private/Set-WinUtilProgressbar.ps1
+++ b/functions/private/Set-WinUtilProgressbar.ps1
@@ -14,11 +14,15 @@ function Set-WinUtilProgressbar{
        [int]$Percent
    )

-    $sync.form.Dispatcher.Invoke([action]{$sync.progressBarTextBlock.Text = $label})
-    $sync.form.Dispatcher.Invoke([action]{$sync.progressBarTextBlock.ToolTip = $label})
+    if($PARAM_NOUI) {
+        return;
+    }
+
+    Invoke-WPFUIThread -ScriptBlock {$sync.progressBarTextBlock.Text = $label}
+    Invoke-WPFUIThread -ScriptBlock {$sync.progressBarTextBlock.ToolTip = $label}
    if ($percent -lt 5 ) {
        $percent = 5 # Ensure the progress bar is not empty, as it looks weird
    }
-    $sync.form.Dispatcher.Invoke([action]{ $sync.ProgressBar.Value = $percent})
+    Invoke-WPFUIThread -ScriptBlock { $sync.ProgressBar.Value = $percent}

 }
--- a/functions/private/Show-WPFInstallAppBusy.ps1
+++ b/functions/private/Show-WPFInstallAppBusy.ps1
@@ -10,12 +10,12 @@ function Show-WPFInstallAppBusy {
    param (
        $text = "Installing apps..."
    )
-    $sync.form.Dispatcher.Invoke([action]{
+    Invoke-WPFUIThread -ScriptBlock {
        $sync.InstallAppAreaOverlay.Visibility = [Windows.Visibility]::Visible
        $sync.InstallAppAreaOverlay.Width = $($sync.InstallAppAreaScrollViewer.ActualWidth * 0.4)
        $sync.InstallAppAreaOverlay.Height = $($sync.InstallAppAreaScrollViewer.ActualWidth * 0.4)
        $sync.InstallAppAreaOverlayText.Text = $text
        $sync.InstallAppAreaBorder.IsEnabled = $false
        $sync.InstallAppAreaScrollViewer.Effect.Radius = 5
-        })
    }
+}
--- a/functions/public/Invoke-WPFButton.ps1
+++ b/functions/public/Invoke-WPFButton.ps1
@@ -18,6 +18,31 @@ function Invoke-WPFButton {
        Set-WinUtilProgressBar  -label "" -percent 0
    }

+    # Check if button is defined in feature config with function or InvokeScript
+    if ($sync.configs.feature.$Button) {
+        $buttonConfig = $sync.configs.feature.$Button
+
+        # If button has a function defined, call it
+        if ($buttonConfig.function) {
+            $functionName = $buttonConfig.function
+            if (Get-Command $functionName -ErrorAction SilentlyContinue) {
+                & $functionName
+                return
+            }
+        }
+
+        # If button has InvokeScript defined, execute the scripts
+        if ($buttonConfig.InvokeScript -and $buttonConfig.InvokeScript.Count -gt 0) {
+            foreach ($script in $buttonConfig.InvokeScript) {
+                if (-not [string]::IsNullOrWhiteSpace($script)) {
+                    Invoke-Expression $script
+                }
+            }
+            return
+        }
+    }
+
+    # Fallback to hard-coded switch for buttons not in feature.json
    Switch -Wildcard ($Button) {
        "WPFTab?BT" {Invoke-WPFTab $Button}
        "WPFInstall" {Invoke-WPFInstall}
@@ -34,34 +59,14 @@ function Invoke-WPFButton {
        "WPFAddUltPerf" {Invoke-WPFUltimatePerformance -State "Enable"}
        "WPFRemoveUltPerf" {Invoke-WPFUltimatePerformance -State "Disable"}
        "WPFundoall" {Invoke-WPFundoall}
-        "WPFFeatureInstall" {Invoke-WPFFeatureInstall}
-        "WPFPanelDISM" {Invoke-WPFSystemRepair}
-        "WPFPanelAutologin" {Invoke-WPFPanelAutologin}
-        "WPFPanelComputer" {Invoke-WPFControlPanel -Panel $button}
-        "WPFPanelControl" {Invoke-WPFControlPanel -Panel $button}
-        "WPFPanelNetwork" {Invoke-WPFControlPanel -Panel $button}
-        "WPFPanelPower" {Invoke-WPFControlPanel -Panel $button}
-        "WPFPanelPrinter" {Invoke-WPFControlPanel -Panel $button}
-        "WPFPanelRegion" {Invoke-WPFControlPanel -Panel $button}
-        "WPFPanelRestore" {Invoke-WPFControlPanel -Panel $button}
-        "WPFPanelSound" {Invoke-WPFControlPanel -Panel $button}
-        "WPFPanelSystem" {Invoke-WPFControlPanel -Panel $button}
-        "WPFPanelTimedate" {Invoke-WPFControlPanel -Panel $button}
-        "WPFPanelUser" {Invoke-WPFControlPanel -Panel $button}
        "WPFUpdatesdefault" {Invoke-WPFUpdatesdefault}
-        "WPFFixesUpdate" {Invoke-WPFFixesUpdate}
-        "WPFFixesWinget" {Invoke-WPFFixesWinget}
        "WPFRunAdobeCCCleanerTool" {Invoke-WPFRunAdobeCCCleanerTool}
-        "WPFFixesNetwork" {Invoke-WPFFixesNetwork}
        "WPFUpdatesdisable" {Invoke-WPFUpdatesdisable}
        "WPFUpdatessecurity" {Invoke-WPFUpdatessecurity}
        "WPFWinUtilShortcut" {Invoke-WPFShortcut -ShortcutToAdd "WinUtil" -RunAsAdmin $true}
        "WPFGetInstalled" {Invoke-WPFGetInstalled -CheckBox "winget"}
        "WPFGetInstalledTweaks" {Invoke-WPFGetInstalled -CheckBox "tweaks"}
-        "WPFCloseButton" {Invoke-WPFCloseButton}
-        "WPFWinUtilInstallPSProfile" {Invoke-WinUtilInstallPSProfile}
-        "WPFWinUtilUninstallPSProfile" {Invoke-WinUtilUninstallPSProfile}
-        "WPFWinUtilSSHServer" {Invoke-WPFSSHServer}
+        "WPFCloseButton" {$sync.Form.Close(); Write-Host "Bye bye!"}
        "WPFselectedAppsButton" {$sync.selectedAppsPopup.IsOpen = -not $sync.selectedAppsPopup.IsOpen}
        "WPFToggleFOSSHighlight" {
            if ($sync.WPFToggleFOSSHighlight.IsChecked) {
--- a/functions/public/Invoke-WPFCloseButton.ps1
+++ b/functions/public/Invoke-WPFCloseButton.ps1
@@ -1,12 +0,0 @@
-function Invoke-WPFCloseButton {
-
-    <#
-
-    .SYNOPSIS
-        Close application
-
-    .PARAMETER Button
-    #>
-    $sync["Form"].Close()
-    Write-Host "Bye bye!"
-}
--- a/functions/public/Invoke-WPFControlPanel.ps1
+++ b/functions/public/Invoke-WPFControlPanel.ps1
@@ -1,26 +0,0 @@
-function Invoke-WPFControlPanel {
-    <#
-
-    .SYNOPSIS
-        Opens the requested legacy panel
-
-    .PARAMETER Panel
-        The panel to open
-
-    #>
-    param($Panel)
-
-    switch ($Panel) {
-        "WPFPanelControl" {control}
-        "WPFPanelComputer" {compmgmt.msc}
-        "WPFPanelNetwork" {ncpa.cpl}
-        "WPFPanelPower"   {powercfg.cpl}
-        "WPFPanelPrinter" {Start-Process "shell:::{A8A91A66-3A7D-4424-8D24-04E180695C7A}"}
-        "WPFPanelRegion"  {intl.cpl}
-        "WPFPanelRestore"  {rstrui.exe}
-        "WPFPanelSound"   {mmsys.cpl}
-        "WPFPanelSystem"  {sysdm.cpl}
-        "WPFPanelTimedate" {timedate.cpl}
-        "WPFPanelUser"    {control userpasswords2}
-    }
-}
--- a/functions/public/Invoke-WPFFeatureInstall.ps1
+++ b/functions/public/Invoke-WPFFeatureInstall.ps1
@@ -12,21 +12,25 @@ function Invoke-WPFFeatureInstall {
        return
    }

-    $Features = $sync.selectedFeatures
-
-    Invoke-WPFRunspace -ArgumentList $Features -DebugPreference $DebugPreference -ScriptBlock {
-        param($Features, $DebugPreference)
+    $handle = Invoke-WPFRunspace -ScriptBlock {
+        $Features = $sync.selectedFeatures
        $sync.ProcessRunning = $true
        if ($Features.count -eq 1) {
-            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
+            Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" }
        } else {
-            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" })
+            Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" }
        }

-        Invoke-WinUtilFeatureInstall $Features
+        $x = 0
+
+        $Features | ForEach-Object {
+            Invoke-WinUtilFeatureInstall $Feature
+            $X++
+            Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -value ($x/$CheckBox.Count) }
+        }

        $sync.ProcessRunning = $false
-        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" })
+        Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" }

        Write-Host "==================================="
        Write-Host "---   Features are Installed    ---"
--- a/functions/public/Invoke-WPFGetInstalled.ps1
+++ b/functions/public/Invoke-WPFGetInstalled.ps1
@@ -20,13 +20,13 @@ function Invoke-WPFGetInstalled {
    }
    $managerPreference = $sync["ManagerPreference"]

-    Invoke-WPFRunspace -ParameterList @(("managerPreference", $managerPreference),("checkbox", $checkbox)) -DebugPreference $DebugPreference -ScriptBlock {
+    Invoke-WPFRunspace -ParameterList @(("managerPreference", $managerPreference),("checkbox", $checkbox)) -ScriptBlock {
        param (
            [string]$checkbox,
            [PackageManagers]$managerPreference
        )
        $sync.ProcessRunning = $true
-        $sync.form.Dispatcher.Invoke([action] { Set-WinUtilTaskbaritem -state "Indeterminate" })
+        Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Indeterminate" }

        if ($checkbox -eq "winget") {
            Write-Host "Getting Installed Programs..."
@@ -48,6 +48,6 @@ function Invoke-WPFGetInstalled {

        Write-Host "Done..."
        $sync.ProcessRunning = $false
-        $sync.form.Dispatcher.Invoke([action] { Set-WinUtilTaskbaritem -state "None" })
+        Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "None" }
    }
 }
--- a/functions/public/Invoke-WPFImpex.ps1
+++ b/functions/public/Invoke-WPFImpex.ps1
@@ -71,8 +71,10 @@ function Invoke-WPFImpex {
                    # $flattenedJson = $jsonFile.PSObject.Properties.Where({ $_.Name -ne "Install" }).ForEach({ $_.Value })
                    $flattenedJson = $jsonFile
                    Update-WinUtilSelections -flatJson $flattenedJson
-                    # TODO test with toggles
-                    Reset-WPFCheckBoxes -doToggles $true
+
+                    if (!$PARAM_NOUI) {
+                        Reset-WPFCheckBoxes -doToggles $true
+                    }
                }
            } catch {
                Write-Error "An error occurred while importing: $_"
--- a/functions/public/Invoke-WPFInstall.ps1
+++ b/functions/public/Invoke-WPFInstall.ps1
@@ -1,13 +1,12 @@
 function Invoke-WPFInstall {
-    param (
-        [Parameter(Mandatory=$false)]
-        [PSObject[]]$PackagesToInstall = $($sync.selectedApps | Foreach-Object { $sync.configs.applicationsHashtable.$_ })
-    )
    <#
    .SYNOPSIS
        Installs the selected programs using winget, if one or more of the selected programs are already installed on the system, winget will try and perform an upgrade if there's a newer version to install.
    #>

+    $PackagesToInstall = $sync.selectedApps | Foreach-Object { $sync.configs.applicationsHashtable.$_ }
+
+
    if($sync.ProcessRunning) {
        $msg = "[Invoke-WPFInstall] An Install process is currently running."
        [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
@@ -22,8 +21,8 @@ function Invoke-WPFInstall {

    $ManagerPreference = $sync["ManagerPreference"]

-    Invoke-WPFRunspace -ParameterList @(("PackagesToInstall", $PackagesToInstall),("ManagerPreference", $ManagerPreference)) -DebugPreference $DebugPreference -ScriptBlock {
-        param($PackagesToInstall, $ManagerPreference, $DebugPreference)
+    $handle = Invoke-WPFRunspace -ParameterList @(("PackagesToInstall", $PackagesToInstall),("ManagerPreference", $ManagerPreference)) -ScriptBlock {
+        param($PackagesToInstall, $ManagerPreference)

        $packagesSorted = Get-WinUtilSelectedPackages -PackageList $PackagesToInstall -Preference $ManagerPreference

@@ -45,12 +44,12 @@ function Invoke-WPFInstall {
            Write-Host "==========================================="
            Write-Host "--      Installs have finished          ---"
            Write-Host "==========================================="
-            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" })
+            Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" }
        } catch {
            Write-Host "==========================================="
            Write-Host "Error: $_"
            Write-Host "==========================================="
-            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" -overlay "warning" })
+            Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" -overlay "warning" }
        }
        $sync.ProcessRunning = $False
    }
--- a/functions/public/Invoke-WPFRunspace.ps1
+++ b/functions/public/Invoke-WPFRunspace.ps1
@@ -27,8 +27,7 @@ function Invoke-WPFRunspace {
    Param (
        $ScriptBlock,
        $ArgumentList,
-        $ParameterList,
-        $DebugPreference
+        $ParameterList
    )

    # Create a PowerShell instance
@@ -41,7 +40,7 @@ function Invoke-WPFRunspace {
    foreach ($parameter in $ParameterList) {
        $script:powershell.AddParameter($parameter[0], $parameter[1])
    }
-    $script:powershell.AddArgument($DebugPreference)  # Pass DebugPreference to the script block
+
    $script:powershell.RunspacePool = $sync.runspace

    # Execute the RunspacePool
--- a/functions/public/Invoke-WPFSSHServer.ps1
+++ b/functions/public/Invoke-WPFSSHServer.ps1
@@ -6,7 +6,7 @@ function Invoke-WPFSSHServer {

  #>

-    Invoke-WPFRunspace -DebugPreference $DebugPreference -ScriptBlock {
+    Invoke-WPFRunspace -ScriptBlock {

        Invoke-WinUtilSSHServer

--- a/functions/public/Invoke-WPFSystemRepair.ps1
+++ b/functions/public/Invoke-WPFSystemRepair.ps1
@@ -2,13 +2,15 @@ function Invoke-WPFSystemRepair {
    <#
    .SYNOPSIS
        Checks for system corruption using SFC, and DISM
+        Checks for disk failure using Chkdsk

    .DESCRIPTION
-        1. SFC - Fixes system file corruption, and fixes DISM if it was corrupted
-        2. DISM - Fixes system image corruption, and fixes SFC's system image if it was corrupted
-        3. Chkdsk - Checks for disk errors, which can cause system file corruption and notifies of early disk failure
+        1. Chkdsk - Checks for disk errors, which can cause system file corruption and notifies of early disk failure
+        2. SFC - scans protected system files for corruption and fixes them
+        3. DISM - Repair a corrupted Windows operating system image
    #>
-    Start-Process cmd.exe -ArgumentList "/c chkdsk.exe /scan /perf" -NoNewWindow -Wait
+
+    Start-Process cmd.exe -ArgumentList "/c chkdsk /scan /perf" -NoNewWindow -Wait
    Start-Process cmd.exe -ArgumentList "/c sfc /scannow" -NoNewWindow -Wait
    Start-Process cmd.exe -ArgumentList "/c dism /online /cleanup-image /restorehealth" -NoNewWindow -Wait

--- a/functions/public/Invoke-WPFUIThread.ps1
+++ b/functions/public/Invoke-WPFUIThread.ps1
@@ -0,0 +1,21 @@
+function Invoke-WPFUIThread {
+    <#
+
+    .SYNOPSIS
+        Creates and runs a task on Winutil's WPF Forms thread.
+
+    .PARAMETER ScriptBlock
+        The scriptblock to invoke in the thread
+    #>
+
+    [CmdletBinding()]
+    Param (
+        $ScriptBlock
+    )
+
+    if ($PARAM_NOUI) {
+        return;
+    }
+
+    $sync.form.Dispatcher.Invoke([action]$ScriptBlock)
+}
--- a/functions/public/Invoke-WPFUnInstall.ps1
+++ b/functions/public/Invoke-WPFUnInstall.ps1
@@ -32,8 +32,8 @@ function Invoke-WPFUnInstall {

    $ManagerPreference = $sync["ManagerPreference"]

-    Invoke-WPFRunspace -ParameterList @(("PackagesToUninstall", $PackagesToUninstall),("ManagerPreference", $ManagerPreference)) -DebugPreference $DebugPreference -ScriptBlock {
-        param($PackagesToUninstall, $ManagerPreference, $DebugPreference)
+    Invoke-WPFRunspace -ParameterList @(("PackagesToUninstall", $PackagesToUninstall),("ManagerPreference", $ManagerPreference)) -ScriptBlock {
+        param($PackagesToUninstall, $ManagerPreference)

        $packagesSorted = Get-WinUtilSelectedPackages -PackageList $PackagesToUninstall -Preference $ManagerPreference
        $packagesWinget = $packagesSorted[[PackageManagers]::Winget]
@@ -54,12 +54,12 @@ function Invoke-WPFUnInstall {
            Write-Host "==========================================="
            Write-Host "--       Uninstalls have finished       ---"
            Write-Host "==========================================="
-            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" })
+            Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" }
        } catch {
            Write-Host "==========================================="
            Write-Host "Error: $_"
            Write-Host "==========================================="
-            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" -overlay "warning" })
+           Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" -overlay "warning" }
        }
        $sync.ProcessRunning = $False

--- a/functions/public/Invoke-WPFtweaksbutton.ps1
+++ b/functions/public/Invoke-WPFtweaksbutton.ps1
@@ -25,30 +25,27 @@ function Invoke-WPFtweaksbutton {
  Write-Debug "Number of tweaks to process: $($Tweaks.Count)"

  # The leading "," in the ParameterList is necessary because we only provide one argument and powershell cannot be convinced that we want a nested loop with only one argument otherwise
-  Invoke-WPFRunspace -ParameterList @(,("tweaks",$tweaks)) -DebugPreference $DebugPreference -ScriptBlock {
-    param(
-      $tweaks,
-      $DebugPreference
-      )
+  $handle = Invoke-WPFRunspace -ParameterList @(,("tweaks",$tweaks)) -ScriptBlock {
+    param($tweaks)
    Write-Debug "Inside Number of tweaks to process: $($Tweaks.Count)"

    $sync.ProcessRunning = $true

    if ($Tweaks.count -eq 1) {
-        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
+        Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" }
    } else {
-        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" })
+        Invoke-WPFUIThread -ScriptBlock{ Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" }
    }
    # Execute other selected tweaks

    for ($i = 0; $i -lt $Tweaks.Count; $i++) {
      Set-WinUtilProgressBar -Label "Applying $($tweaks[$i])" -Percent ($i / $tweaks.Count * 100)
      Invoke-WinUtilTweaks $tweaks[$i]
-      $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -value ($i/$Tweaks.Count) })
+      Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -value ($i/$Tweaks.Count) }
    }
    Set-WinUtilProgressBar -Label "Tweaks finished" -Percent 100
    $sync.ProcessRunning = $false
-    $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" })
+    Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" }
    Write-Host "================================="
    Write-Host "--     Tweaks are Finished    ---"
    Write-Host "================================="
--- a/functions/public/Invoke-WPFundoall.ps1
+++ b/functions/public/Invoke-WPFundoall.ps1
@@ -20,26 +20,26 @@ function Invoke-WPFundoall {
        return
    }

-    Invoke-WPFRunspace -ArgumentList $tweaks -DebugPreference $DebugPreference -ScriptBlock {
-        param($tweaks, $DebugPreference)
+    Invoke-WPFRunspace -ArgumentList $tweaks -ScriptBlock {
+        param($tweaks)

        $sync.ProcessRunning = $true
        if ($tweaks.count -eq 1) {
-            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
+            Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" }
        } else {
-            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" })
+            Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" }
        }


        for ($i = 0; $i -lt $tweaks.Count; $i++) {
            Set-WinUtilProgressBar -Label "Undoing $($tweaks[$i])" -Percent ($i / $tweaks.Count * 100)
            Invoke-WinUtiltweaks $tweaks[$i] -undo $true
-            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -value ($i/$tweaks.Count) })
+            Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -value ($i/$tweaks.Count) }
        }

        Set-WinUtilProgressBar -Label "Undo Tweaks Finished" -Percent 100
        $sync.ProcessRunning = $false
-        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" })
+        Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" }
        Write-Host "=================================="
        Write-Host "---  Undo Tweaks are Finished  ---"
        Write-Host "=================================="
--- a/functions/public/Invoke-WinUtilAutoRun.ps1
+++ b/functions/public/Invoke-WinUtilAutoRun.ps1
@@ -0,0 +1,48 @@
+function Invoke-WinUtilAutoRun {
+    <#
+
+    .SYNOPSIS
+        Runs Install, Tweaks, and Features with optional UI invocation.
+    #>
+
+    function BusyWait {
+        Start-Sleep -Seconds 5
+        while ($sync.ProcessRunning) {
+                Start-Sleep -Seconds 5
+            }
+    }
+
+    BusyWait
+
+    Write-Host "Applying tweaks..."
+    Invoke-WPFtweaksbutton
+    BusyWait
+
+    Write-Host "Applying toggles..."
+    $handle = Invoke-WPFRunspace -ScriptBlock {
+        $Toggles = $sync.selectedToggles
+        Write-Debug "Inside Number of toggles to process: $($Toggles.Count)"
+
+        $sync.ProcessRunning = $true
+
+        for ($i = 0; $i -lt $Tweaks.Count; $i++) {
+            Invoke-WinUtilTweaks $Toggles[$i]
+        }
+
+        $sync.ProcessRunning = $false
+        Write-Host "================================="
+        Write-Host "--     Toggles are Finished    ---"
+        Write-Host "================================="
+    }
+    BusyWait
+
+    Write-Host "Applying features..."
+    Invoke-WPFFeatureInstall
+    BusyWait
+
+    Write-Host "Installing applications..."
+    Invoke-WPFInstall
+    BusyWait
+
+    Write-Host "Done."
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Chris Titus	2ba3a5d324	Win11 ISO Creator (#4110 ) * Tab creation * scaffold outline for the iso tab * autounattended creation * inital modification success * iso save success * cleanup and iso improvements * fix startmenu on new 26h2 * remove old first startup * Fix run for use * fix unapproved verb * Keep step 4 output expanded * update auto-merge * Cleanup * remove out-null and trailing whitespace * explain modify and creator button * fix scroll to end * remove workflow change	2026-02-24 15:28:49 -06:00
Chris Titus	f854d14117	chore: Update generated dev docs (#4105 )	2026-02-23 18:28:56 -06:00
Chris Titus	19204534a2	Add --admin flag to auto-merge command	2026-02-23 18:28:25 -06:00
Chris Titus	a9d9b148db	Change GH_TOKEN to use AUTO_MERGE secret	2026-02-23 18:26:20 -06:00
Chris Titus Tech	d5d0bf25f0	automerge docs	2026-02-23 14:53:46 -06:00
Chris Titus Tech	da3fd87f9a	revise approval	2026-02-23 14:46:15 -06:00
Chris Titus Tech	9e8cefc973	fix automerge	2026-02-23 14:43:52 -06:00
Gabi	a532e9ec9d	Remove WPFTweaksDisableExplorerAutoDiscovery From Minimal Preset (#4081 ) * WPFTweaksDisableExplorerAutoDiscovery Shouldn't not be deafult * Update preset.json * Update tweaks.json * Update config/tweaks.json Co-authored-by: Paweł Gwozdowski <kernea.g@proton.me> --------- Co-authored-by: Paweł Gwozdowski <kernea.g@proton.me>	2026-02-23 10:17:01 -06:00
dependabot[bot]	844979fee7	Bump peter-evans/create-pull-request from 6 to 8 (#4104 ) Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6 to 8. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v6...v8) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-version: '8' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-02-23 09:23:33 -06:00
Sean (ANGRYxScotsman)	78302934ef	updated workflows for automation (#4102 ) * updated workflows for automation * added back the debug logs * Update docs.yaml * Update pre-release.yaml	2026-02-22 21:25:59 -06:00
Gabi	349889b194	Minor format changes for Invoke-WPFSystemRepair.ps1 (#4100 ) * Format changes * Update Invoke-WPFSystemRepair.ps1	2026-02-22 17:31:54 -06:00
Raphaël	c619f3a830	Add more development tools to applications.json (#4093 ) * Add .NET Desktop Runtime 10 to applications.json * Add LLVM to applications.json * Add NASM to applications.json	2026-02-22 17:30:43 -06:00
KamaleiZestri	d005a225a2	NoUI mode and Concurrency edits (#4092 ) * Autorun changes * Missed a handle * Remove todo --------- Co-authored-by: Chris Titus <dfm.titus@gmail.com>	2026-02-22 17:28:55 -06:00
Gabi	e79e946e76	Remove incorrect infromaiton from WPFTweaksRazerBlock (#4082 )	2026-02-22 17:23:19 -06:00
github-actions[bot]	3b957e1a77	Update sponsors in README (#4095 ) Co-authored-by: ChrisTitusTech <7896101+ChrisTitusTech@users.noreply.github.com>	2026-02-22 17:21:52 -06:00
Gabi	d078d67b1d	Remove debug option (#4094 ) * Remove debug option * Remove debug option	2026-02-22 17:21:32 -06:00
Gabi	191fe95572	Update-KnownIssues.md (#4096 ) * Update KnownIssues.md * Update KnownIssues.md	2026-02-22 17:20:39 -06:00
Sean (ANGRYxScotsman)	d10c9413ac	Update devdocs-generator (#4091 ) * Update devdocs-generator.ps1 * made new dir * Update devdocs-generator.ps1 * Update devdocs-generator.ps1	2026-02-22 17:19:43 -06:00
Chris Titus	e93753e5c9	Json-Cleanup-Expansion (#4090 ) * initial cleanup * remove winutilgpu	2026-02-22 17:19:04 -06:00
Gabi	5eec99df1c	Fix title screen image url (#4087 )	2026-02-18 15:29:41 -06:00
Gabi	7e2ba41b8b	Update inputXML.xaml (#4089 )	2026-02-18 15:29:14 -06:00
Chris Titus	d3dc3e7976	Merge branches 'main' and 'main' of https://github.com/ChrisTitusTech/winutil	2026-02-18 14:44:33 -06:00
Gabi	5a4d822710	Fix more images in CONTRIBUTING.md (#4086 )	2026-02-18 14:44:19 -06:00
Chris Titus	2625478ef3	assign docs label	2026-02-18 14:41:00 -06:00
github-actions[bot]	956a544c2e	Update generated documentation (#4084 ) Co-authored-by: ChrisTitusTech <7896101+ChrisTitusTech@users.noreply.github.com>	2026-02-18 14:33:39 -06:00
Gabi	50dbf5bd05	Fix fork image (#4085 )	2026-02-18 14:32:29 -06:00
Gabi	338c3e7e57	Add warning to WPFToggleStartMenuRecommendations (#4083 )	2026-02-18 14:31:38 -06:00