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

.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 }}

.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,22 +47,27 @@ 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
+          add-paths: |
+            docs/content/dev/
+            config/tweaks.json
+            config/feature.json
           labels: |
             automated
             documentation

.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: |

.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'

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
-}
 
 Set-Content -Path "$scriptname" -Value ($script_content -join "`r`n") -Encoding ascii
 Write-Progress -Activity "Compiling" -Completed

README.md

@@ -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 🍻.

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
     }
 }

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"
   }
 }

config/preset.json

@@ -16,7 +16,6 @@
   ],
   "Minimal": [
     "WPFTweaksConsumerFeatures",
-    "WPFTweaksDisableExplorerAutoDiscovery",
     "WPFTweaksWPBT",
     "WPFTweaksServices",
     "WPFTweaksTelemetry"

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",

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": [
@@ -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": [

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.

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" >}}

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"

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"

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": [
       "

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"
     ],

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"

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"
     ],

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",

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",

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"

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
 

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"
+    ],
 ```

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"
+    ],
 ```

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"
+    ],
 ```

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"
+    ],
 ```

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}'"
+    ],
 ```

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"
+    ],
 ```

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"
+    ],
 ```

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"
+    ],
 ```

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"
+    ],
 ```

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"
+    ],
 ```

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"'
+}
+```

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
+}
+```

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" >}}

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 "======================================="
+    }
+}
+```

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" >}}

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" >}}

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

@@ -6,7 +6,7 @@ description: ""
 ```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": [

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
-    }
-
-}
-```

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

@@ -6,7 +6,7 @@ description: ""
 ```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": [

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()

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
-    })
+    }
 }

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" {

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}

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 @"

functions/private/Invoke-WinUtilFeatureInstall.ps1

@@ -10,46 +10,40 @@ function Invoke-WinUtilFeatureInstall {
         $CheckBox
     )
 
-    $x = 0
-
-    $CheckBox | ForEach-Object {
-        if($sync.configs.feature.$psitem.feature) {
-            Foreach( $feature in $sync.configs.feature.$psitem.feature ) {
+    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 ($psitem.Exception.Message -like "*requires elevation*") {
+                if ($CheckBox.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" })
+                    Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" }
                 } else {
 
                     Write-Warning "Unable to Install $feature due to unhandled exception"
-                        Write-Warning $psitem.Exception.StackTrace
+                    Write-Warning $CheckBox.Exception.StackTrace
                 }
             }
         }
     }
-        if($sync.configs.feature.$psitem.InvokeScript) {
-            Foreach( $script in $sync.configs.feature.$psitem.InvokeScript ) {
+    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"
+                Write-Host "Running Script for $CheckBox"
                 Invoke-Command $scriptblock -ErrorAction stop
             } catch {
-                    if ($psitem.Exception.Message -like "*requires elevation*") {
+                if ($CheckBox.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" })
+                    Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" }
                 } else {
-                        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" })
+                    Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" }
                     Write-Warning "Unable to Install $feature due to unhandled exception"
-                        Write-Warning $psitem.Exception.StackTrace
+                    Write-Warning $CheckBox.Exception.StackTrace
                 }
             }
         }
     }
-        $X++
-        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -value ($x/$CheckBox.Count) })
-    }
 }

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
-}

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
+}

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."
+    }
+}

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}
 
 }

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
-        })
+    }
 }

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) {

functions/public/Invoke-WPFCloseButton.ps1

@@ -1,12 +0,0 @@
-function Invoke-WPFCloseButton {
-
-    <#
-
-    .SYNOPSIS
-        Close application
-
-    .PARAMETER Button
-    #>
-    $sync["Form"].Close()
-    Write-Host "Bye bye!"
-}

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}
-    }
-}

functions/public/Invoke-WPFFeatureInstall.ps1

@@ -12,21 +12,25 @@ function Invoke-WPFFeatureInstall {
         return
     }
 
+    $handle = Invoke-WPFRunspace -ScriptBlock {
         $Features = $sync.selectedFeatures
-
-    Invoke-WPFRunspace -ArgumentList $Features -DebugPreference $DebugPreference -ScriptBlock {
-        param($Features, $DebugPreference)
         $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    ---"

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" }
     }
 }

functions/public/Invoke-WPFImpex.ps1

@@ -71,9 +71,11 @@ function Invoke-WPFImpex {
                     # $flattenedJson = $jsonFile.PSObject.Properties.Where({ $_.Name -ne "Install" }).ForEach({ $_.Value })
                     $flattenedJson = $jsonFile
                     Update-WinUtilSelections -flatJson $flattenedJson
-                    # TODO test with toggles
+
+                    if (!$PARAM_NOUI) {
                         Reset-WPFCheckBoxes -doToggles $true
                     }
+                }
             } catch {
                 Write-Error "An error occurred while importing: $_"
             }

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
     }

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

functions/public/Invoke-WPFSSHServer.ps1

@@ -6,7 +6,7 @@ function Invoke-WPFSSHServer {
 
   #>
 
-    Invoke-WPFRunspace -DebugPreference $DebugPreference -ScriptBlock {
+    Invoke-WPFRunspace -ScriptBlock {
 
         Invoke-WinUtilSSHServer
 

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
 

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)
+}

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
 

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 "================================="

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 "=================================="

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."
+}

scripts/main.ps1

@@ -13,10 +13,14 @@ $maxthreads = [int]$env:NUMBER_OF_PROCESSORS
 
 # Create a new session state for parsing variables into our runspace
 $hashVars = New-object System.Management.Automation.Runspaces.SessionStateVariableEntry -ArgumentList 'sync',$sync,$Null
+$debugVar = New-object System.Management.Automation.Runspaces.SessionStateVariableEntry -ArgumentList 'DebugPreference',$DebugPreference,$Null
+$uiVar = New-object System.Management.Automation.Runspaces.SessionStateVariableEntry -ArgumentList 'PARAM_NOUI',$PARAM_NOUI,$Null
 $InitialSessionState = [System.Management.Automation.Runspaces.InitialSessionState]::CreateDefault()
 
 # Add the variable to the session state
 $InitialSessionState.Variables.Add($hashVars)
+$InitialSessionState.Variables.Add($debugVar)
+$InitialSessionState.Variables.Add($uiVar)
 
 # Get every private function and add them to the session state
 $functions = Get-ChildItem function:\ | Where-Object { $_.Name -imatch 'winutil|WPF' }
@@ -55,6 +59,42 @@ class GenericException : Exception {
     GenericException($Message) : base($Message) {}
 }
 
+# Load the configuration files
+
+$sync.configs.applicationsHashtable = @{}
+$sync.configs.applications.PSObject.Properties | ForEach-Object {
+    $sync.configs.applicationsHashtable[$_.Name] = $_.Value
+}
+
+Set-PackageManagerPreference
+
+if ($PARAM_NOUI) {
+    Show-CTTLogo
+    if ($PARAM_CONFIG -and -not [string]::IsNullOrWhiteSpace($PARAM_CONFIG)) {
+        Write-Host "Running config file tasks..."
+        Invoke-WPFImpex -type "import" -Config $PARAM_CONFIG
+        if ($PARAM_RUN) {
+            Invoke-WinUtilAutoRun
+        }
+        else {
+            Write-Host "Did you forget to add '--Run'?";
+        }
+        $sync.runspace.Dispose()
+        $sync.runspace.Close()
+        [System.GC]::Collect()
+        Stop-Transcript
+        exit 1
+    }
+    else {
+        Write-Host "Cannot automatically run without a config file provided."
+        $sync.runspace.Dispose()
+        $sync.runspace.Close()
+        [System.GC]::Collect()
+        Stop-Transcript
+        exit 1
+    }
+}
+
 $inputXML = $inputXML -replace 'mc:Ignorable="d"', '' -replace "x:N", 'N' -replace '^<Win.*', '<Window'
 
 [void][System.Reflection.Assembly]::LoadWithPartialName('presentationframework')
@@ -115,12 +155,7 @@ $sync.Form.Add_Loaded({
 })
 
 Invoke-WinutilThemeChange -init $true
-# Load the configuration files
 
-$sync.configs.applicationsHashtable = @{}
-$sync.configs.applications.PSObject.Properties | ForEach-Object {
-    $sync.configs.applicationsHashtable[$_.Name] = $_.Value
-}
 
 # Now call the function with the final merged config
 Invoke-WPFUIElements -configVariable $sync.configs.appnavigation -targetGridName "appscategory" -columncount 1
@@ -144,7 +179,6 @@ $xaml.SelectNodes("//*[@Name]") | ForEach-Object {$sync["$("$($psitem.Name)")"]
 #Persist Package Manager preference across winutil restarts
 $sync.ChocoRadioButton.Add_Checked({Set-PackageManagerPreference Choco})
 $sync.WingetRadioButton.Add_Checked({Set-PackageManagerPreference Winget})
-Set-PackageManagerPreference
 
 switch ($sync["ManagerPreference"]) {
     "Choco" {$sync.ChocoRadioButton.IsChecked = $true; break}
@@ -247,6 +281,7 @@ $commonKeyEvents = {
             "T" { Invoke-WPFButton "WPFTab2BT"; $keyEventArgs.Handled = $true } # Navigate to Tweaks tab
             "C" { Invoke-WPFButton "WPFTab3BT"; $keyEventArgs.Handled = $true } # Navigate to Config tab
             "U" { Invoke-WPFButton "WPFTab4BT"; $keyEventArgs.Handled = $true } # Navigate to Updates tab
+            "W" { Invoke-WPFButton "WPFTab5BT"; $keyEventArgs.Handled = $true } # Navigate to Win11ISO tab
         }
     }
     # Handle Ctrl key combinations for specific actions
@@ -341,45 +376,11 @@ $sync["Form"].Add_ContentRendered({
 
     $sync["Form"].Focus()
 
-    # maybe this is not the best place to load and execute config file?
-    # maybe community can help?
    if ($PARAM_CONFIG -and -not [string]::IsNullOrWhiteSpace($PARAM_CONFIG)) {
+        Write-Host "Running config file tasks..."
         Invoke-WPFImpex -type "import" -Config $PARAM_CONFIG
         if ($PARAM_RUN) {
-            # Wait for any existing process to complete before starting
-            while ($sync.ProcessRunning) {
-                Start-Sleep -Seconds 5
-            }
-            Start-Sleep -Seconds 5
-
-            Write-Host "Applying tweaks..."
-            if (-not $sync.ProcessRunning) {
-                Invoke-WPFtweaksbutton
-                while ($sync.ProcessRunning) {
-                    Start-Sleep -Seconds 5
-                }
-            }
-            Start-Sleep -Seconds 5
-
-            Write-Host "Installing features..."
-            if (-not $sync.ProcessRunning) {
-                Invoke-WPFFeatureInstall
-                while ($sync.ProcessRunning) {
-                    Start-Sleep -Seconds 5
-                }
-            }
-            Start-Sleep -Seconds 5
-
-            Write-Host "Installing applications..."
-            if (-not $sync.ProcessRunning) {
-                Invoke-WPFInstall
-                while ($sync.ProcessRunning) {
-                    Start-Sleep -Seconds 1
-                }
-            }
-            Start-Sleep -Seconds 5
-
-            Write-Host "Done."
+            Invoke-WinUtilAutoRun
         }
     }
 
@@ -531,5 +532,56 @@ $sync["FontScalingApplyButton"].Add_Click({
     Invoke-WPFPopup -Action "Hide" -Popups @("FontScaling")
 })
 
+# ── Win11ISO Tab button handlers ──────────────────────────────────────────────
+
+$sync["WPFWin11ISOBrowseButton"].Add_Click({
+    Write-Debug "WPFWin11ISOBrowseButton clicked"
+    Invoke-WinUtilISOBrowse
+})
+
+$sync["WPFWin11ISODownloadLink"].Add_Click({
+    Write-Debug "WPFWin11ISODownloadLink clicked"
+    Start-Process "https://www.microsoft.com/software-download/windows11"
+})
+
+$sync["WPFWin11ISOMountButton"].Add_Click({
+    Write-Debug "WPFWin11ISOMountButton clicked"
+    Invoke-WinUtilISOMountAndVerify
+})
+
+$sync["WPFWin11ISOModifyButton"].Add_Click({
+    Write-Debug "WPFWin11ISOModifyButton clicked"
+    Invoke-WinUtilISOModify
+})
+
+$sync["WPFWin11ISOChooseISOButton"].Add_Click({
+    Write-Debug "WPFWin11ISOChooseISOButton clicked"
+    $sync["WPFWin11ISOOptionUSB"].Visibility = "Collapsed"
+    Invoke-WinUtilISOExport
+})
+
+$sync["WPFWin11ISOChooseUSBButton"].Add_Click({
+    Write-Debug "WPFWin11ISOChooseUSBButton clicked"
+    $sync["WPFWin11ISOOptionUSB"].Visibility = "Visible"
+    Invoke-WinUtilISORefreshUSBDrives
+})
+
+$sync["WPFWin11ISORefreshUSBButton"].Add_Click({
+    Write-Debug "WPFWin11ISORefreshUSBButton clicked"
+    Invoke-WinUtilISORefreshUSBDrives
+})
+
+$sync["WPFWin11ISOWriteUSBButton"].Add_Click({
+    Write-Debug "WPFWin11ISOWriteUSBButton clicked"
+    Invoke-WinUtilISOWriteUSB
+})
+
+$sync["WPFWin11ISOCleanResetButton"].Add_Click({
+    Write-Debug "WPFWin11ISOCleanResetButton clicked"
+    Invoke-WinUtilISOCleanAndReset
+})
+
+# ──────────────────────────────────────────────────────────────────────────────
+
 $sync["Form"].ShowDialog() | out-null
 Stop-Transcript

scripts/start.ps1

@@ -7,16 +7,11 @@
 #>
 
 param (
-    [switch]$Debug,
     [string]$Config,
-    [switch]$Run
+    [switch]$Run,
+    [switch]$Noui
 )
 
-# Set DebugPreference based on the -Debug switch
-if ($Debug) {
-    $DebugPreference = "Continue"
-}
-
 if ($Config) {
     $PARAM_CONFIG = $Config
 }
@@ -24,10 +19,14 @@ if ($Config) {
 $PARAM_RUN = $false
 # Handle the -Run switch
 if ($Run) {
-    Write-Host "Running config file tasks..."
     $PARAM_RUN = $true
 }
 
+$PARAM_NOUI = $false
+if ($Noui) {
+    $PARAM_NOUI = $true
+}
+
 # Load DLLs
 Add-Type -AssemblyName PresentationFramework
 Add-Type -AssemblyName System.Windows.Forms

tools/autounattend.xml

@@ -0,0 +1,507 @@
+<?xml version="1.0" encoding="utf-8"?>
+<unattend xmlns="urn:schemas-microsoft-com:unattend" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State">
+    <!--https://schneegans.de/windows/unattend-generator/?LanguageMode=Interactive&ProcessorArchitecture=amd64&BypassRequirementsCheck=true&ComputerNameMode=Random&CompactOsMode=Default&TimeZoneMode=Implicit&PartitionMode=Interactive&DiskAssertionMode=Skip&WindowsEditionMode=Interactive&InstallFromMode=Automatic&PEMode=Default&UserAccountMode=InteractiveLocal&PasswordExpirationMode=Unlimited&LockoutMode=Default&HideFiles=Hidden&ClassicContextMenu=true&LaunchToThisPC=true&ShowEndTask=true&TaskbarSearch=Hide&TaskbarIconsMode=Empty&DisableWidgets=true&LeftTaskbar=true&HideTaskViewButton=true&StartTilesMode=Default&StartPinsMode=Empty&EnableLongPaths=true&HideEdgeFre=true&DisableEdgeStartupBoost=true&DeleteWindowsOld=true&EffectsMode=Default&DeleteEdgeDesktopIcon=true&DesktopIconsMode=Default&StartFoldersMode=Default&WifiMode=Skip&ExpressSettings=DisableAll&LockKeysMode=Configure&CapsLockInitial=Off&CapsLockBehavior=Toggle&NumLockInitial=On&NumLockBehavior=Toggle&ScrollLockInitial=Off&ScrollLockBehavior=Toggle&StickyKeysMode=Disabled&ColorMode=Custom&SystemColorTheme=Dark&AppsColorTheme=Dark&AccentColor=%230078d4&WallpaperMode=Default&LockScreenMode=Default&WdacMode=Skip&AppLockerMode=Skip-->
+    <settings pass="offlineServicing"></settings>
+    <settings pass="windowsPE">
+        <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
+            <UserData>
+                <ProductKey>
+                    <Key>00000-00000-00000-00000-00000</Key>
+                    <WillShowUI>Always</WillShowUI>
+                </ProductKey>
+                <AcceptEula>true</AcceptEula>
+            </UserData>
+            <UseConfigurationSet>false</UseConfigurationSet>
+            <RunSynchronous>
+                <RunSynchronousCommand wcm:action="add">
+                    <Order>1</Order>
+                    <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassTPMCheck /t REG_DWORD /d 1 /f</Path>
+                </RunSynchronousCommand>
+                <RunSynchronousCommand wcm:action="add">
+                    <Order>2</Order>
+                    <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassSecureBootCheck /t REG_DWORD /d 1 /f</Path>
+                </RunSynchronousCommand>
+                <RunSynchronousCommand wcm:action="add">
+                    <Order>3</Order>
+                    <Path>reg.exe add "HKLM\SYSTEM\Setup\LabConfig" /v BypassRAMCheck /t REG_DWORD /d 1 /f</Path>
+                </RunSynchronousCommand>
+            </RunSynchronous>
+        </component>
+    </settings>
+    <settings pass="generalize"></settings>
+    <settings pass="specialize">
+        <component name="Microsoft-Windows-Deployment" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
+            <RunSynchronous>
+                <RunSynchronousCommand wcm:action="add">
+                    <Order>1</Order>
+                    <Path>powershell.exe -WindowStyle "Normal" -NoProfile -Command "$xml = [xml]::new(); $xml.Load('C:\Windows\Panther\unattend.xml'); $sb = [scriptblock]::Create( $xml.unattend.Extensions.ExtractScript ); Invoke-Command -ScriptBlock $sb -ArgumentList $xml;"</Path>
+                </RunSynchronousCommand>
+                <RunSynchronousCommand wcm:action="add">
+                    <Order>2</Order>
+                    <Path>powershell.exe -WindowStyle "Normal" -ExecutionPolicy "Unrestricted" -NoProfile -File "C:\Windows\Setup\Scripts\Specialize.ps1"</Path>
+                </RunSynchronousCommand>
+                <RunSynchronousCommand wcm:action="add">
+                    <Order>3</Order>
+                    <Path>reg.exe load "HKU\DefaultUser" "C:\Users\Default\NTUSER.DAT"</Path>
+                </RunSynchronousCommand>
+                <RunSynchronousCommand wcm:action="add">
+                    <Order>4</Order>
+                    <Path>powershell.exe -WindowStyle "Normal" -ExecutionPolicy "Unrestricted" -NoProfile -File "C:\Windows\Setup\Scripts\DefaultUser.ps1"</Path>
+                </RunSynchronousCommand>
+                <RunSynchronousCommand wcm:action="add">
+                    <Order>5</Order>
+                    <Path>reg.exe unload "HKU\DefaultUser"</Path>
+                </RunSynchronousCommand>
+            </RunSynchronous>
+        </component>
+    </settings>
+    <settings pass="auditSystem"></settings>
+    <settings pass="auditUser"></settings>
+    <settings pass="oobeSystem">
+        <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
+            <OOBE>
+                <ProtectYourPC>3</ProtectYourPC>
+                <HideEULAPage>true</HideEULAPage>
+                <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE>
+                <HideOnlineAccountScreens>true</HideOnlineAccountScreens>
+            </OOBE>
+            <FirstLogonCommands>
+                <SynchronousCommand wcm:action="add">
+                    <Order>1</Order>
+                    <CommandLine>powershell.exe -WindowStyle "Normal" -ExecutionPolicy "Unrestricted" -NoProfile -File "C:\Windows\Setup\Scripts\FirstLogon.ps1"</CommandLine>
+                </SynchronousCommand>
+            </FirstLogonCommands>
+        </component>
+    </settings>
+    <Extensions xmlns="https://schneegans.de/windows/unattend-generator/">
+        <ExtractScript>
+param(
+    [xml]$Document
+);
+
+foreach( $file in $Document.unattend.Extensions.File ) {
+    $path = [System.Environment]::ExpandEnvironmentVariables( $file.GetAttribute( 'path' ) );
+    mkdir -Path( $path | Split-Path -Parent ) -ErrorAction 'SilentlyContinue';
+    $encoding = switch( [System.IO.Path]::GetExtension( $path ) ) {
+        { $_ -in '.ps1', '.xml' } { [System.Text.Encoding]::UTF8; }
+        { $_ -in '.reg', '.vbs', '.js' } { [System.Text.UnicodeEncoding]::new( $false, $true ); }
+        default { [System.Text.Encoding]::Default; }
+    };
+    $bytes = $encoding.GetPreamble() + $encoding.GetBytes( $file.InnerText.Trim() );
+    [System.IO.File]::WriteAllBytes( $path, $bytes );
+}
+        </ExtractScript>
+        <File path="C:\Windows\Setup\Scripts\TaskbarLayoutModification.xml">
+&lt;LayoutModificationTemplate xmlns="http://schemas.microsoft.com/Start/2014/LayoutModification" xmlns:defaultlayout="http://schemas.microsoft.com/Start/2014/FullDefaultLayout" xmlns:start="http://schemas.microsoft.com/Start/2014/StartLayout" xmlns:taskbar="http://schemas.microsoft.com/Start/2014/TaskbarLayout" Version="1"&gt;
+    &lt;CustomTaskbarLayoutCollection PinListPlacement="Replace"&gt;
+        &lt;defaultlayout:TaskbarLayout&gt;
+            &lt;taskbar:TaskbarPinList&gt;
+                &lt;taskbar:DesktopApp DesktopApplicationLinkPath="#leaveempty" /&gt;
+            &lt;/taskbar:TaskbarPinList&gt;
+        &lt;/defaultlayout:TaskbarLayout&gt;
+    &lt;/CustomTaskbarLayoutCollection&gt;
+&lt;/LayoutModificationTemplate&gt;
+        </File>
+        <File path="C:\Windows\Setup\Scripts\UnlockStartLayout.vbs">
+HKU = &amp;H80000003
+Set reg = GetObject("winmgmts://./root/default:StdRegProv")
+Set fso = CreateObject("Scripting.FileSystemObject")
+
+If reg.EnumKey(HKU, "", sids) = 0 Then
+    If Not IsNull(sids) Then
+        For Each sid In sids
+            key = sid + "\Software\Policies\Microsoft\Windows\Explorer"
+            name = "LockedStartLayout"
+            If reg.GetDWORDValue(HKU, key, name, existing) = 0 Then
+                reg.SetDWORDValue HKU, key, name, 0
+            End If
+        Next
+    End If
+End If
+        </File>
+        <File path="C:\Windows\Setup\Scripts\UnlockStartLayout.xml">
+&lt;Task version="1.2" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task"&gt;
+    &lt;Triggers&gt;
+        &lt;EventTrigger&gt;
+            &lt;Enabled&gt;true&lt;/Enabled&gt;
+            &lt;Subscription&gt;&amp;lt;QueryList&amp;gt;&amp;lt;Query Id="0" Path="Application"&amp;gt;&amp;lt;Select Path="Application"&amp;gt;*[System[Provider[@Name='UnattendGenerator'] and EventID=1]]&amp;lt;/Select&amp;gt;&amp;lt;/Query&amp;gt;&amp;lt;/QueryList&amp;gt;&lt;/Subscription&gt;
+        &lt;/EventTrigger&gt;
+    &lt;/Triggers&gt;
+    &lt;Principals&gt;
+        &lt;Principal id="Author"&gt;
+            &lt;UserId&gt;S-1-5-18&lt;/UserId&gt;
+            &lt;RunLevel&gt;LeastPrivilege&lt;/RunLevel&gt;
+        &lt;/Principal&gt;
+    &lt;/Principals&gt;
+    &lt;Settings&gt;
+        &lt;MultipleInstancesPolicy&gt;IgnoreNew&lt;/MultipleInstancesPolicy&gt;
+        &lt;DisallowStartIfOnBatteries&gt;false&lt;/DisallowStartIfOnBatteries&gt;
+        &lt;StopIfGoingOnBatteries&gt;false&lt;/StopIfGoingOnBatteries&gt;
+        &lt;AllowHardTerminate&gt;true&lt;/AllowHardTerminate&gt;
+        &lt;StartWhenAvailable&gt;false&lt;/StartWhenAvailable&gt;
+        &lt;RunOnlyIfNetworkAvailable&gt;false&lt;/RunOnlyIfNetworkAvailable&gt;
+        &lt;IdleSettings&gt;
+            &lt;StopOnIdleEnd&gt;true&lt;/StopOnIdleEnd&gt;
+            &lt;RestartOnIdle&gt;false&lt;/RestartOnIdle&gt;
+        &lt;/IdleSettings&gt;
+        &lt;AllowStartOnDemand&gt;true&lt;/AllowStartOnDemand&gt;
+        &lt;Enabled&gt;true&lt;/Enabled&gt;
+        &lt;Hidden&gt;false&lt;/Hidden&gt;
+        &lt;RunOnlyIfIdle&gt;false&lt;/RunOnlyIfIdle&gt;
+        &lt;WakeToRun&gt;false&lt;/WakeToRun&gt;
+        &lt;ExecutionTimeLimit&gt;PT72H&lt;/ExecutionTimeLimit&gt;
+        &lt;Priority&gt;7&lt;/Priority&gt;
+    &lt;/Settings&gt;
+    &lt;Actions Context="Author"&gt;
+        &lt;Exec&gt;
+            &lt;Command&gt;C:\Windows\System32\wscript.exe&lt;/Command&gt;
+            &lt;Arguments&gt;C:\Windows\Setup\Scripts\UnlockStartLayout.vbs&lt;/Arguments&gt;
+        &lt;/Exec&gt;
+    &lt;/Actions&gt;
+&lt;/Task&gt;
+        </File>
+        <File path="C:\Windows\Setup\Scripts\SetStartPins.ps1">
+$json = '{"pinnedList":[]}';
+if( [System.Environment]::OSVersion.Version.Build -lt 20000 ) {
+    return;
+}
+$key = 'Registry::HKLM\SOFTWARE\Microsoft\PolicyManager\current\device\Start';
+New-Item -Path $key -ItemType 'Directory' -ErrorAction 'SilentlyContinue';
+Set-ItemProperty -LiteralPath $key -Name 'ConfigureStartPins' -Value $json -Type 'String';
+        </File>
+        <File path="C:\Windows\Setup\Scripts\SetColorTheme.ps1">
+$lightThemeSystem = 0;
+$lightThemeApps = 0;
+$accentColorOnStart = 0;
+$enableTransparency = 0;
+$htmlAccentColor = '#0078D4';
+&amp; {
+    $params = @{
+        LiteralPath = 'Registry::HKCU\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize';
+        Force = $true;
+        Type = 'DWord';
+    };
+    Set-ItemProperty @params -Name 'SystemUsesLightTheme' -Value $lightThemeSystem;
+    Set-ItemProperty @params -Name 'AppsUseLightTheme' -Value $lightThemeApps;
+    Set-ItemProperty @params -Name 'ColorPrevalence' -Value $accentColorOnStart;
+    Set-ItemProperty @params -Name 'EnableTransparency' -Value $enableTransparency;
+};
+&amp; {
+    Add-Type -AssemblyName 'System.Drawing';
+    $accentColor = [System.Drawing.ColorTranslator]::FromHtml( $htmlAccentColor );
+
+    function ConvertTo-DWord {
+        param(
+            [System.Drawing.Color]
+            $Color
+        );
+
+        [byte[]]$bytes = @(
+            $Color.R;
+            $Color.G;
+            $Color.B;
+            $Color.A;
+        );
+        return [System.BitConverter]::ToUInt32( $bytes, 0);
+    }
+
+    $startColor = [System.Drawing.Color]::FromArgb( 0xD2, $accentColor );
+    Set-ItemProperty -LiteralPath 'Registry::HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Accent' -Name 'StartColorMenu' -Value( ConvertTo-DWord -Color $accentColor ) -Type 'DWord' -Force;
+    Set-ItemProperty -LiteralPath 'Registry::HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Accent' -Name 'AccentColorMenu' -Value( ConvertTo-DWord -Color $accentColor ) -Type 'DWord' -Force;
+    Set-ItemProperty -LiteralPath 'Registry::HKCU\Software\Microsoft\Windows\DWM' -Name 'AccentColor' -Value( ConvertTo-DWord -Color $accentColor ) -Type 'DWord' -Force;
+    $params = @{
+        LiteralPath = 'Registry::HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Accent';
+        Name = 'AccentPalette';
+    };
+    $palette = Get-ItemPropertyValue @params;
+    $index = 20;
+    $palette[ $index++ ] = $accentColor.R;
+    $palette[ $index++ ] = $accentColor.G;
+    $palette[ $index++ ] = $accentColor.B;
+    $palette[ $index++ ] = $accentColor.A;
+    Set-ItemProperty @params -Value $palette -Type 'Binary' -Force;
+};
+        </File>
+        <File path="C:\Windows\Setup\Scripts\Specialize.ps1">
+$scripts = @(
+    {
+        reg.exe add "HKLM\SYSTEM\Setup\MoSetup" /v AllowUpgradesWithUnsupportedTPMOrCPU /t REG_DWORD /d 1 /f;
+    };
+    {
+        net.exe accounts /maxpwage:UNLIMITED;
+    };
+    {
+        reg.exe add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v "DisableCloudOptimizedContent" /t REG_DWORD /d 1 /f;
+        [System.Diagnostics.EventLog]::CreateEventSource( 'UnattendGenerator', 'Application' );
+    };
+    {
+        Register-ScheduledTask -TaskName 'UnlockStartLayout' -Xml $( Get-Content -LiteralPath 'C:\Windows\Setup\Scripts\UnlockStartLayout.xml' -Raw );
+    };
+    {
+        reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f
+    };
+    {
+        Remove-Item -LiteralPath 'C:\Users\Public\Desktop\Microsoft Edge.lnk' -ErrorAction 'SilentlyContinue' -Verbose;
+    };
+    {
+        reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Dsh" /v AllowNewsAndInterests /t REG_DWORD /d 0 /f;
+    };
+    {
+        reg.exe add "HKLM\Software\Policies\Microsoft\Edge" /v HideFirstRunExperience /t REG_DWORD /d 1 /f;
+    };
+    {
+        reg.exe add "HKLM\Software\Policies\Microsoft\Edge\Recommended" /v BackgroundModeEnabled /t REG_DWORD /d 0 /f;
+        reg.exe add "HKLM\Software\Policies\Microsoft\Edge\Recommended" /v StartupBoostEnabled /t REG_DWORD /d 0 /f;
+    };
+    {
+        &amp; 'C:\Windows\Setup\Scripts\SetStartPins.ps1';
+    };
+    {
+        reg.exe add "HKU\.DEFAULT\Control Panel\Accessibility\StickyKeys" /v Flags /t REG_SZ /d 10 /f;
+    };
+    {
+        reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v NoAutoUpdate /t REG_DWORD /d 1 /f;
+        reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate" /v DisableWindowsUpdateAccess /t REG_DWORD /d 1 /f;
+    };
+);
+
+&amp; {
+  [float]$complete = 0;
+  [float]$increment = 100 / $scripts.Count;
+  foreach( $script in $scripts ) {
+    Write-Progress -Id 0 -Activity 'Running scripts to customize your Windows installation. Do not close this window.' -PercentComplete $complete;
+    '*** Will now execute command &#xAB;{0}&#xBB;.' -f $(
+      $str = $script.ToString().Trim() -replace '\s+', ' ';
+      $max = 100;
+      if( $str.Length -le $max ) {
+        $str;
+      } else {
+        $str.Substring( 0, $max - 1 ) + '&#x2026;';
+      }
+    );
+    $start = [datetime]::Now;
+    &amp; $script;
+    '*** Finished executing command after {0:0} ms.' -f [datetime]::Now.Subtract( $start ).TotalMilliseconds;
+    "`r`n" * 3;
+    $complete += $increment;
+  }
+} *&gt;&amp;1 | Out-String -Width 1KB -Stream &gt;&gt; "C:\Windows\Setup\Scripts\Specialize.log";
+        </File>
+        <File path="C:\Windows\Setup\Scripts\UserOnce.ps1">
+$scripts = @(
+    {
+        [System.Diagnostics.EventLog]::WriteEntry( 'UnattendGenerator', "User '$env:USERNAME' has requested to unlock the Start menu layout.", [System.Diagnostics.EventLogEntryType]::Information, 1 );
+    };
+    {
+        Remove-Item -Path "${env:USERPROFILE}\Desktop\*.lnk" -Force -ErrorAction 'SilentlyContinue';
+        Remove-Item -Path "$env:HOMEDRIVE\Users\Default\Desktop\*.lnk" -Force -ErrorAction 'SilentlyContinue';
+    };
+    {
+        $taskbarPath = "$env:AppData\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar";
+        if( Test-Path $taskbarPath ) {
+            Get-ChildItem -Path $taskbarPath -File | Remove-Item -Force;
+        }
+        Remove-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Taskband' -Name 'FavoritesRemovedChanges' -Force -ErrorAction 'SilentlyContinue';
+        Remove-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Taskband' -Name 'FavoritesChanges' -Force -ErrorAction 'SilentlyContinue';
+        Remove-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Taskband' -Name 'Favorites' -Force -ErrorAction 'SilentlyContinue';
+    };
+    {
+        reg.exe add "HKCU\Software\Classes\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\InprocServer32" /ve /f;
+    };
+    {
+        Set-ItemProperty -LiteralPath 'Registry::HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced' -Name 'LaunchTo' -Type 'DWord' -Value 1;
+    };
+    {
+        Set-ItemProperty -LiteralPath 'Registry::HKCU\Software\Microsoft\Windows\CurrentVersion\Search' -Name 'SearchboxTaskbarMode' -Type 'DWord' -Value 0;
+    };
+    {
+        &amp; 'C:\Windows\Setup\Scripts\SetColorTheme.ps1';
+    };
+    {
+        reg.exe add "HKCU\Software\Microsoft\Windows\CurrentVersion\Notifications\Settings\Windows.SystemToast.Suggested" /f;
+        reg.exe add "HKCU\Software\Microsoft\Windows\CurrentVersion\Notifications\Settings\Windows.SystemToast.Suggested" /v Enabled /t REG_DWORD /d 0 /f;
+        reg.exe add "HKCU\Software\Microsoft\Windows\CurrentVersion\Notifications\Settings\Windows.SystemToast.StartupApp" /f;
+        reg.exe add "HKCU\Software\Microsoft\Windows\CurrentVersion\Notifications\Settings\Windows.SystemToast.StartupApp" /v Enabled /t REG_DWORD /d 0 /f;
+        reg.exe add "HKCU\Software\Microsoft\Windows\CurrentVersion\Notifications\Settings\Microsoft.SkyDrive.Desktop" /f;
+        reg.exe add "HKCU\Software\Microsoft\Windows\CurrentVersion\Notifications\Settings\Microsoft.SkyDrive.Desktop" /v Enabled /t REG_DWORD /d 0 /f;
+        reg.exe add "HKCU\Software\Microsoft\Windows\CurrentVersion\Notifications\Settings\Windows.SystemToast.AccountHealth" /f;
+        reg.exe add "HKCU\Software\Microsoft\Windows\CurrentVersion\Notifications\Settings\Windows.SystemToast.AccountHealth" /v Enabled /t REG_DWORD /d 0 /f;
+    };
+    {
+        reg.exe add "HKCU\Software\Microsoft\Windows\CurrentVersion\Start" /v AllAppsViewMode /t REG_DWORD /d 2 /f;
+        reg.exe add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v Start_IrisRecommendations /t REG_DWORD /d 0 /f;
+        reg.exe add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v Start_AccountNotifications /t REG_DWORD /d 0 /f;
+        reg.exe add "HKCU\Software\Microsoft\Windows\CurrentVersion\Start" /v ShowAllPinsList /t REG_DWORD /d 0 /f;
+        reg.exe add "HKCU\Software\Microsoft\Windows\CurrentVersion\Start" /v ShowFrequentList /t REG_DWORD /d 0 /f;
+        reg.exe add "HKCU\Software\Microsoft\Windows\CurrentVersion\Start" /v ShowRecentList /t REG_DWORD /d 0 /f;
+        reg.exe add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v Start_TrackDocs /t REG_DWORD /d 0 /f;
+    };
+    {
+        Add-Type -TypeDefinition @"
+using System;
+using System.Runtime.InteropServices;
+public class Win32Broadcast {
+    [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = false)]
+    public static extern IntPtr SendMessageTimeout(
+        IntPtr hWnd,
+        uint Msg,
+        IntPtr wParam,
+        string lParam,
+        uint fuFlags,
+        uint uTimeout,
+        out IntPtr lpdwResult);
+}
+"@;
+        [Win32Broadcast]::SendMessageTimeout( [IntPtr]0xffff, 0x1A, [IntPtr]::Zero, 'ImmersiveColorSet', 0x2, 100, [ref]([IntPtr]::Zero) );
+    };
+    {
+        Get-Process -Name 'explorer' -ErrorAction 'SilentlyContinue' | Where-Object -FilterScript {
+            $_.SessionId -eq ( Get-Process -Id $PID ).SessionId;
+        } | Stop-Process -Force;
+    };
+);
+
+&amp; {
+  [float]$complete = 0;
+  [float]$increment = 100 / $scripts.Count;
+  foreach( $script in $scripts ) {
+    Write-Progress -Id 0 -Activity 'Running scripts to configure this user account. Do not close this window.' -PercentComplete $complete;
+    '*** Will now execute command &#xAB;{0}&#xBB;.' -f $(
+      $str = $script.ToString().Trim() -replace '\s+', ' ';
+      $max = 100;
+      if( $str.Length -le $max ) {
+        $str;
+      } else {
+        $str.Substring( 0, $max - 1 ) + '&#x2026;';
+      }
+    );
+    $start = [datetime]::Now;
+    &amp; $script;
+    '*** Finished executing command after {0:0} ms.' -f [datetime]::Now.Subtract( $start ).TotalMilliseconds;
+    "`r`n" * 3;
+    $complete += $increment;
+  }
+} *&gt;&amp;1 | Out-String -Width 1KB -Stream &gt;&gt; "$env:TEMP\UserOnce.log";
+        </File>
+        <File path="C:\Windows\Setup\Scripts\DefaultUser.ps1">
+$scripts = @(
+    {
+        reg.exe add "HKU\DefaultUser\Software\Policies\Microsoft\Windows\Explorer" /v "StartLayoutFile" /t REG_SZ /d "C:\Windows\Setup\Scripts\TaskbarLayoutModification.xml" /f;
+        reg.exe add "HKU\DefaultUser\Software\Policies\Microsoft\Windows\Explorer" /v "LockedStartLayout" /t REG_DWORD /d 1 /f;
+    };
+    {
+        reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v ShowTaskViewButton /t REG_DWORD /d 0 /f;
+    };
+    {
+        reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v TaskbarAl /t REG_DWORD /d 0 /f;
+    };
+    {
+        foreach( $root in 'Registry::HKU\.DEFAULT', 'Registry::HKU\DefaultUser' ) {
+          Set-ItemProperty -LiteralPath "$root\Control Panel\Keyboard" -Name 'InitialKeyboardIndicators' -Type 'String' -Value 2 -Force;
+        }
+    };
+    {
+        reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\TaskbarDeveloperSettings" /v TaskbarEndTask /t REG_DWORD /d 1 /f;
+    };
+    {
+        reg.exe add "HKU\DefaultUser\Control Panel\Accessibility\StickyKeys" /v Flags /t REG_SZ /d 10 /f;
+    };
+    {
+        reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\DWM" /v ColorPrevalence /t REG_DWORD /d 0 /f;
+    };
+    {
+        reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\RunOnce" /v "UnattendedSetup" /t REG_SZ /d "powershell.exe -WindowStyle \""Normal\"" -ExecutionPolicy \""Unrestricted\"" -NoProfile -File \""C:\Windows\Setup\Scripts\UserOnce.ps1\""" /f;
+    };
+);
+
+&amp; {
+  [float]$complete = 0;
+  [float]$increment = 100 / $scripts.Count;
+  foreach( $script in $scripts ) {
+    Write-Progress -Id 0 -Activity 'Running scripts to modify the default user&#x2019;&#x2019;s registry hive. Do not close this window.' -PercentComplete $complete;
+    '*** Will now execute command &#xAB;{0}&#xBB;.' -f $(
+      $str = $script.ToString().Trim() -replace '\s+', ' ';
+      $max = 100;
+      if( $str.Length -le $max ) {
+        $str;
+      } else {
+        $str.Substring( 0, $max - 1 ) + '&#x2026;';
+      }
+    );
+    $start = [datetime]::Now;
+    &amp; $script;
+    '*** Finished executing command after {0:0} ms.' -f [datetime]::Now.Subtract( $start ).TotalMilliseconds;
+    "`r`n" * 3;
+    $complete += $increment;
+  }
+} *&gt;&amp;1 | Out-String -Width 1KB -Stream &gt;&gt; "C:\Windows\Setup\Scripts\DefaultUser.log";
+        </File>
+        <File path="C:\Windows\Setup\Scripts\FirstLogon.ps1">
+$scripts = @(
+    {
+        cmd.exe /c "rmdir C:\Windows.old";
+    };
+    {
+        Remove-Item -LiteralPath @(
+          'C:\Windows\Panther\unattend.xml';
+          'C:\Windows\Panther\unattend-original.xml';
+          'C:\Windows\Setup\Scripts\Wifi.xml';
+        ) -Force -ErrorAction 'SilentlyContinue' -Verbose;
+    };
+    {
+        reg.exe delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v NoAutoUpdate /f;
+        reg.exe delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate" /v DisableWindowsUpdateAccess /f;
+    };
+    {
+        $recallFeature = Get-WindowsOptionalFeature -Online -ErrorAction SilentlyContinue | Where-Object { $_.State -eq 'Enabled' -and $_.FeatureName -like 'Recall' };
+        if( $recallFeature ) {
+            Disable-WindowsOptionalFeature -Online -FeatureName 'Recall' -Remove -ErrorAction SilentlyContinue;
+        }
+    };
+    {
+        try {
+            $viveDir = Join-Path $env:TEMP 'ViVeTool';
+            $viveZip = Join-Path $env:TEMP 'ViVeTool.zip';
+            Invoke-WebRequest 'https://github.com/thebookisclosed/ViVe/releases/download/v0.3.4/ViVeTool-v0.3.4-IntelAmd.zip' -OutFile $viveZip;
+            Expand-Archive -Path $viveZip -DestinationPath $viveDir -Force;
+            Remove-Item -Path $viveZip -Force;
+            Start-Process -FilePath (Join-Path $viveDir 'ViVeTool.exe') -ArgumentList '/disable /id:47205210' -Wait -NoNewWindow;
+            Remove-Item -Path $viveDir -Recurse -Force;
+        } catch {}
+    };
+    {
+        if( (Get-BitLockerVolume -MountPoint $Env:SystemDrive).ProtectionStatus -eq 'On' ) {
+            Disable-BitLocker -MountPoint $Env:SystemDrive;
+        }
+    };
+    {
+        if( (bcdedit | Select-String 'path').Count -eq 2 ) {
+            bcdedit /set `{bootmgr`} timeout 0;
+        }
+    };
+);
+
+&amp; {
+  [float]$complete = 0;
+  [float]$increment = 100 / $scripts.Count;
+  foreach( $script in $scripts ) {
+    Write-Progress -Id 0 -Activity 'Running scripts to finalize your Windows installation. Do not close this window.' -PercentComplete $complete;
+    '*** Will now execute command &#xAB;{0}&#xBB;.' -f $(
+      $str = $script.ToString().Trim() -replace '\s+', ' ';
+      $max = 100;
+      if( $str.Length -le $max ) {
+        $str;
+      } else {
+        $str.Substring( 0, $max - 1 ) + '&#x2026;';
+      }
+    );
+    $start = [datetime]::Now;
+    &amp; $script;
+    '*** Finished executing command after {0:0} ms.' -f [datetime]::Now.Subtract( $start ).TotalMilliseconds;
+    "`r`n" * 3;
+    $complete += $increment;
+  }
+} *&gt;&amp;1 | Out-String -Width 1KB -Stream &gt;&gt; "C:\Windows\Setup\Scripts\FirstLogon.log";
+        </File>
+    </Extensions>
+</unattend>

tools/devdocs-generator.ps1

@@ -1,9 +1,7 @@
 <#
     .DESCRIPTION
-    Generates Hugo-compatible markdown files for the development documentation
-    based on config/tweaks.json and config/feature.json.
-    Each JSON entry gets its own .md file with the raw JSON snippet or PowerShell function embedded.
-    Called by the GitHub Actions docs workflow before Hugo build.
+    Generates Hugo markdown docs from config/tweaks.json and config/feature.json.
+    Run by the GitHub Actions docs workflow before Hugo build.
 #>
 
 function Update-Progress {
@@ -18,11 +16,7 @@ function Update-Progress {
 }
 
 function Get-RawJsonBlock {
-    <#
-        .SYNOPSIS
-        Extracts the raw JSON text for a specific item from a JSON file's lines.
-        Returns the line number and raw text, excluding the "link" property and closing brace.
-    #>
+    # Returns the raw JSON text and 1-based start line for an item, excluding the "link" property.
     param (
         [Parameter(Mandatory)]
         [string]$ItemName,
@@ -35,7 +29,6 @@ function Get-RawJsonBlock {
     $startIndex  = -1
     $startIndent = ""
 
-    # Find the line containing "ItemName": {
     for ($i = 0; $i -lt $JsonLines.Count; $i++) {
         if ($JsonLines[$i] -match "^(\s*)`"$escapedName`"\s*:\s*\{") {
             $startIndex  = $i
@@ -49,7 +42,6 @@ function Get-RawJsonBlock {
         return $null
     }
 
-    # Find the closing } at the same indentation level
     $escapedIndent = [regex]::Escape($startIndent)
     $endIndex      = -1
     for ($i = ($startIndex + 1); $i -lt $JsonLines.Count; $i++) {
@@ -64,7 +56,7 @@ function Get-RawJsonBlock {
         return $null
     }
 
-    # Walk backwards from closing brace to exclude "link" property and empty lines
+    # Strip trailing "link" property and blank lines before returning
     $lastContentIndex = $endIndex - 1
     while ($lastContentIndex -gt $startIndex) {
         $trimmed = $JsonLines[$lastContentIndex].Trim()
@@ -75,28 +67,21 @@ function Get-RawJsonBlock {
         }
     }
 
-    $rawLines = $JsonLines[$startIndex..$lastContentIndex]
-    $rawText = $rawLines -join "`r`n"
-
     return @{
-        LineNumber = $startIndex + 1  # 1-based
-        RawText    = $rawText
+        LineNumber = $startIndex + 1
+        RawText    = ($JsonLines[$startIndex..$lastContentIndex] -join "`r`n")
     }
 }
 
 function Get-ButtonFunctionMapping {
-    <#
-        .SYNOPSIS
-        Parses Invoke-WPFButton.ps1 to build a hashtable mapping button names to function names.
-    #>
+    # Parses Invoke-WPFButton.ps1 and returns a hashtable of button name -> function name.
     param (
         [Parameter(Mandatory)]
         [string]$ButtonFilePath
     )
 
     $mapping = @{}
-    $lines = Get-Content -Path $ButtonFilePath
-    foreach ($line in $lines) {
+    foreach ($line in (Get-Content -Path $ButtonFilePath)) {
         if ($line -match '^\s*"(\w+)"\s*\{(Invoke-\w+)') {
             $mapping[$matches[1]] = $matches[2]
         }
@@ -105,11 +90,8 @@ function Get-ButtonFunctionMapping {
 }
 
 function Add-LinkAttributeToJson {
-    <#
-        .SYNOPSIS
-        Updates the "link" property on each top-level entry in a JSON config file
-        to point to the corresponding documentation page URL.
-    #>
+    # Updates only the "link" property for each entry in a JSON config file.
+    # Reads via ConvertFrom-Json for metadata, then edits lines directly to avoid reformatting.
     param (
         [Parameter(Mandatory)]
         [string]$JsonFilePath,
@@ -119,32 +101,74 @@ function Add-LinkAttributeToJson {
         [string]$ItemNameToCut
     )
 
-    $jsonText = Get-Content -Path $JsonFilePath -Raw
-    $jsonData = $jsonText | ConvertFrom-Json
+    $jsonData = Get-Content -Path $JsonFilePath -Raw | ConvertFrom-Json
+    $lines    = [System.Collections.Generic.List[string]](Get-Content -Path $JsonFilePath)
 
     foreach ($item in $jsonData.PSObject.Properties) {
         $itemName    = $item.Name
-        $itemDetails = $item.Value
-        $category = $itemDetails.category -replace '[^a-zA-Z0-9]', '-'
+        $category    = $item.Value.category -replace '[^a-zA-Z0-9]', '-'
         $displayName = $itemName -replace $ItemNameToCut, ''
-        $docLink = "$UrlPrefix/$($category.ToLower())/$($displayName.ToLower())"
+        $newLink     = "$UrlPrefix/$($category.ToLower())/$($displayName.ToLower())"
+        $escapedName = [regex]::Escape($itemName)
 
-        $itemDetails | Add-Member -NotePropertyName "link" -NotePropertyValue $docLink -Force
+        # Find item start line
+        $startIdx = -1
+        for ($i = 0; $i -lt $lines.Count; $i++) {
+            if ($lines[$i] -match "^\s*`"$escapedName`"\s*:\s*\{") {
+                $startIdx = $i
+                break
+            }
+        }
+        if ($startIdx -eq -1) { continue }
+
+        # Derive indentation: propIndent is one level deeper than the item start.
+        # Used to target only top-level properties and skip nested object braces.
+        $null          = $lines[$startIdx] -match '^(\s*)'
+        $propIndent    = $matches[1] + '  '
+        $propIndentLen = $propIndent.Length
+        $escapedPropIndent = [regex]::Escape($propIndent)
+
+        # Scan forward: update existing "link" or find the closing brace to insert one.
+        # Closing brace is matched by indent <= propIndentLen to handle inconsistent formatting.
+        $linkUpdated   = $false
+        $closeBraceIdx = -1
+        for ($j = $startIdx + 1; $j -lt $lines.Count; $j++) {
+            if ($lines[$j] -match "^$escapedPropIndent`"link`"\s*:") {
+                $lines[$j] = $lines[$j] -replace '"link"\s*:\s*"[^"]*"', "`"link`": `"$newLink`""
+                $linkUpdated = $true
+                break
+            }
+            if ($lines[$j] -match '^\s*\}') {
+                $null = $lines[$j] -match '^(\s*)'
+                if ($matches[1].Length -le $propIndentLen) {
+                    $closeBraceIdx = $j
+                    break
+                }
+            }
         }
 
-    $jsonText = ($jsonData | ConvertTo-Json -Depth 100).replace('\n', "`n").replace('\r', "`r")
-    Set-Content -Path $JsonFilePath -Value $jsonText -Encoding utf8
+        if (-not $linkUpdated -and $closeBraceIdx -ne -1) {
+            # Insert "link" before the closing brace
+            $prevPropIdx = $closeBraceIdx - 1
+            while ($prevPropIdx -gt $startIdx -and $lines[$prevPropIdx].Trim() -eq '') { $prevPropIdx-- }
+
+            if ($lines[$prevPropIdx] -notmatch ',\s*$') {
+                $lines[$prevPropIdx] = $lines[$prevPropIdx].TrimEnd() + ','
+            }
+            $lines.Insert($closeBraceIdx, "$propIndent`"link`": `"$newLink`"")
+        }
+    }
+
+    Set-Content -Path $JsonFilePath -Value $lines -Encoding utf8
 }
 
 # ==============================================================================
-# Main Script
+# Main
 # ==============================================================================
 
-# Use PSScriptRoot if available (running as a script file), otherwise assume CWD is tools/
 $scriptDir = if ($PSScriptRoot) { $PSScriptRoot } else { (Get-Location).Path }
 $repoRoot  = Resolve-Path "$scriptDir/.."
 
-# Paths
 $tweaksJsonPath      = "$repoRoot/config/tweaks.json"
 $featuresJsonPath    = "$repoRoot/config/feature.json"
 $tweaksOutputDir     = "$repoRoot/docs/content/dev/tweaks"
@@ -155,7 +179,7 @@ $privateFunctionsDir = "$repoRoot/functions/private"
 $itemnametocut = 'WPF(WinUtil|Toggle|Features?|Tweaks?|Panel|Fix(es)?)?'
 $baseUrl       = "https://winutil.christitus.com"
 
-# Categories that should have generated documentation
+# Categories with generated docs
 $documentedCategories = @(
     "Essential Tweaks",
     "z__Advanced Tweaks - CAUTION",
@@ -163,49 +187,44 @@ $documentedCategories = @(
     "Performance Plans",
     "Features",
     "Fixes",
-    "Legacy Windows Panels"
+    "Legacy Windows Panels",
+    "Powershell Profile Powershell 7+ Only",
+    "Remote Access"
 )
 
-# --- Load data ---
+# Categories where Button entries embed a PS function instead of raw JSON
+$functionEmbedCategories = @(
+    "Fixes",
+    "Powershell Profile Powershell 7+ Only",
+    "Remote Access"
+)
 
 Update-Progress "Loading JSON files" 10
 $tweaks   = Get-Content -Path $tweaksJsonPath   -Raw | ConvertFrom-Json
 $features = Get-Content -Path $featuresJsonPath -Raw | ConvertFrom-Json
 
-# --- Load function files (content + relative path) ---
-
 Update-Progress "Loading function files" 20
 $functionFiles = @{}
 Get-ChildItem -Path $publicFunctionsDir  -Filter *.ps1 | ForEach-Object {
-    $functionFiles[$_.BaseName] = @{
-        Content      = (Get-Content -Path $_.FullName -Raw).TrimEnd()
-        RelativePath = "functions/public/$($_.Name)"
-    }
+    $functionFiles[$_.BaseName] = @{ Content = (Get-Content -Path $_.FullName -Raw).TrimEnd(); RelativePath = "functions/public/$($_.Name)" }
 }
 Get-ChildItem -Path $privateFunctionsDir -Filter *.ps1 | ForEach-Object {
-    $functionFiles[$_.BaseName] = @{
-        Content      = (Get-Content -Path $_.FullName -Raw).TrimEnd()
-        RelativePath = "functions/private/$($_.Name)"
+    $functionFiles[$_.BaseName] = @{ Content = (Get-Content -Path $_.FullName -Raw).TrimEnd(); RelativePath = "functions/private/$($_.Name)" }
 }
-}
-
-# --- Build button-to-function mapping ---
 
 Update-Progress "Building button-to-function mapping" 30
 $buttonFunctionMap = Get-ButtonFunctionMapping -ButtonFilePath "$publicFunctionsDir/Invoke-WPFButton.ps1"
 
-# --- Update link attributes in JSON files ---
-
 Update-Progress "Updating documentation links in JSON" 40
 Add-LinkAttributeToJson -JsonFilePath $tweaksJsonPath   -UrlPrefix "$baseUrl/dev/tweaks"   -ItemNameToCut $itemnametocut
 Add-LinkAttributeToJson -JsonFilePath $featuresJsonPath -UrlPrefix "$baseUrl/dev/features" -ItemNameToCut $itemnametocut
 
-# Reload JSON lines after link update (so line numbers are accurate)
+# Reload lines after link update so line numbers in docs are accurate
 $tweaksLines   = Get-Content -Path $tweaksJsonPath
 $featuresLines = Get-Content -Path $featuresJsonPath
 
 # ==============================================================================
-# Clean up old generated .md files (keep _index.md)
+# Clean up old generated .md files (preserve _index.md)
 # ==============================================================================
 
 Update-Progress "Cleaning up old generated docs" 45
@@ -236,16 +255,12 @@ foreach ($itemName in $tweakNames) {
     $categoryDir = "$tweaksOutputDir/$category"
     $filename    = "$categoryDir/$displayName.md"
 
-    if (-Not (Test-Path -Path $categoryDir)) {
-        New-Item -ItemType Directory -Path $categoryDir | Out-Null
-    }
+    if (-Not (Test-Path -Path $categoryDir)) { New-Item -ItemType Directory -Path $categoryDir | Out-Null }
 
-    # Hugo frontmatter
     $title   = $item.Content -replace '"', '\"'
     $content = "---`r`ntitle: `"$title`"`r`ndescription: `"`"`r`n---`r`n`r`n"
 
     if ($item.Type -eq "Button") {
-        # Button-type tweak: embed the mapped PowerShell function
         $funcName = $buttonFunctionMap[$itemName]
         if ($funcName -and $functionFiles.ContainsKey($funcName)) {
             $func     = $functionFiles[$funcName]
@@ -254,7 +269,6 @@ foreach ($itemName in $tweakNames) {
             $content += "```````r`n"
         }
     } else {
-        # Standard tweak: embed raw JSON block
         $jsonBlock = Get-RawJsonBlock -ItemName $itemName -JsonLines $tweaksLines
         if ($jsonBlock) {
             $content += "``````json {filename=`"config/tweaks.json`",linenos=inline,linenostart=$($jsonBlock.LineNumber)}`r`n"
@@ -262,27 +276,16 @@ foreach ($itemName in $tweakNames) {
             $content += "```````r`n"
         }
 
-        # Registry Changes section
         if ($item.registry) {
             $content += "`r`n## Registry Changes`r`n`r`n"
             $content += "Applications and System Components store and retrieve configuration data to modify windows settings, so we can use the registry to change many settings in one place.`r`n`r`n"
             $content += "You can find information about the registry on [Wikipedia](https://www.wikiwand.com/en/Windows_Registry) and [Microsoft's Website](https://learn.microsoft.com/en-us/windows/win32/sysinfo/registry).`r`n"
         }
-
-        # Service function reference
-        if ($item.service -and $functionFiles.ContainsKey("Set-WinUtilService")) {
-            $svcFunc = $functionFiles["Set-WinUtilService"]
-            $content += "#Function`r`n"
-            $content += "``````powershell {filename=`"$($svcFunc.RelativePath)`",linenos=inline,linenostart=1}`r`n"
-            $content += $svcFunc.Content + "`r`n"
-            $content += "```````r`n"
-        }
     }
 
     Set-Content -Path $filename -Value $content -Encoding utf8 -NoNewline
 
-    $percent = 50 + [int](($tweakCount / $totalTweaks) * 20)
-    if ($percent -gt 70) { $percent = 70 }
+    $percent = [Math]::Min(70, 50 + [int](($tweakCount / $totalTweaks) * 20))
     Update-Progress "Generating tweak documentation ($tweakCount/$totalTweaks)" $percent
 }
 
@@ -301,8 +304,6 @@ foreach ($itemName in $featureNames) {
     $featureCount++
 
     if ($item.category -notin $documentedCategories) { continue }
-
-    # Skip pure UI buttons that don't need docs
     if ($itemName -eq "WPFFeatureInstall") { continue }
 
     $category    = $item.category -replace '[^a-zA-Z0-9]', '-'
@@ -310,16 +311,13 @@ foreach ($itemName in $featureNames) {
     $categoryDir = "$featuresOutputDir/$category"
     $filename    = "$categoryDir/$displayName.md"
 
-    if (-Not (Test-Path -Path $categoryDir)) {
-        New-Item -ItemType Directory -Path $categoryDir | Out-Null
-    }
+    if (-Not (Test-Path -Path $categoryDir)) { New-Item -ItemType Directory -Path $categoryDir | Out-Null }
 
     $title   = $item.Content -replace '"', '\"'
     $content = "---`r`ntitle: `"$title`"`r`ndescription: `"`"`r`n---`r`n`r`n"
 
-    if ($item.category -eq "Fixes" -or $item.category -eq "Legacy Windows Panels") {
-        # Embed the PowerShell function file
-        $funcName = $buttonFunctionMap[$itemName]
+    if ($item.category -in $functionEmbedCategories) {
+        $funcName = if ($item.function) { $item.function } else { $buttonFunctionMap[$itemName] }
         if ($funcName -and $functionFiles.ContainsKey($funcName)) {
             $func     = $functionFiles[$funcName]
             $content += "``````powershell {filename=`"$($func.RelativePath)`",linenos=inline,linenostart=1}`r`n"
@@ -327,7 +325,6 @@ foreach ($itemName in $featureNames) {
             $content += "```````r`n"
         }
     } else {
-        # Features category: embed raw JSON block
         $jsonBlock = Get-RawJsonBlock -ItemName $itemName -JsonLines $featuresLines
         if ($jsonBlock) {
             $content += "``````json {filename=`"config/feature.json`",linenos=inline,linenostart=$($jsonBlock.LineNumber)}`r`n"
@@ -338,8 +335,7 @@ foreach ($itemName in $featureNames) {
 
     Set-Content -Path $filename -Value $content -Encoding utf8 -NoNewline
 
-    $percent = 70 + [int](($featureCount / $totalFeatures) * 20)
-    if ($percent -gt 90) { $percent = 90 }
+    $percent = [Math]::Min(90, 70 + [int](($featureCount / $totalFeatures) * 20))
     Update-Progress "Generating feature documentation ($featureCount/$totalFeatures)" $percent
 }
 

xaml/inputXML.xaml

@@ -970,6 +970,14 @@
                         </TextBlock>
                     </ToggleButton.Content>
                 </ToggleButton>
+                <ToggleButton Margin="0,0,5,0" Height="{DynamicResource TabButtonHeight}" Width="Auto" MinWidth="{DynamicResource TabButtonWidth}"
+                    Background="{DynamicResource ButtonWin11ISOBackgroundColor}" Foreground="{DynamicResource ButtonWin11ISOForegroundColor}" FontWeight="Bold" Name="WPFTab5BT">
+                    <ToggleButton.Content>
+                        <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonWin11ISOForegroundColor}">
+                            <Underline>W</Underline>in11 Creator
+                        </TextBlock>
+                    </ToggleButton.Content>
+                </ToggleButton>
             </StackPanel>
 
             <!-- Search Bar and Action Buttons -->
@@ -1331,6 +1339,322 @@
                     </Grid>
                 </ScrollViewer>
             </TabItem>
+            <TabItem Header="Win11ISO" Visibility="Collapsed" Name="WPFTab5">
+                <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Margin="{DynamicResource TabContentMargin}">
+                    <Grid Background="Transparent" Name="Win11ISOPanel">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>  <!-- Step 1: Select ISO -->
+                            <RowDefinition Height="Auto"/>  <!-- Step 2: Mount & Verify -->
+                            <RowDefinition Height="Auto"/>  <!-- Step 3: Modify install.wim -->
+                            <RowDefinition Height="Auto"/>  <!-- Step 4: Output Options -->
+                            <RowDefinition Height="Auto"/>  <!-- Log / Status -->
+                        </Grid.RowDefinitions>
+
+                        <!-- ═══════════════════════════════════════════════════════════ -->
+                        <!-- STEP 1 : Select Windows 11 ISO                             -->
+                        <!-- ═══════════════════════════════════════════════════════════ -->
+                        <Border Grid.Row="0" Name="WPFWin11ISOSelectSection" Style="{StaticResource BorderStyle}">
+                            <Grid Margin="5">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+
+                                <!-- Left: File Selector -->
+                                <StackPanel Grid.Column="0" Margin="5,5,15,5">
+                                    <TextBlock FontSize="{DynamicResource FontSize}" FontWeight="Bold"
+                                               Foreground="{DynamicResource MainForegroundColor}" Margin="0,0,0,8">
+                                        Step 1 - Select Windows 11 ISO
+                                    </TextBlock>
+                                    <TextBlock FontSize="{DynamicResource FontSize}" Foreground="{DynamicResource MainForegroundColor}"
+                                               TextWrapping="Wrap" Margin="0,0,0,6">
+                                        Browse to your locally saved Windows 11 ISO file. Only official ISOs
+                                        downloaded from Microsoft are supported.
+                                    </TextBlock>
+                                    <TextBlock FontSize="{DynamicResource FontSize}" Foreground="{DynamicResource MainForegroundColor}"
+                                               TextWrapping="Wrap" Margin="0,0,0,12" FontStyle="Italic">
+                                        <Run FontWeight="Bold">NOTE:</Run> This is only meant for Fresh and New Windows installs.
+                                    </TextBlock>
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*"/>
+                                            <ColumnDefinition Width="Auto"/>
+                                        </Grid.ColumnDefinitions>
+                                        <TextBox Grid.Column="0"
+                                                 Name="WPFWin11ISOPath"
+                                                 IsReadOnly="True"
+                                                 VerticalAlignment="Center"
+                                                 Padding="6,4"
+                                                 Margin="0,0,6,0"
+                                                 Text="No ISO selected..."
+                                                 Foreground="{DynamicResource MainForegroundColor}"
+                                                 Background="{DynamicResource MainBackgroundColor}"/>
+                                        <Button Grid.Column="1"
+                                                Name="WPFWin11ISOBrowseButton"
+                                                Content="Browse"
+                                                Width="Auto" Padding="12,0"
+                                                Height="{DynamicResource ButtonHeight}"/>
+                                    </Grid>
+                                    <TextBlock Name="WPFWin11ISOFileInfo"
+                                               FontSize="{DynamicResource FontSize}"
+                                               Foreground="{DynamicResource MainForegroundColor}"
+                                               Margin="0,8,0,0"
+                                               TextWrapping="Wrap"
+                                               Visibility="Collapsed"/>
+                                </StackPanel>
+
+                                <!-- Right: Download guidance -->
+                                <Border Grid.Column="1"
+                                        Background="{DynamicResource MainBackgroundColor}"
+                                        BorderBrush="{DynamicResource BorderColor}"
+                                        BorderThickness="1" CornerRadius="5"
+                                        Margin="5" Padding="15">
+                                    <StackPanel>
+                                        <TextBlock FontSize="{DynamicResource FontSize}" FontWeight="Bold"
+                                                   Foreground="OrangeRed" Margin="0,0,0,10">
+                                            !!WARNING!! You must use an official Microsoft ISO
+                                        </TextBlock>
+                                        <TextBlock FontSize="{DynamicResource FontSize}"
+                                                   Foreground="{DynamicResource MainForegroundColor}"
+                                                   TextWrapping="Wrap" Margin="0,0,0,8">
+                                            Download the Windows 11 ISO directly from Microsoft.com.
+                                            Third-party, pre-modified, or unofficial images are not supported
+                                            and may produce broken results.
+                                        </TextBlock>
+                                        <TextBlock FontSize="{DynamicResource FontSize}"
+                                                   Foreground="{DynamicResource MainForegroundColor}"
+                                                   TextWrapping="Wrap" Margin="0,0,0,6">
+                                            On the Microsoft download page, choose:
+                                        </TextBlock>
+                                        <TextBlock FontSize="{DynamicResource FontSize}"
+                                                   Foreground="{DynamicResource MainForegroundColor}"
+                                                   TextWrapping="Wrap" Margin="12,0,0,12">
+                                            - Edition  : Windows 11
+                                            <LineBreak/>- Language : your preferred language
+                                            <LineBreak/>- Architecture : 64-bit (x64)
+                                        </TextBlock>
+                                        <Button Name="WPFWin11ISODownloadLink"
+                                                Content="Open Microsoft Download Page"
+                                                HorizontalAlignment="Left"
+                                                Width="Auto" Padding="12,0"
+                                                Height="{DynamicResource ButtonHeight}"/>
+                                    </StackPanel>
+                                </Border>
+                            </Grid>
+                        </Border>
+
+                        <!-- ═══════════════════════════════════════════════════════════ -->
+                        <!-- STEP 2 : Mount & Verify ISO                                -->
+                        <!-- ═══════════════════════════════════════════════════════════ -->
+                        <Border Grid.Row="1"
+                                Name="WPFWin11ISOMountSection"
+                                Style="{StaticResource BorderStyle}"
+                                Visibility="Collapsed">
+                            <Grid Margin="5">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+
+                                <StackPanel Grid.Column="0" Margin="0,0,20,0" VerticalAlignment="Top">
+                                    <TextBlock FontSize="{DynamicResource FontSize}" FontWeight="Bold"
+                                               Foreground="{DynamicResource MainForegroundColor}" Margin="0,0,0,8">
+                                        Step 2 - Mount &amp; Verify ISO
+                                    </TextBlock>
+                                    <TextBlock FontSize="{DynamicResource FontSize}"
+                                               Foreground="{DynamicResource MainForegroundColor}"
+                                               TextWrapping="Wrap" Margin="0,0,0,12" MaxWidth="320">
+                                        Mount the ISO and confirm it contains a valid Windows 11
+                                        install.wim before any modifications are made.
+                                    </TextBlock>
+                                    <Button Name="WPFWin11ISOMountButton"
+                                            Content="Mount &amp; Verify ISO"
+                                            HorizontalAlignment="Left"
+                                            Width="Auto" Padding="12,0"
+                                            Height="{DynamicResource ButtonHeight}"/>
+                                </StackPanel>
+
+                                <!-- Verification results panel -->
+                                <Border Grid.Column="1"
+                                        Name="WPFWin11ISOVerifyResultPanel"
+                                        Background="{DynamicResource MainBackgroundColor}"
+                                        BorderBrush="{DynamicResource BorderColor}"
+                                        BorderThickness="1" CornerRadius="5"
+                                        Padding="12" Margin="0,0,0,0"
+                                        Visibility="Collapsed">
+                                    <StackPanel>
+                                        <TextBlock Name="WPFWin11ISOMountDriveLetter"
+                                                   FontSize="{DynamicResource FontSize}"
+                                                   Foreground="{DynamicResource MainForegroundColor}"
+                                                   Margin="0,0,0,4"/>
+                                        <TextBlock Name="WPFWin11ISOArchLabel"
+                                                   FontSize="{DynamicResource FontSize}"
+                                                   Foreground="{DynamicResource MainForegroundColor}"
+                                                   Margin="0,0,0,4"/>
+                                        <TextBlock FontSize="{DynamicResource FontSize}" FontWeight="Bold"
+                                                   Foreground="{DynamicResource MainForegroundColor}"
+                                                   Margin="0,6,0,4">
+                                            Select Edition:
+                                        </TextBlock>
+                                        <ComboBox Name="WPFWin11ISOEditionComboBox"
+                                                  FontSize="{DynamicResource FontSize}"
+                                                  Foreground="{DynamicResource MainForegroundColor}"
+                                                  Background="{DynamicResource MainBackgroundColor}"
+                                                  BorderBrush="{DynamicResource BorderColor}"
+                                                  HorizontalAlignment="Stretch"
+                                                  Margin="0,0,0,0"/>
+                                    </StackPanel>
+                                </Border>
+                            </Grid>
+                        </Border>
+
+                        <!-- ═══════════════════════════════════════════════════════════ -->
+                        <!-- STEP 3 : Modify install.wim                                -->
+                        <!-- ═══════════════════════════════════════════════════════════ -->
+                        <Border Grid.Row="2"
+                                Name="WPFWin11ISOModifySection"
+                                Style="{StaticResource BorderStyle}"
+                                Visibility="Collapsed">
+                            <StackPanel Margin="5">
+                                <TextBlock FontSize="{DynamicResource FontSize}" FontWeight="Bold"
+                                           Foreground="{DynamicResource MainForegroundColor}" Margin="0,0,0,8">
+                                    Step 3 - Modify install.wim
+                                </TextBlock>
+                                <TextBlock FontSize="{DynamicResource FontSize}"
+                                           Foreground="{DynamicResource MainForegroundColor}"
+                                           TextWrapping="Wrap" Margin="0,0,0,12">
+                                    The ISO contents will be extracted to a temporary working directory,
+                                    install.wim will be modified (components removed, tweaks applied),
+                                    and the result will be repackaged. This process may take several minutes
+                                    depending on your hardware.
+                                </TextBlock>
+                                <Button Name="WPFWin11ISOModifyButton"
+                                        Content="Run Windows ISO Modification and Creator"
+                                        HorizontalAlignment="Left"
+                                        Width="Auto" Padding="12,0"
+                                        Height="{DynamicResource ButtonHeight}"/>
+                            </StackPanel>
+                        </Border>
+
+                        <!-- ═══════════════════════════════════════════════════════════ -->
+                        <!-- STEP 4 : Output Options                                    -->
+                        <!-- ═══════════════════════════════════════════════════════════ -->
+                        <Border Grid.Row="3"
+                                Name="WPFWin11ISOOutputSection"
+                                Style="{StaticResource BorderStyle}">
+                            <StackPanel Margin="5">
+                                <!-- Header row: title + Clean & Reset button -->
+                                <Grid Margin="0,0,0,12">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Grid.Column="0" FontSize="{DynamicResource FontSize}" FontWeight="Bold"
+                                               Foreground="{DynamicResource MainForegroundColor}"
+                                               VerticalAlignment="Center">
+                                        Step 4 - Output: What would you like to do with the modified image?
+                                    </TextBlock>
+                                    <Button Grid.Column="1"
+                                            Name="WPFWin11ISOCleanResetButton"
+                                            Content="Clean &amp; Reset"
+                                            Foreground="OrangeRed"
+                                            Width="Auto" Padding="12,0"
+                                            Height="{DynamicResource ButtonHeight}"
+                                            ToolTip="Delete the temporary working directory and reset the interface back to Step 1"
+                                            Margin="12,0,0,0"/>
+                                </Grid>
+
+                                <!-- ── Choice prompt buttons ── -->
+                                <Grid Margin="0,0,0,12">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="16"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Button Grid.Column="0"
+                                            Name="WPFWin11ISOChooseISOButton"
+                                            Content="Save as an ISO File"
+                                            HorizontalAlignment="Stretch"
+                                            Width="Auto" Padding="12,0"
+                                            Height="{DynamicResource ButtonHeight}"/>
+                                    <Button Grid.Column="2"
+                                            Name="WPFWin11ISOChooseUSBButton"
+                                            Content="Write Directly to a USB Drive  (erases drive)"
+                                            Foreground="OrangeRed"
+                                            HorizontalAlignment="Stretch"
+                                            Width="Auto" Padding="12,0"
+                                            Height="{DynamicResource ButtonHeight}"/>
+                                </Grid>
+
+                                <!-- ── USB write sub-panel (revealed on USB choice) ── -->
+                                <Border Name="WPFWin11ISOOptionUSB"
+                                        Style="{StaticResource BorderStyle}"
+                                        Visibility="Collapsed"
+                                        Margin="0,8,0,0">
+                                    <StackPanel>
+                                        <TextBlock FontSize="{DynamicResource FontSize}"
+                                                   Foreground="{DynamicResource MainForegroundColor}"
+                                                   TextWrapping="Wrap" Margin="0,0,0,8">
+                                            <Run FontWeight="Bold" Foreground="OrangeRed">!! All data on the selected USB drive will be permanently erased !!</Run>
+                                            <LineBreak/>
+                                            Select a removable USB drive below, then click Erase &amp; Write.
+                                        </TextBlock>
+                                        <!-- USB drive selector row -->
+                                        <Grid Margin="0,0,0,8">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="*"/>
+                                                <ColumnDefinition Width="Auto"/>
+                                            </Grid.ColumnDefinitions>
+                                            <ComboBox Grid.Column="0"
+                                                      Name="WPFWin11ISOUSBDriveComboBox"
+                                                      Foreground="{DynamicResource MainForegroundColor}"
+                                                      Background="{DynamicResource MainBackgroundColor}"
+                                                      VerticalAlignment="Center"
+                                                      Margin="0,0,6,0"/>
+                                            <Button Grid.Column="1"
+                                                    Name="WPFWin11ISORefreshUSBButton"
+                                                    Content="↻ Refresh"
+                                                    Width="Auto" Padding="8,0"
+                                                    Height="{DynamicResource ButtonHeight}"/>
+                                        </Grid>
+                                        <Button Name="WPFWin11ISOWriteUSBButton"
+                                                Content="Erase &amp; Write to USB"
+                                                Foreground="OrangeRed"
+                                                HorizontalAlignment="Stretch"
+                                                Width="Auto" Padding="12,0"
+                                                Height="{DynamicResource ButtonHeight}"
+                                                Margin="0,0,0,10"/>
+                                    </StackPanel>
+                                </Border>
+
+                            </StackPanel>
+                        </Border>
+
+                        <!-- ═══════════════════════════════════════════════════════════ -->
+                        <!-- Status / Log Output                                        -->
+                        <!-- ═══════════════════════════════════════════════════════════ -->
+                        <Border Grid.Row="4" Style="{StaticResource BorderStyle}">
+                            <StackPanel>
+                                <TextBlock FontSize="{DynamicResource FontSize}" FontWeight="Bold"
+                                           Foreground="{DynamicResource MainForegroundColor}" Margin="0,0,0,6">
+                                    Status Log
+                                </TextBlock>
+                                <TextBox Name="WPFWin11ISOStatusLog"
+                                         IsReadOnly="True"
+                                         TextWrapping="Wrap"
+                                         VerticalScrollBarVisibility="Auto"
+                                         Height="140" Padding="6"
+                                         Background="{DynamicResource MainBackgroundColor}"
+                                         Foreground="{DynamicResource MainForegroundColor}"
+                                         BorderBrush="{DynamicResource BorderColor}"
+                                         BorderThickness="1"
+                                         Text="Ready. Please select a Windows 11 ISO to begin."/>
+                            </StackPanel>
+                        </Border>
+
+                    </Grid>
+                </ScrollViewer>
+            </TabItem>
         </TabControl>
     </Grid>
 </Window>