null-safe patches

* Fix usb error on drive with no existing partitions

* fix offline mode

* Add offline banner

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -6,9 +6,6 @@ body:
   - type: markdown
     attributes:
       value: |
-        # 🐞 **Issue Report**
-        Thank you for taking the time to report an issue! Please provide as much detail as possible to help us address the problem efficiently.
-
         ## ⚠️ **IMPORTANT**
         - 🛠️ **Supported environments only:** We only support Windows 11.
         - 💡 For general questions, use the [Discussions section](https://github.com/Christitustech/winutil/discussions) or join our Community-driven [Discord Server](https://discord.gg/RUbZUZyByQ).
@@ -24,11 +21,16 @@ body:
     validations:
       required: true
 
-  - type: input
+  - type: dropdown
     id: affected_part
     attributes:
-      label: 📜 What part of Winutil are you having issues with?
+      label: What part of Winutil are you having issues with?
-      placeholder: "e.g., Tweaks, etc."
+      options:
+        - Program Install Tab
+        - Tweaks Tab
+        - Config Tab
+        - Updates Tab
+        - Win11 Creator Tab
     validations:
       required: true
 
@@ -39,24 +41,8 @@ body:
     validations:
       required: true
 
-  - type: textarea
-    id: steps_to_reproduce
-    attributes:
-      label: 🔄 Steps to reproduce the issue.
-      placeholder: "e.g., Step 1: ..., Step 2: ..."
-    validations:
-      required: true
-
   - type: textarea
     id: error_output
     attributes:
-      label: ❌ Paste the full error output (if available).
+      label: ❌ Paste the full error output (if available) or Screenshot.
       placeholder: "Include any relevant logs or error messages."
-
-  - type: textarea
-    id: additional_context
-    attributes:
-      label: 🖼️ Additional context.
-      placeholder: "Include screenshots, code blocks (use triple backticks ```), or any other relevant information."
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -13,45 +13,10 @@ body:
         - 🛠️ **Supported environments only:** We only support Windows 11.
         - 💡 For general questions, use the [Discussions section](https://github.com/Christitustech/winutil/discussions) or join our Community-driven [Discord Server](https://discord.gg/RUbZUZyByQ).
 
-  - type: checkboxes
-    attributes:
-      label: ⚙️ Issue Checklist
-      options:
-        - label: I have read the guidelines.
-        - label: I checked for duplicate issues.
-        - label: I searched for existing discussions.
-        - label: I checked for an existing pull request that addresses this request.
-    validations:
-      required: true
-
-  - type: textarea
-    id: problem_statement
-    attributes:
-      label: ❓ Is your feature request related to a problem?
-      placeholder: "Provide a clear and concise description of the issue you're facing. Example: 'I'm always frustrated when [...]'"
-    validations:
-      required: false
-
   - type: textarea
     id: proposed_solution
     attributes:
       label: 💡 Describe the solution you'd like
-      placeholder: "Provide a clear and concise description of what you want to happen."
+      placeholder: "Provide a clear and concise description."
     validations:
       required: true
-
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: 🔄 Describe alternatives you've considered
-      placeholder: "Provide details on any alternative solutions or features you've thought about."
-    validations:
-      required: false
-
-  - type: textarea
-    id: additional_context
-    attributes:
-      label: 🖼️ Additional context
-      placeholder: "Include screenshots, code blocks (use triple backticks ```), or any other relevant information."
-    validations:
-      required: false

config/applications.json

@@ -36,7 +36,7 @@
         "category": "Document",
         "choco": "na",
         "content": "AFFiNE",
-        "description": "AFFiNE is an open source alternative to Notion. Write, draw, plan all at once. Selfhost it to sync across devices.",
+        "description": "AFFiNE is an open-source alternative to Notion. Write, draw, plan all at once. Selfhost it to sync across devices.",
         "link": "https://affine.pro/",
         "winget": "ToEverything.AFFiNE",
         "foss": true
@@ -105,7 +105,7 @@
         "category": "Microsoft Tools",
         "choco": "autoruns",
         "content": "Autoruns",
-        "description": "This utility shows you what programs are configured to run during system bootup or login",
+        "description": "This utility shows you what programs are configured to run during system bootup or login.",
         "link": "https://learn.microsoft.com/en-us/sysinternals/downloads/autoruns",
         "winget": "Microsoft.Sysinternals.Autoruns"
     },
@@ -156,7 +156,7 @@
         "category": "Communications",
         "choco": "na",
         "content": "Beeper",
-        "description": "All your chats in one app",
+        "description": "All your chats in one app.",
         "link": "https://www.beeper.com/",
         "winget": "Beeper.Beeper"
     },
@@ -173,7 +173,7 @@
         "category": "Utilities",
         "choco": "bleachbit",
         "content": "BleachBit",
-        "description": "Clean Your System and Free Disk Space",
+        "description": "Clean Your System and Free Disk Space.",
         "link": "https://www.bleachbit.org/",
         "winget": "BleachBit.BleachBit",
         "foss": true
@@ -593,7 +593,7 @@
         "category": "Utilities",
         "choco": "espanso",
         "content": "Espanso",
-        "description": "Cross-platform and open-source Text Expander written in Rust",
+        "description": "Cross-platform and open-source Text Expander written in Rust.",
         "link": "https://espanso.org/",
         "winget": "Espanso.Espanso",
         "foss": true
@@ -620,7 +620,7 @@
         "category": "Utilities",
         "choco": "na",
         "content": "Fastfetch",
-        "description": "Fastfetch is a neofetch-like tool for fetching system information and displaying them in a pretty way",
+        "description": "Fastfetch is a neofetch-like tool for fetching system information and displaying them in a pretty way.",
         "link": "https://github.com/fastfetch-cli/fastfetch/",
         "winget": "Fastfetch-cli.Fastfetch",
         "foss": true
@@ -646,7 +646,7 @@
         "category": "Utilities",
         "choco": "file-converter",
         "content": "File-Converter",
-        "description": "File Converter is a very simple tool which allows you to convert and compress one or several file(s) using the context menu in windows explorer.",
+        "description": "File Converter is a very simple tool which allows you to convert and compress one or several file(s) using the context menu in Windows Explorer.",
         "link": "https://file-converter.io/",
         "winget": "AdrienAllard.FileConverter",
         "foss": true
@@ -699,7 +699,7 @@
         "category": "Multimedia Tools",
         "choco": "lightshot",
         "content": "Lightshot (Screenshots)",
-        "description": "Ligthshot is an Easy-to-use, light-weight screenshot software tool, where you can optionally edit your screenshots using different tools, share them via Internet and/or save to disk, and customize the available options.",
+        "description": "Ligthshot is an easy-to-use, light-weight screenshot software tool, where you can optionally edit your screenshots using different tools, share them via Internet and/or save to disk, and customize the available options.",
         "link": "https://app.prntscr.com/",
         "winget": "Skillbrains.Lightshot"
     },
@@ -775,7 +775,7 @@
         "category": "Utilities",
         "choco": "fzf",
         "content": "Fzf",
-        "description": "A command-line fuzzy finder",
+        "description": "A command-line fuzzy finder.",
         "link": "https://github.com/junegunn/fzf/",
         "winget": "junegunn.fzf",
         "foss": true
@@ -895,7 +895,7 @@
         "category": "Utilities",
         "choco": "googledrive",
         "content": "Google Drive",
-        "description": "File syncing across devices all tied to your google account",
+        "description": "File syncing across devices all tied to your Google account.",
         "link": "https://www.google.com/drive/",
         "winget": "Google.GoogleDrive"
     },
@@ -955,7 +955,7 @@
         "category": "Development",
         "choco": "helix",
         "content": "Helix",
-        "description": "Helix is a neovim alternative built in rust.",
+        "description": "Helix is a neovim alternative built in Rust.",
         "link": "https://helix-editor.com/",
         "winget": "Helix.Helix",
         "foss": true
@@ -1147,7 +1147,7 @@
         "category": "Utilities",
         "choco": "jpegview",
         "content": "JPEG View",
-        "description": "JPEGView is a lean, fast and highly configurable viewer/editor for JPEG, BMP, PNG, WEBP, TGA, GIF, JXL, HEIC, HEIF, AVIF and TIFF images with a minimal GUI",
+        "description": "JPEGView is a lean, fast and highly configurable viewer/editor for JPEG, BMP, PNG, WEBP, TGA, GIF, JXL, HEIC, HEIF, AVIF and TIFF images with a minimal GUI.",
         "link": "https://github.com/sylikc/jpegview",
         "winget": "sylikc.JPEGView",
         "foss": true
@@ -1209,7 +1209,7 @@
         "category": "Development",
         "choco": "lazygit",
         "content": "Lazygit",
-        "description": "Simple terminal UI for git commands",
+        "description": "Simple terminal UI for git commands.",
         "link": "https://github.com/jesseduffield/lazygit/",
         "winget": "JesseDuffield.lazygit",
         "foss": true
@@ -1262,7 +1262,7 @@
         "category": "Utilities",
         "choco": "localsend.install",
         "content": "LocalSend",
-        "description": "An open source cross-platform alternative to AirDrop.",
+        "description": "An open-source cross-platform alternative to AirDrop.",
         "link": "https://localsend.org/",
         "winget": "LocalSend.LocalSend",
         "foss": true
@@ -1323,7 +1323,7 @@
         "category": "Multimedia Tools",
         "choco": "na",
         "content": "Modern Flyouts",
-        "description": "An open source, modern, Fluent Design-based set of flyouts for Windows.",
+        "description": "An open-source, modern, Fluent Design-based set of flyouts for Windows.",
         "link": "https://github.com/ModernFlyouts-Community/ModernFlyouts/",
         "winget": "ModernFlyouts.ModernFlyouts",
         "foss": true
@@ -1377,7 +1377,7 @@
         "category": "Utilities",
         "choco": "msedgeredirect",
         "content": "MSEdgeRedirect",
-        "description": "A Tool to Redirect News, Search, Widgets, Weather, and More to Your Default Browser.",
+        "description": "A Tool to Redirect News, Search, Widgets, Weather, and More to your default browser.",
         "link": "https://github.com/rcmaehl/MSEdgeRedirect",
         "winget": "rcmaehl.MSEdgeRedirect",
         "foss": true
@@ -1473,7 +1473,7 @@
         "category": "Multimedia Tools",
         "choco": "tagscanner",
         "content": "TagScanner (Tag Scanner)",
-        "description": "TagScanner is a powerful tool for organizing and managing your music collection",
+        "description": "TagScanner is a powerful tool for organizing and managing your music collection.",
         "link": "https://www.xdlab.ru/en/",
         "winget": "SergeySerkov.TagScanner"
     },
@@ -1490,7 +1490,7 @@
         "category": "Pro Tools",
         "choco": "netbird",
         "content": "NetBird",
-        "description": "NetBird is a Open Source alternative comparable to TailScale that can be connected to a selfhosted Server.",
+        "description": "NetBird is a open-source alternative comparable to TailScale that can be connected to a selfhosted Server.",
         "link": "https://netbird.io/",
         "winget": "netbird",
         "foss": true
@@ -1895,7 +1895,7 @@
         "category": "Games",
         "choco": "prismlauncher",
         "content": "Prism Launcher",
-        "description": "Prism Launcher is an Open Source Minecraft launcher with the ability to manage multiple instances, accounts and mods.",
+        "description": "Prism Launcher is an open-source Minecraft launcher with the ability to manage multiple instances, accounts and mods.",
         "link": "https://prismlauncher.org/",
         "winget": "PrismLauncher.PrismLauncher",
         "foss": true
@@ -1929,7 +1929,7 @@
         "category": "Utilities",
         "choco": "orcaslicer",
         "content": "OrcaSlicer",
-        "description": "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)",
+        "description": "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.).",
         "link": "https://github.com/SoftFever/OrcaSlicer",
         "winget": "SoftFever.OrcaSlicer",
         "foss": true
@@ -1982,7 +1982,7 @@
         "category": "Utilities",
         "choco": "transmission",
         "content": "Transmission",
-        "description": "Transmission is a cross-platform BitTorrent client that is open source, easy, powerful, and lean.",
+        "description": "Transmission is a cross-platform BitTorrent client that is open-source, easy, powerful, and lean.",
         "link": "https://transmissionbt.com/",
         "winget": "Transmission.Transmission",
         "foss": true
@@ -2008,7 +2008,7 @@
         "category": "Utilities",
         "choco": "quicklook",
         "content": "Quicklook",
-        "description": "Bring macOS \u201cQuick Look\u201d feature to Windows",
+        "description": "Bring macOS \u201cQuick Look\u201d feature to Windows.",
         "link": "https://github.com/QL-Win/QuickLook",
         "winget": "QL-Win.QuickLook",
         "foss": true
@@ -2051,7 +2051,7 @@
         "category": "Utilities",
         "choco": "ripgrep",
         "content": "Ripgrep",
-        "description": "Fast and powerful commandline search tool",
+        "description": "Fast and powerful commandline search tool.",
         "link": "https://github.com/BurntSushi/ripgrep/",
         "winget": "BurntSushi.ripgrep.MSVC",
         "foss": true
@@ -2209,7 +2209,7 @@
         "category": "Utilities",
         "choco": "spacesniffer",
         "content": "SpaceSniffer",
-        "description": "A tool application that lets you understand how folders and files are structured on your disks",
+        "description": "A tool application that lets you understand how folders and files are structured on your disks.",
         "link": "http://www.uderzo.it/main_products/space_sniffer/",
         "winget": "UderzoSoftware.SpaceSniffer"
     },
@@ -2277,7 +2277,7 @@
         "category": "Document",
         "choco": "na",
         "content": "PDFgear",
-        "description": "PDFgear is a piece of full-featured PDF management software for Windows, Mac, and mobile, and it's completely free to use.",
+        "description": "PDFgear is a piece of full-featured PDF management software for Windows, macOS, and mobile, and it's completely free to use.",
         "link": "https://www.pdfgear.com/",
         "winget": "PDFgear.PDFgear"
     },
@@ -2312,7 +2312,7 @@
         "category": "Utilities",
         "choco": "synctrayzor",
         "content": "SyncTrayzor",
-        "description": "Windows tray utility / filesystem watcher / launcher for Syncthing",
+        "description": "Windows tray utility / filesystem watcher / launcher for Syncthing.",
         "link": "https://github.com/GermanCoding/SyncTrayzor",
         "winget": "GermanCoding.SyncTrayzor",
         "foss": true
@@ -2329,7 +2329,7 @@
         "category": "Utilities",
         "choco": "tabby",
         "content": "Tabby.sh",
-        "description": "Tabby is a highly configurable terminal emulator, SSH and serial client for Windows, macOS and Linux",
+        "description": "Tabby is a highly configurable terminal emulator, SSH and serial client for Windows, macOS and Linux.",
         "link": "https://tabby.sh/",
         "winget": "Eugeny.Tabby",
         "foss": true
@@ -2389,7 +2389,7 @@
         "category": "Communications",
         "choco": "na",
         "content": "Unigram",
-        "description": "Unigram - Telegram for Windows",
+        "description": "Unigram - Telegram for Windows.",
         "link": "https://unigramdev.github.io/",
         "winget": "Telegram.Unigram",
         "foss": true
@@ -2416,7 +2416,7 @@
         "category": "Development",
         "choco": "na",
         "content": "Code With Mu (Mu Editor)",
-        "description": "Mu is a Python code editor for beginner programmers",
+        "description": "Mu is a Python code editor for beginner programmers.",
         "link": "https://codewith.mu/",
         "winget": "Mu.Mu",
         "foss": true
@@ -2425,7 +2425,7 @@
         "category": "Browsers",
         "choco": "thorium",
         "content": "Thorium Browser AVX2",
-        "description": "Browser built for speed over vanilla chromium. It is built with AVX2 optimizations and is the fastest browser on the market.",
+        "description": "Browser built for speed over vanilla Chromium. It is built with AVX2 optimizations and is the fastest browser on the market.",
         "link": "https://thorium.rocks/",
         "winget": "Alex313031.Thorium.AVX2",
         "foss": true
@@ -2485,7 +2485,7 @@
         "category": "Utilities",
         "choco": "translucenttb",
         "content": "TranslucentTB",
-        "description": "TranslucentTB is a tool that allows you to customize the transparency of the Windows taskbar.",
+        "description": "TranslucentTB is a tool that allows you to customize the transparency of the Windows Taskbar.",
         "link": "https://github.com/TranslucentTB/TranslucentTB",
         "winget": "9PF4KZ2VN4W9",
         "foss": true
@@ -2673,7 +2673,7 @@
         "category": "Development",
         "choco": "wezterm",
         "content": "Wezterm",
-        "description": "WezTerm is a powerful cross-platform terminal emulator and multiplexer",
+        "description": "WezTerm is a powerful cross-platform terminal emulator and multiplexer.",
         "link": "https://wezfurlong.org/wezterm/index.html",
         "winget": "wez.wezterm",
         "foss": true
@@ -2768,7 +2768,7 @@
         "category": "Utilities",
         "choco": "TeraCopy",
         "content": "TeraCopy",
-        "description": "Copy your files faster and more securely",
+        "description": "Copy your files faster and more securely.",
         "link": "https://codesector.com/teracopy",
         "winget": "CodeSector.TeraCopy"
     },
@@ -2896,7 +2896,7 @@
         "category": "Utilities",
         "choco": "na",
         "content": "ZoomIt",
-        "description": "A screen zoom, annotation, and recording tool for technical presentations and demos",
+        "description": "A screen zoom, annotation, and recording tool for technical presentations and demos.",
         "link": "https://learn.microsoft.com/en-us/sysinternals/downloads/zoomit",
         "winget": "Microsoft.Sysinternals.ZoomIt"
     },
@@ -2931,7 +2931,7 @@
         "category": "Utilities",
         "choco": "syncthingtray",
         "content": "Syncthingtray",
-        "description": "Might be the alternative for Synctrayzor. Windows tray utility / filesystem watcher / launcher for Syncthing",
+        "description": "Might be the alternative for Synctrayzor. Windows tray utility / filesystem watcher / launcher for Syncthing.",
         "link": "https://github.com/Martchus/syncthingtray",
         "winget": "Martchus.syncthingtray",
         "foss": true
@@ -2958,7 +2958,7 @@
         "category": "Development",
         "choco": "temurin",
         "content": "Eclipse Temurin",
-        "description": "Eclipse Temurin is the open source Java SE build based upon OpenJDK.",
+        "description": "Eclipse Temurin is the open-source Java SE build based upon OpenJDK.",
         "link": "https://adoptium.net/temurin/",
         "winget": "EclipseAdoptium.Temurin.21.JDK",
         "foss": true
@@ -2985,7 +2985,7 @@
         "category": "Utilities",
         "choco": "TightVNC",
         "content": "TightVNC",
-        "description": "TightVNC is a free and Open Source remote desktop software that lets you access and control a computer over the network. With its intuitive interface, you can interact with the remote screen as if you were sitting in front of it. You can open files, launch applications, and perform other actions on the remote desktop almost as if you were physically there",
+        "description": "TightVNC is a free and open-source remote desktop software that lets you access and control a computer over the network. With its intuitive interface, you can interact with the remote screen as if you were sitting in front of it. You can open files, launch applications, and perform other actions on the remote desktop almost as if you were physically there.",
         "link": "https://www.tightvnc.com/",
         "winget": "GlavSoft.TightVNC",
         "foss": true
@@ -3019,7 +3019,7 @@
         "category": "Utilities",
         "choco": "auto-dark-mode",
         "content": "Windows Auto Dark Mode",
-        "description": "Automatically switches between the dark and light theme of Windows 10 and Windows 11",
+        "description": "Automatically switches between the dark and light theme of Windows 10 and Windows 11.",
         "link": "https://github.com/AutoDarkMode/Windows-Auto-Night-Mode",
         "winget": "Armin2208.WindowsAutoNightMode",
         "foss": true
@@ -3037,7 +3037,7 @@
         "category": "Utilities",
         "choco": "magic-wormhole",
         "content": "Magic Wormhole",
-        "description": "get things from one computer to another, safely",
+        "description": "get things from one computer to another, safely.",
         "link": "https://github.com/magic-wormhole/magic-wormhole",
         "winget": "magic-wormhole.magic-wormhole",
         "foss": true
@@ -3055,7 +3055,7 @@
         "category": "Multimedia Tools",
         "choco": "qgis",
         "content": "QGIS",
-        "description": "QGIS (Quantum GIS) is an open-source Geographic Information System (GIS) software that enables users to create, edit, visualize, analyze, and publish geospatial information on Windows, Mac, and Linux platforms.",
+        "description": "QGIS (Quantum GIS) is an open-source Geographic Information System (GIS) software that enables users to create, edit, visualize, analyze, and publish geospatial information on Windows, macOS, and Linux platforms.",
         "link": "https://qgis.org/en/site/",
         "winget": "OSGeo.QGIS",
         "foss": true
@@ -3073,7 +3073,7 @@
         "category": "Utilities",
         "choco": "na",
         "content": "GlazeWM",
-        "description": "GlazeWM is a tiling window manager for Windows inspired by i3 and Polybar",
+        "description": "GlazeWM is a tiling window manager for Windows inspired by i3 and Polybar.",
         "link": "https://github.com/glzr-io/glazewm",
         "winget": "glzr-io.glazewm",
         "foss": true
@@ -3091,7 +3091,7 @@
         "category": "Development",
         "choco": "fnm",
         "content": "Fast Node Manager",
-        "description": "Fast Node Manager (fnm) allows you to switch your Node version by using the Terminal",
+        "description": "Fast Node Manager (fnm) allows you to switch your Node version by using the terminal.",
         "link": "https://github.com/Schniz/fnm",
         "winget": "Schniz.fnm",
         "foss": true
@@ -3100,7 +3100,7 @@
         "category": "Utilities",
         "choco": "windhawk",
         "content": "Windhawk",
-        "description": "The customization marketplace for Windows programs",
+        "description": "The customization marketplace for Windows programs.",
         "link": "https://windhawk.net",
         "winget": "RamenSoftware.Windhawk"
     },
@@ -3108,7 +3108,7 @@
         "category": "Utilities",
         "choco": "na",
         "content": "ForceAutoHDR",
-        "description": "ForceAutoHDR simplifies the process of adding games to the AutoHDR list in the Windows Registry",
+        "description": "ForceAutoHDR simplifies the process of adding games to the AutoHDR list in the Windows Registry.",
         "link": "https://github.com/7gxycn08/ForceAutoHDR",
         "winget": "ForceAutoHDR.7gxycn08",
         "foss": true
@@ -3117,7 +3117,7 @@
         "category": "Utilities",
         "choco": "joytokey",
         "content": "JoyToKey",
-        "description": "enables PC game controllers to emulate the keyboard and mouse input",
+        "description": "Enables PC game controllers to emulate the keyboard and mouse input.",
         "link": "https://joytokey.net/en/",
         "winget": "JTKsoftware.JoyToKey"
     },
@@ -3159,7 +3159,7 @@
         "category": "Browsers",
         "choco": "paleMoon",
         "content": "PaleMoon",
-        "description": "Pale Moon is an Open Source, Goanna-based web browser available for Microsoft Windows and Linux (with other operating systems in development), focusing on efficiency and ease of use.",
+        "description": "Pale Moon is an open-source, Goanna-based web browser available for Microsoft Windows and Linux (with other operating systems in development), focusing on efficiency and ease of use.",
         "link": "https://www.palemoon.org/download.shtml",
         "winget": "MoonchildProductions.PaleMoon",
         "foss": true
@@ -3168,7 +3168,7 @@
         "category": "Multimedia Tools",
         "choco": "na",
         "content": "Shotcut",
-        "description": "Shotcut is a free, open source, cross-platform video editor.",
+        "description": "Shotcut is a free, open-source, cross-platform video editor.",
         "link": "https://shotcut.org/",
         "winget": "Meltytech.Shotcut",
         "foss": true
@@ -3195,7 +3195,7 @@
         "category": "Development",
         "choco": "aegisub",
         "content": "Aegisub",
-        "description": "Aegisub is a free, cross-platform open source tool for creating and modifying subtitles. Aegisub makes it quick and easy to time subtitles to audio, and features many powerful tools for styling them, including a built-in real-time video preview.",
+        "description": "Aegisub is a free, cross-platform open-source tool for creating and modifying subtitles. Aegisub makes it quick and easy to time subtitles to audio, and features many powerful tools for styling them, including a built-in real-time video preview.",
         "link": "https://github.com/Aegisub/Aegisub",
         "winget": "Aegisub.Aegisub",
         "foss": true
@@ -3204,7 +3204,7 @@
         "category": "Multimedia Tools",
         "choco": "na",
         "content": "Subtitle Edit",
-        "description": "Subtitle Edit is a free and open source editor for video subtitles.",
+        "description": "Subtitle Edit is a free and open-source editor for video subtitles.",
         "link": "https://github.com/SubtitleEdit/subtitleedit",
         "winget": "Nikse.SubtitleEdit",
         "foss": true
@@ -3221,7 +3221,7 @@
         "category": "Browsers",
         "choco": "na",
         "content": "Zen Browser",
-        "description": "The modern, privacy-focused, performance-driven browser built on Firefox",
+        "description": "The modern, privacy-focused, performance-driven browser built on Firefox.",
         "link": "https://zen-browser.app/",
         "winget": "Zen-Team.Zen-Browser",
         "foss": true

config/feature.json

@@ -26,7 +26,7 @@
   },
   "WPFFeatureslegacymedia": {
     "Content": "Legacy Media (WMP, DirectPlay)",
-    "Description": "Enables legacy programs from previous versions of windows",
+    "Description": "Enables legacy programs from previous versions of Windows.",
     "category": "Features",
     "panel": "1",
     "feature": [

config/tweaks.json

@@ -1,7 +1,7 @@
 {
   "WPFTweaksActivity": {
     "Content": "Disable Activity History",
-    "Description": "This erases recent docs, clipboard, and run history.",
+    "Description": "Erases recent docs, clipboard, and run history.",
     "category": "Essential Tweaks",
     "panel": "1",
     "registry": [
@@ -31,7 +31,7 @@
   },
   "WPFTweaksHiber": {
     "Content": "Disable Hibernation",
-    "Description": "Hibernation is really meant for laptops as it saves what's in memory before turning the pc off. It really should never be used",
+    "Description": "Hibernation is really meant for laptops as it saves what's in memory before turning the PC off. It really should never be used.",
     "category": "Essential Tweaks",
     "panel": "1",
     "registry": [
@@ -60,7 +60,7 @@
   },
   "WPFTweaksWidget": {
     "Content": "Remove Widgets",
-    "Description": "Removes the annoying widgets in the bottom left of the taskbar",
+    "Description": "Removes the annoying widgets in the bottom left of the Taskbar.",
     "category": "Essential Tweaks",
     "panel": "1",
     "InvokeScript": [
@@ -89,7 +89,7 @@
   },
   "WPFTweaksRevertStartMenu": {
     "Content": "Revert the new start menu",
-    "Description": "Uses vivetool to revert the the original start menu from 24h2",
+    "Description": "Uses vivetool to revert to the original start menu from 24H2.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "InvokeScript": [
@@ -124,7 +124,7 @@
   },
   "WPFTweaksLocation": {
     "Content": "Disable Location Tracking",
-    "Description": "Disables Location Tracking...DUH!",
+    "Description": "Disables Location Tracking.",
     "category": "Essential Tweaks",
     "panel": "1",
     "registry": [
@@ -1125,7 +1125,7 @@
   },
   "WPFTweaksBraveDebloat": {
     "Content": "Brave Debloat",
-    "Description": "Disables various annoyances like Brave Rewards,Leo AI,Crypto Wallet and VPN",
+    "Description": "Disables various annoyances like Brave Rewards, Leo AI, Crypto Wallet and VPN.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "registry": [
@@ -1290,7 +1290,7 @@
   },
   "WPFTweaksConsumerFeatures": {
     "Content": "Disable ConsumerFeatures",
-    "Description": "Windows will not automatically install any games, third-party apps, or application links from the Windows Store for the signed-in user. Some default Apps will be inaccessible (eg. Phone Link)",
+    "Description": "Windows will not automatically install any games, third-party apps, or application links from the Windows Store for the signed-in user. Some default Apps will be inaccessible (eg. Phone Link).",
     "category": "Essential Tweaks",
     "panel": "1",
     "registry": [
@@ -1306,7 +1306,7 @@
   },
   "WPFTweaksTelemetry": {
     "Content": "Disable Telemetry",
-    "Description": "Disables Microsoft Telemetry...Duh",
+    "Description": "Disables Microsoft Telemetry.",
     "category": "Essential Tweaks",
     "panel": "1",
     "registry": [
@@ -1428,7 +1428,7 @@
   },
   "WPFTweaksRemoveEdge": {
     "Content": "Remove Microsoft Edge",
-    "Description": "Unblocks Microsoft Edge uninstaller restrictions than uses that uninstaller to remove Microsoft Edge",
+    "Description": "Unblocks Microsoft Edge uninstaller restrictions then uses that uninstaller to remove Microsoft Edge.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "InvokeScript": [
@@ -1460,7 +1460,7 @@
   },
   "WPFTweaksRemoveOneDrive": {
     "Content": "Remove OneDrive",
-    "Description": "Denys permission to remove onedrive user files than uses its own uninstaller to remove it than brings back permissions",
+    "Description": "Denies permission to remove OneDrive user files, then uses its own uninstaller to remove it and restores the original permission afterward.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "InvokeScript": [
@@ -1497,7 +1497,7 @@
   },
   "WPFTweaksRemoveHome": {
     "Content": "Remove Home from Explorer",
-    "Description": "Removes the Home from Explorer and sets This PC as default",
+    "Description": "Removes the Home from Explorer and sets This PC as default.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "InvokeScript": [
@@ -1516,7 +1516,7 @@
   },
   "WPFTweaksRemoveGallery": {
     "Content": "Remove Gallery from explorer",
-    "Description": "Removes the Gallery from Explorer and sets This PC as default",
+    "Description": "Removes the Gallery from Explorer and sets This PC as default.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "InvokeScript": [
@@ -1646,7 +1646,7 @@
   },
   "WPFTweaksDeBloat": {
     "Content": "Remove ALL MS Store Apps - NOT RECOMMENDED",
-    "Description": "USE WITH CAUTION!!! This will remove ALL Microsoft store apps.",
+    "Description": "USE WITH CAUTION!!! This will remove ALL Microsoft Store apps.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "appx": [
@@ -1735,7 +1735,7 @@
   },
   "WPFTweaksRestorePoint": {
     "Content": "Create Restore Point",
-    "Description": "Creates a restore point at runtime in case a revert is needed from WinUtil modifications",
+    "Description": "Creates a restore point at runtime in case a revert is needed from WinUtil modifications.",
     "category": "Essential Tweaks",
     "panel": "1",
     "Checked": "False",
@@ -1762,7 +1762,7 @@
   },
   "WPFTweaksEndTaskOnTaskbar": {
     "Content": "Enable End Task With Right Click",
-    "Description": "Enables option to end task when right clicking a program in the taskbar",
+    "Description": "Enables option to end task when right clicking a program in the taskbar.",
     "category": "Essential Tweaks",
     "panel": "1",
     "registry": [
@@ -1778,7 +1778,7 @@
   },
   "WPFTweaksPowershell7Tele": {
     "Content": "Disable Powershell 7 Telemetry",
-    "Description": "This will create an Environment Variable called 'POWERSHELL_TELEMETRY_OPTOUT' with a value of '1' which will tell Powershell 7 to not send Telemetry Data.",
+    "Description": "Creates an Environment Variable called 'POWERSHELL_TELEMETRY_OPTOUT' with a value of '1' which will tell PowerShell 7 to not send Telemetry Data.",
     "category": "Essential Tweaks",
     "panel": "1",
     "InvokeScript": [
@@ -1891,7 +1891,7 @@
   },
   "WPFTweaksWPBT": {
     "Content": "Disable Windows Platform Binary Table (WPBT)",
-    "Description": "If enabled then allows your computer vendor to execute a program each time it boots. It enables computer vendors to force install anti-theft software, software drivers, or a software program conveniently. This could also be a security risk.",
+    "Description": "If enabled, WPBT allows your computer vendor to execute programs at boot time, such as anti-theft software, software drivers, as well as force install software without user consent. Poses potential security risk.",
     "category": "Essential Tweaks",
     "panel": "1",
     "registry": [
@@ -1949,7 +1949,7 @@
   },
   "WPFTweaksDisableNotifications": {
     "Content": "Disable Notification Tray/Calendar",
-    "Description": "Disables all Notifications INCLUDING Calendar",
+    "Description": "Disables all Notifications INCLUDING Calendar.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "registry": [
@@ -1972,7 +1972,7 @@
   },
   "WPFTweaksBlockAdobeNet": {
     "Content": "Adobe Network Block",
-    "Description": "Reduce user interruptions by selectively blocking connections to Adobe's activation and telemetry servers. Credit: Ruddernation-Designs",
+    "Description": "Reduces user interruptions by selectively blocking connections to Adobe's activation and telemetry servers. Credit: Ruddernation-Designs",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "InvokeScript": [
@@ -2002,7 +2002,7 @@
   },
   "WPFTweaksRightClickMenu": {
     "Content": "Set Classic Right-Click Menu",
-    "Description": "Great Windows 11 tweak to bring back good context menus when right clicking things in explorer.",
+    "Description": "Restores the classic context menu when right-clicking in File Explorer, replacing the simplified Windows 11 version.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "InvokeScript": [
@@ -2037,7 +2037,7 @@
   },
   "WPFTweaksDeleteTempFiles": {
     "Content": "Delete Temporary Files",
-    "Description": "Erases TEMP Folders",
+    "Description": "Erases TEMP Folders.",
     "category": "Essential Tweaks",
     "panel": "1",
     "InvokeScript": [
@@ -2050,7 +2050,7 @@
   },
   "WPFTweaksIPv46": {
     "Content": "Prefer IPv4 over IPv6",
-    "Description": "To set the IPv4 preference can have latency and security benefits on private networks where IPv6 is not configured.",
+    "Description": "Setting the IPv4 preference can have latency and security benefits on private networks where IPv6 is not configured.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "registry": [
@@ -2066,7 +2066,7 @@
   },
   "WPFTweaksTeredo": {
     "Content": "Disable Teredo",
-    "Description": "Teredo network tunneling is a ipv6 feature that can cause additional latency, but may cause problems with some games",
+    "Description": "Teredo network tunneling is a IPv6 feature that can cause additional latency, but may cause problems with some games.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "registry": [
@@ -2110,7 +2110,7 @@
   },
   "WPFTweaksDisableBGapps": {
     "Content": "Disable Background Apps",
-    "Description": "Disables all Microsoft Store apps from running in the background, which has to be done individually since Win11",
+    "Description": "Disables all Microsoft Store apps from running in the background, which has to be done individually since Windows 11.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "registry": [
@@ -2126,7 +2126,7 @@
   },
   "WPFTweaksDisableFSO": {
     "Content": "Disable Fullscreen Optimizations",
-    "Description": "Disables FSO in all applications. NOTE: This will disable Color Management in Exclusive Fullscreen",
+    "Description": "Disables FSO in all applications. NOTE: This will disable Color Management in Exclusive Fullscreen.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "registry": [
@@ -2184,7 +2184,7 @@
   },
   "WPFToggleBingSearch": {
     "Content": "Bing Search in Start Menu",
-    "Description": "If enable then includes web search results from Bing in your Start Menu search.",
+    "Description": "If enabled, Bing web search results will be included in your Start Menu search.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",
@@ -2200,6 +2200,24 @@
     ],
     "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/bingsearch"
   },
+  "WPFToggleStandbyFix": {
+    "Content": "Modern Standby fix",
+    "Description": "Disable network connection during S0 sleep. If network connectivity is turned on during S0 sleep it could cause overheating on modern laptops",
+    "category": "Customize Preferences",
+    "panel": "2",
+    "Type": "Toggle",
+    "registry": [
+      {
+        "Path": "HKCU:\\SOFTWARE\\Policies\\Microsoft\\Power\\PowerSettings\\f15576e8-98b7-4186-b944-eafa664402d9",
+        "Name": "ACSettingIndex",
+        "Value": "0",
+        "Type": "DWord",
+        "OriginalValue": "<RemoveEntry>",
+        "DefaultState": "true"
+      }
+    ],
+    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/standbyfix"
+  },
   "WPFToggleNumLock": {
     "Content": "Num Lock on Startup",
     "Description": "Toggle the Num Lock key state when your computer starts.",
@@ -2246,7 +2264,7 @@
   },
   "WPFToggleStartMenuRecommendations": {
     "Content": "Recommendations in Start Menu",
-    "Description": "If disabled then you will not see recommendations in the Start Menu. WARNING: This will also disable Windows Spotlight on your Lock Screen as a side effect.",
+    "Description": "If disabled, then you will not see recommendations in the Start Menu. WARNING: This will also disable Windows Spotlight on your Lock Screen as a side effect.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",
@@ -2290,7 +2308,7 @@
   },
   "WPFToggleHideSettingsHome": {
     "Content": "Remove Settings Home Page",
-    "Description": "Removes the Home page in the Windows Settings app.",
+    "Description": "Removes the Home Page in the Windows Settings app.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",
@@ -2308,7 +2326,7 @@
   },
   "WPFToggleMouseAcceleration": {
     "Content": "Mouse Acceleration",
-    "Description": "If Enabled then Cursor movement is affected by the speed of your physical mouse movements.",
+    "Description": "If enabled, the Cursor movement is affected by the speed of your physical mouse movements.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",
@@ -2342,7 +2360,7 @@
   },
   "WPFToggleStickyKeys": {
     "Content": "Sticky Keys",
-    "Description": "If Enabled then Sticky Keys is activated - Sticky keys is an accessibility feature of some graphical user interfaces which assists users who have physical disabilities or help users reduce repetitive strain injury.",
+    "Description": "If enabled, Sticky Keys is activated. Sticky keys is an accessibility feature of some graphical user interfaces which assists users who have physical disabilities or help users reduce repetitive strain injury.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",
@@ -2360,7 +2378,7 @@
   },
   "WPFToggleNewOutlook": {
     "Content": "New Outlook",
-    "Description": "If disabled it removes the toggle for new Outlook, disables the new Outlook migration and makes sure the Outlook Application actually uses the old Outlook.",
+    "Description": "If disabled, it removes the new Outlook toggle, disables the new Outlook migration, and ensures the classic Outlook application is used.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",
@@ -2420,7 +2438,7 @@
   },
   "WPFToggleHiddenFiles": {
     "Content": "Show Hidden Files",
-    "Description": "If Enabled then Hidden Files will be shown.",
+    "Description": "If enabled, Hidden Files will be shown.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",
@@ -2448,7 +2466,7 @@
   },
   "WPFToggleShowExt": {
     "Content": "Show File Extensions",
-    "Description": "If enabled then File extensions (e.g., .txt, .jpg) are visible.",
+    "Description": "If enabled, File extensions (e.g., .txt, .jpg) are visible.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",
@@ -2476,7 +2494,7 @@
   },
   "WPFToggleTaskbarSearch": {
     "Content": "Search Button in Taskbar",
-    "Description": "If Enabled Search Button will be on the taskbar.",
+    "Description": "If enabled, Search Button will be on the Taskbar.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",
@@ -2494,7 +2512,7 @@
   },
   "WPFToggleTaskView": {
     "Content": "Task View Button in Taskbar",
-    "Description": "If Enabled then Task View Button in Taskbar will be shown.",
+    "Description": "If enabled, Task View Button in Taskbar will be shown.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",
@@ -2512,7 +2530,7 @@
   },
   "WPFToggleTaskbarAlignment": {
     "Content": "Center Taskbar Items",
-    "Description": "[Windows 11] If Enabled then the Taskbar Items will be shown on the Center, otherwise the Taskbar Items will be shown on the Left.",
+    "Description": "[Windows 11] If enabled, the Taskbar Items will be shown on the Center, otherwise the Taskbar Items will be shown on the Left.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",
@@ -2540,7 +2558,7 @@
   },
   "WPFToggleDetailedBSoD": {
     "Content": "Detailed BSoD",
-    "Description": "If Enabled then you will see a detailed Blue Screen of Death (BSOD) with more information.",
+    "Description": "If enabled, you will see a detailed Blue Screen of Death (BSOD) with more information.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",
@@ -2566,7 +2584,7 @@
   },
   "WPFToggleS3Sleep": {
     "Content": "S3 Sleep",
-    "Description": "Toggles between Modern Standby and S3 sleep.",
+    "Description": "Toggles between Modern Standby and S3 Sleep.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",
@@ -2615,7 +2633,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. WARNING! Will disable file explorer grouping",
+    "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/architecture.md

@@ -128,6 +128,154 @@ winutil/
 - CheckBoxes for options
 - ListBoxes for selections
 
+## Win11 Creator Architecture
+
+The **Win11 Creator** is a specialized subsystem within Winutil that creates customized Windows 11 ISOs. It operates independently from the main package installation and tweak system.
+
+### Win11 Creator Components
+
+**Core Functions** (`functions/private/`):
+- `Invoke-WinUtilISO.ps1`: Main orchestrator containing all Win11 Creator functions
+  - `Invoke-WinUtilISOBrowse`: ISO file selection dialog
+  - `Invoke-WinUtilISOMountAndVerify`: Validates and mounts ISO, verifies it's official Windows 11
+  - `Invoke-WinUtilISOModify`: Launches modification in background runspace
+  - `Invoke-WinUtilISOExport`: Handles ISO and USB export
+  - `Invoke-WinUtilISOCheckExistingWork`: Recovers incomplete work sessions
+  - `Invoke-WinUtilISOCleanAndReset`: Cleans up temp directories and resets UI
+
+- `Invoke-WinUtilISOScript.ps1`: Applies modifications to mounted install.wim
+  - Removes provisioned AppX packages (40+ bloatware apps)
+  - Injects drivers (optional) from current system
+  - Removes OneDrive setup files
+  - Applies offline registry tweaks (hardware bypass, privacy, telemetry, OOBE)
+  - Deletes telemetry scheduled task definitions
+  - Pre-stages setup scripts from autounattend.xml
+  - Removes unused Windows editions
+  - Cleans component store via DISM
+
+### Win11 Creator Data Flow
+
+```
+User selects official Windows 11 ISO
+    ↓
+Invoke-WinUtilISOBrowse → OpenFileDialog, validates file size
+    ↓
+Invoke-WinUtilISOMountAndVerify
+    ├─ Mount ISO via Mount-DiskImage
+    ├─ Verify install.wim or install.esd exists
+    ├─ Check for "Windows 11" in image metadata
+    ├─ Extract available editions (Home, Pro, Enterprise, etc.)
+    └─ Store ISO path, drive letter, WIM path, image info in $sync
+    ↓
+User optionally enables Driver Injection checkbox
+    ↓
+Invoke-WinUtilISOModify (runs in background runspace)
+    ├─ Create work directory: ~WinUtil_Win11ISO_[timestamp]
+    ├─ Copy ISO contents to disk (~5-6 GB)
+    ├─ Mount install.wim at selected edition/index
+    ├─ Invoke-WinUtilISOScript:
+    │   ├─ Remove 40+ bloat AppX packages
+    │   ├─ Export and inject drivers (if enabled)
+    │   ├─ Remove OneDrive setup
+    │   ├─ Load offline registry hives
+    │   ├─ Apply 50+ registry tweaks (hardware bypass, privacy, telemetry, OOBE, etc.)
+    │   ├─ Delete telemetry scheduled task files
+    │   ├─ Pre-stage setup scripts from autounattend.xml to C:\Windows\Setup\Scripts\
+    │   └─ Unload registry hives
+    ├─ DISM /Cleanup-Image /StartComponentCleanup /ResetBase (saves 300-800 MB)
+    ├─ Dismount and save modified install.wim (~10+ minutes, slowest step)
+    ├─ Export selected edition only (removes all other editions, saves 1-2 GB each)
+    ├─ Dismount source ISO
+    └─ Report completion, enable export options
+    ↓
+Invoke-WinUtilISOExport (user chooses output)
+    ├─ Option 1: Save as ISO
+    │   ├─ Build bootable ISO via oscdimg.exe (BIOS/UEFI dual-boot)
+    │   └─ Output: Win11_Modified_[date].iso (2.5-3.5 GB)
+    │
+    └─ Option 2: Write to USB
+        ├─ Format USB as GPT
+        ├─ Create 512 MB EFI partition
+        ├─ Copy modified ISO contents
+        └─ Output: Bootable USB (minimum 8 GB)
+    ↓
+Invoke-WinUtilISOCleanAndReset (optional)
+    └─ Delete temp working directory (~10-15 GB)
+    └─ Reset UI to initial state
+```
+
+### Win11 Creator Validation & Safety
+
+**ISO Validation**:
+- Only accepts official Microsoft Windows 11 ISOs
+- Validates presence of install.wim or install.esd
+- Checks image metadata for "Windows 11" string
+- Rejects custom, modified, or non-Windows 11 ISOs
+
+**Work Session Recovery**:
+- Auto-detects incomplete work from previous sessions
+- Allows resuming Step 4 (export) without re-running Steps 1-3
+- Prevents redundant modifications
+
+**Modification Safety**:
+- All registry changes are documented in script (reversible)
+- Original ISO never modified; only working copy
+- Logged to `WinUtil_Win11ISO.log` for debugging
+- DISM handles image dismount with automatic cleanup on error
+
+### Win11 Creator Registry Tweaks
+
+The `Invoke-WinUtilISOScript` function applies **50+ offline registry tweaks**:
+
+**Hardware Bypass**:
+- TPM 2.0 check bypass
+- Secure Boot requirement bypass
+- CPU compatibility bypass
+- RAM requirement bypass
+- Storage check bypass
+
+**Privacy & Telemetry**:
+- Disable advertising ID
+- Disable tailored experiences
+- Disable input personalization
+- Disable speech online privacy
+- Disable cloud content suggestions
+- Disable app suggestion subscriptions
+- Remove CEIP, Appraiser, WaaSMedic, etc.
+
+**OOBE & Setup**:
+- Enable local account setup
+- Skip Microsoft account requirement
+- Dark mode by default
+- Empty taskbar and Start Menu
+
+**Post-Setup Installations**:
+- Prevent DevHome auto-installation
+- Prevent new Outlook Mail app installation
+- Prevent Teams auto-installation
+
+**System Features**:
+- Disable BitLocker and device encryption
+- Disable Chat icon from taskbar
+- Disable OneDrive folder backup
+- Disable Copilot
+- Disable Windows Update during OOBE (re-enabled at first login)
+
+### Driver Injection Feature
+
+**Optional Enhancement**: When enabled, exports all drivers from the running system and injects them into both:
+- `install.wim` (main OS image)
+- `boot.wim` index 2 (Windows Setup PE environment)
+
+**Use Case**: Enables offline installation on systems with missing drivers.
+
+### Disk Space Requirements
+
+- **Temporary working directory**: ~10-15 GB
+- **Original ISO**: 4-6 GB
+- **Modified ISO**: 2.5-3.5 GB
+- **Total needed**: ~25 GB for safe operation
+
 ## Data Flow
 
 ### Application Installation Flow
@@ -514,6 +662,7 @@ Outputs `winutil.ps1` in the root directory.
 
 - [Contributing Guide](../../contributing/) - How to contribute code
 - [User Guide](../../userguide/) - End-user documentation
+- [Win11 Creator Guide](../../userguide/win11Creator/) - Building customized Windows 11 ISOs
 - [FAQ](../../faq/) - Common questions
 
 ## Additional Resources

docs/content/dev/features/Features/legacymedia.md

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/feature.json",linenos=inline,linenostart=27}
   "WPFFeatureslegacymedia": {
     "Content": "Legacy Media (WMP, DirectPlay)",
-    "Description": "Enables legacy programs from previous versions of windows",
+    "Description": "Enables legacy programs from previous versions of Windows.",
     "category": "Features",
     "panel": "1",
     "feature": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=2185}
   "WPFToggleBingSearch": {
     "Content": "Bing Search in Start Menu",
-    "Description": "If enable then includes web search results from Bing in your Start Menu search.",
+    "Description": "If enabled, Bing web search results will be included in your Start Menu search.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",

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

@@ -3,10 +3,10 @@ title: "Detailed BSoD"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2541}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2559}
   "WPFToggleDetailedBSoD": {
     "Content": "Detailed BSoD",
-    "Description": "If Enabled then you will see a detailed Blue Screen of Death (BSOD) with more information.",
+    "Description": "If enabled, you will see a detailed Blue Screen of Death (BSOD) with more information.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",

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

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

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

@@ -3,10 +3,10 @@ title: "Show Hidden Files"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2421}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2439}
   "WPFToggleHiddenFiles": {
     "Content": "Show Hidden Files",
-    "Description": "If Enabled then Hidden Files will be shown.",
+    "Description": "If enabled, Hidden Files will be shown.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",

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

@@ -3,10 +3,10 @@ title: "Remove Settings Home Page"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2291}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2309}
   "WPFToggleHideSettingsHome": {
     "Content": "Remove Settings Home Page",
-    "Description": "Removes the Home page in the Windows Settings app.",
+    "Description": "Removes the Home Page in the Windows Settings app.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",

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

@@ -3,10 +3,10 @@ title: "Mouse Acceleration"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2309}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2327}
   "WPFToggleMouseAcceleration": {
     "Content": "Mouse Acceleration",
-    "Description": "If Enabled then Cursor movement is affected by the speed of your physical mouse movements.",
+    "Description": "If enabled, the Cursor movement is affected by the speed of your physical mouse movements.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",

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

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

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

@@ -3,10 +3,10 @@ title: "New Outlook"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2361}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2379}
   "WPFToggleNewOutlook": {
     "Content": "New Outlook",
-    "Description": "If disabled it removes the toggle for new Outlook, disables the new Outlook migration and makes sure the Outlook Application actually uses the old Outlook.",
+    "Description": "If disabled, it removes the new Outlook toggle, disables the new Outlook migration, and ensures the classic Outlook application is used.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",

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

@@ -3,7 +3,7 @@ title: "NumLock on Startup"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2203}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2221}
   "WPFToggleNumLock": {
     "Content": "Num Lock on Startup",
     "Description": "Toggle the Num Lock key state when your computer starts.",

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

@@ -3,10 +3,10 @@ title: "S3 Sleep"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2567}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2585}
   "WPFToggleS3Sleep": {
     "Content": "S3 Sleep",
-    "Description": "Toggles between Modern Standby and S3 sleep.",
+    "Description": "Toggles between Modern Standby and S3 Sleep.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",

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

@@ -3,10 +3,10 @@ title: "Show File Extensions"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2449}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2467}
   "WPFToggleShowExt": {
     "Content": "Show File Extensions",
-    "Description": "If enabled then File extensions (e.g., .txt, .jpg) are visible.",
+    "Description": "If enabled, File extensions (e.g., .txt, .jpg) are visible.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",

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

@@ -0,0 +1,29 @@
+---
+title: "Modern Standby fix"
+description: ""
+---
+
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2203}
+  "WPFToggleStandbyFix": {
+    "Content": "Modern Standby fix",
+    "Description": "Disable network connection during S0 sleep. If network connectivity is turned on during S0 sleep it could cause overheating on modern laptops",
+    "category": "Customize Preferences",
+    "panel": "2",
+    "Type": "Toggle",
+    "registry": [
+      {
+        "Path": "HKCU:\\SOFTWARE\\Policies\\Microsoft\\Power\\PowerSettings\\f15576e8-98b7-4186-b944-eafa664402d9",
+        "Name": "ACSettingIndex",
+        "Value": "0",
+        "Type": "DWord",
+        "OriginalValue": "<RemoveEntry>",
+        "DefaultState": "true"
+      }
+    ],
+```
+
+## Registry Changes
+
+Applications and System Components store and retrieve configuration data to modify windows settings, so we can use the registry to change many settings in one place.
+
+You can find information about the registry on [Wikipedia](https://www.wikiwand.com/en/Windows_Registry) and [Microsoft's Website](https://learn.microsoft.com/en-us/windows/win32/sysinfo/registry).

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

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

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

@@ -3,10 +3,10 @@ title: "Sticky Keys"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2343}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2361}
   "WPFToggleStickyKeys": {
     "Content": "Sticky Keys",
-    "Description": "If Enabled then Sticky Keys is activated - Sticky keys is an accessibility feature of some graphical user interfaces which assists users who have physical disabilities or help users reduce repetitive strain injury.",
+    "Description": "If enabled, Sticky Keys is activated. Sticky keys is an accessibility feature of some graphical user interfaces which assists users who have physical disabilities or help users reduce repetitive strain injury.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",

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

@@ -3,10 +3,10 @@ title: "Task View Button in Taskbar"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2495}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2513}
   "WPFToggleTaskView": {
     "Content": "Task View Button in Taskbar",
-    "Description": "If Enabled then Task View Button in Taskbar will be shown.",
+    "Description": "If enabled, Task View Button in Taskbar will be shown.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",

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

@@ -3,10 +3,10 @@ title: "Center Taskbar Items"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2513}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2531}
   "WPFToggleTaskbarAlignment": {
     "Content": "Center Taskbar Items",
-    "Description": "[Windows 11] If Enabled then the Taskbar Items will be shown on the Center, otherwise the Taskbar Items will be shown on the Left.",
+    "Description": "[Windows 11] If enabled, the Taskbar Items will be shown on the Center, otherwise the Taskbar Items will be shown on the Left.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",

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

@@ -3,10 +3,10 @@ title: "Search Button in Taskbar"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2477}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2495}
   "WPFToggleTaskbarSearch": {
     "Content": "Search Button in Taskbar",
-    "Description": "If Enabled Search Button will be on the taskbar.",
+    "Description": "If enabled, Search Button will be on the Taskbar.",
     "category": "Customize Preferences",
     "panel": "2",
     "Type": "Toggle",

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

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

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=2}
   "WPFTweaksActivity": {
     "Content": "Disable Activity History",
-    "Description": "This erases recent docs, clipboard, and run history.",
+    "Description": "Erases recent docs, clipboard, and run history.",
     "category": "Essential Tweaks",
     "panel": "1",
     "registry": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=1291}
   "WPFTweaksConsumerFeatures": {
     "Content": "Disable ConsumerFeatures",
-    "Description": "Windows will not automatically install any games, third-party apps, or application links from the Windows Store for the signed-in user. Some default Apps will be inaccessible (eg. Phone Link)",
+    "Description": "Windows will not automatically install any games, third-party apps, or application links from the Windows Store for the signed-in user. Some default Apps will be inaccessible (eg. Phone Link).",
     "category": "Essential Tweaks",
     "panel": "1",
     "registry": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=2038}
   "WPFTweaksDeleteTempFiles": {
     "Content": "Delete Temporary Files",
-    "Description": "Erases TEMP Folders",
+    "Description": "Erases TEMP Folders.",
     "category": "Essential Tweaks",
     "panel": "1",
     "InvokeScript": [

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

@@ -3,10 +3,10 @@ title: "Disable Explorer Automatic Folder Discovery"
 description: ""
 ---
 
-```json {filename="config/tweaks.json",linenos=inline,linenostart=2616}
+```json {filename="config/tweaks.json",linenos=inline,linenostart=2634}
   "WPFTweaksDisableExplorerAutoDiscovery": {
     "Content": "Disable Explorer Automatic Folder Discovery",
-    "Description": "Windows Explorer automatically tries to guess the type of the folder based on its contents, slowing down the browsing experience. WARNING! Will disable file explorer grouping",
+    "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/EndTaskOnTaskbar.md

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=1763}
   "WPFTweaksEndTaskOnTaskbar": {
     "Content": "Enable End Task With Right Click",
-    "Description": "Enables option to end task when right clicking a program in the taskbar",
+    "Description": "Enables option to end task when right clicking a program in the taskbar.",
     "category": "Essential Tweaks",
     "panel": "1",
     "registry": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=32}
   "WPFTweaksHiber": {
     "Content": "Disable Hibernation",
-    "Description": "Hibernation is really meant for laptops as it saves what's in memory before turning the pc off. It really should never be used",
+    "Description": "Hibernation is really meant for laptops as it saves what's in memory before turning the PC off. It really should never be used.",
     "category": "Essential Tweaks",
     "panel": "1",
     "registry": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=125}
   "WPFTweaksLocation": {
     "Content": "Disable Location Tracking",
-    "Description": "Disables Location Tracking...DUH!",
+    "Description": "Disables Location Tracking.",
     "category": "Essential Tweaks",
     "panel": "1",
     "registry": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=1779}
   "WPFTweaksPowershell7Tele": {
     "Content": "Disable Powershell 7 Telemetry",
-    "Description": "This will create an Environment Variable called 'POWERSHELL_TELEMETRY_OPTOUT' with a value of '1' which will tell Powershell 7 to not send Telemetry Data.",
+    "Description": "Creates an Environment Variable called 'POWERSHELL_TELEMETRY_OPTOUT' with a value of '1' which will tell PowerShell 7 to not send Telemetry Data.",
     "category": "Essential Tweaks",
     "panel": "1",
     "InvokeScript": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=1736}
   "WPFTweaksRestorePoint": {
     "Content": "Create Restore Point",
-    "Description": "Creates a restore point at runtime in case a revert is needed from WinUtil modifications",
+    "Description": "Creates a restore point at runtime in case a revert is needed from WinUtil modifications.",
     "category": "Essential Tweaks",
     "panel": "1",
     "Checked": "False",

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=1307}
   "WPFTweaksTelemetry": {
     "Content": "Disable Telemetry",
-    "Description": "Disables Microsoft Telemetry...Duh",
+    "Description": "Disables Microsoft Telemetry.",
     "category": "Essential Tweaks",
     "panel": "1",
     "registry": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=1892}
   "WPFTweaksWPBT": {
     "Content": "Disable Windows Platform Binary Table (WPBT)",
-    "Description": "If enabled then allows your computer vendor to execute a program each time it boots. It enables computer vendors to force install anti-theft software, software drivers, or a software program conveniently. This could also be a security risk.",
+    "Description": "If enabled, WPBT allows your computer vendor to execute programs at boot time, such as anti-theft software, software drivers, as well as force install software without user consent. Poses potential security risk.",
     "category": "Essential Tweaks",
     "panel": "1",
     "registry": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=61}
   "WPFTweaksWidget": {
     "Content": "Remove Widgets",
-    "Description": "Removes the annoying widgets in the bottom left of the taskbar",
+    "Description": "Removes the annoying widgets in the bottom left of the Taskbar.",
     "category": "Essential Tweaks",
     "panel": "1",
     "InvokeScript": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=1973}
   "WPFTweaksBlockAdobeNet": {
     "Content": "Adobe Network Block",
-    "Description": "Reduce user interruptions by selectively blocking connections to Adobe's activation and telemetry servers. Credit: Ruddernation-Designs",
+    "Description": "Reduces user interruptions by selectively blocking connections to Adobe's activation and telemetry servers. Credit: Ruddernation-Designs",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "InvokeScript": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=1126}
   "WPFTweaksBraveDebloat": {
     "Content": "Brave Debloat",
-    "Description": "Disables various annoyances like Brave Rewards,Leo AI,Crypto Wallet and VPN",
+    "Description": "Disables various annoyances like Brave Rewards, Leo AI, Crypto Wallet and VPN.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "registry": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=1647}
   "WPFTweaksDeBloat": {
     "Content": "Remove ALL MS Store Apps - NOT RECOMMENDED",
-    "Description": "USE WITH CAUTION!!! This will remove ALL Microsoft store apps.",
+    "Description": "USE WITH CAUTION!!! This will remove ALL Microsoft Store apps.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "appx": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=2111}
   "WPFTweaksDisableBGapps": {
     "Content": "Disable Background Apps",
-    "Description": "Disables all Microsoft Store apps from running in the background, which has to be done individually since Win11",
+    "Description": "Disables all Microsoft Store apps from running in the background, which has to be done individually since Windows 11.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "registry": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=2127}
   "WPFTweaksDisableFSO": {
     "Content": "Disable Fullscreen Optimizations",
-    "Description": "Disables FSO in all applications. NOTE: This will disable Color Management in Exclusive Fullscreen",
+    "Description": "Disables FSO in all applications. NOTE: This will disable Color Management in Exclusive Fullscreen.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "registry": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=1950}
   "WPFTweaksDisableNotifications": {
     "Content": "Disable Notification Tray/Calendar",
-    "Description": "Disables all Notifications INCLUDING Calendar",
+    "Description": "Disables all Notifications INCLUDING Calendar.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "registry": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=2051}
   "WPFTweaksIPv46": {
     "Content": "Prefer IPv4 over IPv6",
-    "Description": "To set the IPv4 preference can have latency and security benefits on private networks where IPv6 is not configured.",
+    "Description": "Setting the IPv4 preference can have latency and security benefits on private networks where IPv6 is not configured.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "registry": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=1429}
   "WPFTweaksRemoveEdge": {
     "Content": "Remove Microsoft Edge",
-    "Description": "Unblocks Microsoft Edge uninstaller restrictions than uses that uninstaller to remove Microsoft Edge",
+    "Description": "Unblocks Microsoft Edge uninstaller restrictions then uses that uninstaller to remove Microsoft Edge.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "InvokeScript": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=1517}
   "WPFTweaksRemoveGallery": {
     "Content": "Remove Gallery from explorer",
-    "Description": "Removes the Gallery from Explorer and sets This PC as default",
+    "Description": "Removes the Gallery from Explorer and sets This PC as default.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "InvokeScript": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=1498}
   "WPFTweaksRemoveHome": {
     "Content": "Remove Home from Explorer",
-    "Description": "Removes the Home from Explorer and sets This PC as default",
+    "Description": "Removes the Home from Explorer and sets This PC as default.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "InvokeScript": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=1461}
   "WPFTweaksRemoveOneDrive": {
     "Content": "Remove OneDrive",
-    "Description": "Denys permission to remove onedrive user files than uses its own uninstaller to remove it than brings back permissions",
+    "Description": "Denies permission to remove OneDrive user files, then uses its own uninstaller to remove it and restores the original permission afterward.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "InvokeScript": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=90}
   "WPFTweaksRevertStartMenu": {
     "Content": "Revert the new start menu",
-    "Description": "Uses vivetool to revert the the original start menu from 24h2",
+    "Description": "Uses vivetool to revert to the original start menu from 24H2.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "InvokeScript": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=2003}
   "WPFTweaksRightClickMenu": {
     "Content": "Set Classic Right-Click Menu",
-    "Description": "Great Windows 11 tweak to bring back good context menus when right clicking things in explorer.",
+    "Description": "Restores the classic context menu when right-clicking in File Explorer, replacing the simplified Windows 11 version.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "InvokeScript": [

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

@@ -6,7 +6,7 @@ description: ""
 ```json {filename="config/tweaks.json",linenos=inline,linenostart=2067}
   "WPFTweaksTeredo": {
     "Content": "Disable Teredo",
-    "Description": "Teredo network tunneling is a ipv6 feature that can cause additional latency, but may cause problems with some games",
+    "Description": "Teredo network tunneling is a IPv6 feature that can cause additional latency, but may cause problems with some games.",
     "category": "z__Advanced Tweaks - CAUTION",
     "panel": "1",
     "registry": [

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

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

docs/content/userguide/_index.md

@@ -31,9 +31,10 @@ Winutil is designed for:
 New to Winutil? Start here:
 
 1. **[Getting Started Guide](getting-started/)** - Installation and first steps
-2. **[Application Store](store/)** - Learn to install software easily
+2. **[Application Store](application/)** - Learn to install software easily
 3. **[Tweaks Guide](tweaks/)** - Optimize your system
 4. **[Features & Fixes](features/)** - Troubleshoot common issues
+5. **[Win11 Creator](win11Creator/)** - Build a custom debloated Windows 11 ISO
 
 ## Main Features
 
@@ -41,7 +42,7 @@ New to Winutil? Start here:
 
 Browse and install hundreds of popular applications with a single click. No more hunting for download links or dealing with installer bloat.
 
-**[Read the Store Guide →](store/)**
+**[Read the Store Guide →](application/)**
 
 ### ⚙️ System Tweaks
 
@@ -79,16 +80,23 @@ Automate Winutil configurations for:
 
 **[Read the Automation Guide →](automation/)**
 
+### 💿 Windows 11 Creator
+
+Build a custom Windows 11 ISO with bloatware removed, telemetry disabled, and hardware requirement checks bypassed — then export it as an ISO file or write it directly to a USB drive.
+
+**[Read the Win11 Creator Guide →](win11Creator/)**
+
 ## Quick Links
 
 | I want to... | Go to... |
 |--------------|----------|
 | Install Winutil for the first time | [Getting Started](getting-started/) |
-| Install applications quickly | [Application Store](store/) |
+| Install applications quickly | [Application Store](application/) |
 | Speed up my computer | [Tweaks Guide](tweaks/) |
 | Fix Windows Update problems | [Features - Fixes](features/) |
 | Automate setup for multiple PCs | [Automation](automation/) |
 | Understand what tweaks do | [Tweaks Guide](tweaks/) |
+| Build a custom Windows 11 ISO | [Win11 Creator](win11Creator/) |
 
 ## Safety and Best Practices
 
@@ -143,9 +151,10 @@ Want to help improve Winutil?
 This User Guide covers everything you need to know:
 
 1. **[Getting Started](getting-started/)** - Installation, first run, basic usage
-2. **[Application Store](store/)** - Installing software, using presets
+2. **[Application Store](application/)** - Installing software, using presets
 3. **[Tweaks](tweaks/)** - System optimizations and customizations
 4. **[Features & Fixes](features/)** - Troubleshooting tools and utilities
+5. **[Win11 Creator](win11Creator/)** - Build a custom debloated Windows 11 ISO
 6. **[Updates](updates/)** - Managing Windows Update behavior
 7. **[Automation](automation/)** - Scripting and batch deployments
 

docs/content/userguide/application/_index.md

@@ -1,5 +1,5 @@
 ---
-title: Store
+title: Applications
 weight: 2
 ---
 

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

@@ -1,5 +1,5 @@
 ---
-title: Getting Started with Winutil
+title: Getting Started
 weight: 1
 ---
 
@@ -258,7 +258,7 @@ If Winutil downloads but doesn't open:
 
 Now that you're set up, explore these guides:
 
-- [Application Installation Guide](../store/) - Learn about installing software
+- [Application Installation Guide](../application/) - Learn about installing software
 - [Tweaks Guide](../tweaks/) - Understand system optimizations
 - [FAQ](../../faq/) - Common questions and answers
 

docs/content/userguide/win11Creator/_index.md

@@ -0,0 +1,170 @@
+---
+title: Win 11 Creator
+weight: 5
+---
+
+## Using Winutil's Win11 Creator
+
+Winutil includes a built-in **Win11 Creator** tool that lets you take any official Windows 11 ISO and produce a customized, debloated version — with telemetry removed, hardware requirement checks bypassed, and local account setup enabled out of the box. You can export the result as a new ISO file or write it directly to a USB drive.
+
+> [!IMPORTANT]
+> You need an **official Windows 11 ISO** from [Microsoft's website](https://www.microsoft.com/en-us/software-download/windows11) before starting. Custom, modified, or non-official ISOs are not supported. The process uses ~10–15 GB of temporary disk space, so make sure you have room.
+
+---
+
+### Step 1 — Select Your Official Windows 11 ISO
+
+1. Open Winutil and go to the **Win11 Creator** tab.
+2. Click **Browse** and select your **official Windows 11 ISO file** from Microsoft (must be 4 GB or larger). Custom or modified ISOs are not supported.
+3. The file path and size will appear on screen once selected.
+
+---
+
+### Step 2 — Mount & Verify
+
+1. Click **Mount & Verify ISO**.
+2. Winutil mounts the ISO, checks for a valid `install.wim` or `install.esd`, and reads the available editions (Home, Pro, Enterprise, etc.).
+3. Once verified, select your desired **edition** from the dropdown — Pro is selected by default if available.
+
+> [!NOTE]
+> This step takes around 10–30 seconds depending on your drive speed.
+
+---
+
+### Step 3 — Run the Modification
+
+Click **Run Windows ISO Modification and Creator** to start the customization process. Winutil will:
+
+**App & Component Removal:**
+- **Remove 40+ bloat apps** — Clipchamp, Teams, Copilot, Dev Home, new Outlook, Bing apps, Solitaire, and more
+- **Delete OneDrive setup** from the image
+
+**System Customization:**
+- **Bypass hardware checks** — removes TPM, Secure Boot, CPU, and RAM requirement enforcement so the ISO installs on unsupported hardware
+- **Enable local account setup** — injects an `autounattend.xml` that skips the Microsoft account screen during OOBE
+- **Disable BitLocker and device encryption** — removes startup overhead
+- **Disable Chat icon** — removes chat taskbar button
+- **Strip unused editions** — keeps only your selected edition, saving 1–2 GB per removed edition
+- **Clean the component store** — runs DISM cleanup to reclaim another 300–800 MB
+
+**Privacy & Telemetry Tweaks:**
+- **Disable telemetry** — advertising ID, tailored experiences, input personalization, speech online privacy
+- **Disable cloud content features** — app suggestions, Microsoft Store recommendations
+- **Remove telemetry scheduled tasks** — CEIP, Appraiser, WaaSMedic, and others
+- **Disable OneDrive folder backup** — prevents automatic backups to cloud
+- **Prevent DevHome and Outlook post-setup installation**
+- **Prevent Teams installation** — blocks auto-install after OOBE
+- **Prevent new Outlook Mail app installation**
+- **Disable Windows Update during OOBE** — re-enabled automatically on first login
+- **Disable Copilot and search box suggestions**
+
+**Optional: Driver Injection**
+- If enabled, injects all drivers from your current system into the install.wim and boot.wim — useful for offline installations on machines with missing drivers. This is an optional checkbox in Step 3.
+
+A live log shows progress as each step completes. This stage takes **10–30 minutes** depending on your disk speed — the WIM dismount near the end is the slowest part, so don't close Winutil while it's running.
+
+---
+
+### Step 4 — Export Your Result
+
+Once modification is complete, choose how to save your image:
+
+{{< tabs items="Save as ISO,Write to USB" defaultIndex="0" >}}
+
+  {{< tab >}}
+  1. Click **Save as an ISO File**.
+  2. Choose a save location (defaults to your Desktop as `Win11_Modified_yyyyMMdd.iso`).
+  3. Winutil builds a dual BIOS/UEFI bootable ISO using `oscdimg.exe`.
+
+  > [!NOTE]
+  > `oscdimg.exe` (part of the Windows ADK) is required. If it's not found, Winutil will attempt to install it automatically via winget. If that fails, install it manually: `winget install -e --id Microsoft.OSCDIMG`
+
+  **Typical output size:** 2.5–3.5 GB (down from 5–6 GB original)
+  {{< /tab >}}
+
+  {{< tab >}}
+  1. Click **Write Directly to a USB Drive**.
+  2. Select your USB drive from the dropdown (click **Refresh** if it doesn't appear).
+  3. Click **Erase & Write to USB** and confirm the warning — **all data on the drive will be permanently erased**.
+  4. Winutil formats the drive as GPT with a 512 MB EFI partition and copies the modified Windows files.
+
+  > [!WARNING]
+  > Double-check you have selected the correct drive before confirming. This operation cannot be undone.
+
+  **Minimum USB size:** 8 GB recommended. Writing takes 10–20 minutes.
+  {{< /tab >}}
+
+{{< /tabs >}}
+
+---
+
+### Step 5 — Clean Up (Optional)
+
+Click **Clean & Reset** to delete the temporary working directory (~10–15 GB) and reset the tool back to its initial state, ready for a new ISO. You'll be asked to confirm before anything is deleted.
+
+---
+
+### What the Modified ISO Does Differently
+
+When you install Windows 11 from your modified ISO:
+
+- **No Microsoft account required** — create a local account directly during setup
+- **No hardware checks** — installs on machines without TPM 2.0, Secure Boot, or supported CPUs
+- **Dark mode enabled by default**
+- **Empty taskbar and Start Menu** — no pinned apps, Chat icon removed
+- **Windows Update disabled during OOBE** — automatically re-enabled on first login to prevent setup interruptions
+- **BitLocker disabled** — removes startup overhead on first boot
+
+---
+
+### Troubleshooting
+
+| Problem | Fix |
+|---------|-----|
+| "install.wim not found" | Not a valid Windows 11 ISO — download a fresh one from Microsoft |
+| "oscdimg.exe not found" | Run `winget install -e --id Microsoft.OSCDIMG` then retry |
+| USB drive not showing up | Plug it in, wait a few seconds, then click **Refresh** |
+| Modification seems stuck | The WIM dismount step is slow — wait at least 10 minutes before assuming it's frozen |
+| "Access Denied" error | Make sure Winutil is running as Administrator |
+
+---
+
+A list of the best free and open source tools for downloading, creating and flashing Windows ISOs.
+
+## Download Windows ISOs
+
+| Tool | Description | Website |
+|------|-------------|---------|
+| **[UUP Dump](https://uupdump.net/)** | Download Windows UUP files directly from Microsoft's servers and convert them into a clean ISO — great for getting the latest builds | [uupdump.net](https://uupdump.net/) |
+| **[Microsoft Media Creation Tool](https://www.microsoft.com/en-us/software-download/windows11)** | Microsoft's official tool for downloading and creating Windows 10/11 installation media | [microsoft.com](https://www.microsoft.com/en-us/software-download/windows11) |
+
+
+## Customize Windows ISOs
+
+| Tool | Description | Website |
+|------|-------------|---------|
+| **[MicroWin](https://github.com/CodingWonders/microwin)** | A C# desktop app for building stripped-down, customized Windows ISOs — the original predecessor to Winutil's old MicroWin feature | [github.com](https://github.com/CodingWonders/microwin) |
+| **[Tiny11 Builder](https://github.com/ntdevlabs/tiny11builder)** | PowerShell script that strips a Windows 11 ISO down to the bare minimum — removes bloatware and bypasses hardware requirements | [github.com](https://github.com/ntdevlabs/tiny11builder) |
+| **[NTLite](https://www.ntlite.com/)** | Remove Windows components, integrate drivers and updates, and build a custom ISO before installation | [ntlite.com](https://www.ntlite.com/) |
+
+
+## Flash ISOs to USB
+
+| Tool | Description | Website |
+|------|-------------|---------|
+| **[Rufus](https://rufus.ie/)** | The go-to tool for creating bootable Windows USB drives. Supports bypassing Windows 11 TPM/Secure Boot requirements and downloading ISOs directly | [rufus.ie](https://rufus.ie/) |
+| **[Ventoy](https://www.ventoy.net/)** | Install once, then just copy any ISO files onto the USB — supports booting multiple ISOs from a single drive without re-flashing | [ventoy.net](https://www.ventoy.net/) |
+| **[balenaEtcher](https://etcher.balena.io/)** | Simple, beginner-friendly ISO flasher with a clean interface | [etcher.balena.io](https://etcher.balena.io/) |
+
+
+
+---
+
+> [!TIP]
+> Already have a Windows 11 ISO? Skip the third-party tools and use Winutil's built-in **[Win11 Creator](#using-winutilss-win11-creator)** at the top of this page.
+
+> [!NOTE]
+> Always download Windows ISOs from official Microsoft sources or trusted tools like Rufus/UUP Dump to avoid tampered images.
+
+> [!NOTE]
+> Newer Windows 11 ISOs may not boot correctly on older versions of Ventoy — make sure Ventoy is up to date before use. If issues persist after updating, this is a Ventoy compatibility limitation outside of Winutil's control.

functions/private/Invoke-WinUtilFeatureInstall.ps1

@@ -16,13 +16,20 @@ function Invoke-WinUtilFeatureInstall {
                 Write-Host "Installing $feature"
                 Enable-WindowsOptionalFeature -Online -FeatureName $feature -All -NoRestart
             } catch {
-                if ($CheckBox.Exception.Message -like "*requires elevation*") {
+                if ($_.Exception -and $_.Exception.Message -like "*requires elevation*") {
                     Write-Warning "Unable to Install $feature due to permissions. Are you running as admin?"
                     Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" }
                 } else {
 
                     Write-Warning "Unable to Install $feature due to unhandled exception"
-                    Write-Warning $CheckBox.Exception.StackTrace
+                    if ($_.Exception) {
+                        if (-not [string]::IsNullOrWhiteSpace($_.Exception.Message)) {
+                            Write-Warning $_.Exception.Message
+                        }
+                        if (-not [string]::IsNullOrWhiteSpace($_.Exception.StackTrace)) {
+                            Write-Warning $_.Exception.StackTrace
+                        }
+                    }
                 }
             }
         }
@@ -35,13 +42,20 @@ function Invoke-WinUtilFeatureInstall {
                 Write-Host "Running Script for $CheckBox"
                 Invoke-Command $scriptblock -ErrorAction stop
             } catch {
-                if ($CheckBox.Exception.Message -like "*requires elevation*") {
+                if ($_.Exception -and $_.Exception.Message -like "*requires elevation*") {
                     Write-Warning "Unable to Install $feature due to permissions. Are you running as admin?"
                     Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" }
                 } else {
                     Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" }
                     Write-Warning "Unable to Install $feature due to unhandled exception"
-                    Write-Warning $CheckBox.Exception.StackTrace
+                    if ($_.Exception) {
+                        if (-not [string]::IsNullOrWhiteSpace($_.Exception.Message)) {
+                            Write-Warning $_.Exception.Message
+                        }
+                        if (-not [string]::IsNullOrWhiteSpace($_.Exception.StackTrace)) {
+                            Write-Warning $_.Exception.StackTrace
+                        }
+                    }
                 }
             }
         }

functions/private/Invoke-WinUtilISO.ps1

@@ -1,18 +1,12 @@
 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")
+    $ts = (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"
+            $sync["WPFWin11ISOStatusLog"].Text = "[$ts] $Message"
         } else {
-            $sync["WPFWin11ISOStatusLog"].Text += "`n[$timestamp] $Message"
+            $sync["WPFWin11ISOStatusLog"].Text += "`n[$ts] $Message"
         }
         $sync["WPFWin11ISOStatusLog"].CaretIndex = $sync["WPFWin11ISOStatusLog"].Text.Length
         $sync["WPFWin11ISOStatusLog"].ScrollToEnd()
@@ -20,11 +14,6 @@ function Write-Win11ISOLog {
 }
 
 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()
@@ -35,18 +24,12 @@ function Invoke-WinUtilISOBrowse {
     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"
@@ -55,17 +38,10 @@ function Invoke-WinUtilISOBrowse {
 }
 
 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(
+        [System.Windows.MessageBox]::Show("Please select an ISO file first.", "No ISO Selected", "OK", "Warning")
-            "Please select an ISO file first.",
-            "No ISO Selected", "OK", "Warning")
         return
     }
 
@@ -73,14 +49,12 @@ function Invoke-WinUtilISOMountAndVerify {
     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"
 
@@ -96,14 +70,10 @@ function Invoke-WinUtilISOMountAndVerify {
 
         $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 ──
+        if (-not ($imageInfo | Where-Object { $_.ImageName -match "Windows 11" })) {
-        $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(
@@ -113,10 +83,8 @@ function Invoke-WinUtilISOMountAndVerify {
             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()
@@ -124,45 +92,36 @@ function Invoke-WinUtilISOMountAndVerify {
                 [void]$sync["WPFWin11ISOEditionComboBox"].Items.Add("$($img.ImageIndex): $($img.ImageName)")
             }
             if ($sync["WPFWin11ISOEditionComboBox"].Items.Count -gt 0) {
-                $sync["WPFWin11ISOEditionComboBox"].SelectedIndex = 0
+                $proIndex = -1
+                for ($i = 0; $i -lt $sync["WPFWin11ISOEditionComboBox"].Items.Count; $i++) {
+                    if ($sync["WPFWin11ISOEditionComboBox"].Items[$i] -match "Windows 11 Pro(?![\w ])") {
+                        $proIndex = $i; break
+                    }
+                }
+                $sync["WPFWin11ISOEditionComboBox"].SelectedIndex = if ($proIndex -ge 0) { $proIndex } else { 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
+        Set-WinUtilProgressBar -Label "ISO verified" -Percent 100
         Write-Win11ISOLog "ISO verified OK.  Editions found: $($imageInfo.Count)"
-    }
+    } catch {
-    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 {
-    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"]
@@ -174,9 +133,8 @@ function Invoke-WinUtilISOModify {
         return
     }
 
-    # ── Resolve selected edition index from the ComboBox ──
     $selectedItem     = $sync["WPFWin11ISOEditionComboBox"].SelectedItem
-    $selectedWimIndex = 1  # default fallback
+    $selectedWimIndex = 1
     if ($selectedItem -and $selectedItem -match '^(\d+):') {
         $selectedWimIndex = [int]$Matches[1]
     } elseif ($sync["Win11ISOImageInfo"]) {
@@ -185,13 +143,10 @@ function Invoke-WinUtilISOModify {
     $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 } |
+        Where-Object { $_.PSIsContainer } | Sort-Object LastWriteTime -Descending | Select-Object -First 1
-        Sort-Object LastWriteTime -Descending |
-        Select-Object -First 1
 
     $workDir = if ($existingWorkDir) {
         Write-Win11ISOLog "Reusing existing temp directory: $($existingWorkDir.FullName)"
@@ -200,9 +155,6 @@ function Invoke-WinUtilISOModify {
         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 {
@@ -210,11 +162,12 @@ function Invoke-WinUtilISOModify {
         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()
+    $injectDrivers = $sync["WPFWin11ISOInjectDrivers"].IsChecked -eq $true
+
     $runspace.SessionStateProxy.SetVariable("sync",                $sync)
     $runspace.SessionStateProxy.SetVariable("isoPath",             $isoPath)
     $runspace.SessionStateProxy.SetVariable("driveLetter",         $driveLetter)
@@ -223,28 +176,18 @@ function Invoke-WinUtilISOModify {
     $runspace.SessionStateProxy.SetVariable("selectedWimIndex",    $selectedWimIndex)
     $runspace.SessionStateProxy.SetVariable("selectedEditionName", $selectedEditionName)
     $runspace.SessionStateProxy.SetVariable("autounattendContent", $autounattendContent)
+    $runspace.SessionStateProxy.SetVariable("injectDrivers",       $injectDrivers)
 
-    # Serialize functions so they are available inside the runspace
+    $isoScriptFuncDef   = "function Invoke-WinUtilISOScript {`n" + ${function:Invoke-WinUtilISOScript}.ToString() + "`n}"
-    $isoScriptFuncDef = "function Invoke-WinUtilISOScript {`n" + `
+    $win11ISOLogFuncDef = "function Write-Win11ISOLog {`n"       + ${function:Write-Win11ISOLog}.ToString()       + "`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")
@@ -253,6 +196,7 @@ function Invoke-WinUtilISOModify {
                 $sync["WPFWin11ISOStatusLog"].CaretIndex = $sync["WPFWin11ISOStatusLog"].Text.Length
                 $sync["WPFWin11ISOStatusLog"].ScrollToEnd()
             })
+            Add-Content -Path (Join-Path $workDir "WinUtil_Win11ISO.log") -Value "[$ts] $msg" -ErrorAction SilentlyContinue
         }
 
         function SetProgress($label, $pct) {
@@ -264,173 +208,111 @@ function Invoke-WinUtilISOModify {
         }
 
         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 $driveLetter $isoContents /E /NFL /NDL /NJH /NJS | Out-Null
-            & 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)) {
+            if (-not (Test-Path $localWim)) { $localWim = Join-Path $isoContents "sources\install.esd" }
-                # 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 }
+            Invoke-WinUtilISOScript -ScratchDir $mountDir -ISOContentsDir $isoContents -AutoUnattendXml $autounattendContent -InjectCurrentSystemDrivers $injectDrivers -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 `
+            Export-WindowsImage -SourceImagePath $localWim -SourceIndex $selectedWimIndex -DestinationImagePath $exportWim -ErrorAction Stop | Out-Null
-                -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
+            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 {
-        catch {
             Log "ERROR during modification: $_"
 
-            # ── Cleanup: dismount WIM if still mounted ──
             try {
                 if (Test-Path $mountDir) {
-                    $mountedImages = Get-WindowsImage -Mounted -ErrorAction SilentlyContinue |
+                    $mountedImages = Get-WindowsImage -Mounted -ErrorAction SilentlyContinue | Where-Object { $_.Path -eq $mountDir }
-                                     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 {
+            } catch { Log "Warning: could not dismount install.wim during cleanup: $_" }
-                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 {
+            } catch { Log "Warning: could not dismount ISO during cleanup: $_" }
-                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 {
+            } catch { Log "Warning: could not remove temp directory during cleanup: $_" }
-                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 {
-        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
@@ -438,13 +320,36 @@ function Invoke-WinUtilISOModify {
     $script.BeginInvoke() | Out-Null
 }
 
-function Invoke-WinUtilISOCleanAndReset {
+function Invoke-WinUtilISOCheckExistingWork {
-    <#
+    if ($sync["Win11ISOContentsDir"] -and (Test-Path $sync["Win11ISOContentsDir"])) { return }
-    .SYNOPSIS
-        Deletes the temporary working directory created during ISO modification
-        and resets the entire ISO UI back to its initial state (Step 1 only).
-    #>
 
+    $existingWorkDir = Get-Item -Path (Join-Path $env:TEMP "WinUtil_Win11ISO*") -ErrorAction SilentlyContinue |
+        Where-Object { $_.PSIsContainer } | Sort-Object LastWriteTime -Descending | Select-Object -First 1
+
+    if (-not $existingWorkDir) { return }
+
+    $isoContents = Join-Path $existingWorkDir.FullName "iso_contents"
+    if (-not (Test-Path $isoContents)) { return }
+
+    $sync["Win11ISOWorkDir"]     = $existingWorkDir.FullName
+    $sync["Win11ISOContentsDir"] = $isoContents
+
+    $sync["WPFWin11ISOSelectSection"].Visibility = "Collapsed"
+    $sync["WPFWin11ISOMountSection"].Visibility  = "Collapsed"
+    $sync["WPFWin11ISOModifySection"].Visibility = "Collapsed"
+    $sync["WPFWin11ISOOutputSection"].Visibility = "Visible"
+
+    $modified = $existingWorkDir.LastWriteTime.ToString("yyyy-MM-dd HH:mm")
+    Write-Win11ISOLog "Existing working directory found: $($existingWorkDir.FullName)"
+    Write-Win11ISOLog "Last modified: $modified - Skipping Steps 1-3 and resuming at Step 4."
+    Write-Win11ISOLog "Click 'Clean & Reset' if you want to start over with a new ISO."
+
+    [System.Windows.MessageBox]::Show(
+        "A previous WinUtil ISO working directory was found:`n`n$($existingWorkDir.FullName)`n`n(Last modified: $modified)`n`nStep 4 (output options) has been restored so you can save the already-modified image.`n`nClick 'Clean & Reset' in Step 4 if you want to start over.",
+        "Existing Work Found", "OK", "Info")
+}
+
+function Invoke-WinUtilISOCleanAndReset {
     $workDir = $sync["Win11ISOWorkDir"]
 
     if ($workDir -and (Test-Path $workDir)) {
@@ -452,17 +357,104 @@ function Invoke-WinUtilISOCleanAndReset {
             "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 }
+    }
+
+    $sync["WPFWin11ISOCleanResetButton"].IsEnabled = $false
+
+    $runspace = [Management.Automation.Runspaces.RunspaceFactory]::CreateRunspace()
+    $runspace.ApartmentState = "STA"
+    $runspace.ThreadOptions  = "ReuseThread"
+    $runspace.Open()
+    $runspace.SessionStateProxy.SetVariable("sync",    $sync)
+    $runspace.SessionStateProxy.SetVariable("workDir", $workDir)
+
+    $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()
+            })
+            Add-Content -Path (Join-Path $workDir "WinUtil_Win11ISO.log") -Value "[$ts] $msg" -ErrorAction SilentlyContinue
+        }
+
+        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 {
-            Write-Win11ISOLog "Deleting temp directory: $workDir"
+            if ($workDir) {
-            Remove-Item -Path $workDir -Recurse -Force -ErrorAction Stop
+                $mountDir = Join-Path $workDir "wim_mount"
-            Write-Win11ISOLog "Temp directory deleted."
+                try {
+                    $mountedImages = Get-WindowsImage -Mounted -ErrorAction SilentlyContinue |
+                                     Where-Object { $_.Path -like "$workDir*" }
+                    if ($mountedImages) {
+                        foreach ($img in $mountedImages) {
+                            Log "Dismounting WIM at: $($img.Path) (discarding changes)..."
+                            SetProgress "Dismounting WIM image..." 3
+                            Dismount-WindowsImage -Path $img.Path -Discard -ErrorAction Stop | Out-Null
+                            Log "WIM dismounted successfully."
+                        }
+                    } elseif (Test-Path $mountDir) {
+                        Log "No mounted WIM reported by Get-WindowsImage, running DISM /Cleanup-Wim as a precaution..."
+                        SetProgress "Running DISM cleanup..." 3
+                        & dism /English /Cleanup-Wim 2>&1 | ForEach-Object { Log $_ }
+                    }
                 } catch {
-            Write-Win11ISOLog "WARNING: could not fully delete temp directory: $_"
+                    Log "Warning: could not dismount WIM cleanly, attempting DISM /Cleanup-Wim fallback: $_"
+                    try { & dism /English /Cleanup-Wim 2>&1 | ForEach-Object { Log $_ } }
+                    catch { Log "Warning: DISM /Cleanup-Wim also failed: $_" }
                 }
             }
 
-    # Clear all stored ISO state
+            if ($workDir -and (Test-Path $workDir)) {
+                Log "Scanning files to delete in: $workDir"
+                SetProgress "Scanning files..." 5
+
+                $allFiles = @(Get-ChildItem -Path $workDir -File -Recurse -Force -ErrorAction SilentlyContinue)
+                $allDirs  = @(Get-ChildItem -Path $workDir -Directory -Recurse -Force -ErrorAction SilentlyContinue |
+                    Sort-Object { $_.FullName.Length } -Descending)
+                $total   = $allFiles.Count
+                $deleted = 0
+
+                Log "Found $total files to delete."
+
+                foreach ($f in $allFiles) {
+                    try { Remove-Item -Path $f.FullName -Force -ErrorAction Stop } catch { Log "WARNING: could not delete $($f.FullName): $_" }
+                    $deleted++
+                    if ($deleted % 100 -eq 0 -or $deleted -eq $total) {
+                        $pct = [math]::Round(($deleted / [Math]::Max($total, 1)) * 85) + 5
+                        SetProgress "Deleting files in $($f.Directory.Name)... ($deleted / $total)" $pct
+                    }
+                }
+
+                foreach ($d in $allDirs) {
+                    try { Remove-Item -Path $d.FullName -Force -ErrorAction SilentlyContinue } catch {}
+                }
+
+                try { Remove-Item -Path $workDir -Recurse -Force -ErrorAction Stop } catch {}
+
+                if (Test-Path $workDir) {
+                    Log "WARNING: some items could not be deleted in $workDir"
+                } else {
+                    Log "Temp directory deleted successfully."
+                }
+            } else {
+                Log "No temp directory found — resetting UI."
+            }
+
+            SetProgress "Resetting UI..." 95
+            Log "Resetting interface..."
+
+            $sync["WPFWin11ISOStatusLog"].Dispatcher.Invoke([action]{
                 $sync["Win11ISOWorkDir"]     = $null
                 $sync["Win11ISOContentsDir"] = $null
                 $sync["Win11ISOImagePath"]   = $null
@@ -471,7 +463,6 @@ function Invoke-WinUtilISOCleanAndReset {
                 $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"
@@ -480,23 +471,35 @@ function Invoke-WinUtilISOCleanAndReset {
                 $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
+                $sync["WPFWin11ISOCleanResetButton"].IsEnabled   = $true
+
+                $sync.progressBarTextBlock.Text    = ""
+                $sync.progressBarTextBlock.ToolTip = ""
+                $sync.ProgressBar.Value            = 0
+
+                $sync["WPFWin11ISOStatusLog"].Text   = "Ready. Please select a Windows 11 ISO to begin."
+            })
+        } catch {
+            Log "ERROR during Clean & Reset: $_"
+            $sync["WPFWin11ISOStatusLog"].Dispatcher.Invoke([action]{
+                $sync.progressBarTextBlock.Text    = ""
+                $sync.progressBarTextBlock.ToolTip = ""
+                $sync.ProgressBar.Value            = 0
+                $sync["WPFWin11ISOCleanResetButton"].IsEnabled = $true
+            })
+        }
+    }) | Out-Null
+
+    $script.BeginInvoke() | Out-Null
 }
 
 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.",
+            "No modified ISO content found.  Please complete Steps 1-3 first.",
             "Not Ready", "OK", "Warning")
         return
     }
@@ -512,29 +515,30 @@ function Invoke-WinUtilISOExport {
     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)
+    # Locate oscdimg.exe (Windows ADK or winget per-user install)
     $oscdimg = Get-ChildItem "C:\Program Files (x86)\Windows Kits" -Recurse -Filter "oscdimg.exe" -ErrorAction SilentlyContinue |
                Select-Object -First 1 -ExpandProperty FullName
+    if (-not $oscdimg) {
+        $oscdimg = Get-ChildItem "$env:LOCALAPPDATA\Microsoft\WinGet\Packages" -Recurse -Filter "oscdimg.exe" -ErrorAction SilentlyContinue |
+                   Where-Object { $_.FullName -match 'Microsoft\.OSCDIMG' } |
+                   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 "$env:LOCALAPPDATA\Microsoft\WinGet\Packages" -Recurse -Filter "oscdimg.exe" -ErrorAction SilentlyContinue |
-            $oscdimg = Get-ChildItem "C:\Program Files (x86)\Windows Kits" -Recurse -Filter "oscdimg.exe" -ErrorAction SilentlyContinue |
+                       Where-Object { $_.FullName -match 'Microsoft\.OSCDIMG' } |
                        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",
@@ -544,134 +548,25 @@ function Invoke-WinUtilISOExport {
         Write-Win11ISOLog "oscdimg.exe installed successfully."
     }
 
-    # Build boot parameters (BIOS + UEFI dual-boot)
+    $sync["WPFWin11ISOChooseISOButton"].IsEnabled = $false
-    $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)
+    $runspace.SessionStateProxy.SetVariable("outputISO",   $outputISO)
+    $runspace.SessionStateProxy.SetVariable("oscdimg",     $oscdimg)
+
+    $win11ISOLogFuncDef = "function Write-Win11ISOLog {`n" + ${function:Write-Win11ISOLog}.ToString() + "`n}"
+    $runspace.SessionStateProxy.SetVariable("win11ISOLogFuncDef", $win11ISOLogFuncDef)
 
     $script = [Management.Automation.PowerShell]::Create()
     $script.Runspace = $runspace
     $script.AddScript({
+        . ([scriptblock]::Create($win11ISOLogFuncDef))
 
-        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
@@ -681,96 +576,66 @@ function Invoke-WinUtilISOWriteUSB {
         }
 
         try {
-            SetProgress "Formatting USB drive..." 10
+            Write-Win11ISOLog "Exporting to ISO: $outputISO"
+            SetProgress "Building ISO..." 10
 
-            # ── Diskpart script: clean, GPT, create ESP + data partitions ──
+            $bootData    = "2#p0,e,b`"$contentsDir\boot\etfsboot.com`"#pEF,e,b`"$contentsDir\efi\microsoft\boot\efisys.bin`""
-            $dpScript = @"
+            $oscdimgArgs = @("-m", "-o", "-u2", "-udfver102", "-bootdata:$bootData", "-l`"CTOS_MODIFIED`"", "`"$contentsDir`"", "`"$outputISO`"")
-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
+            Write-Win11ISOLog "Running oscdimg..."
-            Start-Sleep -Seconds 3   # let Windows assign drive letters
 
-            # Find newly assigned drive letter for the data partition
+            $psi = [System.Diagnostics.ProcessStartInfo]::new()
-            $usbVol = Get-Partition -DiskNumber $diskNum |
+            $psi.FileName               = $oscdimg
-                      Where-Object { $_.Type -eq "Basic" } |
+            $psi.Arguments              = $oscdimgArgs -join " "
-                      Get-Volume |
+            $psi.RedirectStandardOutput = $true
-                      Where-Object { $_.FileSystemLabel -eq "WINPE" } |
+            $psi.RedirectStandardError  = $true
-                      Select-Object -First 1
+            $psi.UseShellExecute        = $false
+            $psi.CreateNoWindow         = $true
 
-            if (-not $usbVol) {
+            $proc = [System.Diagnostics.Process]::new()
-                throw "Could not locate the formatted USB data partition.  Drive letter may not have been assigned automatically."
+            $proc.StartInfo = $psi
+            $proc.Start() | Out-Null
+
+            # Stream stdout line-by-line as oscdimg runs
+            while (-not $proc.StandardOutput.EndOfStream) {
+                $line = $proc.StandardOutput.ReadLine()
+                if ($line.Trim()) { Write-Win11ISOLog $line }
             }
 
-            $usbDrive = "$($usbVol.DriveLetter):"
+            $proc.WaitForExit()
-            Log "USB data partition: $usbDrive"
-            SetProgress "Copying Windows 11 files to USB..." 45
 
-            # ── Copy files (split large install.wim if > 4 GB for FAT32) ──
+            # Flush any stderr after process exits
-            $installWim = Join-Path $contentsDir "sources\install.wim"
+            $stderr = $proc.StandardError.ReadToEnd()
-            if (Test-Path $installWim) {
+            foreach ($line in ($stderr -split "`r?`n")) {
-                $wimSizeMB = [math]::Round((Get-Item $installWim).Length / 1MB)
+                if ($line.Trim()) { Write-Win11ISOLog "[stderr]$line" }
-                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)
+            if ($proc.ExitCode -eq 0) {
-                    $robocopyArgs = @($contentsDir, $usbDrive, "/E", "/XF", "install.wim", "/NFL", "/NDL", "/NJH", "/NJS")
+                SetProgress "ISO exported" 100
-                    & robocopy @robocopyArgs | Out-Null
+                Write-Win11ISOLog "ISO exported successfully: $outputISO"
+                $sync["WPFWin11ISOStatusLog"].Dispatcher.Invoke([action]{
+                    [System.Windows.MessageBox]::Show("ISO exported successfully!`n`n$outputISO", "Export Complete", "OK", "Info")
+                })
             } else {
-                    & robocopy $contentsDir $usbDrive /E /NFL /NDL /NJH /NJS | Out-Null
+                Write-Win11ISOLog "oscdimg exited with code $($proc.ExitCode)."
-                }
-            } 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.",
+                        "oscdimg exited with code $($proc.ExitCode).`nCheck the status log for details.",
-                    "USB Ready", "OK", "Info")
+                        "Export Error", "OK", "Error")
                 })
             }
-        catch {
+        } catch {
-            Log "ERROR during USB write: $_"
+            Write-Win11ISOLog "ERROR during ISO export: $_"
             $sync["WPFWin11ISOStatusLog"].Dispatcher.Invoke([action]{
-                [System.Windows.MessageBox]::Show(
+                [System.Windows.MessageBox]::Show("ISO export failed:`n`n$_", "Error", "OK", "Error")
-                    "USB write failed:`n`n$_",
-                    "USB Write Error", "OK", "Error")
             })
-        }
+        } finally {
-        finally {
             Start-Sleep -Milliseconds 800
             $sync["WPFWin11ISOStatusLog"].Dispatcher.Invoke([action]{
                 $sync.progressBarTextBlock.Text    = ""
                 $sync.progressBarTextBlock.ToolTip = ""
                 $sync.ProgressBar.Value            = 0
-                $sync["WPFWin11ISOWriteUSBButton"].IsEnabled = $true
+                $sync["WPFWin11ISOChooseISOButton"].IsEnabled = $true
             })
         }
     }) | Out-Null

functions/private/Invoke-WinUtilISOScript.ps1

@@ -4,52 +4,38 @@ function Invoke-WinUtilISOScript {
         Applies WinUtil modifications to a mounted Windows 11 install.wim image.
 
     .DESCRIPTION
-        Performs the following operations against an already-mounted WIM image:
+        Removes AppX bloatware and OneDrive, optionally injects all drivers exported from
+        the running system into install.wim and boot.wim (controlled by the
+        -InjectCurrentSystemDrivers switch), applies offline registry tweaks (hardware
+        bypass, privacy, OOBE, telemetry, update suppression), deletes CEIP/WU
+        scheduled-task definition files, and optionally writes autounattend.xml to the ISO
+        root and removes the support\ folder from the ISO contents directory.
 
-        1. Removes provisioned AppX bloatware packages via DISM.
+        All setup scripts embedded in the autounattend.xml <Extensions><File> nodes are
-        2. Deletes Microsoft Edge program files.
+        written directly into the WIM at their target paths under C:\Windows\Setup\Scripts\
-        3. Removes OneDriveSetup.exe from the system image.
+        to ensure they survive Windows Setup stripping unrecognised-namespace XML elements
-        4. Loads offline registry hives (COMPONENTS, DEFAULT, NTUSER, SOFTWARE, SYSTEM)
+        from the Panther copy of the answer file.
-           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
+        Mounting/dismounting the WIM is the caller's responsibility (e.g. Invoke-WinUtilISO).
-        (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.
+        Optional. Root directory of the extracted ISO contents. When supplied,
-        When supplied, autounattend.xml is also written here so Windows Setup picks it
+        autounattend.xml is written here and the support\ folder is removed.
-        up automatically at boot, and the support\ folder is deleted from that location.
 
     .PARAMETER AutoUnattendXml
-        Optional. Full XML content for autounattend.xml.
+        Optional. Full XML content for autounattend.xml. If empty, the OOBE bypass
-        In compiled winutil.ps1 this is the embedded $WinUtilAutounattendXml here-string;
+        file is skipped and a warning is logged.
-        in dev mode it is read from tools\autounattend.xml.
+
-        If empty, the OOBE bypass file is skipped and a warning is logged.
+    .PARAMETER InjectCurrentSystemDrivers
+        Optional. When $true, exports all drivers from the running system and injects
+        them into install.wim and boot.wim index 2 (Windows Setup PE).
+        Defaults to $false.
 
     .PARAMETER Log
-        Optional ScriptBlock used for progress/status logging.
+        Optional ScriptBlock for progress/status logging. Receives a single [string] argument.
-        Receives a single [string] message argument.
-        Defaults to { param($m) Write-Output $m } when not supplied.
 
     .EXAMPLE
         Invoke-WinUtilISOScript -ScratchDir "C:\Temp\wim_mount"
@@ -64,24 +50,19 @@ function Invoke-WinUtilISOScript {
     .NOTES
         Author  : Chris Titus @christitustech
         GitHub  : https://github.com/ChrisTitusTech
-        Version : 26.02.22
+        Version : 26.03.02
     #>
     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 = "",
+        [bool]$InjectCurrentSystemDrivers = $false,
         [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 {
@@ -102,15 +83,37 @@ function Invoke-WinUtilISOScript {
         }
     }
 
-    # ═════════════════════════════════════════════════════════════════════════
+    function Add-DriversToImage {
-    #  1. Remove provisioned AppX packages
+        param ([string]$MountPath, [string]$DriverDir, [string]$Label = "image", [scriptblock]$Logger)
-    # ═════════════════════════════════════════════════════════════════════════
+        & dism /English "/image:$MountPath" /Add-Driver "/Driver:$DriverDir" /Recurse 2>&1 |
+            ForEach-Object { & $Logger "  dism[$Label]: $_" }
+    }
+
+    function Invoke-BootWimInject {
+        param ([string]$BootWimPath, [string]$DriverDir, [scriptblock]$Logger)
+        Set-ItemProperty -Path $BootWimPath -Name IsReadOnly -Value $false -ErrorAction SilentlyContinue
+        $mountDir = Join-Path $env:TEMP "WinUtil_BootMount_$(Get-Random)"
+        New-Item -Path $mountDir -ItemType Directory -Force | Out-Null
+        try {
+            & $Logger "Mounting boot.wim (index 2) for driver injection..."
+            Mount-WindowsImage -ImagePath $BootWimPath -Index 2 -Path $mountDir -ErrorAction Stop | Out-Null
+            Add-DriversToImage -MountPath $mountDir -DriverDir $DriverDir -Label "boot" -Logger $Logger
+            & $Logger "Saving boot.wim..."
+            Dismount-WindowsImage -Path $mountDir -Save -ErrorAction Stop | Out-Null
+            & $Logger "boot.wim driver injection complete."
+        } catch {
+            & $Logger "Warning: boot.wim driver injection failed: $_"
+            try { Dismount-WindowsImage -Path $mountDir -Discard -ErrorAction SilentlyContinue | Out-Null } catch {}
+        } finally {
+            Remove-Item -Path $mountDir -Recurse -Force -ErrorAction SilentlyContinue
+        }
+    }
+
+    # ── 1. Remove provisioned AppX packages ──────────────────────────────────
     & $Log "Removing provisioned AppX packages..."
 
     $packages = & dism /English "/image:$ScratchDir" /Get-ProvisionedAppxPackages |
-        ForEach-Object {
+        ForEach-Object { if ($_ -match 'PackageName : (.*)') { $matches[1] } }
-            if ($_ -match 'PackageName : (.*)') { $matches[1] }
-        }
 
     $packagePrefixes = @(
         'AppUp.IntelManagementandSecurityStatus',
@@ -122,7 +125,6 @@ function Invoke-WinUtilISOScript {
         'Microsoft.BingWeather',
         'Microsoft.Copilot',
         'Microsoft.Windows.CrossDevice',
-        'Microsoft.GamingApp',
         'Microsoft.GetHelp',
         'Microsoft.Getstarted',
         'Microsoft.Microsoft3DViewer',
@@ -158,31 +160,46 @@ function Invoke-WinUtilISOScript {
         'MicrosoftTeams'
     )
 
-    $packagesToRemove = $packages | Where-Object {
+    $packages | Where-Object { $pkg = $_; $packagePrefixes | Where-Object { $pkg -like "*$_*" } } |
-        $pkg = $_
+        ForEach-Object { & dism /English "/image:$ScratchDir" /Remove-ProvisionedAppxPackage "/PackageName:$_" }
-        $packagePrefixes | Where-Object { $pkg -like "*$_*" }
+
+    # ── 2. Inject current system drivers (optional) ───────────────────────────
+    if ($InjectCurrentSystemDrivers) {
+        & $Log "Exporting all drivers from running system..."
+        $driverExportRoot = Join-Path $env:TEMP "WinUtil_DriverExport_$(Get-Random)"
+        New-Item -Path $driverExportRoot -ItemType Directory -Force | Out-Null
+        try {
+            Export-WindowsDriver -Online -Destination $driverExportRoot | Out-Null
+
+            & $Log "Injecting current system drivers into install.wim..."
+            Add-DriversToImage -MountPath $ScratchDir -DriverDir $driverExportRoot -Label "install" -Logger $Log
+            & $Log "install.wim driver injection complete."
+
+            if ($ISOContentsDir -and (Test-Path $ISOContentsDir)) {
+                $bootWim = Join-Path $ISOContentsDir "sources\boot.wim"
+                if (Test-Path $bootWim) {
+                    & $Log "Injecting current system drivers into boot.wim..."
+                    Invoke-BootWimInject -BootWimPath $bootWim -DriverDir $driverExportRoot -Logger $Log
+                } else {
+                    & $Log "Warning: boot.wim not found — skipping boot.wim driver injection."
                 }
-    foreach ($package in $packagesToRemove) {
+            }
-        & dism /English "/image:$ScratchDir" /Remove-ProvisionedAppxPackage "/PackageName:$package"
+        } catch {
+            & $Log "Error during driver export/injection: $_"
+        } finally {
+            Remove-Item -Path $driverExportRoot -Recurse -Force -ErrorAction SilentlyContinue
+        }
+    } else {
+        & $Log "Driver injection skipped."
     }
 
-    # ═════════════════════════════════════════════════════════════════════════
+    # ── 3. Remove OneDrive ────────────────────────────────────────────────────
-    #  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 ────────────────────────────────────────────────────
-    #  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"
@@ -231,14 +248,37 @@ function Invoke-WinUtilISOScript {
     Set-ISOScriptReg 'HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\OOBE' 'BypassNRO' 'REG_DWORD' '1'
 
     if ($AutoUnattendXml) {
-        # ── Place autounattend.xml inside the WIM (Sysprep) ──────────────────
+        try {
-        $sysprepDest = "$ScratchDir\Windows\System32\Sysprep\autounattend.xml"
+            $xmlDoc = [xml]::new()
-        Set-Content -Path $sysprepDest -Value $AutoUnattendXml -Encoding UTF8 -Force
+            $xmlDoc.LoadXml($AutoUnattendXml)
-        & $Log "Written autounattend.xml to Sysprep directory."
+
+            $nsMgr = New-Object System.Xml.XmlNamespaceManager($xmlDoc.NameTable)
+            $nsMgr.AddNamespace("sg", "https://schneegans.de/windows/unattend-generator/")
+
+            $fileNodes = $xmlDoc.SelectNodes("//sg:File", $nsMgr)
+            if ($fileNodes -and $fileNodes.Count -gt 0) {
+                foreach ($fileNode in $fileNodes) {
+                    $absPath  = $fileNode.GetAttribute("path")
+                    $relPath  = $absPath -replace '^[A-Za-z]:[/\\]', ''
+                    $destPath = Join-Path $ScratchDir $relPath
+                    New-Item -Path (Split-Path $destPath -Parent) -ItemType Directory -Force -ErrorAction SilentlyContinue | Out-Null
+
+                    $ext = [IO.Path]::GetExtension($destPath).ToLower()
+                    $encoding = switch ($ext) {
+                        { $_ -in '.ps1', '.xml' }        { [System.Text.Encoding]::UTF8 }
+                        { $_ -in '.reg', '.vbs', '.js' } { [System.Text.UnicodeEncoding]::new($false, $true) }
+                        default                          { [System.Text.Encoding]::Default }
+                    }
+                    [System.IO.File]::WriteAllBytes($destPath, ($encoding.GetPreamble() + $encoding.GetBytes($fileNode.InnerText.Trim())))
+                    & $Log "Pre-staged setup script: $relPath"
+                }
+            } else {
+                & $Log "Warning: no <Extensions><File> nodes found in autounattend.xml — setup scripts not pre-staged."
+            }
+        } catch {
+            & $Log "Warning: could not pre-stage setup scripts from autounattend.xml: $_"
+        }
 
-        # ── 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
@@ -258,10 +298,6 @@ function Invoke-WinUtilISOScript {
     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'
 
@@ -291,7 +327,18 @@ function Invoke-WinUtilISOScript {
 
     & $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\AU' 'AUOptions'                 'REG_DWORD' '1'
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU' 'UseWUServer'               'REG_DWORD' '1'
     Set-ISOScriptReg 'HKLM\zSOFTWARE\Policies\Microsoft\Windows\WindowsUpdate'    'DisableWindowsUpdateAccess' 'REG_DWORD' '1'
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Policies\Microsoft\Windows\WindowsUpdate'    'WUServer'                  'REG_SZ'    'http://localhost:8080'
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Policies\Microsoft\Windows\WindowsUpdate'    'WUStatusServer'            'REG_SZ'    'http://localhost:8080'
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Orchestrator\UScheduler_Oobe\WindowsUpdate' 'workCompleted' 'REG_DWORD' '1'
+    Remove-ISOScriptReg 'HKLM\zSOFTWARE\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\WindowsUpdate'
+    Set-ISOScriptReg 'HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\DeliveryOptimization\Config' 'DODownloadMode' 'REG_DWORD' '0'
+    Set-ISOScriptReg 'HKLM\zSYSTEM\ControlSet001\Services\BITS'         'Start' 'REG_DWORD' '4'
+    Set-ISOScriptReg 'HKLM\zSYSTEM\ControlSet001\Services\wuauserv'     'Start' 'REG_DWORD' '4'
+    Set-ISOScriptReg 'HKLM\zSYSTEM\ControlSet001\Services\UsoSvc'       'Start' 'REG_DWORD' '4'
+    Set-ISOScriptReg 'HKLM\zSYSTEM\ControlSet001\Services\WaaSMedicSvc' 'Start' 'REG_DWORD' '4'
 
     & $Log "Preventing installation of Teams..."
     Set-ISOScriptReg 'HKLM\zSOFTWARE\Policies\Microsoft\Teams' 'DisableInstallation' 'REG_DWORD' '1'
@@ -306,23 +353,23 @@ function Invoke-WinUtilISOScript {
     reg unload HKLM\zSOFTWARE
     reg unload HKLM\zSYSTEM
 
-    # ═════════════════════════════════════════════════════════════════════════
+    # ── 5. Delete scheduled task definition files ─────────────────────────────
-    #  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
-
+    Remove-Item "$tasksPath\Microsoft\Windows\InstallService"                                          -Recurse -Force -ErrorAction SilentlyContinue
+    Remove-Item "$tasksPath\Microsoft\Windows\UpdateOrchestrator"                                      -Recurse -Force -ErrorAction SilentlyContinue
+    Remove-Item "$tasksPath\Microsoft\Windows\UpdateAssistant"                                         -Recurse -Force -ErrorAction SilentlyContinue
+    Remove-Item "$tasksPath\Microsoft\Windows\WaaSMedic"                                               -Recurse -Force -ErrorAction SilentlyContinue
+    Remove-Item "$tasksPath\Microsoft\Windows\WindowsUpdate"                                           -Recurse -Force -ErrorAction SilentlyContinue
+    Remove-Item "$tasksPath\Microsoft\WindowsUpdate"                                                   -Recurse -Force -ErrorAction SilentlyContinue
     & $Log "Scheduled task files deleted."
 
-    # ═════════════════════════════════════════════════════════════════════════
+    # ── 6. Remove ISO support folder ─────────────────────────────────────────
-    #  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

functions/private/Invoke-WinUtilISOUSB.ps1

@@ -0,0 +1,268 @@
+function Invoke-WinUtilISORefreshUSBDrives {
+    $combo    = $sync["WPFWin11ISOUSBDriveComboBox"]
+    $removable = @(Get-Disk | Where-Object { $_.BusType -eq "USB" } | Sort-Object Number)
+
+    $combo.Items.Clear()
+
+    if ($removable.Count -eq 0) {
+        $combo.Items.Add("No USB drives detected")
+        $combo.SelectedIndex = 0
+        $sync["Win11ISOUSBDisks"] = @()
+        Write-Win11ISOLog "No USB drives detected."
+        return
+    }
+
+    foreach ($disk in $removable) {
+        $sizeGB = [math]::Round($disk.Size / 1GB, 1)
+        $combo.Items.Add("Disk $($disk.Number): $($disk.FriendlyName)  [$sizeGB GB] - $($disk.PartitionStyle)")
+    }
+    $combo.SelectedIndex = 0
+    Write-Win11ISOLog "Found $($removable.Count) USB drive(s)."
+    $sync["Win11ISOUSBDisks"] = $removable
+}
+
+function Invoke-WinUtilISOWriteUSB {
+    $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
+    }
+
+    $combo = $sync["WPFWin11ISOUSBDriveComboBox"]
+    $selectedIndex = $combo.SelectedIndex
+    $selectedItemText = [string]$combo.SelectedItem
+    $usbDisks = @($usbDisks)
+
+    $targetDisk = $null
+    if ($selectedIndex -ge 0 -and $selectedIndex -lt $usbDisks.Count) {
+        $targetDisk = $usbDisks[$selectedIndex]
+    } elseif ($selectedItemText -match 'Disk\s+(\d+):') {
+        $selectedDiskNum = [int]$matches[1]
+        $targetDisk = $usbDisks | Where-Object { $_.Number -eq $selectedDiskNum } | Select-Object -First 1
+    }
+
+    if (-not $targetDisk) {
+        [System.Windows.MessageBox]::Show("Please select a USB drive from the dropdown.", "No Drive Selected", "OK", "Warning")
+        return
+    }
+
+    $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)
+            })
+        }
+
+        function Get-FreeDriveLetter {
+            $used = (Get-PSDrive -PSProvider FileSystem -ErrorAction SilentlyContinue).Name
+            foreach ($c in [char[]](68..90)) {
+                if ($used -notcontains [string]$c) { return $c }
+            }
+            return $null
+        }
+
+        try {
+            SetProgress "Formatting USB drive..." 10
+
+            # Phase 1: Clean disk via diskpart (retry once if the drive is not yet ready)
+            $dpFile1 = Join-Path $env:TEMP "winutil_diskpart_$(Get-Random).txt"
+            "select disk $diskNum`nclean`nexit" | Set-Content -Path $dpFile1 -Encoding ASCII
+            Log "Running diskpart clean on Disk $diskNum..."
+            $dpCleanOut = diskpart /s $dpFile1 2>&1
+            $dpCleanOut | Where-Object { $_ -match '\S' } | ForEach-Object { Log "  diskpart: $_" }
+            Remove-Item $dpFile1 -Force -ErrorAction SilentlyContinue
+
+            if (($dpCleanOut -join ' ') -match 'device is not ready') {
+                Log "Disk $diskNum was not ready; waiting 5 seconds and retrying clean..."
+                Start-Sleep -Seconds 5
+                Update-Disk -Number $diskNum -ErrorAction SilentlyContinue
+                $dpFile1b = Join-Path $env:TEMP "winutil_diskpart_$(Get-Random).txt"
+                "select disk $diskNum`nclean`nexit" | Set-Content -Path $dpFile1b -Encoding ASCII
+                diskpart /s $dpFile1b 2>&1 | Where-Object { $_ -match '\S' } | ForEach-Object { Log "  diskpart: $_" }
+                Remove-Item $dpFile1b -Force -ErrorAction SilentlyContinue
+            }
+
+            # Phase 2: Initialize as GPT
+            Start-Sleep -Seconds 2
+            Update-Disk -Number $diskNum -ErrorAction SilentlyContinue
+            $diskObj = Get-Disk -Number $diskNum -ErrorAction Stop
+            if ($diskObj.PartitionStyle -eq 'RAW') {
+                Initialize-Disk -Number $diskNum -PartitionStyle GPT -ErrorAction Stop
+                Log "Disk $diskNum initialized as GPT."
+            } else {
+                Set-Disk -Number $diskNum -PartitionStyle GPT -ErrorAction Stop
+                Log "Disk $diskNum converted to GPT (was $($diskObj.PartitionStyle))."
+            }
+
+            # Phase 3: Create FAT32 partition via diskpart, then format with Format-Volume
+            # (diskpart's 'format' command can fail with "no volume selected" on fresh/never-formatted drives)
+            $volLabel = "W11-" + (Get-Date).ToString('yyMMdd')
+            $dpFile2  = Join-Path $env:TEMP "winutil_diskpart2_$(Get-Random).txt"
+            $maxFat32PartitionMB = 32768
+            $diskSizeMB = [int][Math]::Floor((Get-Disk -Number $diskNum -ErrorAction Stop).Size / 1MB)
+            $createPartitionCommand = "create partition primary"
+            if ($diskSizeMB -gt $maxFat32PartitionMB) {
+                $createPartitionCommand = "create partition primary size=$maxFat32PartitionMB"
+                Log "Disk $diskNum is $diskSizeMB MB; creating FAT32 partition capped at $maxFat32PartitionMB MB (32 GB)."
+            }
+
+            @(
+                "select disk $diskNum"
+                $createPartitionCommand
+                "exit"
+            ) | Set-Content -Path $dpFile2 -Encoding ASCII
+            Log "Creating partitions on Disk $diskNum..."
+            diskpart /s $dpFile2 2>&1 | Where-Object { $_ -match '\S' } | ForEach-Object { Log "  diskpart: $_" }
+            Remove-Item $dpFile2 -Force -ErrorAction SilentlyContinue
+
+            SetProgress "Formatting USB partition..." 25
+            Start-Sleep -Seconds 3
+            Update-Disk -Number $diskNum -ErrorAction SilentlyContinue
+
+            $partitions = Get-Partition -DiskNumber $diskNum -ErrorAction Stop
+            Log "Partitions on Disk $diskNum after creation: $($partitions.Count)"
+            foreach ($p in $partitions) {
+                Log "  Partition $($p.PartitionNumber)  Type=$($p.Type)  Letter=$($p.DriveLetter)  Size=$([math]::Round($p.Size/1MB))MB"
+            }
+
+            $winpePart = $partitions | Where-Object { $_.Type -eq "Basic" } | Select-Object -Last 1
+            if (-not $winpePart) {
+                throw "Could not find the Basic partition on Disk $diskNum after creation."
+            }
+
+            # Format using Format-Volume (reliable on fresh drives; diskpart format fails
+            # with 'no volume selected' when the partition has never been formatted before)
+            Log "Formatting Partition $($winpePart.PartitionNumber) as FAT32 (label: $volLabel)..."
+            Get-Partition -DiskNumber $diskNum -PartitionNumber $winpePart.PartitionNumber |
+                Format-Volume -FileSystem FAT32 -NewFileSystemLabel $volLabel -Force -Confirm:$false | Out-Null
+            Log "Partition $($winpePart.PartitionNumber) formatted as FAT32."
+
+            SetProgress "Assigning drive letters..." 30
+            Start-Sleep -Seconds 2
+            Update-Disk -Number $diskNum -ErrorAction SilentlyContinue
+
+            try { Remove-PartitionAccessPath -DiskNumber $diskNum -PartitionNumber $winpePart.PartitionNumber -AccessPath "$($winpePart.DriveLetter):" -ErrorAction SilentlyContinue } catch {}
+            $usbLetter = Get-FreeDriveLetter
+            if (-not $usbLetter) { throw "No free drive letters (D-Z) available to assign to the USB data partition." }
+            Set-Partition -DiskNumber $diskNum -PartitionNumber $winpePart.PartitionNumber -NewDriveLetter $usbLetter
+            Log "Assigned drive letter $usbLetter to WINPE partition (Partition $($winpePart.PartitionNumber))."
+            Start-Sleep -Seconds 2
+
+            $usbDrive = "${usbLetter}:"
+            $retries = 0
+            while (-not (Test-Path $usbDrive) -and $retries -lt 6) {
+                $retries++
+                Log "Waiting for $usbDrive to become accessible (attempt $retries/6)..."
+                Start-Sleep -Seconds 2
+            }
+            if (-not (Test-Path $usbDrive)) { throw "Drive $usbDrive is not accessible after letter assignment." }
+            Log "USB data partition: $usbDrive"
+
+            $contentSizeBytes = (Get-ChildItem -LiteralPath $contentsDir -File -Recurse -Force -ErrorAction Stop | Measure-Object -Property Length -Sum).Sum
+            if (-not $contentSizeBytes) { $contentSizeBytes = 0 }
+            $usbVolume = Get-Volume -DriveLetter $usbLetter -ErrorAction Stop
+            $partitionCapacityBytes = [int64]$usbVolume.Size
+            $partitionFreeBytes = [int64]$usbVolume.SizeRemaining
+
+            $contentSizeGB = [math]::Round($contentSizeBytes / 1GB, 2)
+            $partitionCapacityGB = [math]::Round($partitionCapacityBytes / 1GB, 2)
+            $partitionFreeGB = [math]::Round($partitionFreeBytes / 1GB, 2)
+
+            Log "Source content size: $contentSizeGB GB. USB partition capacity: $partitionCapacityGB GB, free: $partitionFreeGB GB."
+
+            if ($contentSizeBytes -gt $partitionCapacityBytes) {
+                throw "ISO content ($contentSizeGB GB) is larger than the USB partition capacity ($partitionCapacityGB GB). Use a larger USB drive or reduce image size."
+            }
+
+            if ($contentSizeBytes -gt $partitionFreeBytes) {
+                throw "Insufficient free space on USB partition. Required: $contentSizeGB GB, available: $partitionFreeGB GB."
+            }
+
+            SetProgress "Copying Windows 11 files to USB..." 45
+
+            # Copy files; split install.wim if > 4 GB (FAT32 limit)
+            $installWim = Join-Path $contentsDir "sources\install.wim"
+            if (Test-Path $installWim) {
+                $wimSizeMB = [math]::Round((Get-Item $installWim).Length / 1MB)
+                if ($wimSizeMB -gt 3800) {
+                    Log "install.wim is $wimSizeMB MB - splitting for FAT32 compatibility... This will take several minutes."
+                    $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
+                    Log "install.wim split complete."
+                    Log "Copying remaining files to USB..."
+                    & robocopy $contentsDir $usbDrive /E /XF install.wim /NFL /NDL /NJH /NJS
+                } else {
+                    & robocopy $contentsDir $usbDrive /E /NFL /NDL /NJH /NJS
+                }
+            } else {
+                & robocopy $contentsDir $usbDrive /E /NFL /NDL /NJH /NJS
+            }
+
+            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-WinUtilScript.ps1

@@ -25,20 +25,35 @@ function Invoke-WinUtilScript {
         Invoke-Command $scriptblock -ErrorAction Stop
     } catch [System.Management.Automation.CommandNotFoundException] {
         Write-Warning "The specified command was not found."
-        Write-Warning $PSItem.Exception.message
+        if ($_.Exception -and -not [string]::IsNullOrWhiteSpace($_.Exception.Message)) {
+            Write-Warning $_.Exception.Message
+        }
     } catch [System.Management.Automation.RuntimeException] {
         Write-Warning "A runtime exception occurred."
-        Write-Warning $PSItem.Exception.message
+        if ($_.Exception -and -not [string]::IsNullOrWhiteSpace($_.Exception.Message)) {
+            Write-Warning $_.Exception.Message
+        }
     } catch [System.Security.SecurityException] {
         Write-Warning "A security exception occurred."
-        Write-Warning $PSItem.Exception.message
+        if ($_.Exception -and -not [string]::IsNullOrWhiteSpace($_.Exception.Message)) {
+            Write-Warning $_.Exception.Message
+        }
     } catch [System.UnauthorizedAccessException] {
         Write-Warning "Access denied. You do not have permission to perform this operation."
-        Write-Warning $PSItem.Exception.message
+        if ($_.Exception -and -not [string]::IsNullOrWhiteSpace($_.Exception.Message)) {
+            Write-Warning $_.Exception.Message
+        }
     } catch {
         # Generic catch block to handle any other type of exception
         Write-Warning "Unable to run script for $name due to unhandled exception"
-        Write-Warning $psitem.Exception.StackTrace
+        if ($_.Exception) {
+            if (-not [string]::IsNullOrWhiteSpace($_.Exception.Message)) {
+                Write-Warning $_.Exception.Message
+            }
+            if (-not [string]::IsNullOrWhiteSpace($_.Exception.StackTrace)) {
+                Write-Warning $_.Exception.StackTrace
+            }
+        }
     }
 
 }

functions/private/Invoke-WinutilThemeChange.ps1

@@ -8,20 +8,14 @@ function Invoke-WinutilThemeChange {
         modifying various UI elements such as colors, margins, corner radii, font families, etc.
         If the '-init' switch is used, it initializes the theme based on the system's current dark mode setting.
 
-    .PARAMETER init
-        A switch parameter. If set to $true, the function initializes the theme based on the system’s current dark mode setting.
-
     .EXAMPLE
         Invoke-WinutilThemeChange
         # Toggles the theme between 'Light' and 'Dark'.
 
-    .EXAMPLE
+
-        Invoke-WinutilThemeChange -init
-        # Initializes the theme based on the system's dark mode and applies the shared theme.
     #>
     param (
-        [switch]$init = $false,
+        [string]$theme = "Auto"
-        [string]$theme
     )
 
     function Set-WinutilTheme {
@@ -129,48 +123,30 @@ function Invoke-WinutilThemeChange {
         }
     }
 
-    $LightPreferencePath = "$winutildir\LightTheme.ini"
+    $sync.preferences.theme = $theme
-    $DarkPreferencePath = "$winutildir\DarkTheme.ini"
+    Set-Preferences -save
-
-    if ($init) {
     Set-WinutilTheme -currentTheme "shared"
-        if (Test-Path $LightPreferencePath) {
-            $theme = "Light"
-        }
-        elseif (Test-Path $DarkPreferencePath) {
-            $theme = "Dark"
-        }
-        else {
-            $theme = "Auto"
-        }
-    }
 
-    switch ($theme) {
+    switch ($sync.preferences.theme) {
         "Auto" {
             $systemUsesDarkMode = Get-WinUtilToggleStatus WPFToggleDarkMode
             if ($systemUsesDarkMode) {
-                Set-WinutilTheme  -currentTheme "Dark"
+                $theme = "Dark"
             }
             else{
-                Set-WinutilTheme  -currentTheme "Light"
+                $theme = "Light"
             }
 
-
+            Set-WinutilTheme -currentTheme $theme
             $themeButtonIcon = [char]0xF08C
-            Remove-Item $LightPreferencePath -Force -ErrorAction SilentlyContinue
-            Remove-Item $DarkPreferencePath -Force -ErrorAction SilentlyContinue
         }
         "Dark" {
-            Set-WinutilTheme  -currentTheme $theme
+            Set-WinutilTheme -currentTheme $sync.preferences.theme
             $themeButtonIcon = [char]0xE708
-            $null = New-Item $DarkPreferencePath -Force
-            Remove-Item $LightPreferencePath -Force -ErrorAction SilentlyContinue
            }
         "Light" {
-            Set-WinutilTheme  -currentTheme $theme
+            Set-WinutilTheme -currentTheme $sync.preferences.theme
             $themeButtonIcon = [char]0xE706
-            $null = New-Item $LightPreferencePath -Force
-            Remove-Item $DarkPreferencePath -Force -ErrorAction SilentlyContinue
         }
     }
 

functions/private/Set-PackageManagerPreference.ps1

@@ -1,43 +0,0 @@
-function Set-PackageManagerPreference {
-    <#
-    .SYNOPSIS
-        Sets the currently selected package manager to global "ManagerPreference" in sync.
-        Also persists preference across Winutil restarts via preference.ini.
-
-        Reads from preference.ini if no argument sent.
-
-    .PARAMETER preferredPackageManager
-        The PackageManager that was selected.
-    #>
-    param(
-        [Parameter(Position=0, Mandatory=$false)]
-        [PackageManagers]$preferredPackageManager
-    )
-
-    $preferencePath = "$winutildir\preferences.ini"
-    $oldChocoPath = "$winutildir\preferChocolatey.ini"
-
-    #Try loading from file if no argument given.
-    if ($null -eq $preferredPackageManager) {
-        # Backwards compat for preferChocolatey.ini
-        if (Test-Path -Path $oldChocoPath) {
-            $preferredPackageManager = [PackageManagers]::Choco
-            Remove-Item -Path $oldChocoPath
-        }
-        elseif (Test-Path -Path $preferencePath) {
-            $potential = Get-Content -Path $preferencePath -TotalCount 1
-            $preferredPackageManager = [PackageManagers]$potential
-        }
-        else {
-            Write-Debug "Creating new preference file, defaulting to winget."
-            $preferredPackageManager = [PackageManagers]::Winget
-        }
-    }
-
-    $sync["ManagerPreference"] = [PackageManagers]::$preferredPackageManager
-    Write-Debug "Manager Preference changed to '$($sync["ManagerPreference"])'"
-
-
-    # Write preference to file to persist across restarts.
-    Out-File -FilePath $preferencePath -InputObject $sync["ManagerPreference"]
-}

functions/private/Set-Preferences.ps1

@@ -0,0 +1,83 @@
+function Set-Preferences{
+
+    param(
+        [switch]$save=$false
+    )
+
+    # TODO delete this function sometime later
+    function Clean-OldPrefs{
+        if (Test-Path -Path "$winutildir\LightTheme.ini") {
+            $sync.preferences.theme = "Light"
+            Remove-Item -Path "$winutildir\LightTheme.ini"
+        }
+
+        if (Test-Path -Path "$winutildir\DarkTheme.ini") {
+            $sync.preferences.theme = "Dark"
+            Remove-Item -Path "$winutildir\DarkTheme.ini"
+        }
+
+        # check old prefs, if its first line has no =, then absorb it as pm
+        if (Test-Path -Path $iniPath) {
+            $oldPM = Get-Content $iniPath
+            if ($oldPM -notlike "*=*") {
+                $sync.preferences.packagemanager = $oldPM
+            }
+        }
+
+        if (Test-Path -Path "$winutildir\preferChocolatey.ini") {
+            $sync.preferences.packagemanager = "Choco"
+            Remove-Item -Path "$winutildir\preferChocolatey.ini"
+        }
+    }
+
+    function Save-Preferences{
+        $ini = ""
+        foreach($key in $sync.preferences.Keys) {
+            $pref = "$($key)=$($sync.preferences.$key)"
+            Write-Debug "Saving pref: $($pref)"
+            $ini = $ini + $pref + "`r`n"
+        }
+        $ini | Out-File $iniPath
+    }
+
+    function Load-Preferences{
+        Clean-OldPrefs
+        if (Test-Path -Path $iniPath) {
+            $iniData = Get-Content "$winutildir\preferences.ini"
+            foreach ($line in $iniData) {
+                if ($line -like "*=*") {
+                    $arr = $line -split "=",-2
+                    $key = $arr[0] -replace "\s",""
+                    $value = $arr[1] -replace "\s",""
+                    Write-Debug "Preference: Key = '$($key)' Value ='$($value)'"
+                    $sync.preferences.$key = $value
+                }
+            }
+        }
+
+        # write defaults in case preferences dont exist
+        if ($null -eq $sync.preferences.theme) {
+            $sync.preferences.theme = "Auto"
+        }
+        if ($null -eq $sync.preferences.packagemanager) {
+            $sync.preferences.packagemanager = "Winget"
+        }
+
+        # convert packagemanager to enum
+        if ($sync.preferences.packagemanager -eq "Choco") {
+            $sync.preferences.packagemanager = [PackageManagers]::Choco
+        }
+        elseif ($sync.preferences.packagemanager -eq "Winget") {
+            $sync.preferences.packagemanager = [PackageManagers]::Winget
+        }
+    }
+
+    $iniPath = "$winutildir\preferences.ini"
+
+    if ($save) {
+        Save-Preferences
+    }
+    else {
+        Load-Preferences
+    }
+}

functions/private/Set-WinUtilDNS.ps1

@@ -28,6 +28,13 @@ function Set-WinUtilDNS {
         }
     } catch {
         Write-Warning "Unable to set DNS Provider due to an unhandled exception"
-        Write-Warning $psitem.Exception.StackTrace
+        if ($_.Exception) {
+            if (-not [string]::IsNullOrWhiteSpace($_.Exception.Message)) {
+                Write-Warning $_.Exception.Message
+            }
+            if (-not [string]::IsNullOrWhiteSpace($_.Exception.StackTrace)) {
+                Write-Warning $_.Exception.StackTrace
+            }
+        }
     }
 }

functions/private/Set-WinUtilRegistry.ps1

@@ -46,11 +46,22 @@ function Set-WinUtilRegistry {
     } catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
     } catch [System.Management.Automation.ItemNotFoundException] {
-        Write-Warning $psitem.Exception.ErrorRecord
+        Write-Warning $_.Exception.ErrorRecord
     } catch [System.UnauthorizedAccessException] {
-       Write-Warning $psitem.Exception.Message
+       if ($_.Exception -and -not [string]::IsNullOrWhiteSpace($_.Exception.Message)) {
+           Write-Warning $_.Exception.Message
+       } else {
+           Write-Warning "Unauthorized access while setting $Path\$Name"
+       }
     } catch {
         Write-Warning "Unable to set $Name due to unhandled exception"
-        Write-Warning $psitem.Exception.StackTrace
+        if ($_.Exception) {
+            if (-not [string]::IsNullOrWhiteSpace($_.Exception.Message)) {
+                Write-Warning $_.Exception.Message
+            }
+            if (-not [string]::IsNullOrWhiteSpace($_.Exception.StackTrace)) {
+                Write-Warning $_.Exception.StackTrace
+            }
+        }
     }
 }

functions/private/Set-WinUtilScheduledTask.ps1

@@ -29,14 +29,23 @@ function Set-WinUtilScheduledTask {
             Enable-ScheduledTask -TaskName $Name -ErrorAction Stop
         }
     } catch [System.Exception] {
-        if($psitem.Exception.Message -like "*The system cannot find the file specified*") {
+        if ($_.Exception -and $_.Exception.Message -like "*The system cannot find the file specified*") {
             Write-Warning "Scheduled Task $name was not Found"
         } else {
             Write-Warning "Unable to set $Name due to unhandled exception"
-            Write-Warning $psitem.Exception.Message
+            if ($_.Exception -and -not [string]::IsNullOrWhiteSpace($_.Exception.Message)) {
+                Write-Warning $_.Exception.Message
+            }
         }
     } catch {
         Write-Warning "Unable to run script for $name due to unhandled exception"
-        Write-Warning $psitem.Exception.StackTrace
+        if ($_.Exception) {
+            if (-not [string]::IsNullOrWhiteSpace($_.Exception.Message)) {
+                Write-Warning $_.Exception.Message
+            }
+            if (-not [string]::IsNullOrWhiteSpace($_.Exception.StackTrace)) {
+                Write-Warning $_.Exception.StackTrace
+            }
+        }
     }
 }

functions/private/Set-WinUtilService.ps1

@@ -34,7 +34,14 @@ Function Set-WinUtilService {
         Write-Warning "Service $Name was not found"
     } catch {
         Write-Warning "Unable to set $Name due to unhandled exception"
+        if ($_.Exception) {
+            if (-not [string]::IsNullOrWhiteSpace($_.Exception.Message)) {
                 Write-Warning $_.Exception.Message
             }
+            if (-not [string]::IsNullOrWhiteSpace($_.Exception.StackTrace)) {
+                Write-Warning $_.Exception.StackTrace
+            }
+        }
+    }
 
 }

functions/private/Test-WinUtilInternetConnection.ps1

@@ -1,26 +0,0 @@
-function Test-WinUtilInternetConnection {
-    <#
-    .SYNOPSIS
-        Tests if the computer has internet connectivity
-    .OUTPUTS
-        Boolean - True if connected, False if offline
-    #>
-    try {
-        # Test multiple reliable endpoints
-        $testSites = @(
-            "8.8.8.8",           # Google DNS
-            "1.1.1.1",           # Cloudflare DNS
-            "208.67.222.222"     # OpenDNS
-        )
-
-        foreach ($site in $testSites) {
-            if (Test-Connection -ComputerName $site -Count 1 -Quiet -ErrorAction SilentlyContinue) {
-                return $true
-            }
-        }
-        return $false
-    }
-    catch {
-        return $false
-    }
-}

functions/private/Update-WinUtilSelections.ps1

@@ -14,7 +14,9 @@ function Update-WinUtilSelections {
 
     Write-Debug "JSON to import: $($flatJson)"
 
-    foreach ($cbkey in $flatJson) {
+    foreach ($item in $flatJson) {
+        # Ensure each item is treated as a string to handle PSCustomObject from JSON deserialization
+        $cbkey = [string]$item
         $group = if ($cbkey.StartsWith("WPFInstall")) { "Install" }
                     elseif ($cbkey.StartsWith("WPFTweaks")) { "Tweaks" }
                     elseif ($cbkey.StartsWith("WPFToggle")) { "Toggle" }
@@ -26,7 +28,7 @@ function Update-WinUtilSelections {
                 if (!$sync.selectedApps.Contains($cbkey)) {
                     $sync.selectedApps.Add($cbkey)
                     # The List type needs to be specified again, because otherwise Sort-Object will convert the list to a string if there is only a single entry
-                    [System.Collections.Generic.List[pscustomobject]]$sync.selectedApps = $sync.SelectedApps | Sort-Object
+                    [System.Collections.Generic.List[string]]$sync.selectedApps = $sync.SelectedApps | Sort-Object
                 }
             }
             "Tweaks" {

functions/public/Invoke-WPFFixesWinget.ps1

@@ -11,7 +11,7 @@ function Invoke-WPFFixesWinget {
     try {
         Set-WinUtilTaskbaritem -state "Indeterminate" -overlay "logo"
         Write-Host "==> Starting Winget Repair"
-        Install-WinUtilWinget -Force
+        Install-WinUtilWinget
     } catch {
         Write-Error "Failed to install winget: $_"
         Set-WinUtilTaskbaritem -state "Error" -overlay "warning"

functions/public/Invoke-WPFGetInstalled.ps1

@@ -18,7 +18,7 @@ function Invoke-WPFGetInstalled {
     if (($sync.ChocoRadioButton.IsChecked -eq $false) -and ((Test-WinUtilPackageManager -winget) -eq "not-installed") -and $checkbox -eq "winget") {
         return
     }
-    $managerPreference = $sync["ManagerPreference"]
+    $managerPreference = $sync.preferences.packagemanager
 
     Invoke-WPFRunspace -ParameterList @(("managerPreference", $managerPreference),("checkbox", $checkbox)) -ScriptBlock {
         param (

functions/public/Invoke-WPFImpex.ps1

@@ -44,7 +44,13 @@ function Invoke-WPFImpex {
             try {
                 $Config = ConfigDialog
                 if ($Config) {
-                    $allConfs = $sync.selectedApps + $sync.selectedTweaks + $sync.selectedToggles + $sync.selectedFeatures
+                    $allConfs = ($sync.selectedApps + $sync.selectedTweaks + $sync.selectedToggles + $sync.selectedFeatures) | ForEach-Object { [string]$_ }
+                    if (-not $allConfs) {
+                        [System.Windows.MessageBox]::Show(
+                            "No settings are selected to export. Please select at least one app, tweak, toggle, or feature before exporting.",
+                            "Nothing to Export", "OK", "Warning")
+                        return
+                    }
                     $jsonFile = $allConfs | ConvertTo-Json
                     $jsonFile | Out-File $Config -Force
                     "iex ""& { `$(irm https://christitus.com/win) } -Config '$Config'""" | Set-Clipboard
@@ -70,6 +76,21 @@ function Invoke-WPFImpex {
                     # TODO how to handle old style? detected json type then flatten it in a func?
                     # $flattenedJson = $jsonFile.PSObject.Properties.Where({ $_.Name -ne "Install" }).ForEach({ $_.Value })
                     $flattenedJson = $jsonFile
+
+                    if (-not $flattenedJson) {
+                        [System.Windows.MessageBox]::Show(
+                            "The selected file contains no settings to import. No changes have been made.",
+                            "Empty Configuration", "OK", "Warning")
+                        return
+                    }
+
+                    # Clear all existing selections before importing so the import replaces
+                    # the current state rather than merging with it
+                    $sync.selectedApps = [System.Collections.Generic.List[string]]::new()
+                    $sync.selectedTweaks = [System.Collections.Generic.List[string]]::new()
+                    $sync.selectedToggles = [System.Collections.Generic.List[string]]::new()
+                    $sync.selectedFeatures = [System.Collections.Generic.List[string]]::new()
+
                     Update-WinUtilSelections -flatJson $flattenedJson
 
                     if (!$PARAM_NOUI) {

functions/public/Invoke-WPFInstall.ps1

@@ -19,7 +19,7 @@ function Invoke-WPFInstall {
         return
     }
 
-    $ManagerPreference = $sync["ManagerPreference"]
+    $ManagerPreference = $sync.preferences.packagemanager
 
     $handle = Invoke-WPFRunspace -ParameterList @(("PackagesToInstall", $PackagesToInstall),("ManagerPreference", $ManagerPreference)) -ScriptBlock {
         param($PackagesToInstall, $ManagerPreference)

functions/public/Invoke-WPFPresets.ps1

@@ -32,8 +32,8 @@ function Invoke-WPFPresets {
         $CheckBoxesToCheck = $sync.configs.preset.$preset
     }
 
-    # clear out the filtered pattern
+    # clear out the filtered pattern so applying a preset replaces the current
-    if (!$preset) {
+    # state rather than merging with it
     switch ($checkboxfilterpattern) {
         "WPFTweak*" { $sync.selectedTweaks = [System.Collections.Generic.List[string]]::new() }
         "WPFInstall*" { $sync.selectedApps = [System.Collections.Generic.List[string]]::new() }
@@ -41,8 +41,8 @@ function Invoke-WPFPresets {
         "WPFToggle" { $sync.selectedToggles = [System.Collections.Generic.List[string]]::new() }
         default {}
     }
-    }
+
-    else {
+    if ($preset) {
         Update-WinUtilSelections -flatJson $CheckBoxesToCheck
     }
 

functions/public/Invoke-WPFSelectedCheckboxesUpdate.ps1

@@ -38,7 +38,7 @@ function Invoke-WPFSelectedCheckboxesUpdate{
                if (!$sync.selectedApps.Contains($appKey)) {
                     $sync.selectedApps.Add($appKey)
                     # The List type needs to be specified again, because otherwise Sort-Object will convert the list to a string if there is only a single entry
-                    [System.Collections.Generic.List[pscustomobject]]$sync.selectedApps = $sync.SelectedApps | Sort-Object
+                    [System.Collections.Generic.List[string]]$sync.selectedApps = $sync.SelectedApps | Sort-Object
                 }
             }
             else{

functions/public/Invoke-WPFUnInstall.ps1

@@ -30,7 +30,7 @@ function Invoke-WPFUnInstall {
 
     if($confirm -eq "No") {return}
 
-    $ManagerPreference = $sync["ManagerPreference"]
+    $ManagerPreference = $sync.preferences.packagemanager
 
     Invoke-WPFRunspace -ParameterList @(("PackagesToUninstall", $PackagesToUninstall),("ManagerPreference", $ManagerPreference)) -ScriptBlock {
         param($PackagesToUninstall, $ManagerPreference)

scripts/main.ps1

@@ -15,12 +15,14 @@ $maxthreads = [int]$env:NUMBER_OF_PROCESSORS
 $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
+$offlineVar = New-object System.Management.Automation.Runspaces.SessionStateVariableEntry -ArgumentList 'PARAM_OFFLINE',$PARAM_OFFLINE,$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)
+$InitialSessionState.Variables.Add($offlineVar)
 
 # Get every private function and add them to the session state
 $functions = Get-ChildItem function:\ | Where-Object { $_.Name -imatch 'winutil|WPF' }
@@ -66,7 +68,7 @@ $sync.configs.applications.PSObject.Properties | ForEach-Object {
     $sync.configs.applicationsHashtable[$_.Name] = $_.Value
 }
 
-Set-PackageManagerPreference
+Set-Preferences
 
 if ($PARAM_NOUI) {
     Show-CTTLogo
@@ -154,7 +156,7 @@ $sync.Form.Add_Loaded({
     })
 })
 
-Invoke-WinutilThemeChange -init $true
+Invoke-WinutilThemeChange -theme $sync.preferences.theme
 
 
 # Now call the function with the final merged config
@@ -177,10 +179,16 @@ Invoke-WPFUIElements -configVariable $sync.configs.feature -targetGridName "feat
 $xaml.SelectNodes("//*[@Name]") | ForEach-Object {$sync["$("$($psitem.Name)")"] = $sync["Form"].FindName($psitem.Name)}
 
 #Persist Package Manager preference across winutil restarts
-$sync.ChocoRadioButton.Add_Checked({Set-PackageManagerPreference Choco})
+$sync.ChocoRadioButton.Add_Checked({
-$sync.WingetRadioButton.Add_Checked({Set-PackageManagerPreference Winget})
+    $sync.preferences.packagemanager = [PackageManagers]::Choco
+    Set-Preferences -save
+})
+$sync.WingetRadioButton.Add_Checked({
+    $sync.preferences.packagemanager = [PackageManagers]::Winget
+    Set-Preferences -save
+})
 
-switch ($sync["ManagerPreference"]) {
+switch ($sync.preferences.packagemanager) {
     "Choco" {$sync.ChocoRadioButton.IsChecked = $true; break}
     "Winget" {$sync.WingetRadioButton.IsChecked = $true; break}
 }
@@ -344,11 +352,10 @@ $sync["Form"].Add_ContentRendered({
         Write-Debug "Unable to retrieve information about the primary monitor."
     }
 
-    # Check internet connectivity and disable install tab if offline
+    if ($PARAM_OFFLINE) {
-    #$isOnline = Test-WinUtilInternetConnection
+        # Show offline banner
-    $isOnline = $true # Temporarily force online mode until we can resolve false negatives
+        $sync.WPFOfflineBanner.Visibility = [System.Windows.Visibility]::Visible
 
-    if (-not $isOnline) {
         # Disable the install tab
         $sync.WPFTab1BT.IsEnabled = $false
         $sync.WPFTab1BT.Opacity = 0.5
@@ -534,6 +541,10 @@ $sync["FontScalingApplyButton"].Add_Click({
 
 # ── Win11ISO Tab button handlers ──────────────────────────────────────────────
 
+$sync["WPFTab5BT"].Add_Click({
+    $sync["Form"].Dispatcher.BeginInvoke([System.Windows.Threading.DispatcherPriority]::Background, [action]{ Invoke-WinUtilISOCheckExistingWork }) | Out-Null
+})
+
 $sync["WPFWin11ISOBrowseButton"].Add_Click({
     Write-Debug "WPFWin11ISOBrowseButton clicked"
     Invoke-WinUtilISOBrowse

scripts/start.ps1

@@ -9,7 +9,8 @@
 param (
     [string]$Config,
     [switch]$Run,
-    [switch]$Noui
+    [switch]$Noui,
+    [switch]$Offline
 )
 
 if ($Config) {
@@ -27,24 +28,10 @@ if ($Noui) {
     $PARAM_NOUI = $true
 }
 
-# Load DLLs
+$PARAM_OFFLINE = $false
-Add-Type -AssemblyName PresentationFramework
+if ($Offline) {
-Add-Type -AssemblyName System.Windows.Forms
+    $PARAM_OFFLINE = $true
-
+}
-# Variable to sync between runspaces
-$sync = [Hashtable]::Synchronized(@{})
-$sync.PSScriptRoot = $PSScriptRoot
-$sync.version = "#{replaceme}"
-$sync.configs = @{}
-$sync.Buttons = [System.Collections.Generic.List[PSObject]]::new()
-$sync.ProcessRunning = $false
-$sync.selectedApps = [System.Collections.Generic.List[string]]::new()
-$sync.selectedTweaks = [System.Collections.Generic.List[string]]::new()
-$sync.selectedToggles = [System.Collections.Generic.List[string]]::new()
-$sync.selectedFeatures = [System.Collections.Generic.List[string]]::new()
-$sync.currentTab = "Install"
-$sync.selectedAppsStackPanel
-$sync.selectedAppsPopup
 
 
 if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) {
@@ -79,6 +66,26 @@ if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]:
     break
 }
 
+# Load DLLs
+Add-Type -AssemblyName PresentationFramework
+Add-Type -AssemblyName System.Windows.Forms
+
+# Variable to sync between runspaces
+$sync = [Hashtable]::Synchronized(@{})
+$sync.PSScriptRoot = $PSScriptRoot
+$sync.version = "#{replaceme}"
+$sync.configs = @{}
+$sync.Buttons = [System.Collections.Generic.List[PSObject]]::new()
+$sync.preferences = @{}
+$sync.ProcessRunning = $false
+$sync.selectedApps = [System.Collections.Generic.List[string]]::new()
+$sync.selectedTweaks = [System.Collections.Generic.List[string]]::new()
+$sync.selectedToggles = [System.Collections.Generic.List[string]]::new()
+$sync.selectedFeatures = [System.Collections.Generic.List[string]]::new()
+$sync.currentTab = "Install"
+$sync.selectedAppsStackPanel
+$sync.selectedAppsPopup
+
 $dateTime = Get-Date -Format "yyyy-MM-dd_HH-mm-ss"
 
 # Set the path for the winutil directory

tools/autounattend.xml

@@ -5,10 +5,6 @@
     <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>
@@ -450,7 +446,16 @@ $scripts = @(
     };
     {
         reg.exe delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v NoAutoUpdate              /f;
+        reg.exe delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v AUOptions                 /f;
+        reg.exe delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v UseWUServer               /f;
         reg.exe delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate"    /v DisableWindowsUpdateAccess /f;
+        reg.exe delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate"    /v WUServer                  /f;
+        reg.exe delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate"    /v WUStatusServer            /f;
+        reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\DeliveryOptimization\Config" /v DODownloadMode /f;
+        reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\BITS"         /v Start /t REG_DWORD /d 3 /f;
+        reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\wuauserv"     /v Start /t REG_DWORD /d 3 /f;
+        reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\UsoSvc"       /v Start /t REG_DWORD /d 2 /f;
+        reg.exe add "HKLM\SYSTEM\CurrentControlSet\Services\WaaSMedicSvc" /v Start /t REG_DWORD /d 3 /f;
     };
     {
         $recallFeature = Get-WindowsOptionalFeature -Online -ErrorAction SilentlyContinue | Where-Object { $_.State -eq 'Enabled' -and $_.FeatureName -like 'Recall' };

xaml/inputXML.xaml

@@ -273,22 +273,43 @@
         <Style TargetType="ComboBox">
             <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundColor}" />
             <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundColor}" />
+            <Setter Property="MinWidth"   Value="{DynamicResource ButtonWidth}" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="ComboBox">
                         <Grid>
+                            <Border x:Name="OuterBorder"
+                                    BorderBrush="{DynamicResource BorderColor}"
+                                    BorderThickness="1"
+                                    CornerRadius="{DynamicResource ButtonCornerRadius}"
+                                    Background="{TemplateBinding Background}">
                                 <ToggleButton x:Name="ToggleButton"
-                                          Background="{TemplateBinding Background}"
+                                              Background="Transparent"
-                                          BorderBrush="{TemplateBinding Background}"
                                               BorderThickness="0"
                                               IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                               ClickMode="Press">
-                                <TextBlock Text="{TemplateBinding SelectionBoxItem}"
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*"/>
+                                            <ColumnDefinition Width="Auto"/>
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock Grid.Column="0"
+                                                   Text="{TemplateBinding SelectionBoxItem}"
                                                    Foreground="{TemplateBinding Foreground}"
                                                    Background="Transparent"
-                                           HorizontalAlignment="Center" VerticalAlignment="Center" Margin="2"
+                                                   HorizontalAlignment="Left" VerticalAlignment="Center"
-                                           />
+                                                   Margin="6,3,2,3"/>
+                                        <Path Grid.Column="1"
+                                              Data="M 0,0 L 8,0 L 4,5 Z"
+                                              Fill="{TemplateBinding Foreground}"
+                                              Width="8" Height="5"
+                                              VerticalAlignment="Center"
+                                              HorizontalAlignment="Center"
+                                              Stretch="Uniform"
+                                              Margin="4,0,6,0"/>
+                                    </Grid>
                                 </ToggleButton>
+                            </Border>
                             <Popup x:Name="Popup"
                                    IsOpen="{TemplateBinding IsDropDownOpen}"
                                    Placement="Bottom"
@@ -297,11 +318,11 @@
                                    PopupAnimation="Slide">
                                 <Border x:Name="DropDownBorder"
                                         Background="{TemplateBinding Background}"
-                                        BorderBrush="{TemplateBinding Foreground}"
+                                        BorderBrush="{DynamicResource BorderColor}"
                                         BorderThickness="1"
                                         CornerRadius="4">
                                     <ScrollViewer>
-                                        <ItemsPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Margin="2"/>
+                                        <ItemsPresenter HorizontalAlignment="Left" VerticalAlignment="Center" Margin="4,2"/>
                                     </ScrollViewer>
                                 </Border>
                             </Popup>
@@ -922,13 +943,19 @@
     </Window.Resources>
     <Grid Background="{DynamicResource MainBackgroundColor}" ShowGridLines="False" Name="WPFMainGrid" Width="Auto" Height="Auto" HorizontalAlignment="Stretch">
         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
-        <Grid Grid.Row="0" Background="{DynamicResource MainBackgroundColor}">
+        <!-- Offline banner -->
+        <Border Name="WPFOfflineBanner" Grid.Row="0" Background="#8B0000" Visibility="Collapsed" Padding="6,4">
+            <TextBlock Text="&#x26A0; Offline Mode - No Internet Connection" Foreground="White" FontWeight="Bold"
+                HorizontalAlignment="Center" FontSize="13" Background="Transparent"/>
+        </Border>
+        <Grid Grid.Row="1" Background="{DynamicResource MainBackgroundColor}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/> <!-- Navigation buttons -->
                 <ColumnDefinition Width="*"/> <!-- Search bar and buttons -->
@@ -1171,7 +1198,7 @@
             </Grid>
         </Grid>
 
-        <TabControl Name="WPFTabNav" Background="Transparent" Width="Auto" Height="Auto" BorderBrush="Transparent" BorderThickness="0" Grid.Row="1" Grid.Column="0" Padding="-1">
+        <TabControl Name="WPFTabNav" Background="Transparent" Width="Auto" Height="Auto" BorderBrush="Transparent" BorderThickness="0" Grid.Row="2" Grid.Column="0" Padding="-1">
             <TabItem Header="Install" Visibility="Collapsed" Name="WPFTab1">
                 <Grid Background="Transparent" >
 
@@ -1340,21 +1367,17 @@
                 </ScrollViewer>
             </TabItem>
             <TabItem Header="Win11ISO" Visibility="Collapsed" Name="WPFTab5">
-                <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Margin="{DynamicResource TabContentMargin}">
+                <Grid Name="Win11ISOPanel" Margin="{DynamicResource TabContentMargin}" Background="Transparent">
-                    <Grid Background="Transparent" Name="Win11ISOPanel">
                     <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>  <!-- Step 1: Select ISO -->
+                        <RowDefinition Height="Auto"/>  <!-- Steps 1-4 -->
-                            <RowDefinition Height="Auto"/>  <!-- Step 2: Mount & Verify -->
+                        <RowDefinition Height="*"/>     <!-- Log / Status -->
-                            <RowDefinition Height="Auto"/>  <!-- Step 3: Modify install.wim -->
-                            <RowDefinition Height="Auto"/>  <!-- Step 4: Output Options -->
-                            <RowDefinition Height="Auto"/>  <!-- Log / Status -->
                     </Grid.RowDefinitions>
 
-                        <!-- ═══════════════════════════════════════════════════════════ -->
+                    <!-- Steps 1-4 -->
-                        <!-- STEP 1 : Select Windows 11 ISO                             -->
+                    <StackPanel Grid.Row="0">
-                        <!-- ═══════════════════════════════════════════════════════════ -->
+
-                        <Border Grid.Row="0" Name="WPFWin11ISOSelectSection" Style="{StaticResource BorderStyle}">
+                            <!-- ─── STEP 1 : Select Windows 11 ISO ─────────────── -->
-                            <Grid Margin="5">
+                            <Grid Name="WPFWin11ISOSelectSection" Margin="5" HorizontalAlignment="Left" MinWidth="{DynamicResource ButtonWidth}">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="*"/>
                                     <ColumnDefinition Width="*"/>
@@ -1441,16 +1464,12 @@
                                     </StackPanel>
                                 </Border>
                             </Grid>
-                        </Border>
 
-                        <!-- ═══════════════════════════════════════════════════════════ -->
+                            <!-- ─── STEP 2 : Mount & Verify ISO ──────────────────── -->
-                        <!-- STEP 2 : Mount & Verify ISO                                -->
+                            <Grid Name="WPFWin11ISOMountSection"
-                        <!-- ═══════════════════════════════════════════════════════════ -->
+                                  Margin="5"
-                        <Border Grid.Row="1"
+                                  Visibility="Collapsed"
-                                Name="WPFWin11ISOMountSection"
+                                  HorizontalAlignment="Left" MinWidth="{DynamicResource ButtonWidth}">
-                                Style="{StaticResource BorderStyle}"
-                                Visibility="Collapsed">
-                            <Grid Margin="5">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto"/>
                                     <ColumnDefinition Width="*"/>
@@ -1472,6 +1491,13 @@
                                             HorizontalAlignment="Left"
                                             Width="Auto" Padding="12,0"
                                             Height="{DynamicResource ButtonHeight}"/>
+                                    <CheckBox Name="WPFWin11ISOInjectDrivers"
+                                              Content="Inject current system drivers"
+                                              FontSize="{DynamicResource FontSize}"
+                                              Foreground="{DynamicResource MainForegroundColor}"
+                                              IsChecked="False"
+                                              Margin="0,8,0,0"
+                                              ToolTip="Exports all drivers from this machine and injects them into install.wim and boot.wim. Recommended for systems with unsupported NVMe or network controllers."/>
                                 </StackPanel>
 
                                 <!-- Verification results panel -->
@@ -1500,22 +1526,17 @@
                                                   FontSize="{DynamicResource FontSize}"
                                                   Foreground="{DynamicResource MainForegroundColor}"
                                                   Background="{DynamicResource MainBackgroundColor}"
-                                                  BorderBrush="{DynamicResource BorderColor}"
+                                                  HorizontalAlignment="Left"
-                                                  HorizontalAlignment="Stretch"
                                                   Margin="0,0,0,0"/>
                                     </StackPanel>
                                 </Border>
                             </Grid>
-                        </Border>
 
-                        <!-- ═══════════════════════════════════════════════════════════ -->
+                            <!-- ─── STEP 3 : Modify install.wim ───────────────────── -->
-                        <!-- STEP 3 : Modify install.wim                                -->
+                            <StackPanel Name="WPFWin11ISOModifySection"
-                        <!-- ═══════════════════════════════════════════════════════════ -->
+                                        Margin="5"
-                        <Border Grid.Row="2"
+                                        Visibility="Collapsed"
-                                Name="WPFWin11ISOModifySection"
+                                        HorizontalAlignment="Left" MinWidth="{DynamicResource ButtonWidth}">
-                                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
@@ -1534,15 +1555,12 @@
                                         Width="Auto" Padding="12,0"
                                         Height="{DynamicResource ButtonHeight}"/>
                             </StackPanel>
-                        </Border>
 
-                        <!-- ═══════════════════════════════════════════════════════════ -->
+                            <!-- ─── STEP 4 : Output Options ───────────────────────── -->
-                        <!-- STEP 4 : Output Options                                    -->
+                            <StackPanel Name="WPFWin11ISOOutputSection"
-                        <!-- ═══════════════════════════════════════════════════════════ -->
+                                        Margin="5"
-                        <Border Grid.Row="3"
+                                        Visibility="Collapsed"
-                                Name="WPFWin11ISOOutputSection"
+                                        HorizontalAlignment="Left" MinWidth="{DynamicResource ButtonWidth}">
-                                Style="{StaticResource BorderStyle}">
-                            <StackPanel Margin="5">
                                 <!-- Header row: title + Clean & Reset button -->
                                 <Grid Margin="0,0,0,12">
                                     <Grid.ColumnDefinitions>
@@ -1579,7 +1597,7 @@
                                             Height="{DynamicResource ButtonHeight}"/>
                                     <Button Grid.Column="2"
                                             Name="WPFWin11ISOChooseUSBButton"
-                                            Content="Write Directly to a USB Drive  (erases drive)"
+                                            Content="Write Directly to a USB Drive (ERASES DRIVE)"
                                             Foreground="OrangeRed"
                                             HorizontalAlignment="Stretch"
                                             Width="Auto" Padding="12,0"
@@ -1613,7 +1631,7 @@
                                                       Margin="0,0,6,0"/>
                                             <Button Grid.Column="1"
                                                     Name="WPFWin11ISORefreshUSBButton"
-                                                    Content="↻ Refresh"
+                                                    Content="Refresh"
                                                     Width="Auto" Padding="8,0"
                                                     Height="{DynamicResource ButtonHeight}"/>
                                         </Grid>
@@ -1626,34 +1644,37 @@
                                                 Margin="0,0,0,10"/>
                                     </StackPanel>
                                 </Border>
+                            </StackPanel>
 
                     </StackPanel>
-                        </Border>
 
-                        <!-- ═══════════════════════════════════════════════════════════ -->
+                    <!-- Status Log (fills remaining height) -->
-                        <!-- Status / Log Output                                        -->
+                    <Grid Grid.Row="1" Margin="5">
-                        <!-- ═══════════════════════════════════════════════════════════ -->
+                        <Grid.RowDefinitions>
-                        <Border Grid.Row="4" Style="{StaticResource BorderStyle}">
+                            <RowDefinition Height="Auto"/>
-                            <StackPanel>
+                            <RowDefinition Height="*"/>
-                                <TextBlock FontSize="{DynamicResource FontSize}" FontWeight="Bold"
+                        </Grid.RowDefinitions>
-                                           Foreground="{DynamicResource MainForegroundColor}" Margin="0,0,0,6">
+                        <TextBlock Grid.Row="0"
+                                   FontSize="{DynamicResource FontSize}" FontWeight="Bold"
+                                   Foreground="{DynamicResource MainForegroundColor}"
+                                   Margin="0,0,0,4">
                             Status Log
                         </TextBlock>
-                                <TextBox Name="WPFWin11ISOStatusLog"
+                        <TextBox Grid.Row="1"
+                                 Name="WPFWin11ISOStatusLog"
                                  IsReadOnly="True"
                                  TextWrapping="Wrap"
-                                         VerticalScrollBarVisibility="Auto"
+                                 VerticalScrollBarVisibility="Visible"
-                                         Height="140" Padding="6"
+                                 VerticalAlignment="Stretch"
+                                 Padding="6"
                                  Background="{DynamicResource MainBackgroundColor}"
                                  Foreground="{DynamicResource MainForegroundColor}"
                                  BorderBrush="{DynamicResource BorderColor}"
                                  BorderThickness="1"
                                  Text="Ready. Please select a Windows 11 ISO to begin."/>
-                            </StackPanel>
+                    </Grid>
-                        </Border>
 
                 </Grid>
-                </ScrollViewer>
             </TabItem>
         </TabControl>
     </Grid>