Change formating in WPFTweaksRemoveCopilot (#3808)

* Remove unneccary services from WPFTweaksServices

* Update tweaks.json

.github/CONTRIBUTING.md

@@ -87,7 +87,7 @@ graph TD
 
 ### Testing your changes
 
-* To test to see if your changes work as intended run following commands in a powershell teminal as admin:
+* To test to see if your changes work as intended run following commands in a powershell terminal as admin:
 
 * Change the directory where you are running the commands to the forked project.
 * `cd {path to the folder with the compile.ps1}`

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-<!--Before you make this PR have you followed the docs here? - https://christitustech.github.io/winutil/contribute/ -->
+<!--Before you make this PR have you followed the docs here? - https://winutil.christitus.com/contributing/ -->
 
 ## Type of Change
 - [ ] New feature

.github/workflows/close-discussion-on-pr.yaml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Check if PR was merged
         if: github.event.pull_request.merged == true

.github/workflows/compile-check.yaml

@@ -13,7 +13,7 @@ jobs:
     runs-on: windows-latest
     steps:
     - name: Checkout Sources
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Compile and Syntaxcheck winutil.ps1
       shell: pwsh

.github/workflows/pre-release.yaml

@@ -14,7 +14,7 @@ jobs:
       CERTIFICATE_BASE64: ${{ secrets.CERTIFICATE_BASE64 }}
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Compile project
         shell: pwsh

.github/workflows/remove-winutil.yaml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Check if winutil.ps1 exists
       id: check_existence

.github/workflows/sponsors.yaml

@@ -11,7 +11,7 @@ jobs:
     if: (github.event_name == 'schedule' && github.repository == 'ChrisTitusTech/winutil') || (github.event_name != 'schedule')
     steps:
       - name: Checkout 🛎️
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Generate Sponsors 💖
         uses: JamesIves/github-sponsors-readme-action@v1

.github/workflows/unittests.yaml

@@ -8,7 +8,7 @@ jobs:
     name: PS Script Analyzer
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: lint
       uses: devblackops/github-action-psscriptanalyzer@master
       with:
@@ -22,7 +22,7 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Install Pester
       run: |

.gitignore

@@ -54,3 +54,5 @@ winutil.ps1
 .github/site/
 
 binary/
+
+.preprocessor_hashes.json

Compile.ps1

@@ -51,7 +51,24 @@ Update-Progress "Pre-req: Running Preprocessor..." 0
 $preprocessingFilePath = ".\tools\Invoke-Preprocessing.ps1"
 . $preprocessingFilePath
 
-$excludedFiles = @('.\.git\', '.\.gitignore', '.\.gitattributes', '.\.github\CODEOWNERS', '.\LICENSE', "$preprocessingFilePath", '*.png', '*.exe','.\.preprocessor_hashes.json')
+$excludedFiles = @()
+
+# Add directories only if they exist
+if (Test-Path '.\.git\') { $excludedFiles += '.\.git\' }
+if (Test-Path '.\binary\') { $excludedFiles += '.\binary\' }
+
+# Add files that should always be excluded
+$excludedFiles += @(
+    '.\.gitignore',
+    '.\.gitattributes',
+    '.\.github\CODEOWNERS',
+    '.\LICENSE',
+    "$preprocessingFilePath",
+    '*.png',
+    '*.exe',
+    '.\.preprocessor_hashes.json'
+)
+
 $msg = "Pre-req: Code Formatting"
 Invoke-Preprocessing -WorkingDir "$workingdir" -ExcludedFiles $excludedFiles -ProgressStatusMessage $msg
 

README.md

@@ -35,7 +35,7 @@ irm "https://christitus.com/win" | iex
 irm "https://christitus.com/windev" | iex
 ```
 
-If you have Issues, refer to [Known Issues](https://winutil.christitus.com/knownissues/)
+If you have Issues, refer to [Known Issues](https://winutil.christitus.com/knownissues/) or [Create Issue](https://github.com/ChrisTitusTech/winutil/issues)
 
 ## 🎓 Documentation
 
@@ -51,7 +51,7 @@ If you have Issues, refer to [Known Issues](https://winutil.christitus.com/known
 ## 🛠️ Build & Develop
 
 > [!NOTE]
-> Winutil is a relatively large script, so it's split into multiple files which're combined into a single `.ps1` file using a custom compiler. This makes maintaining the project a lot easiler.
+> Winutil is a relatively large script, so it's split into multiple files which're combined into a single `.ps1` file using a custom compiler. This makes maintaining the project a lot easier.
 
 Get a copy of the source code, this can be done using GitHub UI (`Code -> Download ZIP`), or by cloning (downloading) the repo using git.
 
@@ -79,7 +79,7 @@ You'll see a new file named `winutil.ps1`, which's created by `Compile.ps1` scri
 
 These are the sponsors that help keep this project alive with monthly contributions.
 
-<!-- sponsors --><a href="https://github.com/TriHydera"><img src="https:&#x2F;&#x2F;github.com&#x2F;TriHydera.png" width="60px" alt="User avatar: TriHydera" /></a><a href="https://github.com/DelDongo"><img src="https:&#x2F;&#x2F;github.com&#x2F;DelDongo.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/markamos"><img src="https:&#x2F;&#x2F;github.com&#x2F;markamos.png" width="60px" alt="User avatar: Mark Amos" /></a><a href="https://github.com/dwelfusius"><img src="https:&#x2F;&#x2F;github.com&#x2F;dwelfusius.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/mews-se"><img src="https:&#x2F;&#x2F;github.com&#x2F;mews-se.png" width="60px" alt="User avatar: Martin Stockzell" /></a><a href="https://github.com/jdiegmueller"><img src="https:&#x2F;&#x2F;github.com&#x2F;jdiegmueller.png" width="60px" alt="User avatar: Jason A. Diegmueller" /></a><a href="https://github.com/robertsandrock"><img src="https:&#x2F;&#x2F;github.com&#x2F;robertsandrock.png" width="60px" alt="User avatar: RMS" /></a><a href="https://github.com/KenichiQaz"><img src="https:&#x2F;&#x2F;github.com&#x2F;KenichiQaz.png" width="60px" alt="User avatar: Stefan" /></a><a href="https://github.com/paulsheets"><img src="https:&#x2F;&#x2F;github.com&#x2F;paulsheets.png" width="60px" alt="User avatar: Paul" /></a><a href="https://github.com/djones369"><img src="https:&#x2F;&#x2F;github.com&#x2F;djones369.png" width="60px" alt="User avatar: Dave J. - WhamGeek" /></a><a href="https://github.com/anthonymendez"><img src="https:&#x2F;&#x2F;github.com&#x2F;anthonymendez.png" width="60px" alt="User avatar: Anthony Mendez" /></a><a href="https://github.com/FatBastard0"><img src="https:&#x2F;&#x2F;github.com&#x2F;FatBastard0.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/DursleyGuy"><img src="https:&#x2F;&#x2F;github.com&#x2F;DursleyGuy.png" width="60px" alt="User avatar: DursleyGuy" /></a><a href="https://github.com/realmuddy"><img src="https:&#x2F;&#x2F;github.com&#x2F;realmuddy.png" width="60px" alt="User avatar: Phillip Waters" /></a><a href="https://github.com/quaszi"><img src="https:&#x2F;&#x2F;github.com&#x2F;quaszi.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/DwayneTheRockLobster1"><img src="https:&#x2F;&#x2F;github.com&#x2F;DwayneTheRockLobster1.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/KieraKujisawa"><img src="https:&#x2F;&#x2F;github.com&#x2F;KieraKujisawa.png" width="60px" alt="User avatar: Kiera Meredith" /></a><a href="https://github.com/craigccfl"><img src="https:&#x2F;&#x2F;github.com&#x2F;craigccfl.png" width="60px" alt="User avatar: CraigW" /></a><a href="https://github.com/RoelCrabbe"><img src="https:&#x2F;&#x2F;github.com&#x2F;RoelCrabbe.png" width="60px" alt="User avatar: Roel Crabbé" /></a><a href="https://github.com/Data-Syd"><img src="https:&#x2F;&#x2F;github.com&#x2F;Data-Syd.png" width="60px" alt="User avatar: Data Syd" /></a><!-- sponsors -->
+<!-- sponsors --><a href="https://github.com/markamos"><img src="https:&#x2F;&#x2F;github.com&#x2F;markamos.png" width="60px" alt="User avatar: Mark Amos" /></a><a href="https://github.com/dwelfusius"><img src="https:&#x2F;&#x2F;github.com&#x2F;dwelfusius.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/mews-se"><img src="https:&#x2F;&#x2F;github.com&#x2F;mews-se.png" width="60px" alt="User avatar: Martin Stockzell" /></a><a href="https://github.com/jdiegmueller"><img src="https:&#x2F;&#x2F;github.com&#x2F;jdiegmueller.png" width="60px" alt="User avatar: Jason A. Diegmueller" /></a><a href="https://github.com/robertsandrock"><img src="https:&#x2F;&#x2F;github.com&#x2F;robertsandrock.png" width="60px" alt="User avatar: RMS" /></a><a href="https://github.com/KenichiQaz"><img src="https:&#x2F;&#x2F;github.com&#x2F;KenichiQaz.png" width="60px" alt="User avatar: Stefan" /></a><a href="https://github.com/paulsheets"><img src="https:&#x2F;&#x2F;github.com&#x2F;paulsheets.png" width="60px" alt="User avatar: Paul" /></a><a href="https://github.com/djones369"><img src="https:&#x2F;&#x2F;github.com&#x2F;djones369.png" width="60px" alt="User avatar: Dave J  (WhamGeek)" /></a><a href="https://github.com/anthonymendez"><img src="https:&#x2F;&#x2F;github.com&#x2F;anthonymendez.png" width="60px" alt="User avatar: Anthony Mendez" /></a><a href="https://github.com/FatBastard0"><img src="https:&#x2F;&#x2F;github.com&#x2F;FatBastard0.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/DursleyGuy"><img src="https:&#x2F;&#x2F;github.com&#x2F;DursleyGuy.png" width="60px" alt="User avatar: DursleyGuy" /></a><a href="https://github.com/realmuddy"><img src="https:&#x2F;&#x2F;github.com&#x2F;realmuddy.png" width="60px" alt="User avatar: Phillip Waters" /></a><a href="https://github.com/quaszi"><img src="https:&#x2F;&#x2F;github.com&#x2F;quaszi.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/DwayneTheRockLobster1"><img src="https:&#x2F;&#x2F;github.com&#x2F;DwayneTheRockLobster1.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/KieraKujisawa"><img src="https:&#x2F;&#x2F;github.com&#x2F;KieraKujisawa.png" width="60px" alt="User avatar: Kiera Meredith" /></a><a href="https://github.com/IsaacThoman"><img src="https:&#x2F;&#x2F;github.com&#x2F;IsaacThoman.png" width="60px" alt="User avatar: Isaac Thoman" /></a><!-- sponsors -->
 
 ## 🏅 Thanks to all Contributors
 Thanks a lot for spending your time helping Winutil grow. Thanks a lot! Keep rocking 🍻.

config/applications.json

@@ -143,6 +143,15 @@
         "link": "https://github.com/sharkdp/bat",
         "winget": "sharkdp.bat"
     },
+    "beeper": {
+        "category": "Communications",
+        "choco": "na",
+        "content": "Beeper",
+        "description": "All your chats in one app",
+        "link": "https://www.beeper.com/",
+        "winget": "Beeper.Beeper"
+    },
+
     "bitwarden": {
         "category": "Utilities",
         "choco": "bitwarden",
@@ -375,6 +384,22 @@
         "link": "https://discord.com/",
         "winget": "Discord.Discord"
     },
+    "dismtools": {
+        "category": "Microsoft Tools",
+        "choco": "na",
+        "content": "DISMTools",
+        "description": "DISMTools is a fast, customizable GUI for the DISM utility, supporting Windows images from Windows 7 onward. It handles installations on any drive, offers project support, and lets users tweak settings like color modes, language, and DISM versions; powered by both native DISM and a managed DISM API.",
+        "link": "https://github.com/CodingWonders/DISMTools",
+        "winget": "CodingWondersSoftware.DISMTools.Stable"
+    },
+    "ntlite": {
+        "category": "Microsoft Tools",
+        "choco": "ntlite-free",
+        "content": "NTLite",
+        "description": "Integrate updates, drivers, automate Windows and application setup, speedup Windows deployment process and have it all set for the next time.",
+        "link": "https://ntlite.com",
+        "winget": "Nlitesoft.NTLite"
+    },
     "ditto": {
         "category": "Utilities",
         "choco": "ditto",
@@ -495,6 +520,14 @@
         "link": "https://emulationstation.org/",
         "winget": "Emulationstation.Emulationstation"
     },
+    "enteauth": {
+        "category": "Utilities",
+        "choco": "ente-auth",
+        "content": "Ente Auth",
+        "description": "Ente Auth is a free, cross-platform, end-to-end encrypted authenticator app.",
+        "link": "https://ente.io/auth/",
+        "winget": "ente-io.auth-desktop"
+    },
     "epicgames": {
         "category": "Games",
         "choco": "epicgameslauncher",
@@ -547,7 +580,7 @@
         "category": "Multimedia Tools",
         "choco": "ffmpeg-full",
         "content": "FFmpeg (full)",
-        "description": "FFmpeg is a powerful multimedia processing tool that enables users to convert, edit, and stream audio and video files with a vast range of codecs and formats.",
+        "description": "FFmpeg is a powerful multimedia processing tool that enables users to convert, edit, and stream audio and video files with a vast range of codecs and formats. | Note: FFmpeg can not be uninstalled using winget.",
         "link": "https://ffmpeg.org/",
         "winget": "Gyan.FFmpeg"
     },
@@ -967,6 +1000,14 @@
         "link": "https://aws.amazon.com/corretto",
         "winget": "Amazon.Corretto.21.JDK"
     },
+    "java25": {
+        "category": "Development",
+        "choco": "corretto25jdk",
+        "content": "Amazon Corretto 25 (LTS)",
+        "description": "Amazon Corretto is a no-cost, multiplatform, production-ready distribution of the Open Java Development Kit (OpenJDK).",
+        "link": "https://aws.amazon.com/corretto",
+        "winget": "Amazon.Corretto.25.JDK"
+    },
     "jdownloader": {
         "category": "Utilities",
         "choco": "jdownloader",
@@ -1155,7 +1196,7 @@
         "category": "Communications",
         "choco": "element-desktop",
         "content": "Element",
-        "description": "Element is a client for Matrix—an open network for secure, decentralized communication.",
+        "description": "Element is a client for Matrix; an open network for secure, decentralized communication.",
         "link": "https://element.io/",
         "winget": "Element.Element"
     },
@@ -1501,7 +1542,7 @@
         "content": "OpenRGB",
         "description": "OpenRGB is an open-source RGB lighting control software designed to manage and control RGB lighting for various components and peripherals.",
         "link": "https://openrgb.org/",
-        "winget": "CalcProgrammer1.OpenRGB"
+        "winget": "OpenRGB.OpenRGB"
     },
     "openscad": {
         "category": "Multimedia Tools",
@@ -1687,13 +1728,13 @@
         "link": "https://bitsum.com/",
         "winget": "BitSum.ProcessLasso"
     },
-    "spotify": {
-        "category": "Multimedia Tools",
-        "choco": "spotify",
-        "content": "Spotify",
-        "description": "Spotify is a digital music service that gives you access to millions of songs, podcasts, and videos from artists all over the world.",
-        "link": "https://www.spotify.com/",
-        "winget": "Spotify.Spotify"
+    "protonauth": {
+        "category": "Utilities",
+        "choco": "protonauth",
+        "content": "Proton Authenticator",
+        "description": "2FA app from Proton to securely sync and backup 2FA codes.",
+        "link": "https://proton.me/authenticator",
+        "winget": "Proton.ProtonAuthenticator"
     },
     "processmonitor": {
         "category": "Microsoft Tools",
@@ -1741,7 +1782,7 @@
         "content": "Python3",
         "description": "Python is a versatile programming language used for web development, data analysis, artificial intelligence, and more.",
         "link": "https://www.python.org/",
-        "winget": "Python.Python.3.12"
+        "winget": "Python.Python.3.13"
     },
     "qbittorrent": {
         "category": "Utilities",
@@ -1877,7 +1918,7 @@
         "content": "Session",
         "description": "Session is a private and secure messaging app built on a decentralized network for user privacy and data protection.",
         "link": "https://getsession.org/",
-        "winget": "Oxen.Session"
+        "winget": "Session.Session"
     },
     "sharex": {
         "category": "Multimedia Tools",
@@ -1935,14 +1976,6 @@
         "link": "https://github.com/henrypp/simplewall",
         "winget": "Henry++.simplewall"
     },
-    "skype": {
-        "category": "Communications",
-        "choco": "skype",
-        "content": "Skype",
-        "description": "Skype is a widely used communication platform offering video calls, voice calls, and instant messaging services.",
-        "link": "https://www.skype.com/",
-        "winget": "Microsoft.Skype"
-    },
     "slack": {
         "category": "Communications",
         "choco": "slack",
@@ -2218,8 +2251,8 @@
     "ttaskbar": {
         "category": "Utilities",
         "choco": "translucenttb",
-        "content": "Translucent Taskbar",
-        "description": "Translucent Taskbar is a tool that allows you to customize the transparency of the Windows taskbar.",
+        "content": "TranslucentTB",
+        "description": "TranslucentTB is a tool that allows you to customize the transparency of the Windows taskbar.",
         "link": "https://github.com/TranslucentTB/TranslucentTB",
         "winget": "9PF4KZ2VN4W9"
     },
@@ -2301,7 +2334,7 @@
         "content": "Viber",
         "description": "Viber is a free messaging and calling app with features like group chats, video calls, and more.",
         "link": "https://www.viber.com/",
-        "winget": "Viber.Viber"
+        "winget": "Rakuten.Viber"
     },
     "videomass": {
         "category": "Multimedia Tools",
@@ -2691,7 +2724,7 @@
         "category": "Utilities",
         "choco": "ultravnc",
         "content": "UltraVNC",
-        "description": "UltraVNC is a powerful, easy to use and free - remote pc access softwares - that can display the screen of another computer (via internet or network) on your own screen. The program allows you to use your mouse and keyboard to control the other PC remotely. It means that you can work on a remote computer, as if you were sitting in front of it, right from your current location.",
+        "description": "UltraVNC is a powerful, easy to use and free - remote pc access software - that can display the screen of another computer (via internet or network) on your own screen. The program allows you to use your mouse and keyboard to control the other PC remotely. It means that you can work on a remote computer, as if you were sitting in front of it, right from your current location.",
         "link": "https://uvnc.com/",
         "winget": "uvncbvba.UltraVnc"
     },
@@ -2902,5 +2935,13 @@
         "description": "The modern, privacy-focused, performance-driven browser built on Firefox",
         "link": "https://zen-browser.app/",
         "winget": "Zen-Team.Zen-Browser"
+    },
+    "Zed": {
+        "category": "Development",
+        "choco": "na",
+        "content": "Zed",
+        "description": "Zed is a modern, high-performance code editor designed from the ground up for speed and collaboration.",
+        "link": "https://zed.dev/",
+        "winget": "Zed.Zed"
     }
 }

config/dns.json

@@ -46,23 +46,5 @@
         "Secondary": "94.140.15.16",
         "Primary6": "2a10:50c0::bad1:ff",
         "Secondary6": "2a10:50c0::bad2:ff"
-    },
-    "dns0.eu_Open":{
-        "Primary": "193.110.81.254",
-        "Secondary": "185.253.5.254",
-        "Primary6": "2a0f:fc80::ffff",
-        "Secondary6": "2a0f:fc81::ffff"
-    },
-    "dns0.eu_ZERO":{
-        "Primary": "193.110.81.9",
-        "Secondary": "185.253.5.9",
-        "Primary6": "2a0f:fc80::9",
-        "Secondary6": "2a0f:fc81::9"
-    },
-    "dns0.eu_KIDS":{
-        "Primary": "193.110.81.1",
-        "Secondary": "185.253.5.1",
-        "Primary6": "2a0f:fc80::1",
-        "Secondary6": "2a0f:fc81::1"
     }
 }

config/feature.json

@@ -81,42 +81,6 @@
     ],
     "link": "https://winutil.christitus.com/dev/features/features/nfs"
   },
-  "WPFFeatureEnableSearchSuggestions": {
-    "Content": "Enable Search Box Web Suggestions in Registry(explorer restart)",
-    "Description": "Enables web suggestions when searching using Windows Search.",
-    "category": "Features",
-    "panel": "1",
-    "Order": "a015_",
-    "feature": [],
-    "InvokeScript": [
-      "
-      If (!(Test-Path 'HKCU:\\SOFTWARE\\Policies\\Microsoft\\Windows\\Explorer')) {
-            New-Item -Path 'HKCU:\\SOFTWARE\\Policies\\Microsoft\\Windows\\Explorer' -Force | Out-Null
-      }
-      New-ItemProperty -Path 'HKCU:\\SOFTWARE\\Policies\\Microsoft\\Windows\\Explorer' -Name 'DisableSearchBoxSuggestions' -Type DWord -Value 0 -Force
-      Stop-Process -name explorer -force
-      "
-    ],
-    "link": "https://winutil.christitus.com/dev/features/features/enablesearchsuggestions"
-  },
-  "WPFFeatureDisableSearchSuggestions": {
-    "Content": "Disable Search Box Web Suggestions in Registry(explorer restart)",
-    "Description": "Disables web suggestions when searching using Windows Search.",
-    "category": "Features",
-    "panel": "1",
-    "Order": "a016_",
-    "feature": [],
-    "InvokeScript": [
-      "
-      If (!(Test-Path 'HKCU:\\SOFTWARE\\Policies\\Microsoft\\Windows\\Explorer')) {
-            New-Item -Path 'HKCU:\\SOFTWARE\\Policies\\Microsoft\\Windows\\Explorer' -Force | Out-Null
-      }
-      New-ItemProperty -Path 'HKCU:\\SOFTWARE\\Policies\\Microsoft\\Windows\\Explorer' -Name 'DisableSearchBoxSuggestions' -Type DWord -Value 1 -Force
-      Stop-Process -name explorer -force
-      "
-    ],
-    "link": "https://winutil.christitus.com/dev/features/features/disablesearchsuggestions"
-  },
   "WPFFeatureRegBackup": {
     "Content": "Enable Daily Registry Backup Task 12.30am",
     "Description": "Enables daily registry backup, previously disabled by Microsoft in Windows 10 1803.",
@@ -242,15 +206,7 @@
     "ButtonWidth": "300",
     "link": "https://winutil.christitus.com/dev/features/fixes/runadobecccleanertool"
   },
-  "WPFPanelnetwork": {
-    "Content": "Network Connections",
-    "category": "Legacy Windows Panels",
-    "panel": "2",
-    "Type": "Button",
-    "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/network"
-  },
-  "WPFPanelcontrol": {
+  "WPFPanelControl": {
     "Content": "Control Panel",
     "category": "Legacy Windows Panels",
     "panel": "2",
@@ -258,7 +214,23 @@
     "ButtonWidth": "300",
     "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/control"
   },
-  "WPFPanelpower": {
+  "WPFPanelComputer": {
+    "Content": "Computer Management",
+    "category": "Legacy Windows Panels",
+    "panel": "2",
+    "Type": "Button",
+    "ButtonWidth": "300",
+    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/computer"
+  },
+  "WPFPanelNetwork": {
+    "Content": "Network Connections",
+    "category": "Legacy Windows Panels",
+    "panel": "2",
+    "Type": "Button",
+    "ButtonWidth": "300",
+    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/network"
+  },
+  "WPFPanelPower": {
     "Content": "Power Panel",
     "category": "Legacy Windows Panels",
     "panel": "2",
@@ -266,23 +238,7 @@
     "ButtonWidth": "300",
     "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/power"
   },
-  "WPFPanelregion": {
-    "Content": "Region",
-    "category": "Legacy Windows Panels",
-    "panel": "2",
-    "Type": "Button",
-    "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/region"
-  },
-  "WPFPanelsound": {
-    "Content": "Sound Settings",
-    "category": "Legacy Windows Panels",
-    "panel": "2",
-    "Type": "Button",
-    "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/sound"
-  },
-  "WPFPanelprinter": {
+  "WPFPanelPrinter": {
     "Content": "Printer Panel",
     "category": "Legacy Windows Panels",
     "panel": "2",
@@ -290,7 +246,31 @@
     "ButtonWidth": "300",
     "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/printer"
   },
-  "WPFPanelsystem": {
+  "WPFPanelRegion": {
+    "Content": "Region",
+    "category": "Legacy Windows Panels",
+    "panel": "2",
+    "Type": "Button",
+    "ButtonWidth": "300",
+    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/region"
+  },
+  "WPFPanelRestore": {
+    "Content": "Windows Restore",
+    "category": "Legacy Windows Panels",
+    "panel": "2",
+    "Type": "Button",
+    "ButtonWidth": "300",
+    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/restore"
+  },
+  "WPFPanelSound": {
+    "Content": "Sound Settings",
+    "category": "Legacy Windows Panels",
+    "panel": "2",
+    "Type": "Button",
+    "ButtonWidth": "300",
+    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/user"
+  },
+  "WPFPanelSystem": {
     "Content": "System Properties",
     "category": "Legacy Windows Panels",
     "panel": "2",
@@ -298,20 +278,13 @@
     "ButtonWidth": "300",
     "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/system"
   },
-  "WPFPaneluser": {
-    "Content": "User Accounts",
+  "WPFPanelTimedate": {
+    "Content": "Time and Date",
     "category": "Legacy Windows Panels",
     "panel": "2",
     "Type": "Button",
     "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/user"
-  },
-  "WPFPanelGodMode": {
-    "Content": "God Mode",
-    "category": "Legacy Windows Panels",
-    "panel": "2",
-    "Type": "Button",
-    "ButtonWidth": "300"
+    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/timedate"
   },
   "WPFWinUtilInstallPSProfile": {
     "Content": "Install CTT PowerShell Profile",

config/preset.json

@@ -1,16 +1,12 @@
 {
   "Standard": [
-    "WPFTweaksAH",
+    "WPFTweaksActivity",
     "WPFTweaksConsumerFeatures",
     "WPFTweaksDisableExplorerAutoDiscovery",
     "WPFTweaksDVR",
-    "WPFTweaksHiber",
-    "WPFTweaksHome",
-    "WPFTweaksLoc",
+    "WPFTweaksLocation",
     "WPFTweaksServices",
-    "WPFTweaksStorage",
     "WPFTweaksTele",
-    "WPFTweaksWifi",
     "WPFTweaksDiskCleanup",
     "WPFTweaksDeleteTempFiles",
     "WPFTweaksEndTaskOnTaskbar",
@@ -20,7 +16,6 @@
   "Minimal": [
     "WPFTweaksConsumerFeatures",
     "WPFTweaksDisableExplorerAutoDiscovery",
-    "WPFTweaksHome",
     "WPFTweaksServices",
     "WPFTweaksTele"
   ]

config/themes.json

@@ -3,7 +3,7 @@
         "AppEntryWidth":  "130",
         "AppEntryFontSize":  "11",
         "AppEntryMargin":  "1,1,1,1",
-        "AppEntryBorderTickness":  "0",
+        "AppEntryBorderThickness":  "0",
         "CustomDialogFontSize":       "12",
         "CustomDialogFontSizeHeader": "14",
         "CustomDialogLogoSize":       "25",
@@ -32,6 +32,7 @@
         "ButtonFontFamily": "Arial",
         "ButtonWidth":      "200",
         "ButtonHeight":     "25",
+        "ConfigTabButtonFontSize":   "14",
         "ConfigUpdateButtonFontSize":   "14",
         "SearchBarWidth":               "200",
         "SearchBarHeight":              "26",
@@ -46,6 +47,7 @@
         "AppInstallUnselectedColor": "#F7F7F7",
         "AppInstallHighlightedColor": "#CFCFCF",
         "AppInstallSelectedColor": "#C2C2C2",
+        "AppInstallOverlayBackgroundColor":"#6A6D72",
         "ComboBoxForegroundColor":  "#232629",
         "ComboBoxBackgroundColor":  "#F7F7F7",
         "LabelboxForegroundColor":  "#232629",
@@ -58,6 +60,7 @@
         "ScrollBarHoverColor": "#5A5D62",
         "ScrollBarDraggingColor": "#6A6D72",
 
+        "MicrowinBusyColor": "#2e77ff",
         "ProgressBarForegroundColor": "#2e77ff",
         "ProgressBarBackgroundColor": "Transparent",
         "ProgressBarTextColor": "#232629",
@@ -85,6 +88,7 @@
         "AppInstallUnselectedColor": "#232629",
         "AppInstallHighlightedColor": "#3C3C3C",
         "AppInstallSelectedColor": "#4C4C4C",
+        "AppInstallOverlayBackgroundColor":"#2E3135",
         "ComboBoxForegroundColor":  "#F7F7F7",
         "ComboBoxBackgroundColor":  "#1E3747",
         "LabelboxForegroundColor":  "#0567ff",
@@ -97,9 +101,10 @@
         "ScrollBarHoverColor": "#3B4252",
         "ScrollBarDraggingColor": "#5E81AC",
 
+        "MicrowinBusyColor": "#2e77ff",
         "ProgressBarForegroundColor": "#222222",
         "ProgressBarBackgroundColor": "Transparent",
-        "ProgressBarTextColor": "#cccccc",
+        "ProgressBarTextColor": "#232629",
         "ButtonInstallBackgroundColor":  "#222222",
         "ButtonTweaksBackgroundColor":  "#333333",
         "ButtonConfigBackgroundColor":  "#444444",

functions/microwin/Invoke-Microwin.ps1

@@ -39,12 +39,15 @@ public class PowerManagement {
     $SaveDialog.ShowDialog() | Out-Null
 
     if ($SaveDialog.FileName -eq "") {
-        Write-Host "No file name for the target image was specified"
+        $msg = "No file name for the target image was specified"
+        Write-Host $msg
+        Invoke-MicrowinBusyInfo -action "warning" -message $msg
         Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
         return
     }
 
     Set-WinUtilTaskbaritem -state "Indeterminate" -overlay "logo"
+    Invoke-MicrowinBusyInfo -action "wip" -message "Busy..." -interactive $false
 
     Write-Host "Target ISO location: $($SaveDialog.FileName)"
 
@@ -55,6 +58,10 @@ public class PowerManagement {
     $injectDrivers = $sync.MicrowinInjectDrivers.IsChecked
     $importDrivers = $sync.MicrowinImportDrivers.IsChecked
 
+    $WPBT = $sync.MicroWinWPBT.IsChecked
+    $unsupported = $sync.MicroWinUnsupported.IsChecked
+    $skipFla = $sync.MicroWinNoFLA.IsChecked
+
     $importVirtIO = $sync.MicrowinCopyVirtIO.IsChecked
 
     $mountDir = $sync.MicrowinMountDir.Text
@@ -63,16 +70,22 @@ public class PowerManagement {
     # Detect if the Windows image is an ESD file and convert it to WIM
     if (-not (Test-Path -Path "$mountDir\sources\install.wim" -PathType Leaf) -and (Test-Path -Path "$mountDir\sources\install.esd" -PathType Leaf)) {
         Write-Host "Exporting Windows image to a WIM file, keeping the index we want to work on. This can take several minutes, depending on the performance of your computer..."
-        Export-WindowsImage -SourceImagePath $mountDir\sources\install.esd -SourceIndex $index -DestinationImagePath $mountDir\sources\install.wim -CompressionType "Max"
+        try {
+            Export-WindowsImage -SourceImagePath "$mountDir\sources\install.esd" -SourceIndex $index -DestinationImagePath "$mountDir\sources\install.wim" -CompressionType "Max"
+        } catch {
+            # Usually the case if it can't find unattend.dll on the host system. Guys, fix your corrupt messes that are your installations!
+            dism /english /export-image /sourceimagefile="$mountDir\sources\install.esd" /sourceindex=$index /destinationimagefile="$mountDir\sources\install.wim" /compress:max
+        }
         if ($?) {
             Remove-Item -Path "$mountDir\sources\install.esd" -Force
             # Since we've already exported the image index we wanted, switch to the first one
             $index = 1
         } else {
             $msg = "The export process has failed and MicroWin processing cannot continue"
-            Write-Host "Failed to export the image"
-            [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Error)
+            Write-Host $msg
             Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
+            Invoke-MicrowinBusyInfo -action "warning" -message $msg
+            [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Error)
             return
         }
     }
@@ -87,6 +100,7 @@ public class PowerManagement {
         Write-Host $msg
         [System.Windows.MessageBox]::Show($dlg_msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Exclamation)
         Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
+        Invoke-MicrowinBusyInfo -action "warning" -message $msg
         return
     }
 
@@ -101,8 +115,10 @@ public class PowerManagement {
     $mountDirExists = Test-Path $mountDir
     $scratchDirExists = Test-Path $scratchDir
     if (-not $mountDirExists -or -not $scratchDirExists) {
-        Write-Error "Required directories '$mountDirExists' '$scratchDirExists' and do not exist."
+        $msg = "Required directories '$mountDirExists' '$scratchDirExists' and do not exist."
+        Write-Error $msg
         Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
+        Invoke-MicrowinBusyInfo -action "warning" -message $msg
         return
     }
 
@@ -113,8 +129,10 @@ public class PowerManagement {
         if ($?) {
             Write-Host "The Windows image has been mounted successfully. Continuing processing..."
         } else {
-            Write-Host "Could not mount image. Exiting..."
+            $msg = "Could not mount image. Exiting..."
+            Write-Host $msg
             Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
+            Invoke-MicrowinBusyInfo -action "warning" -message $msg
             return
         }
 
@@ -157,6 +175,34 @@ public class PowerManagement {
             }
         }
 
+        if ($WPBT) {
+            Write-Host "Disabling WPBT Execution"
+            reg load HKLM\zSYSTEM "$($scratchDir)\Windows\System32\config\SYSTEM"
+            reg add "HKLM\zSYSTEM\ControlSet001\Control\Session Manager" /v DisableWpbtExecution /t REG_DWORD /d 1 /f
+            reg unload HKLM\zSYSTEM
+        }
+
+        if ($skipFla) {
+            Write-Host "Skipping first logon animation..."
+            reg load HKLM\zSOFTWARE "$($scratchDir)\Windows\System32\config\SOFTWARE"
+            reg add "HKLM\zSOFTWARE\Microsoft\Active Setup\Installed Components\CMP_NoFla" /f
+            reg add "HKLM\zSOFTWARE\Microsoft\Active Setup\Installed Components\CMP_NoFla" /ve /t REG_SZ /d "Stop First Logon Animation Process" /f
+            reg add "HKLM\zSOFTWARE\Microsoft\Active Setup\Installed Components\CMP_NoFla" /v StubPath /t REG_EXPAND_SZ /d '""%WINDIR%\System32\cmd.exe"" /C ""taskkill /f /im firstlogonanim.exe""' /f
+            reg unload HKLM\zSOFTWARE
+        }
+
+        if ($unsupported) {
+            Write-Host "Bypassing system requirements (locally)"
+            reg add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v "SV1" /t REG_DWORD /d 0 /f
+            reg add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v "SV2" /t REG_DWORD /d 0 /f
+            reg add "HKLM\SYSTEM\Setup\LabConfig" /v "BypassCPUCheck" /t REG_DWORD /d 1 /f
+            reg add "HKLM\SYSTEM\Setup\LabConfig" /v "BypassRAMCheck" /t REG_DWORD /d 1 /f
+            reg add "HKLM\SYSTEM\Setup\LabConfig" /v "BypassSecureBootCheck" /t REG_DWORD /d 1 /f
+            reg add "HKLM\SYSTEM\Setup\LabConfig" /v "BypassStorageCheck" /t REG_DWORD /d 1 /f
+            reg add "HKLM\SYSTEM\Setup\LabConfig" /v "BypassTPMCheck" /t REG_DWORD /d 1 /f
+            reg add "HKLM\SYSTEM\Setup\MoSetup" /v "AllowUpgradesWithUnsupportedTPMOrCPU" /t REG_DWORD /d 1 /f
+        }
+
         if ($importVirtIO) {
             Write-Host "Copying VirtIO drivers..."
             Microwin-CopyVirtIO
@@ -212,6 +258,20 @@ public class PowerManagement {
 
         Write-Host "Create unattend.xml"
 
+        if (($sync.MicrowinAutoConfigBox.Text -ne "") -and (Test-Path "$($sync.MicrowinAutoConfigBox.Text)"))
+        {
+            try
+            {
+                Write-Host "A configuration file has been specified. Copying to WIM file..."
+                Copy-Item "$($sync.MicrowinAutoConfigBox.Text)" "$($scratchDir)\winutil-config.json"
+            }
+            catch
+            {
+                Write-Host "The config file could not be copied. Continuing without it..."
+            }
+        }
+
+        # Create unattended answer file with user information - Check condition to learn more about this functionality
         if ($sync.MicrowinUserName.Text -eq "")
         {
             Microwin-NewUnattend -userName "User"
@@ -233,7 +293,6 @@ public class PowerManagement {
         Copy-Item "$env:temp\unattend.xml" "$($scratchDir)\Windows\Panther\unattend.xml" -force
         New-Item -ItemType Directory -Force -Path "$($scratchDir)\Windows\System32\Sysprep"
         Copy-Item "$env:temp\unattend.xml" "$($scratchDir)\Windows\System32\Sysprep\unattend.xml" -force
-        Copy-Item "$env:temp\unattend.xml" "$($scratchDir)\unattend.xml" -force
         Write-Host "Done Copy unattend.xml"
 
         Write-Host "Create FirstRun"
@@ -268,7 +327,6 @@ public class PowerManagement {
         reg add "HKLM\zSOFTWARE\Policies\Microsoft\Windows\Windows Chat" /v ChatIcon /t REG_DWORD /d 2 /f                             >$null 2>&1
         reg add "HKLM\zNTUSER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f        >$null 2>&1
         reg query "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Communications" /v "ConfigureChatAutoInstall"                      >$null 2>&1
-        # Write-Host Error code $LASTEXITCODE
         Write-Host "Done disabling Teams"
 
         Write-Host "Fix Windows Volume Mixer Issue"
@@ -295,11 +353,6 @@ public class PowerManagement {
                 'CrossDeviceUpdate'
             ) | ForEach-Object {
                 Write-Host "Removing Windows Expedited App: $_"
-
-                # Copied here After Installation (Online)
-                # reg delete "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Orchestrator\UScheduler\$_" /f | Out-Null
-
-                # When in Offline Image
                 reg delete "HKLM\zSOFTWARE\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\$_" /f | Out-Null
             }
         }
@@ -307,7 +360,6 @@ public class PowerManagement {
         reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "SearchboxTaskbarMode" /t REG_DWORD /d 0 /f
         Write-Host "Setting all services to start manually"
         reg add "HKLM\zSOFTWARE\CurrentControlSet\Services" /v Start /t REG_DWORD /d 3 /f
-        # Write-Host $LASTEXITCODE
 
         Write-Host "Enabling Local Accounts on OOBE"
         reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\OOBE" /v "BypassNRO" /t REG_DWORD /d "1" /f
@@ -362,18 +414,39 @@ public class PowerManagement {
     try {
 
         Write-Host "Exporting image into $mountDir\sources\install2.wim"
-        Export-WindowsImage -SourceImagePath "$mountDir\sources\install.wim" -SourceIndex $index -DestinationImagePath "$mountDir\sources\install2.wim" -CompressionType "Max"
+        try {
+            Export-WindowsImage -SourceImagePath "$mountDir\sources\install.wim" -SourceIndex $index -DestinationImagePath "$mountDir\sources\install2.wim" -CompressionType "Max"
+        } catch {
+            # Usually the case if it can't find unattend.dll on the host system. Guys, fix your corrupt messes that are your installations!
+            dism /english /export-image /sourceimagefile="$mountDir\sources\install.wim" /sourceindex=$index /destinationimagefile="$mountDir\sources\install2.wim" /compress:max
+        }
         Write-Host "Remove old '$mountDir\sources\install.wim' and rename $mountDir\sources\install2.wim"
         Remove-Item "$mountDir\sources\install.wim"
         Rename-Item "$mountDir\sources\install2.wim" "$mountDir\sources\install.wim"
 
         if (-not (Test-Path -Path "$mountDir\sources\install.wim")) {
-            Write-Error "Something went wrong and '$mountDir\sources\install.wim' doesn't exist. Please report this bug to the devs"
+            $msg = "Something went wrong. Please report this bug to the devs."
+            Write-Error "$($msg) '$($mountDir)\sources\install.wim' doesn't exist"
+            Invoke-MicrowinBusyInfo -action "warning" -message $msg
             Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
             return
         }
         Write-Host "Windows image completed. Continuing with boot.wim."
 
+        $esd = $sync.MicroWinESD.IsChecked
+        if ($esd) {
+            Write-Host "Converting install image to ESD."
+            try {
+                Export-WindowsImage -SourceImagePath "$mountDir\sources\install.wim" -SourceIndex $index -DestinationImagePath "$mountDir\sources\install.esd" -CompressionType "Recovery"
+                Remove-Item "$mountDir\sources\install.wim"
+                Write-Host "Converted install image to ESD."
+            } catch {
+                Start-Process -FilePath "$env:SystemRoot\System32\dism.exe" -ArgumentList "/export-image /sourceimagefile:`"$mountDir\sources\install.wim`" /sourceindex:1 /destinationimagefile:`"$mountDir\sources\install.esd`" /compress:recovery" -Wait -NoNewWindow
+                Remove-Item "$mountDir\sources\install.wim"
+                Write-Host "Converted install image to ESD."
+            }
+        }
+
         # Next step boot image
         Write-Host "Mounting boot image $mountDir\sources\boot.wim into $scratchDir"
         Mount-WindowsImage -ImagePath "$mountDir\sources\boot.wim" -Index 2 -Path "$scratchDir"
@@ -459,6 +532,7 @@ public class PowerManagement {
             $msg = "Done. ISO image is located here: $($SaveDialog.FileName)"
             Write-Host $msg
             Set-WinUtilTaskbaritem -state "None" -overlay "checkmark"
+            Invoke-MicrowinBusyInfo -action "done" -message "Finished!"
             [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Information)
         } else {
             Write-Host "ISO creation failed. The "$($mountDir)" directory has not been removed."
@@ -467,14 +541,16 @@ public class PowerManagement {
                 # Now, this will NOT throw an exception
                 $exitCode = New-Object System.ComponentModel.Win32Exception($LASTEXITCODE)
                 Write-Host "Reason: $($exitCode.Message)"
+                Invoke-MicrowinBusyInfo -action "warning" -message $exitCode.Message
+                Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
+                [System.Windows.MessageBox]::Show("MicroWin failed to make the ISO.", "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Error)
             } catch {
                 # Could not get error description from Windows APIs
             }
         }
 
-        $sync.MicrowinOptionsPanel.Visibility = 'Collapsed'
+        Toggle-MicrowinPanel 1
 
-        #$sync.MicrowinFinalIsoLocation.Text = "$env:temp\microwin.iso"
         $sync.MicrowinFinalIsoLocation.Text = "$($SaveDialog.FileName)"
         # Allow the machine to sleep again (optional)
         [PowerManagement]::SetThreadExecutionState(0)

functions/microwin/Invoke-MicrowinBusyInfo.ps1

@@ -0,0 +1,65 @@
+function Invoke-MicrowinBusyInfo {
+    <#
+    .DESCRIPTION
+    Function to display the busy info for the Microwin process
+    #>
+    [CmdletBinding(DefaultParameterSetName='done')]
+    param(
+        [Parameter(ParameterSetName='wip', Mandatory, Position = 0)]
+        [Parameter(ParameterSetName='warning', Mandatory, Position = 0)]
+        [Parameter(ParameterSetName='done', Mandatory, Position = 0)]
+        [Parameter(ParameterSetName='hide', Mandatory, Position = 0)]
+        [ValidateSet('wip', 'warning', 'done', 'hide')]
+        [string]$action,
+
+        [Parameter(ParameterSetName='wip', Mandatory, Position = 1)]
+        [Parameter(ParameterSetName='warning', Mandatory, Position = 1)]
+        [Parameter(ParameterSetName='done', Mandatory, Position = 1)]
+        [string]$message,
+
+        [Parameter(ParameterSetName='wip', Position = 2)] [bool]$interactive = $false
+    )
+
+    switch ($action) {
+        "wip" {
+            $sync.form.Dispatcher.BeginInvoke([action]{
+                $sync.MicrowinBusyIndicator.Visibility="Visible"
+                $finalMessage = ""
+                if ($interactive -eq $false) {
+                    $finalMessage += "Please wait. "
+                }
+                $finalMessage += $message
+                $sync.BusyText.Text = $finalMessage
+                $sync.BusyIcon.Foreground="#FFA500"
+                $sync.BusyText.Foreground="#FFA500"
+            })
+        }
+        "warning" {
+            $sync.form.Dispatcher.BeginInvoke([action]{
+                $sync.MicrowinBusyIndicator.Visibility="Visible"
+                $sync.BusyText.Text=$message
+                $sync.BusyText.Foreground="#FF0000"
+                $sync.BusyIcon.Foreground="#FF0000"
+            })
+        }
+        "done" {
+            $sync.form.Dispatcher.BeginInvoke([action]{
+                $sync.MicrowinBusyIndicator.Visibility="Visible"
+                $sync.BusyText.Text=$message
+                $sync.BusyText.Foreground="#00FF00"
+                $sync.BusyIcon.Foreground="#00FF00"
+            })
+        }
+        "hide" {
+            $sync.form.Dispatcher.BeginInvoke([action]{
+                $sync.MicrowinBusyIndicator.Visibility="Hidden"
+                $sync.BusyText.Foreground=$sync.Form.Resources.MicrowinBusyColor
+                $sync.BusyIcon.Foreground=$sync.Form.Resources.MicrowinBusyColor
+            })
+        }
+    }
+
+    # Force the UI to process pending messages
+    [System.Windows.Forms.Application]::DoEvents()
+    Start-Sleep -Milliseconds 50
+}

functions/microwin/Invoke-MicrowinGetIso.ps1

@@ -4,7 +4,7 @@ function Invoke-MicrowinGetIso {
     Function to get the path to Iso file for MicroWin, unpack that isom=, read basic information and populate the UI Options
     #>
 
-    Write-Host "Invoking WPFGetIso"
+    Write-Debug "Invoking WPFGetIso"
 
     if($sync.ProcessRunning) {
         $msg = "GetIso process is currently running."
@@ -12,10 +12,8 @@ function Invoke-MicrowinGetIso {
         return
     }
 
-    $sync.BusyMessage.Visibility="Visible"
-    $sync.BusyText.Text="N Busy"
-
-
+    # Provide immediate feedback to user
+    Invoke-MicrowinBusyInfo -action "wip" -message "Initializing MicroWin process..." -interactive $false
 
     Write-Host "         _                     __    __  _         "
     Write-Host "  /\/\  (_)  ___  _ __   ___  / / /\ \ \(_) _ __   "
@@ -23,47 +21,9 @@ function Invoke-MicrowinGetIso {
     Write-Host "/ /\/\ \| || (__ | |   | (_) | \  /\  / | || | | | "
     Write-Host "\/    \/|_| \___||_|    \___/   \/  \/  |_||_| |_| "
 
-    $oscdimgPath = Join-Path $env:TEMP 'oscdimg.exe'
-    $oscdImgFound = [bool] (Get-Command -ErrorAction Ignore -Type Application oscdimg.exe) -or (Test-Path $oscdimgPath -PathType Leaf)
-    Write-Host "oscdimg.exe on system: $oscdImgFound"
-
-    if (!$oscdImgFound) {
-        $downloadFromGitHub = $sync.WPFMicrowinDownloadFromGitHub.IsChecked
-        $sync.BusyMessage.Visibility="Hidden"
-
-        if (!$downloadFromGitHub) {
-            # only show the message to people who did check the box to download from github, if you check the box
-            # you consent to downloading it, no need to show extra dialogs
-            [System.Windows.MessageBox]::Show("oscdimge.exe is not found on the system, winutil will now attempt do download and install it using choco. This might take a long time.")
-            # the step below needs choco to download oscdimg
-            # Install Choco if not already present
-            Install-WinUtilChoco
-            $chocoFound = [bool] (Get-Command -ErrorAction Ignore -Type Application choco)
-            Write-Host "choco on system: $chocoFound"
-            if (!$chocoFound) {
-                [System.Windows.MessageBox]::Show("choco.exe is not found on the system, you need choco to download oscdimg.exe")
-                return
-            }
-
-            Start-Process -Verb runas -FilePath powershell.exe -ArgumentList "choco install windows-adk-oscdimg"
-            [System.Windows.MessageBox]::Show("oscdimg is installed, now close, reopen PowerShell terminal and re-launch winutil.ps1")
-            return
-        } else {
-            [System.Windows.MessageBox]::Show("oscdimge.exe is not found on the system, winutil will now attempt do download and install it from github. This might take a long time.")
-            Microwin-GetOscdimg -oscdimgPath $oscdimgPath
-            $oscdImgFound = Test-Path $oscdimgPath -PathType Leaf
-            if (!$oscdImgFound) {
-                $msg = "oscdimg was not downloaded can not proceed"
-                [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Error)
-                return
-            } else {
-                Write-Host "oscdimg.exe was successfully downloaded from github"
-            }
-        }
-    }
-
     if ($sync["ISOmanual"].IsChecked) {
         # Open file dialog to let user choose the ISO file
+        Invoke-MicrowinBusyInfo -action "wip" -message "Please select an ISO file..." -interactive $true
         [System.Reflection.Assembly]::LoadWithPartialName("System.windows.forms") | Out-Null
         $openFileDialog = New-Object System.Windows.Forms.OpenFileDialog
         $openFileDialog.initialDirectory = $initialDirectory
@@ -73,20 +33,26 @@ function Invoke-MicrowinGetIso {
 
         if ([string]::IsNullOrEmpty($filePath)) {
             Write-Host "No ISO is chosen"
-            $sync.BusyMessage.Visibility="Hidden"
+            Invoke-MicrowinBusyInfo -action "hide" -message " "
             return
         }
+
     } elseif ($sync["ISOdownloader"].IsChecked) {
         # Create folder browsers for user-specified locations
+        Invoke-MicrowinBusyInfo -action "wip" -message "Please select download location..." -interactive $true
         [System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms") | Out-Null
         $isoDownloaderFBD = New-Object System.Windows.Forms.FolderBrowserDialog
         $isoDownloaderFBD.Description = "Please specify the path to download the ISO file to:"
         $isoDownloaderFBD.ShowNewFolderButton = $true
         if ($isoDownloaderFBD.ShowDialog() -ne [System.Windows.Forms.DialogResult]::OK)
         {
+            Invoke-MicrowinBusyInfo -action "hide" -message " "
             return
         }
 
+        Set-WinUtilTaskbaritem -state "Indeterminate" -overlay "logo"
+        Invoke-MicrowinBusyInfo -action "wip" -message "Preparing to download ISO..." -interactive $false
+
         # Grab the location of the selected path
         $targetFolder = $isoDownloaderFBD.SelectedPath
 
@@ -95,6 +61,7 @@ function Invoke-MicrowinGetIso {
         $fidopath = "$env:temp\Fido.ps1"
         $originalLocation = $PSScriptRoot
 
+        Invoke-MicrowinBusyInfo -action "wip" -message "Downloading Fido script..." -interactive $false
         Invoke-WebRequest "https://github.com/pbatard/Fido/raw/master/Fido.ps1" -OutFile $fidopath
 
         Set-Location -Path $env:temp
@@ -105,11 +72,15 @@ function Invoke-MicrowinGetIso {
             $sync["ISOLanguage"].SelectedItem
         }
 
-        & $fidopath -Win 'Windows 11' -Rel $sync["ISORelease"].SelectedItem -Arch "x64" -Lang $lang -Ed "Windows 11 Home/Pro/Edu"
+        Invoke-MicrowinBusyInfo -action "wip" -message "Downloading Windows ISO... (This may take a long time)" -interactive $false
+        & $fidopath -Win 'Windows 11' -Rel Latest -Arch "x64" -Lang $lang
         if (-not $?)
         {
             Write-Host "Could not download the ISO file. Look at the output of the console for more information."
+            Write-Host "If you get an error about scripts is disabled on this system please close WinUtil and run - 'Set-ExecutionPolicy -ExecutionPolicy Unrestricted' and select 'A' and retry using MicroWin again."
             $msg = "The ISO file could not be downloaded"
+            Invoke-MicrowinBusyInfo -action "warning" -message $msg
+            Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
             [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Error)
             return
         }
@@ -131,8 +102,11 @@ function Invoke-MicrowinGetIso {
             }
             catch
             {
-                Write-Host "Unable to move the ISO file to the location you specified. The downloaded ISO is in the `"$env:TEMP`" folder"
+                $msg = "Unable to move the ISO file to the location you specified. The downloaded ISO is in the `"$env:TEMP`" folder"
+                Write-Host $msg
                 Write-Host "Error information: $($_.Exception.Message)" -ForegroundColor Yellow
+                Invoke-MicrowinBusyInfo -action "warning" -message $msg
+                return
             }
         }
     }
@@ -140,11 +114,57 @@ function Invoke-MicrowinGetIso {
     Write-Host "File path $($filePath)"
     if (-not (Test-Path -Path "$filePath" -PathType Leaf)) {
         $msg = "File you've chosen doesn't exist"
+        Invoke-MicrowinBusyInfo -action "warning" -message $msg
         [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Error)
         return
     }
 
     Set-WinUtilTaskbaritem -state "Indeterminate" -overlay "logo"
+    Invoke-MicrowinBusyInfo -action "wip" -message "Checking system requirements..." -interactive $false
+
+    $oscdimgPath = Join-Path $env:TEMP 'oscdimg.exe'
+    $oscdImgFound = [bool] (Get-Command -ErrorAction Ignore -Type Application oscdimg.exe) -or (Test-Path $oscdimgPath -PathType Leaf)
+    Write-Host "oscdimg.exe on system: $oscdImgFound"
+
+    if (!$oscdImgFound) {
+        $downloadFromGitHub = $sync.WPFMicrowinDownloadFromGitHub.IsChecked
+
+        if (!$downloadFromGitHub) {
+            # only show the message to people who did check the box to download from github, if you check the box
+            # you consent to downloading it, no need to show extra dialogs
+            [System.Windows.MessageBox]::Show("oscdimg.exe is not found on the system, winutil will now attempt do download and install it using choco. This might take a long time.")
+            # the step below needs choco to download oscdimg
+            # Install Choco if not already present
+            Install-WinUtilChoco
+            $chocoFound = [bool] (Get-Command -ErrorAction Ignore -Type Application choco)
+            Write-Host "choco on system: $chocoFound"
+            if (!$chocoFound) {
+                [System.Windows.MessageBox]::Show("choco.exe is not found on the system, you need choco to download oscdimg.exe")
+                return
+            }
+
+            Start-Process -Verb runas -FilePath powershell.exe -ArgumentList "choco install windows-adk-oscdimg"
+            $msg = "oscdimg is installed, now close, reopen PowerShell terminal and re-launch winutil.ps1"
+            Invoke-MicrowinBusyInfo -action "done" -message $msg        # We set it to done because it immediately returns from this function
+            [System.Windows.MessageBox]::Show($msg)
+            return
+        } else {
+            [System.Windows.MessageBox]::Show("oscdimg.exe is not found on the system, winutil will now attempt do download and install it from github. This might take a long time.")
+            Invoke-MicrowinBusyInfo -action "wip" -message "Downloading oscdimg.exe..." -interactive $false
+            Microwin-GetOscdimg -oscdimgPath $oscdimgPath
+            $oscdImgFound = Test-Path $oscdimgPath -PathType Leaf
+            if (!$oscdImgFound) {
+                $msg = "oscdimg was not downloaded can not proceed"
+                Invoke-MicrowinBusyInfo -action "warning" -message $msg
+                [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Error)
+                return
+            } else {
+                Write-Host "oscdimg.exe was successfully downloaded from github"
+            }
+        }
+    }
+
+    Invoke-MicrowinBusyInfo -action "wip" -message "Checking disk space..." -interactive $false
 
     # Detect the file size of the ISO and compare it with the free space of the system drive
     $isoSize = (Get-Item -Path "$filePath").Length
@@ -159,14 +179,17 @@ function Invoke-MicrowinGetIso {
     }
     elseif ($driveSpace -lt $isoSize) {
         # It's critical and we can't continue. Output an error
-        Write-Host "You don't have enough space for this operation. You need at least $([Math]::Round(($isoSize / ([Math]::Pow(1024, 2))) * 2, 2)) MB of free space to copy the ISO files to a temp directory and to be able to perform additional operations."
+        $msg = "You don't have enough space for this operation. You need at least $([Math]::Round(($isoSize / ([Math]::Pow(1024, 2))) * 2, 2)) MB of free space to copy the ISO files to a temp directory and to be able to perform additional operations."
+        Write-Host $msg
         Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
+        Invoke-MicrowinBusyInfo -action "warning" -message $msg
         return
     } else {
         Write-Host "You have enough space for this operation."
     }
 
     try {
+        Invoke-MicrowinBusyInfo -action "wip" -message "Mounting ISO file..." -interactive $false
         Write-Host "Mounting Iso. Please wait."
         $mountedISO = Mount-DiskImage -PassThru "$filePath"
         Write-Host "Done mounting Iso `"$($mountedISO.ImagePath)`""
@@ -174,10 +197,12 @@ function Invoke-MicrowinGetIso {
         Write-Host "Iso mounted to '$driveLetter'"
     } catch {
         # @ChrisTitusTech  please copy this wiki and change the link below to your copy of the wiki
-        Write-Error "Failed to mount the image. Error: $($_.Exception.Message)"
+        $msg = "Failed to mount the image. Error: $($_.Exception.Message)"
+        Write-Error $msg
         Write-Error "This is NOT winutil's problem, your ISO might be corrupt, or there is a problem on the system"
-        Write-Host "Please refer to this wiki for more details: https://christitustech.github.io/winutil/KnownIssues/#troubleshoot-errors-during-microwin-usage" -ForegroundColor Red
+        Write-Host "Please refer to this wiki for more details: https://winutil.christitus.com/knownissues/" -ForegroundColor Red
         Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
+        Invoke-MicrowinBusyInfo -action "warning" -message $msg
         return
     }
     # storing off values in hidden fields for further steps
@@ -236,23 +261,32 @@ function Invoke-MicrowinGetIso {
     try {
 
         #$data = @($driveLetter, $filePath)
+        Invoke-MicrowinBusyInfo -action "wip" -message "Creating directories..." -interactive $false
         New-Item -ItemType Directory -Force -Path "$($mountDir)" | Out-Null
         New-Item -ItemType Directory -Force -Path "$($scratchDir)" | Out-Null
+
+        Invoke-MicrowinBusyInfo -action "wip" -message "Copying Windows files... (This may take several minutes)" -interactive $false
         Write-Host "Copying Windows image. This will take awhile, please don't use UI or cancel this step!"
 
         # xcopy we can verify files and also not copy files that already exist, but hard to measure
         # xcopy.exe /E /I /H /R /Y /J $DriveLetter":" $mountDir >$null
-        $totalTime = Measure-Command { Copy-Files "$($driveLetter):" "$mountDir" -Recurse -Force }
+        $totalTime = Measure-Command {
+            Copy-Files "$($driveLetter):" "$mountDir" -Recurse -Force
+            # Force UI update during long operation
+            [System.Windows.Forms.Application]::DoEvents()
+        }
         Write-Host "Copy complete! Total Time: $($totalTime.Minutes) minutes, $($totalTime.Seconds) seconds"
 
+        Invoke-MicrowinBusyInfo -action "wip" -message "Processing Windows image..." -interactive $false
         $wimFile = "$mountDir\sources\install.wim"
         Write-Host "Getting image information $wimFile"
 
         if ((-not (Test-Path -Path "$wimFile" -PathType Leaf)) -and (-not (Test-Path -Path "$($wimFile.Replace(".wim", ".esd").Trim())" -PathType Leaf))) {
-            $msg = "Neither install.wim nor install.esd exist in the image, this could happen if you use unofficial Windows images. Please don't use shady images from the internet, use only official images. Here are instructions how to download ISO images if the Microsoft website is not showing the link to download and ISO. https://www.techrepublic.com/article/how-to-download-a-windows-10-iso-file-without-using-the-media-creation-tool/"
-            Write-Host $msg
-            [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Error)
+            $msg = "Neither install.wim nor install.esd exist in the image, this could happen if you use unofficial Windows images. Please don't use shady images from the internet."
+            Write-Host "$($msg) Only use official images. Here are instructions how to download ISO images if the Microsoft website is not showing the link to download and ISO. https://www.techrepublic.com/article/how-to-download-a-windows-10-iso-file-without-using-the-media-creation-tool/"
+            Invoke-MicrowinBusyInfo -action "warning" -message $msg
             Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
+            [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Error)
             throw
         }
         elseif ((-not (Test-Path -Path $wimFile -PathType Leaf)) -and (Test-Path -Path $wimFile.Replace(".wim", ".esd").Trim() -PathType Leaf)) {
@@ -265,23 +299,34 @@ function Invoke-MicrowinGetIso {
             $imageName = $_.ImageName
             $sync.MicrowinWindowsFlavors.Items.Add("$imageIdx : $imageName")
         }
+        [System.Windows.Forms.Application]::DoEvents()
+
         $sync.MicrowinWindowsFlavors.SelectedIndex = 0
         Write-Host "Finding suitable Pro edition. This can take some time. Do note that this is an automatic process that might not select the edition you want."
+        Invoke-MicrowinBusyInfo -action "wip" -message "Finding suitable Pro edition..." -interactive $false
+
         Get-WindowsImage -ImagePath $wimFile | ForEach-Object {
             if ((Get-WindowsImage -ImagePath $wimFile -Index $_.ImageIndex).EditionId -eq "Professional") {
                 # We have found the Pro edition
                 $sync.MicrowinWindowsFlavors.SelectedIndex = $_.ImageIndex - 1
             }
+            # Allow UI updates during this loop
+            [System.Windows.Forms.Application]::DoEvents()
         }
+
         Get-Volume $driveLetter | Get-DiskImage | Dismount-DiskImage
         Write-Host "Selected value '$($sync.MicrowinWindowsFlavors.SelectedValue)'....."
 
-        $sync.MicrowinOptionsPanel.Visibility = 'Visible'
+        Toggle-MicrowinPanel 2
+
     } catch {
         Write-Host "Dismounting bad image..."
         Get-Volume $driveLetter | Get-DiskImage | Dismount-DiskImage
         Remove-Item -Recurse -Force "$($scratchDir)"
         Remove-Item -Recurse -Force "$($mountDir)"
+        Invoke-MicrowinBusyInfo -action "warning" -message "Failed to read and unpack ISO"
+        Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
+
     }
 
     Write-Host "Done reading and unpacking ISO"
@@ -289,7 +334,7 @@ function Invoke-MicrowinGetIso {
     Write-Host "*********************************"
     Write-Host "Check the UI for further steps!!!"
 
-    $sync.BusyMessage.Visibility="Hidden"
+    Invoke-MicrowinBusyInfo -action "done" -message "Done! Proceed with customization."
     $sync.ProcessRunning = $false
     Set-WinUtilTaskbaritem -state "None" -overlay "checkmark"
 }

functions/microwin/Microwin-NewCheckInstall.ps1

@@ -1,6 +1,6 @@
 function Microwin-NewCheckInstall {
 
-    # using here string to embedd firstrun
+    # using here string to embed firstrun
     $checkInstall = @'
     @echo off
     if exist "%HOMEDRIVE%\windows\cpu.txt" (

functions/microwin/Microwin-NewFirstRun.ps1

@@ -1,6 +1,6 @@
 function Microwin-NewFirstRun {
 
-    # using here string to embedd firstrun
+    # using here string to embed firstrun
     $firstRun = @'
     # Set the global error action preference to continue
     $ErrorActionPreference = "Continue"
@@ -34,7 +34,9 @@ function Microwin-NewFirstRun {
 
     $taskbarPath = "$env:AppData\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar"
     # Delete all files on the Taskbar
-    Get-ChildItem -Path $taskbarPath -File | Remove-Item -Force
+    if (Test-Path "$taskbarPath") {
+        Get-ChildItem -Path $taskbarPath -File | Remove-Item -Force
+    }
     Remove-RegistryValue -RegistryPath "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Taskband" -ValueName "FavoritesRemovedChanges"
     Remove-RegistryValue -RegistryPath "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Taskband" -ValueName "FavoritesChanges"
     Remove-RegistryValue -RegistryPath "HKCU:\Software\Microsoft\Windows\CurrentVersion\Explorer\Taskband" -ValueName "Favorites"
@@ -85,6 +87,31 @@ function Microwin-NewFirstRun {
     reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Notifications\Settings\Windows.SystemToast.StartupApp" /v Enabled /t REG_DWORD /d 0 /f
     reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Notifications\Settings\Microsoft.SkyDrive.Desktop" /f
     reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Notifications\Settings\Microsoft.SkyDrive.Desktop" /v Enabled /t REG_DWORD /d 0 /f
+    reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Notifications\Settings\Windows.SystemToast.AccountHealth" /f
+    reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Notifications\Settings\Windows.SystemToast.AccountHealth" /v Enabled /t REG_DWORD /d 0 /f
+
+    # This will set List view in Start menu on Win11 25H2. This will not do anything in 24H2 and older
+    reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Start" /v AllAppsViewMode /t REG_DWORD /d 2 /f
+
+    # This will disable the Recommendations in 25H2. This is much simpler than the method used in 24H2 that requires the Education Environment policy
+    reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v Start_IrisRecommendations /t REG_DWORD /d 0 /f
+
+    # Other Start Menu settings
+    reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v Start_AccountNotifications /t REG_DWORD /d 0 /f
+    reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Start" /v ShowAllPinsList /t REG_DWORD /d 0 /f
+    reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Start" /v ShowFrequentList /t REG_DWORD /d 0 /f
+    reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Start" /v ShowRecentList /t REG_DWORD /d 0 /f
+    reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v Start_TrackDocs /t REG_DWORD /d 0 /f
+
+    Clear-Host
+    Write-Host "The taskbar will take around a minute to show up, but you can start using your computer now. Try pressing the Windows key to open the Start menu, or Windows + E to launch File Explorer."
+    Start-Sleep -Seconds 10
+
+    if (Test-Path -Path "$env:HOMEDRIVE\winutil-config.json")
+    {
+        Write-Host "Configuration file detected. Applying..."
+        iex "& { $(irm christitus.com/win) } -Config `"$env:HOMEDRIVE\winutil-config.json`" -Run"
+    }
 
 '@
     $firstRun | Out-File -FilePath "$env:temp\FirstStartup.ps1" -Force

functions/microwin/Toggle-MicrowinPanel.ps1

@@ -0,0 +1,28 @@
+function Toggle-MicrowinPanel {
+    <#
+    .SYNOPSIS
+    Toggles the visibility of the Microwin options and ISO panels in the GUI.
+    .DESCRIPTION
+    This function toggles the visibility of the Microwin options and ISO panels in the GUI.
+    .PARAMETER MicrowinOptionsPanel
+    The panel containing Microwin options.
+    .PARAMETER MicrowinISOPanel
+    The panel containing the Microwin ISO options.
+    .EXAMPLE
+    Toggle-MicrowinPanel 1
+    #>
+    param (
+        [Parameter(Mandatory = $true, Position = 0)]
+        [ValidateSet(1, 2)]
+        [int]$PanelNumber
+    )
+
+    if ($PanelNumber -eq 1) {
+        $sync.MicrowinISOPanel.Visibility = 'Visible'
+        $sync.MicrowinOptionsPanel.Visibility = 'Collapsed'
+
+    } elseif ($PanelNumber -eq 2) {
+        $sync.MicrowinOptionsPanel.Visibility = 'Visible'
+        $sync.MicrowinISOPanel.Visibility = 'Collapsed'
+    }
+}

functions/private/Add-SelectedAppsMenuItem.ps1

@@ -41,7 +41,7 @@
         $selectedAppRemoveButton.Add_MouseEnter({ $this.Foreground = "Red" })
         $selectedAppRemoveButton.Add_MouseLeave({ $this.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "MainForegroundColor") })
         $selectedAppRemoveButton.Add_Click({
-            $sync.($this.Tag).isChecked = $false # On click of the remove button, we only have to uncheck the corresponding checkbox. This will kick of all neccessary changes to update the UI
+            $sync.($this.Tag).isChecked = $false # On click of the remove button, we only have to uncheck the corresponding checkbox. This will kick of all necessary changes to update the UI
         })
         [System.Windows.Controls.Grid]::SetColumn($selectedAppRemoveButton, 1)
         $selectedAppGrid.Children.Add($selectedAppRemoveButton)

functions/private/Get-LocalizedYesNo.ps1

@@ -13,7 +13,7 @@ function Get-LocalizedYesNo {
     #>
 
     # Run choice and capture its options as output
-    # The output shows the options for Yes and No as "[Y,N]?" in the (partitially) localized format.
+    # The output shows the options for Yes and No as "[Y,N]?" in the (partially) localized format.
     # eg. English: [Y,N]?
     # Dutch: [Y,N]?
     # German: [J,N]?

functions/private/Get-WinUtilSelectedPackages.ps1

@@ -33,7 +33,7 @@ function Get-WinUtilSelectedPackages
             "Choco" {
                 if ($package.choco -eq "na") {
                     Write-Debug "$($package.content) has no Choco value."
-                    $packagesWinget.add($package.winget)
+                    $null = $packagesWinget.add($($package.winget))
                     Write-Host "Queueing $($package.winget) for Winget"
                 } else {
                     $null = $packagesChoco.add($package.choco)
@@ -44,7 +44,7 @@ function Get-WinUtilSelectedPackages
             "Winget" {
                 if ($package.winget -eq "na") {
                     Write-Debug "$($package.content) has no Winget value."
-                    $packagesChoco.add($package.choco)
+                    $null = $packagesChoco.add($package.choco)
                     Write-Host "Queueing $($package.choco) for Chocolatey"
                 } else {
                     $null = $packagesWinget.add($($package.winget))

functions/private/Hide-WPFInstallAppBusy.ps1

@@ -0,0 +1,12 @@
+function Hide-WPFInstallAppBusy {
+    <#
+    .SYNOPSIS
+        Hides the busy overlay in the install app area of the WPF form.
+        This is used to indicate that an install or uninstall has finished.
+    #>
+    $sync.form.Dispatcher.Invoke([action]{
+        $sync.InstallAppAreaOverlay.Visibility = [Windows.Visibility]::Collapsed
+        $sync.InstallAppAreaBorder.IsEnabled = $true
+        $sync.InstallAppAreaScrollViewer.Effect.Radius = 0
+    })
+}

functions/private/Initialize-InstallAppArea.ps1

@@ -5,8 +5,10 @@
                 This is used as the parent object for all category and app entries on the install tab
                 Used to as part of the Install Tab UI generation
 
+                Also creates an overlay with a progress bar and text to indicate that an install or uninstall is in progress
+
             .PARAMETER TargetElement
-                The element to which the AppArea shoud be added
+                The element to which the AppArea should be added
 
         #>
         param($TargetElement)
@@ -17,6 +19,7 @@
         $Border = New-Object Windows.Controls.Border
         $Border.VerticalAlignment = "Stretch"
         $Border.SetResourceReference([Windows.Controls.Control]::StyleProperty, "BorderStyle")
+        $sync.InstallAppAreaBorder = $Border
 
         # Add a ScrollViewer, because the ItemsControl does not support scrolling by itself
         $scrollViewer = New-Object Windows.Controls.ScrollViewer
@@ -24,11 +27,19 @@
         $scrollViewer.HorizontalAlignment = 'Stretch'
         $scrollViewer.VerticalAlignment = 'Stretch'
         $scrollViewer.CanContentScroll = $true
+        $sync.InstallAppAreaScrollViewer = $scrollViewer
+        $Border.Child = $scrollViewer
+
+        # Initialize the Blur Effect for the ScrollViewer, which will be used to indicate that an install/uninstall is in progress
+        $blurEffect = New-Object Windows.Media.Effects.BlurEffect
+        $blurEffect.Radius = 0
+        $scrollViewer.Effect = $blurEffect
 
         ## Create the ItemsControl, which will be the parent of all the app entries
         $itemsControl = New-Object Windows.Controls.ItemsControl
         $itemsControl.HorizontalAlignment = 'Stretch'
         $itemsControl.VerticalAlignment = 'Stretch'
+        $scrollViewer.Content = $itemsControl
 
         # Enable virtualization for the ItemsControl to improve performance (It's hard to test if this is actually working, so if you know what you're doing, please check this)
         $itemsPanelTemplate = New-Object Windows.Controls.ItemsPanelTemplate
@@ -38,8 +49,64 @@
         $itemsControl.SetValue([Windows.Controls.VirtualizingStackPanel]::IsVirtualizingProperty, $true)
         $itemsControl.SetValue([Windows.Controls.VirtualizingStackPanel]::VirtualizationModeProperty, [Windows.Controls.VirtualizationMode]::Recycling)
 
-        $scrollViewer.Content = $itemsControl
-        $Border.Child = $scrollViewer
-        $null = $targetGrid.Children.Add($Border)
+        # Add the Border containing the App Area to the target Grid
+        $targetGrid.Children.Add($Border) | Out-Null
+
+        $overlay = New-Object Windows.Controls.Border
+        $overlay.CornerRadius = New-Object Windows.CornerRadius(10)
+        $overlay.SetResourceReference([Windows.Controls.Control]::BackgroundProperty, "AppInstallOverlayBackgroundColor")
+        $overlay.Visibility = [Windows.Visibility]::Collapsed
+
+        # Also add the overlay to the target Grid on top of the App Area
+        $targetGrid.Children.Add($overlay) | Out-Null
+        $sync.InstallAppAreaOverlay = $overlay
+
+        $overlayText = New-Object Windows.Controls.TextBlock
+        $overlayText.Text = "Installing apps..."
+        $overlayText.HorizontalAlignment = 'Center'
+        $overlayText.VerticalAlignment = 'Center'
+        $overlayText.SetResourceReference([Windows.Controls.TextBlock]::ForegroundProperty, "MainForegroundColor")
+        $overlayText.Background = "Transparent"
+        $overlayText.SetResourceReference([Windows.Controls.TextBlock]::FontSizeProperty, "HeaderFontSize")
+        $overlayText.SetResourceReference([Windows.Controls.TextBlock]::FontFamilyProperty, "MainFontFamily")
+        $overlayText.SetResourceReference([Windows.Controls.TextBlock]::FontWeightProperty, "MainFontWeight")
+        $overlayText.SetResourceReference([Windows.Controls.TextBlock]::MarginProperty, "MainMargin")
+        $sync.InstallAppAreaOverlayText = $overlayText
+
+        $progressbar = New-Object Windows.Controls.ProgressBar
+        $progressbar.Name = "ProgressBar"
+        $progressbar.Width = 250
+        $progressbar.Height = 50
+        $sync.ProgressBar = $progressbar
+
+        # Add a TextBlock overlay for the progress bar text
+        $progressBarTextBlock = New-Object Windows.Controls.TextBlock
+        $progressBarTextBlock.Name = "progressBarTextBlock"
+        $progressBarTextBlock.FontWeight = [Windows.FontWeights]::Bold
+        $progressBarTextBlock.FontSize = 16
+        $progressBarTextBlock.Width = $progressbar.Width
+        $progressBarTextBlock.Height = $progressbar.Height
+        $progressBarTextBlock.SetResourceReference([Windows.Controls.TextBlock]::ForegroundProperty, "ProgressBarTextColor")
+        $progressBarTextBlock.TextTrimming = "CharacterEllipsis"
+        $progressBarTextBlock.Background = "Transparent"
+        $sync.progressBarTextBlock = $progressBarTextBlock
+
+        # Create a Grid to overlay the text on the progress bar
+        $progressGrid = New-Object Windows.Controls.Grid
+        $progressGrid.Width = $progressbar.Width
+        $progressGrid.Height = $progressbar.Height
+        $progressGrid.Margin = "0,10,0,10"
+        $progressGrid.Children.Add($progressbar) | Out-Null
+        $progressGrid.Children.Add($progressBarTextBlock) | Out-Null
+
+        $overlayStackPanel = New-Object Windows.Controls.StackPanel
+        $overlayStackPanel.Orientation = "Vertical"
+        $overlayStackPanel.HorizontalAlignment = 'Center'
+        $overlayStackPanel.VerticalAlignment = 'Center'
+        $overlayStackPanel.Children.Add($overlayText) | Out-Null
+        $overlayStackPanel.Children.Add($progressGrid) | Out-Null
+
+        $overlay.Child = $overlayStackPanel
+
         return $itemsControl
     }

functions/private/Initialize-InstallAppEntry.ps1

@@ -1,7 +1,7 @@
 function Initialize-InstallAppEntry {
     <#
         .SYNOPSIS
-            Creates the app entry to be placed on the isntall tab for a given app
+            Creates the app entry to be placed on the install tab for a given app
             Used to as part of the Install Tab UI generation
         .PARAMETER TargetElement
             The Element into which the Apps should be placed

functions/private/Initialize-InstallCategoryAppList.ps1

@@ -24,7 +24,9 @@ function Initialize-InstallCategoryAppList {
             $toggleButton = New-Object Windows.Controls.Label
             $toggleButton.Content = "$Category"
             $toggleButton.Tag = "CategoryToggleButton"
-            $sync.$Category = $Category
+            $toggleButton.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "HeaderFontSize")
+            $toggleButton.SetResourceReference([Windows.Controls.Control]::FontFamilyProperty, "HeaderFontFamily")
+            $sync.$Category = $toggleButton
 
             $null = $TargetElement.Items.Add($toggleButton)
         }

functions/private/Install-WinUtilProgramWinget.ps1

@@ -30,24 +30,16 @@ Function Install-WinUtilProgramWinget {
     .PARAMETER wingetId
     The Id of the Program that Winget should Install/Uninstall
 
-    .PARAMETER scope
-    Determines the installation mode. Can be "user" or "machine" (For more info look at the winget documentation)
-
-    .PARAMETER credential
-    The PSCredential Object of the user that should be used to run winget
-
     .NOTES
     Invoke Winget uses the public variable $Action defined outside the function to determine if a Program should be installed or removed
     #>
         param (
-            [string]$wingetId,
-            [string]$scope = "",
-            [PScredential]$credential = $null
+            [string]$wingetId
         )
 
         $commonArguments = "--id $wingetId --silent"
         $arguments = if ($Action -eq "Install") {
-            "install $commonArguments --accept-source-agreements --accept-package-agreements $(if ($scope) {" --scope $scope"})"
+            "install $commonArguments --accept-source-agreements --accept-package-agreements"
         } else {
             "uninstall $commonArguments"
         }
@@ -60,10 +52,6 @@ Function Install-WinUtilProgramWinget {
             NoNewWindow = $true
         }
 
-        if ($credential) {
-            $processParams.credential = $credential
-        }
-
         return (Start-Process @processParams).ExitCode
     }
 
@@ -87,28 +75,6 @@ Function Install-WinUtilProgramWinget {
             return $true
         }
 
-        Write-Host "Attempt installation of $($Program) with User scope"
-        $status = Invoke-Winget -wingetId $Program -scope "user"
-        if ($status -eq 0) {
-            Write-Host "$($Program) installed successfully with User scope."
-            return $true
-        } elseif ($status -eq -1978335189) {
-            Write-Host "$($Program) No applicable update found"
-            return $true
-        }
-
-        $userChoice = [System.Windows.MessageBox]::Show("Do you want to attempt $($Program) installation with specific user credentials? Select 'Yes' to proceed or 'No' to skip.", "User credential Prompt", [System.Windows.MessageBoxButton]::YesNo)
-        if ($userChoice -eq 'Yes') {
-            $getcreds = Get-Credential
-            $status = Invoke-Winget -wingetId $Program -credential $getcreds
-            if ($status -eq 0) {
-                Write-Host "$($Program) installed successfully with User prompt."
-                return $true
-            }
-        } else {
-            Write-Host "Skipping installation with specific user credentials."
-        }
-
         Write-Host "Failed to install $($Program)."
         return $false
     }

functions/private/Install-WinUtilWinget.ps1

@@ -52,6 +52,10 @@ function Install-WinUtilWinget {
 
             # Check if Windows version supports Repair-WinGetPackageManager (24H2 and above)
             if ([System.Environment]::OSVersion.Version.Build -ge 26100) {
+                Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force
+                Set-PSRepository -Name PSGallery -InstallationPolicy Trusted
+                Install-Module "Microsoft.WinGet.Client" -Force
+                Import-Module Microsoft.WinGet.Client
                 Repair-WinGetPackageManager -Force -Latest -Verbose
                 # Verify if repair was successful
                 $wingetCmd = Get-Command winget -ErrorAction Stop

functions/private/Invoke-WinUtilFontScaling.ps1

@@ -0,0 +1,88 @@
+function Invoke-WinUtilFontScaling {
+    <#
+
+    .SYNOPSIS
+        Applies UI and font scaling for accessibility
+
+    .PARAMETER ScaleFactor
+        Sets the scaling from 0.75 and 2.0.
+        Default is 1.0 (100% - no scaling)
+
+    .EXAMPLE
+        Invoke-WinUtilFontScaling -ScaleFactor 1.25
+        # Applies 125% scaling
+    #>
+
+    param (
+        [double]$ScaleFactor = 1.0
+    )
+
+    # Validate if scale factor is within the range
+    if ($ScaleFactor -lt 0.75 -or $ScaleFactor -gt 2.0) {
+        Write-Warning "Scale factor must be between 0.75 and 2.0. Using 1.0 instead."
+        $ScaleFactor = 1.0
+    }
+
+    # Define an array for resources to be scaled
+    $fontResources = @(
+        # Fonts
+        "FontSize",
+        "ButtonFontSize",
+        "HeaderFontSize",
+        "TabButtonFontSize",
+        "ConfigTabButtonFontSize",
+        "IconFontSize",
+        "SettingsIconFontSize",
+        "CloseIconFontSize",
+        "AppEntryFontSize",
+        "SearchBarTextBoxFontSize",
+        "SearchBarClearButtonFontSize",
+        "CustomDialogFontSize",
+        "CustomDialogFontSizeHeader",
+        "ConfigUpdateButtonFontSize",
+        # Buttons and UI
+        "CheckBoxBulletDecoratorSize",
+        "ButtonWidth",
+        "ButtonHeight",
+        "TabButtonWidth",
+        "TabButtonHeight",
+        "IconButtonSize",
+        "AppEntryWidth",
+        "SearchBarWidth",
+        "SearchBarHeight",
+        "CustomDialogWidth",
+        "CustomDialogHeight",
+        "CustomDialogLogoSize",
+        "MicroWinLogoSize",
+        "ToolTipWidth"
+    )
+
+    # Apply scaling to each resource
+    foreach ($resourceName in $fontResources) {
+        try {
+            # Get the default font size from the theme configuration
+            $originalValue = $sync.configs.themes.shared.$resourceName
+            if ($originalValue) {
+                # Convert string to double since values are stored as strings
+                $originalValue = [double]$originalValue
+                # Calculates and applies the new font size
+                $newValue = [math]::Round($originalValue * $ScaleFactor, 1)
+                $sync.Form.Resources[$resourceName] = $newValue
+                Write-Debug "Scaled $resourceName from original $originalValue to $newValue (factor: $ScaleFactor)"
+            }
+        }
+        catch {
+            Write-Warning "Failed to scale resource $resourceName : $_"
+        }
+    }
+
+    # Update the font scaling percentage displayed on the UI
+    if ($sync.FontScalingValue) {
+        $percentage = [math]::Round($ScaleFactor * 100)
+        $sync.FontScalingValue.Text = "$percentage%"
+    }
+
+    Write-Debug "Font scaling applied with factor: $ScaleFactor"
+}
+
+

functions/private/Invoke-WinUtilTweaks.ps1

@@ -21,10 +21,6 @@ function Invoke-WinUtilTweaks {
         $KeepServiceStartup = $true
     )
 
-    if ($Checkbox -contains "Toggle") {
-        $CheckBox = $sync.configs.tweaks.$CheckBox
-    }
-
     Write-Debug "Tweaks: $($CheckBox)"
     if($undo) {
         $Values = @{
@@ -54,7 +50,7 @@ function Invoke-WinUtilTweaks {
         $sync.configs.tweaks.$CheckBox.service | ForEach-Object {
             $changeservice = $true
 
-        # The check for !($undo) is required, without it the script will throw an error for accessing unavailable memeber, which's the 'OriginalService' Property
+        # The check for !($undo) is required, without it the script will throw an error for accessing unavailable member, which's the 'OriginalService' Property
             if($KeepServiceStartup -AND !($undo)) {
                 try {
                     # Check if the service exists

functions/private/Set-PackageManagerPreference.ps1

@@ -6,35 +6,35 @@ function Set-PackageManagerPreference {
 
         Reads from preference.ini if no argument sent.
 
-    .PARAMETER preferedPackageManager
+    .PARAMETER preferredPackageManager
         The PackageManager that was selected.
     #>
     param(
         [Parameter(Position=0, Mandatory=$false)]
-        [PackageManagers]$preferedPackageManager
+        [PackageManagers]$preferredPackageManager
     )
 
     $preferencePath = "$env:LOCALAPPDATA\winutil\preferences.ini"
     $oldChocoPath = "$env:LOCALAPPDATA\winutil\preferChocolatey.ini"
 
     #Try loading from file if no argument given.
-    if ($null -eq $preferedPackageManager) {
+    if ($null -eq $preferredPackageManager) {
         # Backwards compat for preferChocolatey.ini
         if (Test-Path -Path $oldChocoPath) {
-            $preferedPackageManager = [PackageManagers]::Choco
+            $preferredPackageManager = [PackageManagers]::Choco
             Remove-Item -Path $oldChocoPath
         }
         elseif (Test-Path -Path $preferencePath) {
             $potential = Get-Content -Path $preferencePath -TotalCount 1
-            $preferedPackageManager = [PackageManagers]$potential
+            $preferredPackageManager = [PackageManagers]$potential
         }
         else {
             Write-Debug "Creating new preference file, defaulting to winget."
-            $preferedPackageManager = [PackageManagers]::Winget
+            $preferredPackageManager = [PackageManagers]::Winget
         }
     }
 
-    $sync["ManagerPreference"] = [PackageManagers]::$preferedPackageManager
+    $sync["ManagerPreference"] = [PackageManagers]::$preferredPackageManager
     Write-Debug "Manager Preference changed to '$($sync["ManagerPreference"])'"
 
 

functions/private/Set-WinUtilProgressbar.ps1

@@ -4,27 +4,21 @@ function Set-WinUtilProgressbar{
         This function is used to Update the Progress Bar displayed in the winutil GUI.
         It will be automatically hidden if the user clicks something and no process is running
     .PARAMETER Label
-        The Text to be overlayed onto the Progress Bar
+        The Text to be overlaid onto the Progress Bar
     .PARAMETER PERCENT
         The percentage of the Progress Bar that should be filled (0-100)
-    .PARAMETER Hide
-        If provided, the Progress Bar and the label will be hidden
     #>
     param(
         [string]$Label,
         [ValidateRange(0,100)]
-        [int]$Percent,
-        $Hide
+        [int]$Percent
     )
-    if ($hide) {
-        $sync.form.Dispatcher.Invoke([action]{$sync.ProgressBarLabel.Visibility = "Collapsed"})
-        $sync.form.Dispatcher.Invoke([action]{$sync.ProgressBar.Visibility = "Collapsed"})
-    } else {
-        $sync.form.Dispatcher.Invoke([action]{$sync.ProgressBarLabel.Visibility = "Visible"})
-        $sync.form.Dispatcher.Invoke([action]{$sync.ProgressBar.Visibility = "Visible"})
+
+    $sync.form.Dispatcher.Invoke([action]{$sync.progressBarTextBlock.Text = $label})
+    $sync.form.Dispatcher.Invoke([action]{$sync.progressBarTextBlock.ToolTip = $label})
+    if ($percent -lt 5 ) {
+        $percent = 5 # Ensure the progress bar is not empty, as it looks weird
     }
-    $sync.form.Dispatcher.Invoke([action]{$sync.ProgressBarLabel.Content.Text = $label})
-    $sync.form.Dispatcher.Invoke([action]{$sync.ProgressBarLabel.Content.ToolTip = $label})
     $sync.form.Dispatcher.Invoke([action]{ $sync.ProgressBar.Value = $percent})
 
 }

functions/private/Set-WinUtilService.ps1

@@ -24,8 +24,12 @@ Function Set-WinUtilService {
         # Check if the service exists
         $service = Get-Service -Name $Name -ErrorAction Stop
 
-        # Service exists, proceed with changing properties
-        $service | Set-Service -StartupType $StartupType -ErrorAction Stop
+        # Service exists, proceed with changing properties -- while handling auto delayed start for PWSH 5
+        if (($PSVersionTable.PSVersion.Major -lt 7) -and ($StartupType -eq "AutomaticDelayedStart")) {
+            sc.exe config $Name start=delayed-auto
+        } else {
+            $service | Set-Service -StartupType $StartupType -ErrorAction Stop
+        }
     } catch [System.ServiceProcess.ServiceNotFoundException] {
         Write-Warning "Service $Name was not found"
     } catch {

functions/private/Show-WPFInstallAppBusy.ps1

@@ -0,0 +1,21 @@
+function Show-WPFInstallAppBusy {
+    <#
+    .SYNOPSIS
+        Displays a busy overlay in the install app area of the WPF form.
+        This is used to indicate that an install or uninstall is in progress.
+        Dynamically updates the size of the overlay based on the app area on each invocation.
+    .PARAMETER text
+        The text to display in the busy overlay. Defaults to "Installing apps...".
+    #>
+    param (
+        $text = "Installing apps..."
+    )
+    $sync.form.Dispatcher.Invoke([action]{
+        $sync.InstallAppAreaOverlay.Visibility = [Windows.Visibility]::Visible
+        $sync.InstallAppAreaOverlay.Width = $($sync.InstallAppAreaScrollViewer.ActualWidth * 0.4)
+        $sync.InstallAppAreaOverlay.Height = $($sync.InstallAppAreaScrollViewer.ActualWidth * 0.4)
+        $sync.InstallAppAreaOverlayText.Text = $text
+        $sync.InstallAppAreaBorder.IsEnabled = $false
+        $sync.InstallAppAreaScrollViewer.Effect.Radius = 5
+        })
+    }

functions/private/Test-WinUtilInternetConnection.ps1

@@ -0,0 +1,26 @@
+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/Test-WinUtilPackageManager.ps1

@@ -33,7 +33,7 @@ function Test-WinUtilPackageManager {
                 $wingetVersionFull = ($wingetInfo | Select-String -Pattern 'Package Manager v\d+\.\d+\.\d+').Matches.Value.Split(' ')[-1]
             }
         } catch [System.Management.Automation.CommandNotFoundException], [System.Management.Automation.ApplicationFailedException] {
-            Write-Warning "Winget was not found due to un-availablity reasons"
+            Write-Warning "Winget was not found due to un-availability reasons"
             $wingetExists = $false
         } catch {
             Write-Warning "Winget was not found due to un-known reasons, The Stack Trace is:`n$($psitem.Exception.StackTrace)"
@@ -41,7 +41,7 @@ function Test-WinUtilPackageManager {
         }
 
         # If Winget is available, Parse it's Version and give proper information to Terminal Output.
-    # If it isn't available, the return of this funtion will be "not-installed", indicating that
+    # If it isn't available, the return of this function will be "not-installed", indicating that
         # Winget isn't installed/available on The System.
     if ($wingetExists) {
             # Check if Preview Version
@@ -55,7 +55,7 @@ function Test-WinUtilPackageManager {
 
             # Check if Winget's Version is too old.
             $wingetCurrentVersion = [System.Version]::Parse($wingetVersion.Trim('v'))
-            # Grabs the latest release of Winget from the Github API for version check process.
+            # Grabs the latest release of Winget from the GitHub API for version check process.
             $response = winget search -e Microsoft.AppInstaller --accept-source-agreements
             $wingetLatestVersion = ($response | Select-String -Pattern '\d+\.\d+\.\d+\.\d+').Matches.Value
             Write-Host "Latest Search Version: $wingetLatestVersion" -ForegroundColor White

functions/private/Uninstall-WinUtilEdgeBrowser.ps1

@@ -1,138 +0,0 @@
-Function Uninstall-WinUtilEdgeBrowser {
-    <#
-    .SYNOPSIS
-        Uninstall the Edge Browser (Chromium) from the system in an elegant way.
-    .DESCRIPTION
-        This will switch up the region to one of the EEA countries temporarily and uninstall the Edge Browser (Chromium).
-    #>
-
-    param (
-        [Parameter(Mandatory = $true)]
-        [ValidateSet("install", "uninstall")]
-        [string]$action
-    )
-
-    function Uninstall-EdgeClient {
-        param (
-            [Parameter(Mandatory = $true)]
-            [string]$Key
-        )
-
-        $originalNation = [microsoft.win32.registry]::GetValue('HKEY_USERS\.DEFAULT\Control Panel\International\Geo', 'Nation', [Microsoft.Win32.RegistryValueKind]::String)
-
-        # Set Nation to any of the EEA regions temporarily
-        # Refer: https://learn.microsoft.com/en-us/windows/win32/intl/table-of-geographical-locations
-        $tmpNation = 68 # Ireland
-        [microsoft.win32.registry]::SetValue('HKEY_USERS\.DEFAULT\Control Panel\International\Geo', 'Nation', $tmpNation, [Microsoft.Win32.RegistryValueKind]::String) | Out-Null
-
-        $baseKey = 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate'
-        $registryPath = $baseKey + '\ClientState\' + $Key
-
-        if (!(Test-Path -Path $registryPath)) {
-            Write-Host "[$Mode] Registry key not found: $registryPath"
-            return
-        }
-
-        # Remove the status flag
-        Remove-ItemProperty -Path $baseKey -Name "IsEdgeStableUninstalled" -ErrorAction SilentlyContinue | Out-Null
-
-        Remove-ItemProperty -Path $registryPath -Name "experiment_control_labels" -ErrorAction SilentlyContinue | Out-Null
-
-        $uninstallString = (Get-ItemProperty -Path $registryPath).UninstallString
-        $uninstallArguments = (Get-ItemProperty -Path $registryPath).UninstallArguments
-
-        if ([string]::IsNullOrEmpty($uninstallString) -or [string]::IsNullOrEmpty($uninstallArguments)) {
-            Write-Host "[$Mode] Cannot find uninstall methods for $Mode"
-            return
-        }
-
-        # Extra arguments to nuke it
-        $uninstallArguments += " --force-uninstall --delete-profile"
-
-        # $uninstallCommand = "`"$uninstallString`"" + $uninstallArguments
-        if (!(Test-Path -Path $uninstallString)) {
-            Write-Host "[$Mode] setup.exe not found at: $uninstallString"
-            return
-        }
-        Start-Process -FilePath $uninstallString -ArgumentList $uninstallArguments -Wait -NoNewWindow -Verbose
-
-        # Restore Nation back to the original
-        [microsoft.win32.registry]::SetValue('HKEY_USERS\.DEFAULT\Control Panel\International\Geo', 'Nation', $originalNation, [Microsoft.Win32.RegistryValueKind]::String) | Out-Null
-
-        # might not exist in some cases
-        if ((Get-ItemProperty -Path $baseKey).IsEdgeStableUninstalled -eq 1) {
-            Write-Host "[$Mode] Edge Stable has been successfully uninstalled"
-        }
-    }
-
-    function Uninstall-Edge {
-        Remove-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge" -Name "NoRemove" -ErrorAction SilentlyContinue | Out-Null
-
-        [microsoft.win32.registry]::SetValue("HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdateDev", "AllowUninstall", 1, [Microsoft.Win32.RegistryValueKind]::DWord) | Out-Null
-
-        Uninstall-EdgeClient -Key '{56EB18F8-B008-4CBD-B6D2-8C97FE7E9062}'
-
-        Remove-Item -Path "Computer\\HKEY_CLASSES_ROOT\\MSEdgePDF" -ErrorAction SilentlyContinue | Out-Null
-        Remove-Item -Path "Computer\\HKEY_CLASSES_ROOT\\MSEdgeHTM" -ErrorAction SilentlyContinue | Out-Null
-        Remove-Item -Path "Computer\\HKEY_CLASSES_ROOT\\MSEdgeMHT" -ErrorAction SilentlyContinue | Out-Null
-
-        # Remove Edge Polocy reg keys
-        Remove-Item -Path "HKLM:\SOFTWARE\Policies\Microsoft\Edge" -Recurse -ErrorAction SilentlyContinue | Out-Null
-
-        # Remove Edge reg keys
-        Remove-Item -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Edge" -Recurse -ErrorAction SilentlyContinue | Out-Null
-    }
-
-    function Uninstall-WebView {
-        # FIXME: might not work on some systems
-
-        Remove-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft EdgeWebView" -Name "NoRemove" -ErrorAction SilentlyContinue | Out-Null
-
-        Uninstall-EdgeClient -Key '{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}'
-    }
-
-    function Uninstall-EdgeUpdate {
-        # FIXME: might not work on some systems
-
-        Remove-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Microsoft Edge Update" -Name "NoRemove" -ErrorAction SilentlyContinue | Out-Null
-
-        $registryPath = 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate'
-        if (!(Test-Path -Path $registryPath)) {
-            Write-Host "Registry key not found: $registryPath"
-            return
-        }
-        $uninstallCmdLine = (Get-ItemProperty -Path $registryPath).UninstallCmdLine
-
-        if ([string]::IsNullOrEmpty($uninstallCmdLine)) {
-            Write-Host "Cannot find uninstall methods for $Mode"
-            return
-        }
-
-        Start-Process cmd.exe "/c $uninstallCmdLine" -WindowStyle Hidden -Wait
-
-        # Remove EdgeUpdate reg keys
-        Remove-Item -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate" -Recurse -ErrorAction SilentlyContinue | Out-Null
-    }
-
-    function Install-Edge {
-        $tempEdgePath = "$env:TEMP\MicrosoftEdgeSetup.exe"
-
-        try {
-            write-host "Installing Edge ..."
-            Invoke-WebRequest -Uri "https://go.microsoft.com/fwlink/?linkid=2109047&Channel=Stable&language=en&consent=1" -OutFile $tempEdgePath
-            Start-Process -FilePath $tempEdgePath -ArgumentList "/silent /install" -Wait
-            Remove-item $tempEdgePath
-            write-host "Edge Installed Successfully"
-        } catch {
-            write-host "Failed to install Edge"
-        }
-    }
-
-    if ($action -eq "Install") {
-        Install-Edge
-    } elseif ($action -eq "Uninstall") {
-        Uninstall-Edge
-        Uninstall-EdgeUpdate
-        # Uninstall-WebView - WebView is needed for Visual Studio and some MS Store Games like Forza
-    }
-}

functions/public/Invoke-AutoConfigDialog.ps1

@@ -0,0 +1,24 @@
+function Invoke-AutoConfigDialog {
+
+    <#
+
+        .SYNOPSIS
+            Sets the automatic configuration file based on a specified JSON file
+
+    #>
+
+    [System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms") | Out-Null
+    $OFD = New-Object System.Windows.Forms.OpenFileDialog
+    $OFD.Filter = "JSON Files (*.json)|*.json"
+    $OFD.ShowDialog()
+
+    if (($OFD.FileName -eq "") -and ($sync.MicrowinAutoConfigBox.Text -eq ""))
+    {
+        Write-Host "No automatic config file has been selected. Continuing without one..."
+        return
+    }
+    elseif ($OFD.FileName -ne "")
+    {
+        $sync.MicrowinAutoConfigBox.Text = "$($OFD.FileName)"
+    }
+}

functions/public/Invoke-ScratchDialog.ps1

@@ -4,7 +4,7 @@ function Invoke-ScratchDialog {
     <#
 
     .SYNOPSIS
-        Enable Editable Text box Alternate Scartch path
+        Enable Editable Text box Alternate Scratch path
 
     .PARAMETER Button
     #>

functions/public/Invoke-WPFButton.ps1

@@ -15,7 +15,7 @@ function Invoke-WPFButton {
     # Use this to get the name of the button
     #[System.Windows.MessageBox]::Show("$Button","Chris Titus Tech's Windows Utility","OK","Info")
     if (-not $sync.ProcessRunning) {
-        Set-WinUtilProgressBar  -label "" -percent 0 -hide $true
+        Set-WinUtilProgressBar  -label "" -percent 0
     }
 
     Switch -Wildcard ($Button) {
@@ -35,16 +35,18 @@ function Invoke-WPFButton {
         "WPFFeatureInstall" {Invoke-WPFFeatureInstall}
         "WPFPanelDISM" {Invoke-WPFSystemRepair}
         "WPFPanelAutologin" {Invoke-WPFPanelAutologin}
-        "WPFPanelcontrol" {Invoke-WPFControlPanel -Panel $button}
-        "WPFPanelnetwork" {Invoke-WPFControlPanel -Panel $button}
-        "WPFPanelpower" {Invoke-WPFControlPanel -Panel $button}
-        "WPFPanelregion" {Invoke-WPFControlPanel -Panel $button}
-        "WPFPanelsound" {Invoke-WPFControlPanel -Panel $button}
-        "WPFPanelprinter" {Invoke-WPFControlPanel -Panel $button}
-        "WPFPanelsystem" {Invoke-WPFControlPanel -Panel $button}
-        "WPFPaneluser" {Invoke-WPFControlPanel -Panel $button}
-        "WPFPanelGodMode" {Invoke-WPFControlPanel -Panel $button}
-        "WPFUpdatesdefault" {Invoke-WPFFixesUpdate}
+        "WPFPanelComputer" {Invoke-WPFControlPanel -Panel $button}
+        "WPFPanelControl" {Invoke-WPFControlPanel -Panel $button}
+        "WPFPanelNetwork" {Invoke-WPFControlPanel -Panel $button}
+        "WPFPanelPower" {Invoke-WPFControlPanel -Panel $button}
+        "WPFPanelPrinter" {Invoke-WPFControlPanel -Panel $button}
+        "WPFPanelRegion" {Invoke-WPFControlPanel -Panel $button}
+        "WPFPanelRestore" {Invoke-WPFControlPanel -Panel $button}
+        "WPFPanelSound" {Invoke-WPFControlPanel -Panel $button}
+        "WPFPanelSystem" {Invoke-WPFControlPanel -Panel $button}
+        "WPFPanelTimedate" {Invoke-WPFControlPanel -Panel $button}
+        "WPFPanelUser" {Invoke-WPFControlPanel -Panel $button}
+        "WPFUpdatesdefault" {Invoke-WPFUpdatesdefault}
         "WPFFixesUpdate" {Invoke-WPFFixesUpdate}
         "WPFFixesWinget" {Invoke-WPFFixesWinget}
         "WPFRunAdobeCCCleanerTool" {Invoke-WPFRunAdobeCCCleanerTool}
@@ -62,5 +64,7 @@ function Invoke-WPFButton {
         "WPFWinUtilUninstallPSProfile" {Invoke-WinUtilUninstallPSProfile}
         "WPFWinUtilSSHServer" {Invoke-WPFSSHServer}
         "WPFselectedAppsButton" {$sync.selectedAppsPopup.IsOpen = -not $sync.selectedAppsPopup.IsOpen}
+        "WPFMicrowinPanelBack" {Toggle-MicrowinPanel 1}
+        "MicrowinAutoConfigBtn" {Invoke-AutoConfigDialog}
     }
 }

functions/public/Invoke-WPFControlPanel.ps1

@@ -11,14 +11,16 @@ function Invoke-WPFControlPanel {
     param($Panel)
 
     switch ($Panel) {
-        "WPFPanelcontrol" {cmd /c control}
-        "WPFPanelnetwork" {cmd /c ncpa.cpl}
-        "WPFPanelpower"   {cmd /c powercfg.cpl}
-        "WPFPanelregion"  {cmd /c intl.cpl}
-        "WPFPanelsound"   {cmd /c mmsys.cpl}
-        "WPFPanelprinter" {Start-Process "shell:::{A8A91A66-3A7D-4424-8D24-04E180695C7A}"}
-        "WPFPanelsystem"  {cmd /c sysdm.cpl}
-        "WPFPaneluser"    {cmd /c "control userpasswords2"}
-        "WPFPanelGodMode" {Start-Process "shell:::{ED7BA470-8E54-465E-825C-99712043E01C}"}
+        "WPFPanelControl" {control}
+        "WPFPanelComputer" {compmgmt.msc}
+        "WPFPanelNetwork" {ncpa.cpl}
+        "WPFPanelPower"   {powercfg.cpl}
+        "WPFPanelPrinter" {Start-Process "shell:::{A8A91A66-3A7D-4424-8D24-04E180695C7A}"}
+        "WPFPanelRegion"  {intl.cpl}
+        "WPFPanelRestore"  {rstrui.exe}
+        "WPFPanelSound"   {mmsys.cpl}
+        "WPFPanelSystem"  {sysdm.cpl}
+        "WPFPanelTimedate" {timedate.cpl}
+        "WPFPanelUser"    {control userpasswords2}
     }
 }

functions/public/Invoke-WPFFixesNetwork.ps1

@@ -8,13 +8,20 @@ function Invoke-WPFFixesNetwork {
 
     Write-Host "Resetting Network with netsh"
 
+    Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo"
     # Reset WinSock catalog to a clean state
     Start-Process -NoNewWindow -FilePath "netsh" -ArgumentList "winsock", "reset"
+
+    Set-WinUtilTaskbaritem -state "Normal" -value 0.35 -overlay "logo"
     # Resets WinHTTP proxy setting to DIRECT
     Start-Process -NoNewWindow -FilePath "netsh" -ArgumentList "winhttp", "reset", "proxy"
+
+    Set-WinUtilTaskbaritem -state "Normal" -value 0.7 -overlay "logo"
     # Removes all user configured IP settings
     Start-Process -NoNewWindow -FilePath "netsh" -ArgumentList "int", "ip", "reset"
 
+    Set-WinUtilTaskbaritem -state "None" -overlay "checkmark"
+
     Write-Host "Process complete. Please reboot your computer."
 
     $ButtonType = [System.Windows.MessageBoxButton]::OK

functions/public/Invoke-WPFFixesUpdate.ps1

@@ -30,6 +30,8 @@ function Invoke-WPFFixesUpdate {
     param($Aggressive = $false)
 
     Write-Progress -Id 0 -Activity "Repairing Windows Update" -PercentComplete 0
+    Set-WinUtilTaskbaritem -state "Indeterminate" -overlay "logo"
+    Write-Host "Starting Windows Update Repair..."
     # Wait for the first progress bar to show, otherwise the second one won't show
     Start-Sleep -Milliseconds 200
 
@@ -190,12 +192,15 @@ function Invoke-WPFFixesUpdate {
     try {
         (New-Object -ComObject Microsoft.Update.AutoUpdate).DetectNow()
     } catch {
+        Set-WinUtilTaskbaritem -state "Error" -overlay "warning"
         Write-Warning "Failed to create Windows Update COM object: $_"
     }
     Start-Process -NoNewWindow -FilePath "wuauclt" -ArgumentList "/resetauthorization", "/detectnow"
     Write-Progress -Id 10 -ParentId 0 -Activity "Forcing discovery" -Status "Completed" -PercentComplete 100
     Write-Progress -Id 0 -Activity "Repairing Windows Update" -Status "Completed" -PercentComplete 100
 
+    Set-WinUtilTaskbaritem -state "None" -overlay "checkmark"
+
     $ButtonType = [System.Windows.MessageBoxButton]::OK
     $MessageboxTitle = "Reset Windows Update "
     $Messageboxbody = ("Stock settings loaded.`n Please reboot your computer")

functions/public/Invoke-WPFFixesWinget.ps1

@@ -8,7 +8,16 @@ function Invoke-WPFFixesWinget {
         BravoNorris for the fantastic idea of a button to reinstall winget
     #>
     # Install Choco if not already present
-    Install-WinUtilChoco
-    Start-Process -FilePath "choco" -ArgumentList "install winget -y --force" -NoNewWindow -Wait
+    try {
+        Set-WinUtilTaskbaritem -state "Indeterminate" -overlay "logo"
+        Install-WinUtilChoco
+        Start-Process -FilePath "choco" -ArgumentList "install winget -y --force" -NoNewWindow -Wait
+    } catch {
+        Write-Error "Failed to install winget: $_"
+        Set-WinUtilTaskbaritem -state "Error" -overlay "warning"
+    } finally {
+        Write-Host "==> Finished Winget Repair"
+        Set-WinUtilTaskbaritem -state "None" -overlay "checkmark"
+    }
 
 }

functions/public/Invoke-WPFInstall.ps1

@@ -4,10 +4,8 @@ function Invoke-WPFInstall {
         [PSObject[]]$PackagesToInstall = $($sync.selectedApps | Foreach-Object { $sync.configs.applicationsHashtable.$_ })
     )
     <#
-
     .SYNOPSIS
         Installs the selected programs using winget, if one or more of the selected programs are already installed on the system, winget will try and perform an upgrade if there's a newer version to install.
-
     #>
 
     if($sync.ProcessRunning) {
@@ -34,15 +32,16 @@ function Invoke-WPFInstall {
 
         try {
             $sync.ProcessRunning = $true
-            if($packagesWinget.Count -gt 0) {
+            if($packagesWinget.Count -gt 0 -and $packagesWinget -ne "0") {
+                Show-WPFInstallAppBusy -text "Installing apps..."
                 Install-WinUtilWinget
                 Install-WinUtilProgramWinget -Action Install -Programs $packagesWinget
-
             }
             if($packagesChoco.Count -gt 0) {
                 Install-WinUtilChoco
                 Install-WinUtilProgramChoco -Action Install -Programs $packagesChoco
             }
+            Hide-WPFInstallAppBusy
             Write-Host "==========================================="
             Write-Host "--      Installs have finished          ---"
             Write-Host "==========================================="

functions/public/Invoke-WPFInstallUpgrade.ps1

@@ -12,7 +12,7 @@ function Invoke-WPFInstallUpgrade {
             Write-Host "Upgrade Successful"
         }
         else{
-            Write-Host "Error Occured. Return Code: $chocoUpgradeStatus"
+            Write-Host "Error Occurred. Return Code: $chocoUpgradeStatus"
         }
     }
     else{

functions/public/Invoke-WPFSystemRepair.ps1

@@ -104,21 +104,34 @@ function Invoke-WPFSystemRepair {
         Write-Progress -Id 1 -Activity $childProgressBarActivity -Status "DISM Completed" -PercentComplete 100 -Completed
     }
 
-    $childProgressBarActivity = "Scanning for corruption"
-    Write-Progress -Id 0 -Activity "Repairing Windows" -PercentComplete 0
-    # Step 1: Run chkdsk to fix disk and filesystem corruption before proceeding with system file repairs
-    Invoke-Chkdsk
-    Write-Progress -Id 0 -Activity "Repairing Windows" -PercentComplete 25
+    try {
+        Set-WinUtilTaskbaritem -state "Indeterminate" -overlay "logo"
 
-    # Step 2: Run SFC to fix system file corruption and ensure DISM can operate correctly
-    Invoke-SFC
-    Write-Progress -Id 0 -Activity "Repairing Windows" -PercentComplete 50
+        $childProgressBarActivity = "Scanning for corruption"
+        Write-Progress -Id 0 -Activity "Repairing Windows" -PercentComplete 0
+        # Step 1: Run chkdsk to fix disk and filesystem corruption before proceeding with system file repairs
+        Invoke-Chkdsk
+        Write-Progress -Id 0 -Activity "Repairing Windows" -PercentComplete 25
 
-    # Step 3: Run DISM to repair the system image, which SFC relies on for accurate repairs
-    Invoke-DISM
-    Write-Progress -Id 0 -Activity "Repairing Windows" -PercentComplete 75
+        # Step 2: Run SFC to fix system file corruption and ensure DISM can operate correctly
+        Invoke-SFC
+        Write-Progress -Id 0 -Activity "Repairing Windows" -PercentComplete 50
+
+        # Step 3: Run DISM to repair the system image, which SFC relies on for accurate repairs
+        Invoke-DISM
+        Write-Progress -Id 0 -Activity "Repairing Windows" -PercentComplete 75
+
+        # Step 4: Run SFC again to ensure system files are repaired using the now-fixed system image
+        Invoke-SFC
+        Write-Progress -Id 0 -Activity "Repairing Windows" -PercentComplete 100 -Completed
+
+        Set-WinUtilTaskbaritem -state "None" -overlay "checkmark"
+    } catch {
+        Write-Error "An error occurred while repairing the system: $_"
+        Set-WinUtilTaskbaritem -state "Error" -overlay "warning"
+    } finally {
+        Write-Host "==> Finished System Repair"
+        Set-WinUtilTaskbaritem -state "None" -overlay "checkmark"
+    }
 
-    # Step 4: Run SFC again to ensure system files are repaired using the now-fixed system image
-    Invoke-SFC
-    Write-Progress -Id 0 -Activity "Repairing Windows" -PercentComplete 100 -Completed
 }

functions/public/Invoke-WPFUIElements.ps1

@@ -140,6 +140,7 @@ function Invoke-WPFUIElements {
             $label.Content = $category -replace ".*__", ""
             $label.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "HeaderFontSize")
             $label.SetResourceReference([Windows.Controls.Control]::FontFamilyProperty, "HeaderFontFamily")
+            $label.UseLayoutRounding = $true
             $itemsControl.Items.Add($label) | Out-Null
             $sync[$category] = $label
 
@@ -154,6 +155,8 @@ function Invoke-WPFUIElements {
                         $checkBox = New-Object Windows.Controls.CheckBox
                         $checkBox.Name = $entryInfo.Name
                         $checkBox.HorizontalAlignment = "Right"
+                        $checkBox.UseLayoutRounding = $true
+                        [System.Windows.Automation.AutomationProperties]::SetName($checkBox, $entryInfo.Content)
                         $dockPanel.Children.Add($checkBox) | Out-Null
                         $checkBox.Style = $ColorfulToggleSwitchStyle
 
@@ -163,6 +166,7 @@ function Invoke-WPFUIElements {
                         $label.HorizontalAlignment = "Left"
                         $label.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "FontSize")
                         $label.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "MainForegroundColor")
+                        $label.UseLayoutRounding = $true
                         $dockPanel.Children.Add($label) | Out-Null
                         $itemsControl.Items.Add($dockPanel) | Out-Null
 
@@ -188,6 +192,7 @@ function Invoke-WPFUIElements {
                         $toggleButton.ToolTip = $entryInfo.Description
                         $toggleButton.HorizontalAlignment = "Left"
                         $toggleButton.Style = $ToggleButtonStyle
+                        [System.Windows.Automation.AutomationProperties]::SetName($toggleButton, $entryInfo.Content[0])
 
                         $toggleButton.Tag = @{
                             contentOn = if ($entryInfo.Content.Count -ge 1) { $entryInfo.Content[0] } else { "" }
@@ -217,6 +222,7 @@ function Invoke-WPFUIElements {
                         $label.HorizontalAlignment = "Left"
                         $label.VerticalAlignment = "Center"
                         $label.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "ButtonFontSize")
+                        $label.UseLayoutRounding = $true
                         $horizontalStackPanel.Children.Add($label) | Out-Null
 
                         $comboBox = New-Object Windows.Controls.ComboBox
@@ -226,11 +232,15 @@ function Invoke-WPFUIElements {
                         $comboBox.HorizontalAlignment = "Left"
                         $comboBox.VerticalAlignment = "Center"
                         $comboBox.SetResourceReference([Windows.Controls.Control]::MarginProperty, "ButtonMargin")
+                        $comboBox.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "ButtonFontSize")
+                        $comboBox.UseLayoutRounding = $true
+                        [System.Windows.Automation.AutomationProperties]::SetName($comboBox, $entryInfo.Content)
 
                         foreach ($comboitem in ($entryInfo.ComboItems -split " ")) {
                             $comboBoxItem = New-Object Windows.Controls.ComboBoxItem
                             $comboBoxItem.Content = $comboitem
                             $comboBoxItem.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "ButtonFontSize")
+                            $comboBoxItem.UseLayoutRounding = $true
                             $comboBox.Items.Add($comboBoxItem) | Out-Null
                         }
 
@@ -239,6 +249,19 @@ function Invoke-WPFUIElements {
 
                         $comboBox.SelectedIndex = 0
 
+                        # Set initial text
+                        if ($comboBox.Items.Count -gt 0) {
+                            $comboBox.Text = $comboBox.Items[0].Content
+                        }
+
+                        # Add SelectionChanged event handler to update the text property
+                        $comboBox.Add_SelectionChanged({
+                            $selectedItem = $this.SelectedItem
+                            if ($selectedItem) {
+                                $this.Text = $selectedItem.Content
+                            }
+                        })
+
                         $sync[$entryInfo.Name] = $comboBox
                     }
 
@@ -250,8 +273,10 @@ function Invoke-WPFUIElements {
                         $button.SetResourceReference([Windows.Controls.Control]::MarginProperty, "ButtonMargin")
                         $button.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "ButtonFontSize")
                         if ($entryInfo.ButtonWidth) {
-                            $button.Width = $entryInfo.ButtonWidth
+                            $baseWidth = [int]$entryInfo.ButtonWidth
+                            $button.Width = [math]::Max($baseWidth, 350)
                         }
+                        [System.Windows.Automation.AutomationProperties]::SetName($button, $entryInfo.Content)
                         $itemsControl.Items.Add($button) | Out-Null
 
                         $sync[$entryInfo.Name] = $button
@@ -281,6 +306,8 @@ function Invoke-WPFUIElements {
                         $radioButton.SetResourceReference([Windows.Controls.Control]::MarginProperty, "CheckBoxMargin")
                         $radioButton.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "ButtonFontSize")
                         $radioButton.ToolTip = $entryInfo.Description
+                        $radioButton.UseLayoutRounding = $true
+                        [System.Windows.Automation.AutomationProperties]::SetName($radioButton, $entryInfo.Content)
 
                         if ($entryInfo.Checked -eq $true) {
                             $radioButton.IsChecked = $true
@@ -301,6 +328,8 @@ function Invoke-WPFUIElements {
                         $checkBox.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "FontSize")
                         $checkBox.ToolTip = $entryInfo.Description
                         $checkBox.SetResourceReference([Windows.Controls.Control]::MarginProperty, "CheckBoxMargin")
+                        $checkBox.UseLayoutRounding = $true
+                        [System.Windows.Automation.AutomationProperties]::SetName($checkBox, $entryInfo.Content)
                         if ($entryInfo.Checked -eq $true) {
                             $checkBox.IsChecked = $entryInfo.Checked
                         }
@@ -312,6 +341,7 @@ function Invoke-WPFUIElements {
                             $textBlock.Text = "(?)"
                             $textBlock.ToolTip = $entryInfo.Link
                             $textBlock.Style = $HoverTextBlockStyle
+                            $textBlock.UseLayoutRounding = $true
 
                             $horizontalStackPanel.Children.Add($textBlock) | Out-Null
 

functions/public/Invoke-WPFUltimatePerformance.ps1

@@ -8,65 +8,74 @@ Function Invoke-WPFUltimatePerformance {
         Specifies whether to "Enable" or "Disable" the Ultimate Performance power scheme.
 
     #>
-    param($State)
+    param(
+        [Parameter(Mandatory = $true)]
+        [ValidateSet("Enable", "Disable")]
+        [string]$State
+    )
 
     try {
         # GUID of the Ultimate Performance power plan
         $ultimateGUID = "e9a42b02-d5df-448d-aa00-03f14749eb61"
 
-        if ($State -eq "Enable") {
-            # Duplicate the Ultimate Performance power plan using its GUID
-            $duplicateOutput = powercfg /duplicatescheme $ultimateGUID
+        switch ($State) {
+            "Enable" {
+                # Duplicate the Ultimate Performance power plan using its GUID
+                $duplicateOutput = powercfg /duplicatescheme $ultimateGUID
 
-            $guid = $null
-            $nameFromFile = "ChrisTitus - Ultimate Power Plan"
-            $description = "Ultimate Power Plan, added via WinUtils"
+                $guid = $null
+                $nameFromFile = "ChrisTitus - Ultimate Power Plan"
+                $description = "Ultimate Power Plan, added via WinUtils"
 
-            # Extract the new GUID from the duplicateOutput
-            foreach ($line in $duplicateOutput) {
-                if ($line -match "\b[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\b") {
-                    $guid = $matches[0]  # $matches[0] will contain the first match, which is the GUID
-                    Write-Output "GUID: $guid has been extracted and stored in the variable."
-                    break
+                # Extract the new GUID from the duplicateOutput
+                foreach ($line in $duplicateOutput) {
+                    if ($line -match "\b[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\b") {
+                        $guid = $matches[0]  # $matches[0] will contain the first match, which is the GUID
+                        Write-Output "GUID: $guid has been extracted and stored in the variable."
+                        break
+                    }
+                }
+
+                if (-not $guid) {
+                    Write-Output "No GUID found in the duplicateOutput. Check the output format."
+                    exit 1
+                }
+
+                # Change the name of the power plan and set its description
+                $changeNameOutput = powercfg /changename $guid "$nameFromFile" "$description"
+                Write-Output "The power plan name and description have been changed. Output:"
+                Write-Output $changeNameOutput
+
+                # Set the duplicated Ultimate Performance plan as active
+                $setActiveOutput = powercfg /setactive $guid
+                Write-Output "The power plan has been set as active. Output:"
+                Write-Output $setActiveOutput
+
+                Write-Host "> Ultimate Performance plan installed and set as active."
+            }
+            "Disable" {
+                # Check if the Ultimate Performance plan is installed by GUID
+                $installedPlan = powercfg -list | Select-String -Pattern "ChrisTitus - Ultimate Power Plan"
+
+                if ($installedPlan) {
+                    # Extract the GUID of the installed Ultimate Performance plan
+                    $ultimatePlanGUID = $installedPlan.Line.Split()[3]
+
+                    # Set a different power plan as active before deleting the Ultimate Performance plan
+                    $balancedPlanGUID = "381b4222-f694-41f0-9685-ff5bb260df2e"
+                    powercfg -setactive $balancedPlanGUID
+
+                    # Delete the Ultimate Performance plan by GUID
+                    powercfg -delete $ultimatePlanGUID
+
+                    Write-Host "Ultimate Performance plan has been uninstalled."
+                    Write-Host "> Balanced plan is now active."
+                } else {
+                    Write-Host "Ultimate Performance plan is not installed."
                 }
             }
-
-            if (-not $guid) {
-                Write-Output "No GUID found in the duplicateOutput. Check the output format."
-                exit 1
-            }
-
-            # Change the name of the power plan and set its description
-            $changeNameOutput = powercfg /changename $guid "$nameFromFile" "$description"
-            Write-Output "The power plan name and description have been changed. Output:"
-            Write-Output $changeNameOutput
-
-            # Set the duplicated Ultimate Performance plan as active
-            $setActiveOutput = powercfg /setactive $guid
-            Write-Output "The power plan has been set as active. Output:"
-            Write-Output $setActiveOutput
-
-            Write-Host "> Ultimate Performance plan installed and set as active."
-
-        } elseif ($State -eq "Disable") {
-            # Check if the Ultimate Performance plan is installed by GUID
-            $installedPlan = (powercfg -list | Select-String -Pattern "ChrisTitus - Ultimate Power Plan").Line.Split()[3]
-
-            if ($installedPlan) {
-                # Extract the GUID of the installed Ultimate Performance plan
-                $ultimatePlanGUID = $installedPlan.Line.Split()[3]
-
-                # Set a different power plan as active before deleting the Ultimate Performance plan
-                $balancedPlanGUID = 381b4222-f694-41f0-9685-ff5bb260df2e
-                powercfg -setactive $balancedPlanGUID
-
-                # Delete the Ultimate Performance plan by GUID
-                powercfg -delete $ultimatePlanGUID
-
-                Write-Host "Ultimate Performance plan has been uninstalled."
-                Write-Host "> Balanced plan is now active."
-            } else {
-                Write-Host "Ultimate Performance plan is not installed."
+            default {
+                Write-Host "Invalid state. Please use 'Enable' or 'Disable'."
             }
         }
     } catch {

functions/public/Invoke-WPFUnInstall.ps1

@@ -41,6 +41,7 @@ function Invoke-WPFUnInstall {
 
         try {
             $sync.ProcessRunning = $true
+            Show-WPFInstallAppBusy -text "Uninstalling apps..."
 
             # Uninstall all selected programs in new window
             if($packagesWinget.Count -gt 0) {
@@ -49,7 +50,7 @@ function Invoke-WPFUnInstall {
             if($packagesChoco.Count -gt 0) {
                 Install-WinUtilProgramChoco -Action Uninstall -Programs $packagesChoco
             }
-
+            Hide-WPFInstallAppBusy
             Write-Host "==========================================="
             Write-Host "--       Uninstalls have finished       ---"
             Write-Host "==========================================="

functions/public/Invoke-WPFUpdatesdefault.ps1

@@ -5,6 +5,9 @@ function Invoke-WPFUpdatesdefault {
         Resets Windows Update settings to default
 
     #>
+
+    Write-Host "Restoring Windows Update registry settings..." -ForegroundColor Yellow
+
     If (!(Test-Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU")) {
         New-Item -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" -Force | Out-Null
     }
@@ -15,17 +18,99 @@ function Invoke-WPFUpdatesdefault {
     }
     Set-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\DeliveryOptimization\Config" -Name "DODownloadMode" -Type DWord -Value 1
 
+    # Reset WaaSMedicSvc registry settings to defaults
+    Write-Host "Restoring WaaSMedicSvc settings..." -ForegroundColor Yellow
+    Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Services\WaaSMedicSvc" -Name "Start" -Type DWord -Value 3 -ErrorAction SilentlyContinue
+    Remove-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Services\WaaSMedicSvc" -Name "FailureActions" -ErrorAction SilentlyContinue
+
+    # Restore update services to their default state
+    Write-Host "Restoring update services..." -ForegroundColor Yellow
+
     $services = @(
-        "BITS"
-        "wuauserv"
+        @{Name = "BITS"; StartupType = "Manual"},
+        @{Name = "wuauserv"; StartupType = "Manual"},
+        @{Name = "UsoSvc"; StartupType = "Automatic"},
+        @{Name = "uhssvc"; StartupType = "Disabled"},
+        @{Name = "WaaSMedicSvc"; StartupType = "Manual"}
     )
 
     foreach ($service in $services) {
-        # -ErrorAction SilentlyContinue is so it doesn't write an error to stdout if a service doesn't exist
+        try {
+            Write-Host "Restoring $($service.Name) to $($service.StartupType)..."
+            $serviceObj = Get-Service -Name $service.Name -ErrorAction SilentlyContinue
+            if ($serviceObj) {
+                Set-Service -Name $service.Name -StartupType $service.StartupType -ErrorAction SilentlyContinue
 
-        Write-Host "Setting $service StartupType to Automatic"
-        Get-Service -Name $service -ErrorAction SilentlyContinue | Set-Service -StartupType Automatic
+                # Reset failure actions to default using sc command
+                Start-Process -FilePath "sc.exe" -ArgumentList "failure `"$($service.Name)`" reset= 86400 actions= restart/60000/restart/60000/restart/60000" -Wait -WindowStyle Hidden -ErrorAction SilentlyContinue
+
+                # Start the service if it should be running
+                if ($service.StartupType -eq "Automatic") {
+                    Start-Service -Name $service.Name -ErrorAction SilentlyContinue
+                }
+            }
+        }
+        catch {
+            Write-Host "Warning: Could not restore service $($service.Name) - $($_.Exception.Message)" -ForegroundColor Yellow
+        }
     }
+
+    # Restore renamed DLLs if they exist
+    Write-Host "Restoring renamed update service DLLs..." -ForegroundColor Yellow
+
+    $dlls = @("WaaSMedicSvc", "wuaueng")
+
+    foreach ($dll in $dlls) {
+        $dllPath = "C:\Windows\System32\$dll.dll"
+        $backupPath = "C:\Windows\System32\${dll}_BAK.dll"
+
+        if ((Test-Path $backupPath) -and !(Test-Path $dllPath)) {
+            try {
+                # Take ownership of backup file
+                Start-Process -FilePath "takeown.exe" -ArgumentList "/f `"$backupPath`"" -Wait -WindowStyle Hidden -ErrorAction SilentlyContinue
+
+                # Grant full control to everyone
+                Start-Process -FilePath "icacls.exe" -ArgumentList "`"$backupPath`" /grant *S-1-1-0:F" -Wait -WindowStyle Hidden -ErrorAction SilentlyContinue
+
+                # Rename back to original
+                Rename-Item -Path $backupPath -NewName "$dll.dll" -ErrorAction SilentlyContinue
+                Write-Host "Restored ${dll}_BAK.dll to $dll.dll"
+
+                # Restore ownership to TrustedInstaller
+                Start-Process -FilePath "icacls.exe" -ArgumentList "`"$dllPath`" /setowner `"NT SERVICE\TrustedInstaller`"" -Wait -WindowStyle Hidden -ErrorAction SilentlyContinue
+                Start-Process -FilePath "icacls.exe" -ArgumentList "`"$dllPath`" /remove *S-1-1-0" -Wait -WindowStyle Hidden -ErrorAction SilentlyContinue
+            }
+            catch {
+                Write-Host "Warning: Could not restore $dll.dll - $($_.Exception.Message)" -ForegroundColor Yellow
+            }
+        }
+    }
+
+    # Enable update related scheduled tasks
+    Write-Host "Enabling update related scheduled tasks..." -ForegroundColor Yellow
+
+    $taskPaths = @(
+        '\Microsoft\Windows\InstallService\*'
+        '\Microsoft\Windows\UpdateOrchestrator\*'
+        '\Microsoft\Windows\UpdateAssistant\*'
+        '\Microsoft\Windows\WaaSMedic\*'
+        '\Microsoft\Windows\WindowsUpdate\*'
+        '\Microsoft\WindowsUpdate\*'
+    )
+
+    foreach ($taskPath in $taskPaths) {
+        try {
+            $tasks = Get-ScheduledTask -TaskPath $taskPath -ErrorAction SilentlyContinue
+            foreach ($task in $tasks) {
+                Enable-ScheduledTask -TaskName $task.TaskName -TaskPath $task.TaskPath -ErrorAction SilentlyContinue
+                Write-Host "Enabled task: $($task.TaskName)"
+            }
+        }
+        catch {
+            Write-Host "Warning: Could not enable tasks in path $taskPath - $($_.Exception.Message)" -ForegroundColor Yellow
+        }
+    }
+
     Write-Host "Enabling driver offering through Windows Update..."
     Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Device Metadata" -Name "PreventDeviceMetadataFromNetwork" -ErrorAction SilentlyContinue
     Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\DriverSearching" -Name "DontPromptForWindowsUpdate" -ErrorAction SilentlyContinue
@@ -39,6 +124,7 @@ function Invoke-WPFUpdatesdefault {
     Remove-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\WindowsUpdate\UX\Settings" -Name "BranchReadinessLevel" -ErrorAction SilentlyContinue
     Remove-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\WindowsUpdate\UX\Settings" -Name "DeferFeatureUpdatesPeriodInDays" -ErrorAction SilentlyContinue
     Remove-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\WindowsUpdate\UX\Settings" -Name "DeferQualityUpdatesPeriodInDays" -ErrorAction SilentlyContinue
+
     Write-Host "==================================================="
     Write-Host "---  Windows Update Settings Reset to Default   ---"
     Write-Host "==================================================="
@@ -62,4 +148,6 @@ function Invoke-WPFUpdatesdefault {
     Write-Host "==================================================="
     Write-Host "---  Windows Local Policies Reset to Default   ---"
     Write-Host "==================================================="
+
+    Write-Host "Note: A system restart may be required for all changes to take full effect." -ForegroundColor Yellow
 }

functions/public/Invoke-WPFUpdatesdisable.ps1

@@ -6,30 +6,130 @@ function Invoke-WPFUpdatesdisable {
 
     .NOTES
         Disabling Windows Update is not recommended. This is only for advanced users who know what they are doing.
+        This function requires administrator privileges and will attempt to run as SYSTEM for certain operations.
 
     #>
+
+    Write-Host "Configuring registry settings..." -ForegroundColor Yellow
+
     If (!(Test-Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU")) {
         New-Item -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" -Force | Out-Null
     }
     Set-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" -Name "NoAutoUpdate" -Type DWord -Value 1
     Set-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" -Name "AUOptions" -Type DWord -Value 1
+
     If (!(Test-Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\DeliveryOptimization\Config")) {
         New-Item -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\DeliveryOptimization\Config" -Force | Out-Null
     }
     Set-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\DeliveryOptimization\Config" -Name "DODownloadMode" -Type DWord -Value 0
 
+    # Additional registry settings
+    Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Services\WaaSMedicSvc" -Name "Start" -Type DWord -Value 4 -ErrorAction SilentlyContinue
+    $failureActions = [byte[]](0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xd4,0x01,0x00,0x00,0x00,0x00,0x00,0xe0,0x93,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00)
+    Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Services\WaaSMedicSvc" -Name "FailureActions" -Type Binary -Value $failureActions -ErrorAction SilentlyContinue
+
+    # Disable and stop update related services
+    Write-Host "Disabling update services..." -ForegroundColor Yellow
+
     $services = @(
         "BITS"
         "wuauserv"
+        "UsoSvc"
+        "uhssvc"
+        "WaaSMedicSvc"
     )
 
     foreach ($service in $services) {
-        # -ErrorAction SilentlyContinue is so it doesn't write an error to stdout if a service doesn't exist
+        try {
+            Write-Host "Stopping and disabling $service..."
+            $serviceObj = Get-Service -Name $service -ErrorAction SilentlyContinue
+            if ($serviceObj) {
+                Stop-Service -Name $service -Force -ErrorAction SilentlyContinue
+                Set-Service -Name $service -StartupType Disabled -ErrorAction SilentlyContinue
 
-        Write-Host "Setting $service StartupType to Disabled"
-        Get-Service -Name $service -ErrorAction SilentlyContinue | Set-Service -StartupType Disabled
+                # Set failure actions to nothing using sc command
+                Start-Process -FilePath "sc.exe" -ArgumentList "failure `"$service`" reset= 0 actions= `"`"" -Wait -WindowStyle Hidden -ErrorAction SilentlyContinue
+            }
+        }
+        catch {
+            Write-Host "Warning: Could not process service $service - $($_.Exception.Message)" -ForegroundColor Yellow
+        }
     }
-    Write-Host "================================="
-    Write-Host "---   Updates ARE DISABLED    ---"
-    Write-Host "================================="
+
+    # Rename critical update service DLLs (requires SYSTEM privileges)
+    Write-Host "Attempting to rename critical update service DLLs..." -ForegroundColor Yellow
+
+    $dlls = @("WaaSMedicSvc", "wuaueng")
+
+    foreach ($dll in $dlls) {
+        $dllPath = "C:\Windows\System32\$dll.dll"
+        $backupPath = "C:\Windows\System32\${dll}_BAK.dll"
+
+        if (Test-Path $dllPath) {
+            try {
+                # Take ownership
+                Start-Process -FilePath "takeown.exe" -ArgumentList "/f `"$dllPath`"" -Wait -WindowStyle Hidden -ErrorAction SilentlyContinue
+
+                # Grant full control to everyone
+                Start-Process -FilePath "icacls.exe" -ArgumentList "`"$dllPath`" /grant *S-1-1-0:F" -Wait -WindowStyle Hidden -ErrorAction SilentlyContinue
+
+                # Rename file
+                if (!(Test-Path $backupPath)) {
+                    Rename-Item -Path $dllPath -NewName "${dll}_BAK.dll" -ErrorAction SilentlyContinue
+                    Write-Host "Renamed $dll.dll to ${dll}_BAK.dll"
+
+                    # Restore ownership to TrustedInstaller
+                    Start-Process -FilePath "icacls.exe" -ArgumentList "`"$backupPath`" /setowner `"NT SERVICE\TrustedInstaller`"" -Wait -WindowStyle Hidden -ErrorAction SilentlyContinue
+                    Start-Process -FilePath "icacls.exe" -ArgumentList "`"$backupPath`" /remove *S-1-1-0" -Wait -WindowStyle Hidden -ErrorAction SilentlyContinue
+                }
+            }
+            catch {
+                Write-Host "Warning: Could not rename $dll.dll - $($_.Exception.Message)" -ForegroundColor Yellow
+            }
+        }
+    }
+
+    # Delete downloaded update files
+    Write-Host "Cleaning up downloaded update files..." -ForegroundColor Yellow
+
+    try {
+        $softwareDistPath = "C:\Windows\SoftwareDistribution"
+        if (Test-Path $softwareDistPath) {
+            Get-ChildItem -Path $softwareDistPath -Recurse -Force | Remove-Item -Force -Recurse -ErrorAction SilentlyContinue
+            Write-Host "Cleared SoftwareDistribution folder"
+        }
+    }
+    catch {
+        Write-Host "Warning: Could not fully clear SoftwareDistribution folder - $($_.Exception.Message)" -ForegroundColor Yellow
+    }
+
+    # Disable update related scheduled tasks
+    Write-Host "Disabling update related scheduled tasks..." -ForegroundColor Yellow
+
+    $taskPaths = @(
+        '\Microsoft\Windows\InstallService\*'
+        '\Microsoft\Windows\UpdateOrchestrator\*'
+        '\Microsoft\Windows\UpdateAssistant\*'
+        '\Microsoft\Windows\WaaSMedic\*'
+        '\Microsoft\Windows\WindowsUpdate\*'
+        '\Microsoft\WindowsUpdate\*'
+    )
+
+    foreach ($taskPath in $taskPaths) {
+        try {
+            $tasks = Get-ScheduledTask -TaskPath $taskPath -ErrorAction SilentlyContinue
+            foreach ($task in $tasks) {
+                Disable-ScheduledTask -TaskName $task.TaskName -TaskPath $task.TaskPath -ErrorAction SilentlyContinue
+                Write-Host "Disabled task: $($task.TaskName)"
+            }
+        }
+        catch {
+            Write-Host "Warning: Could not disable tasks in path $taskPath - $($_.Exception.Message)" -ForegroundColor Yellow
+        }
+    }
+
+    Write-Host "=================================" -ForegroundColor Green
+    Write-Host "---   Updates ARE DISABLED    ---" -ForegroundColor Green
+    Write-Host "===================================" -ForegroundColor Green
+    Write-Host "Note: Some operations may require a system restart to take full effect." -ForegroundColor Yellow
 }

functions/public/Invoke-WPFtweaksbutton.ps1

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

scripts/main.ps1

@@ -261,7 +261,7 @@ $commonKeyEvents = {
 $sync["Form"].Add_PreViewKeyDown($commonKeyEvents)
 
 $sync["Form"].Add_MouseLeftButtonDown({
-    Invoke-WPFPopup -Action "Hide" -Popups @("Settings", "Theme")
+    Invoke-WPFPopup -Action "Hide" -Popups @("Settings", "Theme", "FontScaling")
     $sync["Form"].DragMove()
 })
 
@@ -279,7 +279,7 @@ $sync["Form"].Add_MouseDoubleClick({
 
 $sync["Form"].Add_Deactivated({
     Write-Debug "WinUtil lost focus"
-    Invoke-WPFPopup -Action "Hide" -Popups @("Settings", "Theme")
+    Invoke-WPFPopup -Action "Hide" -Popups @("Settings", "Theme", "FontScaling")
 })
 
 $sync["Form"].Add_ContentRendered({
@@ -310,38 +310,74 @@ $sync["Form"].Add_ContentRendered({
         Write-Debug "Unable to retrieve information about the primary monitor."
     }
 
-    Invoke-WPFTab "WPFTab1BT"
+    # Check internet connectivity and disable install tab if offline
+    #$isOnline = Test-WinUtilInternetConnection
+    $isOnline = $true # Temporarily force online mode until we can resolve false negatives
+
+    if (-not $isOnline) {
+        # Disable the install tab
+        $sync.WPFTab1BT.IsEnabled = $false
+        $sync.WPFTab1BT.Opacity = 0.5
+        $sync.WPFTab1BT.ToolTip = "Internet connection required for installing applications"
+
+        # Disable install-related buttons
+        $sync.WPFInstall.IsEnabled = $false
+        $sync.WPFUninstall.IsEnabled = $false
+        $sync.WPFInstallUpgrade.IsEnabled = $false
+        $sync.WPFGetInstalled.IsEnabled = $false
+
+        # Show offline indicator
+        Write-Host "Offline mode detected - Install tab disabled" -ForegroundColor Yellow
+
+        # Optionally switch to a different tab if install tab was going to be default
+        Invoke-WPFTab "WPFTab2BT"  # Switch to Tweaks tab instead
+    }
+    else {
+        # Online - ensure install tab is enabled
+        $sync.WPFTab1BT.IsEnabled = $true
+        $sync.WPFTab1BT.Opacity = 1.0
+        $sync.WPFTab1BT.ToolTip = $null
+        Invoke-WPFTab "WPFTab1BT"  # Default to install tab
+    }
+
     $sync["Form"].Focus()
 
     # maybe this is not the best place to load and execute config file?
     # maybe community can help?
-    if ($PARAM_CONFIG) {
+    if ($PARAM_CONFIG -and -not [string]::IsNullOrWhiteSpace($PARAM_CONFIG)) {
         Invoke-WPFImpex -type "import" -Config $PARAM_CONFIG
         if ($PARAM_RUN) {
+            # Wait for any existing process to complete before starting
             while ($sync.ProcessRunning) {
                 Start-Sleep -Seconds 5
             }
             Start-Sleep -Seconds 5
 
             Write-Host "Applying tweaks..."
-            Invoke-WPFtweaksbutton
-            while ($sync.ProcessRunning) {
-                Start-Sleep -Seconds 5
+            if (-not $sync.ProcessRunning) {
+                Invoke-WPFtweaksbutton
+                while ($sync.ProcessRunning) {
+                    Start-Sleep -Seconds 5
+                }
             }
             Start-Sleep -Seconds 5
 
             Write-Host "Installing features..."
-            Invoke-WPFFeatureInstall
-            while ($sync.ProcessRunning) {
-                Start-Sleep -Seconds 5
+            if (-not $sync.ProcessRunning) {
+                Invoke-WPFFeatureInstall
+                while ($sync.ProcessRunning) {
+                    Start-Sleep -Seconds 5
+                }
             }
-
             Start-Sleep -Seconds 5
+
             Write-Host "Installing applications..."
-            while ($sync.ProcessRunning) {
-                Start-Sleep -Seconds 1
+            if (-not $sync.ProcessRunning) {
+                Invoke-WPFInstall
+                while ($sync.ProcessRunning) {
+                    Start-Sleep -Seconds 1
+                }
             }
-            Invoke-WPFInstall
             Start-Sleep -Seconds 5
 
             Write-Host "Done."
@@ -352,18 +388,13 @@ $sync["Form"].Add_ContentRendered({
 
 # Add event handlers for the RadioButtons
 $sync["ISOdownloader"].add_Checked({
-    $sync["ISORelease"].Visibility = [System.Windows.Visibility]::Visible
     $sync["ISOLanguage"].Visibility = [System.Windows.Visibility]::Visible
 })
 
 $sync["ISOmanual"].add_Checked({
-    $sync["ISORelease"].Visibility = [System.Windows.Visibility]::Collapsed
     $sync["ISOLanguage"].Visibility = [System.Windows.Visibility]::Collapsed
 })
 
-$sync["ISORelease"].Items.Add("24H2") | Out-Null
-$sync["ISORelease"].SelectedItem = "24H2"
-
 $sync["ISOLanguage"].Items.Add("System Language ($(Microwin-GetLangFromCulture -langName $((Get-Culture).Name)))") | Out-Null
 if ($currentCulture -ne "English International") {
     $sync["ISOLanguage"].Items.Add("English International") | Out-Null
@@ -420,13 +451,11 @@ $NavLogoPanel.Children.Add((Invoke-WinUtilAssets -Type "logo" -Size 25)) | Out-N
 $winutildir = @{}
 
 # Set the path for the winutil directory
-$winutildir["path"] = "$env:LOCALAPPDATA\winutil\"
-[System.IO.Directory]::CreateDirectory($winutildir["path"]) | Out-Null
+$winutildir = "$env:LocalAppData\winutil\"
+New-Item $winutildir -ItemType Directory -Force | Out-Null
 
-$winutildir["logo.ico"] = $winutildir["path"] + "cttlogo.ico"
-
-if (Test-Path $winutildir["logo.ico"]) {
-    $sync["logorender"] = $winutildir["logo.ico"]
+if (Test-Path "$winutildir\logo.ico") {
+    $sync["logorender"] = "$winutildir\logo.ico"
 } else {
     $sync["logorender"] = (Invoke-WinUtilAssets -Type "Logo" -Size 90 -Render)
 }
@@ -441,7 +470,7 @@ $sync["Form"].Add_Activated({
 
 $sync["ThemeButton"].Add_Click({
     Write-Debug "ThemeButton clicked"
-    Invoke-WPFPopup -PopupActionTable @{ "Settings" = "Hide"; "Theme" = "Toggle" }
+    Invoke-WPFPopup -PopupActionTable @{ "Settings" = "Hide"; "Theme" = "Toggle"; "FontScaling" = "Hide" }
 })
 $sync["AutoThemeMenuItem"].Add_Click({
     Write-Debug "About clicked"
@@ -461,7 +490,7 @@ $sync["LightThemeMenuItem"].Add_Click({
 
 $sync["SettingsButton"].Add_Click({
     Write-Debug "SettingsButton clicked"
-    Invoke-WPFPopup -PopupActionTable @{ "Settings" = "Toggle"; "Theme" = "Hide" }
+    Invoke-WPFPopup -PopupActionTable @{ "Settings" = "Toggle"; "Theme" = "Hide"; "FontScaling" = "Hide" }
 })
 $sync["ImportMenuItem"].Add_Click({
     Write-Debug "Import clicked"
@@ -481,7 +510,7 @@ $sync["AboutMenuItem"].Add_Click({
 Author   : <a href="https://github.com/ChrisTitusTech">@christitustech</a>
 UI       : <a href="https://github.com/MyDrift-user">@MyDrift-user</a>, <a href="https://github.com/Marterich">@Marterich</a>
 Runspace : <a href="https://github.com/DeveloperDurp">@DeveloperDurp</a>, <a href="https://github.com/Marterich">@Marterich</a>
-MicroWin : <a href="https://github.com/KonTy">@KonTy</a>, <a href="https://github.com/CodingWonders">@CodingWonders</a>
+MicroWin : <a href="https://github.com/KonTy">@KonTy</a>, <a href="https://github.com/CodingWonders">@CodingWonders</a>, <a href="https://github.com/Real-MullaC">@Real-MullaC</a>
 GitHub   : <a href="https://github.com/ChrisTitusTech/winutil">ChrisTitusTech/winutil</a>
 Version  : <a href="https://github.com/ChrisTitusTech/winutil/releases/tag/$($sync.version)">$($sync.version)</a>
 "@
@@ -506,5 +535,30 @@ $sync["SponsorMenuItem"].Add_Click({
     Show-CustomDialog -Title "Sponsors" -Message $authorInfo -EnableScroll $true
 })
 
+# Font Scaling Event Handlers
+$sync["FontScalingButton"].Add_Click({
+    Write-Debug "FontScalingButton clicked"
+    Invoke-WPFPopup -PopupActionTable @{ "Settings" = "Hide"; "Theme" = "Hide"; "FontScaling" = "Toggle" }
+})
+
+$sync["FontScalingSlider"].Add_ValueChanged({
+    param($slider)
+    $percentage = [math]::Round($slider.Value * 100)
+    $sync.FontScalingValue.Text = "$percentage%"
+})
+
+$sync["FontScalingResetButton"].Add_Click({
+    Write-Debug "FontScalingResetButton clicked"
+    $sync.FontScalingSlider.Value = 1.0
+    $sync.FontScalingValue.Text = "100%"
+})
+
+$sync["FontScalingApplyButton"].Add_Click({
+    Write-Debug "FontScalingApplyButton clicked"
+    $scaleFactor = $sync.FontScalingSlider.Value
+    Invoke-WinUtilFontScaling -ScaleFactor $scaleFactor
+    Invoke-WPFPopup -Action "Hide" -Popups @("FontScaling")
+})
+
 $sync["Form"].ShowDialog() | out-null
 Stop-Transcript

scripts/start.ps1

@@ -80,7 +80,7 @@ if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]:
 $dateTime = Get-Date -Format "yyyy-MM-dd_HH-mm-ss"
 
 $logdir = "$env:localappdata\winutil\logs"
-[System.IO.Directory]::CreateDirectory("$logdir") | Out-Null
+New-Item $logdir -ItemType Directory -Force | Out-Null
 Start-Transcript -Path "$logdir\winutil_$dateTime.log" -Append -NoClobber | Out-Null
 
 # Set PowerShell window title

tools/Invoke-Preprocessing.ps1

@@ -23,7 +23,7 @@ function Invoke-Preprocessing {
         .EXAMPLE
         Invoke-Preprocessing -WorkingDir "DRIVE:\Path\To\Folder\" -ExcludedFiles @('file.txt', '.\.git\', '*.png') -ProgressStatusMessage "Doing Preprocessing"
 
-        Calls 'Invoke-Preprocessing' function using Named Paramters, with 'WorkingDir' (Mandatory Parameter) which's used as the base folder when searching for files recursively (using 'Get-ChildItem'), other two paramters are, in order from right to left, the Optional 'ExcludeFiles', which can be a path to a file, folder, or pattern-matched (like '*.png'), and the 'ProgressStatusMessage', which's used in Progress Bar.
+        Calls 'Invoke-Preprocessing' function using Named Parameters, with 'WorkingDir' (Mandatory Parameter) which's used as the base folder when searching for files recursively (using 'Get-ChildItem'), other two parameters are, in order from right to left, the Optional 'ExcludeFiles', which can be a path to a file, folder, or pattern-matched (like '*.png'), and the 'ProgressStatusMessage', which's used in Progress Bar.
 
         .EXAMPLE
         Invoke-Preprocessing -WorkingDir "DRIVE:\Path\To\Folder\" -ExcludedFiles @('file.txt', '.\.git\', '*.png') -ProgressStatusMessage "Doing Preprocessing" -ProgressActivity "Re-Formatting Code"
@@ -51,7 +51,7 @@ function Invoke-Preprocessing {
     )
 
     if (-NOT (Test-Path -PathType Container -Path "$WorkingDir")) {
-        throw "[Invoke-Preprocessing] Invalid Paramter Value for 'WorkingDir', passed value: '$WorkingDir'. Either the path is a File or Non-Existing/Invlid, please double check your code."
+        throw "[Invoke-Preprocessing] Invalid Parameter Value for 'WorkingDir', passed value: '$WorkingDir'. Either the path is a File or Non-Existing/Invlid, please double check your code."
     }
 
     $InternalExcludedFiles = [System.Collections.Generic.List[string]]::new($ExcludedFiles.Count)
@@ -63,6 +63,10 @@ function Invoke-Preprocessing {
     if ($ExcludedFiles.Count -gt 0) {
         ForEach ($excludedFile in $ExcludedFiles) {
             $filePath = "$(($WorkingDir -replace ('\\$', '')) + '\' + ($excludedFile -replace ('\.\\', '')))"
+            # Only attempt to create the directory if the excludedFile ends with '\'
+            if ($excludedFile -match '\\$' -and -not (Test-Path "$filePath")) {
+                New-Item -Path "$filePath" -ItemType Directory -Force | Out-Null
+            }
             $files = Get-ChildItem -Recurse -Path "$filePath" -File -Force
             if ($files.Count -gt 0) {
                 ForEach ($file in $files) {

xaml/inputXML.xaml

@@ -10,8 +10,8 @@
         WindowStyle="None"
         Width="Auto"
         Height="Auto"
-        MaxWidth="1380"
-        MaxHeight="800"
+        MinWidth="800"
+        MinHeight="600"
         Title="WinUtil">
     <WindowChrome.WindowChrome>
         <WindowChrome CaptionHeight="0" CornerRadius="10"/>
@@ -534,11 +534,18 @@
                                                 Height="{DynamicResource CheckBoxBulletDecoratorSize *0.85}"
                                                 Margin="2"
                                                 SnapsToDevicePixels="True"/>
-                                        <Path x:Name="CheckMark"
-                                              Stroke="{DynamicResource ToggleButtonOnColor}"
-                                              StrokeThickness="2"
-                                              Data="M 0 5 L 5 10 L 12 0"
-                                              Visibility="Collapsed"/>
+                                        <Viewbox x:Name="CheckMarkContainer"
+                                                Width="{DynamicResource CheckBoxBulletDecoratorSize}"
+                                                Height="{DynamicResource CheckBoxBulletDecoratorSize}"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Visibility="Collapsed">
+                                            <Path x:Name="CheckMark"
+                                                  Stroke="{DynamicResource ToggleButtonOnColor}"
+                                                  StrokeThickness="1.5"
+                                                  Data="M 0 5 L 5 10 L 12 0"
+                                                  Stretch="Uniform"/>
+                                        </Viewbox>
                                     </Grid>
                                 </BulletDecorator.Bullet>
                                 <ContentPresenter Margin="4,0,0,0"
@@ -549,7 +556,7 @@
                         </Grid>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsChecked" Value="True">
-                                <Setter TargetName="CheckMark" Property="Visibility" Value="Visible"/>
+                                <Setter TargetName="CheckMarkContainer" Property="Visibility" Value="Visible"/>
                             </Trigger>
                             <Trigger Property="IsMouseOver" Value="True">
                                 <!--Setter TargetName="Border" Property="Background" Value="{DynamicResource ButtonBackgroundPressedColor}"/-->
@@ -569,22 +576,24 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="RadioButton">
                         <StackPanel Orientation="Horizontal" Margin="{DynamicResource CheckBoxMargin}">
-                            <Grid Width="14" Height="14">
-                                <Ellipse x:Name="OuterCircle"
-                                        Stroke="{DynamicResource ToggleButtonOffColor}"
-                                        Fill="{DynamicResource ButtonBackgroundColor}"
-                                        StrokeThickness="1"
-                                        Width="14"
-                                        Height="14"
-                                        SnapsToDevicePixels="True"/>
-                                <Ellipse x:Name="InnerCircle"
-                                        Fill="{DynamicResource ToggleButtonOnColor}"
-                                        Width="8"
-                                        Height="8"
-                                        Visibility="Collapsed"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"/>
-                            </Grid>
+                            <Viewbox Width="{DynamicResource CheckBoxBulletDecoratorSize}" Height="{DynamicResource CheckBoxBulletDecoratorSize}">
+                                <Grid Width="14" Height="14">
+                                    <Ellipse x:Name="OuterCircle"
+                                            Stroke="{DynamicResource ToggleButtonOffColor}"
+                                            Fill="{DynamicResource ButtonBackgroundColor}"
+                                            StrokeThickness="1"
+                                            Width="14"
+                                            Height="14"
+                                            SnapsToDevicePixels="True"/>
+                                    <Ellipse x:Name="InnerCircle"
+                                            Fill="{DynamicResource ToggleButtonOnColor}"
+                                            Width="8"
+                                            Height="8"
+                                            Visibility="Collapsed"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"/>
+                                </Grid>
+                            </Viewbox>
                             <ContentPresenter Margin="4,0,0,0"
                                             VerticalAlignment="Center"
                                             RecognizesAccessKey="True"/>
@@ -801,6 +810,7 @@
             <Setter Property="HorizontalAlignment" Value="Stretch"/>
             <Setter Property="VerticalAlignment" Value="Center"/>
             <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+            <Setter Property="CaretBrush" Value="{DynamicResource MainForegroundColor}"/>
             <Setter Property="ContextMenu">
                 <Setter.Value>
                     <ContextMenu>
@@ -855,6 +865,7 @@
             <Setter Property="HorizontalAlignment" Value="Stretch"/>
             <Setter Property="VerticalAlignment" Value="Center"/>
             <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+            <Setter Property="CaretBrush" Value="{DynamicResource MainForegroundColor}"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="PasswordBox">
@@ -890,62 +901,69 @@
     </Window.Resources>
     <Grid Background="{DynamicResource MainBackgroundColor}" ShowGridLines="False" Name="WPFMainGrid" Width="Auto" Height="Auto" HorizontalAlignment="Stretch">
         <Grid.RowDefinitions>
-            <RowDefinition Height="{DynamicResource TabRowHeightInPixels}"/>
-            <RowDefinition Height=".9*"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
-        <DockPanel Name="NavDockPanel" HorizontalAlignment="Stretch" Background="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True" Grid.Row="0" Width="Auto">
-            <StackPanel Name="NavLogoPanel" Orientation="Horizontal" HorizontalAlignment="Left" Background="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True" Margin="10,0,20,0">
+        <Grid Grid.Row="0" Background="{DynamicResource MainBackgroundColor}">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/> <!-- Navigation buttons -->
+                <ColumnDefinition Width="*"/> <!-- Search bar and buttons -->
+            </Grid.ColumnDefinitions>
+
+            <!-- Navigation Buttons Panel -->
+            <StackPanel Name="NavDockPanel" Orientation="Horizontal" Grid.Column="0" Margin="5,5,10,5">
+                <StackPanel Name="NavLogoPanel" Orientation="Horizontal" HorizontalAlignment="Left" Background="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True" Margin="10,0,20,0">
+                </StackPanel>
+                <ToggleButton Margin="0,0,5,0" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
+                    Background="{DynamicResource ButtonInstallBackgroundColor}" Foreground="white" FontWeight="Bold" Name="WPFTab1BT">
+                    <ToggleButton.Content>
+                        <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonInstallForegroundColor}" >
+                            <Underline>I</Underline>nstall
+                        </TextBlock>
+                    </ToggleButton.Content>
+                </ToggleButton>
+                <ToggleButton Margin="0,0,5,0" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
+                    Background="{DynamicResource ButtonTweaksBackgroundColor}" Foreground="{DynamicResource ButtonTweaksForegroundColor}" FontWeight="Bold" Name="WPFTab2BT">
+                    <ToggleButton.Content>
+                        <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonTweaksForegroundColor}">
+                            <Underline>T</Underline>weaks
+                        </TextBlock>
+                    </ToggleButton.Content>
+                </ToggleButton>
+                <ToggleButton Margin="0,0,5,0" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
+                    Background="{DynamicResource ButtonConfigBackgroundColor}" Foreground="{DynamicResource ButtonConfigForegroundColor}" FontWeight="Bold" Name="WPFTab3BT">
+                    <ToggleButton.Content>
+                        <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonConfigForegroundColor}">
+                            <Underline>C</Underline>onfig
+                        </TextBlock>
+                    </ToggleButton.Content>
+                </ToggleButton>
+                <ToggleButton Margin="0,0,5,0" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
+                    Background="{DynamicResource ButtonUpdatesBackgroundColor}" Foreground="{DynamicResource ButtonUpdatesForegroundColor}" FontWeight="Bold" Name="WPFTab4BT">
+                    <ToggleButton.Content>
+                        <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonUpdatesForegroundColor}">
+                            <Underline>U</Underline>pdates
+                        </TextBlock>
+                    </ToggleButton.Content>
+                </ToggleButton>
+                <ToggleButton Margin="0,0,5,0" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
+                    Background="{DynamicResource ButtonUpdatesBackgroundColor}" Foreground="{DynamicResource ButtonUpdatesForegroundColor}" FontWeight="Bold" Name="WPFTab5BT">
+                    <ToggleButton.Content>
+                        <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonUpdatesForegroundColor}">
+                            <Underline>M</Underline>icroWin
+                        </TextBlock>
+                    </ToggleButton.Content>
+                </ToggleButton>
             </StackPanel>
-            <ToggleButton Margin="0,0,5,0" HorizontalAlignment="Left" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
-                Background="{DynamicResource ButtonInstallBackgroundColor}" Foreground="white" FontWeight="Bold" Name="WPFTab1BT">
-                <ToggleButton.Content>
-                    <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonInstallForegroundColor}" >
-                        <Underline>I</Underline>nstall
-                    </TextBlock>
-                </ToggleButton.Content>
-            </ToggleButton>
-            <ToggleButton Margin="0,0,5,0" HorizontalAlignment="Left" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
-                Background="{DynamicResource ButtonTweaksBackgroundColor}" Foreground="{DynamicResource ButtonTweaksForegroundColor}" FontWeight="Bold" Name="WPFTab2BT">
-                <ToggleButton.Content>
-                    <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonTweaksForegroundColor}">
-                        <Underline>T</Underline>weaks
-                    </TextBlock>
-                </ToggleButton.Content>
-            </ToggleButton>
-            <ToggleButton Margin="0,0,5,0" HorizontalAlignment="Left" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
-                Background="{DynamicResource ButtonConfigBackgroundColor}" Foreground="{DynamicResource ButtonConfigForegroundColor}" FontWeight="Bold" Name="WPFTab3BT">
-                <ToggleButton.Content>
-                    <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonConfigForegroundColor}">
-                        <Underline>C</Underline>onfig
-                    </TextBlock>
-                </ToggleButton.Content>
-            </ToggleButton>
-            <ToggleButton Margin="0,0,5,0" HorizontalAlignment="Left" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
-                Background="{DynamicResource ButtonUpdatesBackgroundColor}" Foreground="{DynamicResource ButtonUpdatesForegroundColor}" FontWeight="Bold" Name="WPFTab4BT">
-                <ToggleButton.Content>
-                    <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonUpdatesForegroundColor}">
-                        <Underline>U</Underline>pdates
-                    </TextBlock>
-                </ToggleButton.Content>
-            </ToggleButton>
-            <ToggleButton Margin="0,0,5,0" HorizontalAlignment="Left" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
-                Background="{DynamicResource ButtonUpdatesBackgroundColor}" Foreground="{DynamicResource ButtonUpdatesForegroundColor}" FontWeight="Bold" Name="WPFTab5BT">
-                <ToggleButton.Content>
-                    <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonUpdatesForegroundColor}">
-                        <Underline>M</Underline>icroWin
-                    </TextBlock>
-                </ToggleButton.Content>
-            </ToggleButton>
-            <Grid Name="GridBesideNavDockPanel" Background="{DynamicResource MainBackgroundColor}" ShowGridLines="False" Width="Auto" Height="Auto" HorizontalAlignment="Stretch">
+
+            <!-- Search Bar and Action Buttons -->
+            <Grid Name="GridBesideNavDockPanel" Grid.Column="1" Background="{DynamicResource MainBackgroundColor}" ShowGridLines="False" Height="Auto">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/> <!-- Main content area -->
-                    <ColumnDefinition Width="Auto"/><!-- Space for options button -->
-                    <ColumnDefinition Width="Auto"/><!-- Space for close button -->
-                    <ColumnDefinition Width="Auto"/>
-                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="2*"/> <!-- Search bar area - priority space -->
+                    <ColumnDefinition Width="Auto"/><!-- Buttons area -->
                 </Grid.ColumnDefinitions>
 
                 <!--
@@ -957,27 +975,28 @@
                     Consider using a Math Solver, will help in making
                     development of these things much easier
                 -->
-                <TextBox
-                    Grid.Column="0"
-                    Width="{DynamicResource SearchBarWidth}"
-                    Height="{DynamicResource SearchBarHeight}"
-                    FontSize="{DynamicResource SearchBarTextBoxFontSize}"
-                    VerticalAlignment="Center" HorizontalAlignment="Left"
-                    BorderThickness="1"
-                    Name="SearchBar"
-                    Foreground="{DynamicResource MainForegroundColor}" Background="{DynamicResource MainBackgroundColor}"
-                    Padding="3,3,30,0"
-                    Margin="5,0,0,0"
-                    ToolTip="Press Ctrl-F and type app name to filter application list below. Press Esc to reset the filter">
-                </TextBox>
-                <TextBlock
-                    Grid.Column="0"
-                    VerticalAlignment="Center" HorizontalAlignment="Left"
-                    FontFamily="Segoe MDL2 Assets"
-                    Foreground="{DynamicResource ButtonBackgroundSelectedColor}"
-                    FontSize="{DynamicResource IconFontSize}"
-                    Margin="180,0,0,0">&#xE721;
-                </TextBlock>
+                <Border Grid.Column="0" Margin="5,0,0,0" Width="{DynamicResource SearchBarWidth}" Height="{DynamicResource SearchBarHeight}" VerticalAlignment="Center" HorizontalAlignment="Left">
+                    <Grid>
+                        <TextBox
+                            Width="{DynamicResource SearchBarWidth}"
+                            Height="{DynamicResource SearchBarHeight}"
+                            FontSize="{DynamicResource SearchBarTextBoxFontSize}"
+                            VerticalAlignment="Center" HorizontalAlignment="Left"
+                            BorderThickness="1"
+                            Name="SearchBar"
+                            Foreground="{DynamicResource MainForegroundColor}" Background="{DynamicResource MainBackgroundColor}"
+                            Padding="3,3,30,0"
+                            ToolTip="Press Ctrl-F and type app name to filter application list below. Press Esc to reset the filter">
+                        </TextBox>
+                        <TextBlock
+                            VerticalAlignment="Center" HorizontalAlignment="Right"
+                            FontFamily="Segoe MDL2 Assets"
+                            Foreground="{DynamicResource ButtonBackgroundSelectedColor}"
+                            FontSize="{DynamicResource IconFontSize}"
+                            Margin="0,0,8,0" Width="Auto" Height="Auto">&#xE721;
+                        </TextBlock>
+                    </Grid>
+                </Border>
                 <!--
                   TODO:
                     Make this ClearButton Positioning react to
@@ -989,51 +1008,25 @@
                     VerticalAlignment="Center" HorizontalAlignment="Left"
                     Name="SearchBarClearButton"
                     Style="{StaticResource SearchBarClearButtonStyle}"
-                    Margin="210,0,0,0" Visibility="Collapsed">
+                    Margin="213,0,0,0" Visibility="Collapsed">
                 </Button>
 
-                <ProgressBar
-                    Grid.Column="1"
-                    Minimum="0"
-                    Maximum="100"
-                    Width="250"
-                    Height="{DynamicResource SearchBarHeight}"
-                    Foreground="{DynamicResource ProgressBarForegroundColor}" Background="{DynamicResource ProgressBarBackgroundColor}" BorderBrush="{DynamicResource ProgressBarForegroundColor}"
-                    Visibility="Collapsed"
-                    VerticalAlignment="Center" HorizontalAlignment="Left"
-                    Margin="2,0,0,0" BorderThickness="1" Padding="6,2,2,2"
-                    Name="ProgressBar">
-                </ProgressBar>
-                <Label
-                    Grid.Column="1"
-                    Width="250"
-                    Height="{DynamicResource SearchBarHeight}"
-                    VerticalAlignment="Center" HorizontalAlignment="Left"
-                    FontSize="{DynamicResource SearchBarTextBoxFontSize}"
-                    Background="Transparent"
-                    Visibility="Collapsed"
-                    Margin="2,0,0,0" BorderThickness="0" Padding="6,2,2,2"
-                    Name="ProgressBarLabel">
-                    <TextBlock
-                        TextTrimming="CharacterEllipsis"
-                        Background="Transparent"
-                        Foreground="{DynamicResource ProgressBarTextColor}">
-                    </TextBlock>
-                </Label>
-                <Button Name="ThemeButton"
-                    Style="{StaticResource HoverButtonStyle}"
-                    Grid.Column="2" BorderBrush="Transparent"
+                <!-- Buttons Container -->
+                <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="5,5,5,5">
+                    <Button Name="ThemeButton"
+                        Style="{StaticResource HoverButtonStyle}"
+                        BorderBrush="Transparent"
                     Background="{DynamicResource MainBackgroundColor}"
                     Foreground="{DynamicResource MainForegroundColor}"
                     FontSize="{DynamicResource SettingsIconFontSize}"
                     Width="{DynamicResource IconButtonSize}" Height="{DynamicResource IconButtonSize}"
                     HorizontalAlignment="Right" VerticalAlignment="Top"
-                    Margin="0,5,5,0"
+                    Margin="0,0,2,0"
                     FontFamily="Segoe MDL2 Assets"
                     Content="N/A"
                     ToolTip="Change the Winutil UI Theme"
                 />
-                <Popup Grid.Column="2" Name="ThemePopup"
+                    <Popup Name="ThemePopup"
                     IsOpen="False"
                     PlacementTarget="{Binding ElementName=ThemeButton}" Placement="Bottom"
                     HorizontalAlignment="Right" VerticalAlignment="Top">
@@ -1058,18 +1051,86 @@
                     </Border>
                 </Popup>
 
-                <Button Name="SettingsButton"
-                    Style="{StaticResource HoverButtonStyle}"
-                    Grid.Column="3" BorderBrush="Transparent"
+                    <Button Name="FontScalingButton"
+                        Style="{StaticResource HoverButtonStyle}"
+                        BorderBrush="Transparent"
                     Background="{DynamicResource MainBackgroundColor}"
                     Foreground="{DynamicResource MainForegroundColor}"
                     FontSize="{DynamicResource SettingsIconFontSize}"
                     Width="{DynamicResource IconButtonSize}" Height="{DynamicResource IconButtonSize}"
                     HorizontalAlignment="Right" VerticalAlignment="Top"
-                    Margin="5,5,5,0"
+                    Margin="0,0,2,0"
+                    FontFamily="Segoe MDL2 Assets"
+                    Content="&#xE8D3;"
+                    ToolTip="Adjust Font Scaling for Accessibility"
+                />
+                    <Popup Name="FontScalingPopup"
+                    IsOpen="False"
+                    PlacementTarget="{Binding ElementName=FontScalingButton}" Placement="Bottom"
+                    HorizontalAlignment="Right" VerticalAlignment="Top">
+                    <Border Background="{DynamicResource MainBackgroundColor}" BorderBrush="{DynamicResource MainForegroundColor}" BorderThickness="1" CornerRadius="0" Margin="0">
+                        <StackPanel Background="{DynamicResource MainBackgroundColor}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MinWidth="200">
+                            <TextBlock Text="Font Scaling"
+                                       FontSize="{DynamicResource ButtonFontSize}"
+                                       Foreground="{DynamicResource MainForegroundColor}"
+                                       HorizontalAlignment="Center"
+                                       Margin="10,5,10,5"
+                                       FontWeight="Bold"/>
+                            <Separator Margin="5,0,5,5"/>
+                            <StackPanel Orientation="Horizontal" Margin="10,5,10,10">
+                                <TextBlock Text="Small"
+                                           FontSize="{DynamicResource ButtonFontSize}"
+                                           Foreground="{DynamicResource MainForegroundColor}"
+                                           VerticalAlignment="Center"
+                                           Margin="0,0,10,0"/>
+                                <Slider Name="FontScalingSlider"
+                                        Minimum="0.75" Maximum="2.0"
+                                        Value="1.0"
+                                        TickFrequency="0.25"
+                                        TickPlacement="BottomRight"
+                                        IsSnapToTickEnabled="True"
+                                        Width="120"
+                                        VerticalAlignment="Center"/>
+                                <TextBlock Text="Large"
+                                           FontSize="{DynamicResource ButtonFontSize}"
+                                           Foreground="{DynamicResource MainForegroundColor}"
+                                           VerticalAlignment="Center"
+                                           Margin="10,0,0,0"/>
+                            </StackPanel>
+                            <TextBlock Name="FontScalingValue"
+                                       Text="100%"
+                                       FontSize="{DynamicResource ButtonFontSize}"
+                                       Foreground="{DynamicResource MainForegroundColor}"
+                                       HorizontalAlignment="Center"
+                                       Margin="10,0,10,5"/>
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="10,0,10,10">
+                                <Button Name="FontScalingResetButton"
+                                        Content="Reset"
+                                        Style="{StaticResource HoverButtonStyle}"
+                                        Width="60" Height="25"
+                                        Margin="5,0,5,0"/>
+                                <Button Name="FontScalingApplyButton"
+                                        Content="Apply"
+                                        Style="{StaticResource HoverButtonStyle}"
+                                        Width="60" Height="25"
+                                        Margin="5,0,5,0"/>
+                            </StackPanel>
+                        </StackPanel>
+                    </Border>
+                </Popup>
+
+                    <Button Name="SettingsButton"
+                        Style="{StaticResource HoverButtonStyle}"
+                        BorderBrush="Transparent"
+                    Background="{DynamicResource MainBackgroundColor}"
+                    Foreground="{DynamicResource MainForegroundColor}"
+                    FontSize="{DynamicResource SettingsIconFontSize}"
+                    Width="{DynamicResource IconButtonSize}" Height="{DynamicResource IconButtonSize}"
+                    HorizontalAlignment="Right" VerticalAlignment="Top"
+                    Margin="0,0,2,0"
                     FontFamily="Segoe MDL2 Assets"
                     Content="&#xE713;"/>
-                <Popup Grid.Column="3" Name="SettingsPopup"
+                    <Popup Name="SettingsPopup"
                     IsOpen="False"
                     PlacementTarget="{Binding ElementName=SettingsButton}" Placement="Bottom"
                     HorizontalAlignment="Right" VerticalAlignment="Top">
@@ -1092,19 +1153,18 @@
                     </Border>
                 </Popup>
 
-            <Button
-                Grid.Column="4"
-                Content="&#xD7;" BorderThickness="0"
+                    <Button
+                    Content="&#xD7;" BorderThickness="0"
                 BorderBrush="Transparent"
                 Background="{DynamicResource MainBackgroundColor}"
                 Width="{DynamicResource IconButtonSize}" Height="{DynamicResource IconButtonSize}"
                 HorizontalAlignment="Right" VerticalAlignment="Top"
-                Margin="0,5,5,0"
+                Margin="0,0,0,0"
                 FontFamily="{DynamicResource FontFamily}"
                 Foreground="{DynamicResource MainForegroundColor}" FontSize="{DynamicResource CloseIconFontSize}" Name="WPFCloseButton" />
+                </StackPanel>
             </Grid>
-
-        </DockPanel>
+        </Grid>
 
         <TabControl Name="WPFTabNav" Background="Transparent" Width="Auto" Height="Auto" BorderBrush="Transparent" BorderThickness="0" Grid.Row="1" Grid.Column="0" Padding="-1">
             <TabItem Header="Install" Visibility="Collapsed" Name="WPFTab1">
@@ -1112,7 +1172,7 @@
 
                     <Grid Grid.Row="0" Grid.Column="0" Margin="{DynamicResource TabContentMargin}">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="225" />
+                            <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
 
@@ -1132,20 +1192,22 @@
                         <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
 
-                    <ScrollViewer VerticalScrollBarVisibility="Auto" Grid.Row="0" Margin="{DynamicResource TabContentMargin}">
+                    <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Grid.Row="0" Margin="{DynamicResource TabContentMargin}">
                         <Grid Background="Transparent">
                             <Grid.RowDefinitions>
-                                <RowDefinition Height="45px"/>
+                                <RowDefinition Height="Auto"/>
                                 <RowDefinition Height="*"/>
                                 <RowDefinition Height="Auto"/>
                             </Grid.RowDefinitions>
 
-                            <StackPanel Background="{DynamicResource MainBackgroundColor}" Orientation="Horizontal" HorizontalAlignment="Left" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="5">
+                            <StackPanel Background="{DynamicResource MainBackgroundColor}" Orientation="Vertical" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="5">
                                 <Label Content="Recommended Selections:" FontSize="{DynamicResource FontSize}" VerticalAlignment="Center" Margin="2"/>
-                                <Button Name="WPFstandard" Content=" Standard " Margin="2"/>
-                                <Button Name="WPFminimal" Content=" Minimal " Margin="2"/>
-                                <Button Name="WPFClearTweaksSelection" Content=" Clear " Margin="2"/>
-                                <Button Name="WPFGetInstalledTweaks" Content=" Get Installed " Margin="2"/>
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,2,0,0">
+                                    <Button Name="WPFstandard" Content=" Standard " Margin="2" Width="{DynamicResource ButtonWidth}" Height="{DynamicResource ButtonHeight}"/>
+                                    <Button Name="WPFminimal" Content=" Minimal " Margin="2" Width="{DynamicResource ButtonWidth}" Height="{DynamicResource ButtonHeight}"/>
+                                    <Button Name="WPFClearTweaksSelection" Content=" Clear " Margin="2" Width="{DynamicResource ButtonWidth}" Height="{DynamicResource ButtonHeight}"/>
+                                    <Button Name="WPFGetInstalledTweaks" Content=" Get Installed " Margin="2" Width="{DynamicResource ButtonWidth}" Height="{DynamicResource ButtonHeight}"/>
+                                </StackPanel>
                             </StackPanel>
 
                             <Grid Name="tweakspanel" Grid.Row="1">
@@ -1163,22 +1225,22 @@
                         </Grid>
                     </ScrollViewer>
                     <Border Grid.Row="1" Background="{DynamicResource MainBackgroundColor}" BorderBrush="{DynamicResource BorderColor}" BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch" Padding="10">
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Column="0">
-                            <Button Name="WPFTweaksbutton" Content="Run Tweaks" Margin="5"/>
-                            <Button Name="WPFUndoall" Content="Undo Selected Tweaks" Margin="5"/>
-                        </StackPanel>
+                        <WrapPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Column="0">
+                            <Button Name="WPFTweaksbutton" Content="Run Tweaks" Margin="5" Width="{DynamicResource ButtonWidth}" Height="{DynamicResource ButtonHeight}"/>
+                            <Button Name="WPFUndoall" Content="Undo Selected Tweaks" Margin="5" Width="{DynamicResource ButtonWidth}" Height="{DynamicResource ButtonHeight}"/>
+                        </WrapPanel>
                     </Border>
                 </Grid>
             </TabItem>
             <TabItem Header="Config" Visibility="Collapsed" Name="WPFTab3">
-                <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="{DynamicResource TabContentMargin}">
+                <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" Margin="{DynamicResource TabContentMargin}">
                     <Grid Name="featurespanel" Grid.Row="1" Background="Transparent">
                     </Grid>
                 </ScrollViewer>
             </TabItem>
             <TabItem Header="Updates" Visibility="Collapsed" Name="WPFTab4">
-                <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="{DynamicResource TabContentMargin}">
-                    <Grid Background="Transparent">
+                <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Margin="{DynamicResource TabContentMargin}">
+                    <Grid Background="Transparent" MaxWidth="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer}}">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto"/>  <!-- Row for the 3 columns -->
                             <RowDefinition Height="Auto"/>  <!-- Row for Windows Version -->
@@ -1195,7 +1257,7 @@
                             <!-- Default Settings -->
                             <Border Grid.Column="0" Style="{StaticResource BorderStyle}">
                                 <StackPanel>
-                                    <Button Name="WPFFixesUpdate"
+                                    <Button Name="WPFUpdatesdefault"
                                             FontSize="{DynamicResource ConfigTabButtonFontSize}"
                                             Content="Default Settings"
                                             Margin="10,5"
@@ -1273,8 +1335,8 @@
                 </ScrollViewer>
             </TabItem>
             <TabItem Header="MicroWin" Visibility="Collapsed" Name="WPFTab5">
-                <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="{DynamicResource TabContentMargin}">
-                <Grid Width="Auto" Height="Auto">
+                <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Margin="{DynamicResource TabContentMargin}">
+                <Grid MaxWidth="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer}}">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="3*"/>
@@ -1287,8 +1349,8 @@
                         VerticalAlignment="Stretch"
                         HorizontalAlignment="Stretch">
                     <StackPanel Name="MicrowinMain" Background="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True" Grid.Column="0" Grid.Row="0">
-                        <StackPanel Background="Transparent" SnapsToDevicePixels="True" Margin="1">
-                            <CheckBox x:Name="WPFMicrowinDownloadFromGitHub" Content="Download oscdimg.exe from CTT Github repo" IsChecked="True" Margin="{DynamicResource MicrowinCheckBoxMargin}" />
+                        <StackPanel Name="MicrowinISOPanel" Background="Transparent" SnapsToDevicePixels="True" Margin="1">
+                            <CheckBox x:Name="WPFMicrowinDownloadFromGitHub" Content="Download oscdimg.exe from CTT GitHub repo" IsChecked="True" Margin="{DynamicResource MicrowinCheckBoxMargin}" />
                             <TextBlock Margin="5" Padding="1" TextWrapping="Wrap" Foreground="{DynamicResource ComboBoxForegroundColor}">
                                 Choose a Windows ISO file that you've downloaded <LineBreak/>
                                 Check the status in the console
@@ -1332,7 +1394,6 @@
                             />
                             <RadioButton x:Name="ISOmanual" Content="Select your own ISO" GroupName="Options" Margin="0,10,0,0" IsChecked="True"/>
                             <RadioButton x:Name="ISOdownloader" Content="Get newest ISO automatically" GroupName="Options" Margin="0,5,0,5"/>
-                            <ComboBox x:Name="ISORelease" Visibility="Collapsed"/>
                             <ComboBox x:Name="ISOLanguage" Visibility="Collapsed"/>
                             <Button Name="WPFGetIso" Margin="2" Padding="15">
                                 <Button.Content>
@@ -1342,8 +1403,46 @@
                                 </Button.Content>
                             </Button>
                         </StackPanel>
+
                         <!-- Visibility="Hidden" -->
                         <StackPanel Name="MicrowinOptionsPanel" HorizontalAlignment="Left" SnapsToDevicePixels="True" Margin="1" Visibility="Hidden">
+                            <Grid Margin="0,0,0,10">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+
+                                <Button Name="WPFMicrowinPanelBack"
+                                        Grid.Column="0"
+                                        Width="30" Height="30"
+                                        HorizontalAlignment="Left"
+                                        FontFamily="Segoe MDL2 Assets"
+                                        FontSize="12"
+                                        Content="&#xE76B;"
+                                        ToolTip="Back to main view"
+                                        Background="{DynamicResource ButtonBackgroundColor}"
+                                        Foreground="{DynamicResource ButtonForegroundColor}"
+                                        BorderBrush="{DynamicResource ButtonBackgroundColor}"
+                                        BorderThickness="1"
+                                        Padding="0">
+                                    <Button.ContentTemplate>
+                                        <DataTemplate>
+                                            <TextBlock Text="{Binding}"
+                                                      HorizontalAlignment="Center"
+                                                      VerticalAlignment="Center"/>
+                                        </DataTemplate>
+                                    </Button.ContentTemplate>
+                                </Button>
+
+                                <TextBlock Name="MicrowinPanel2Title"
+                                         Grid.Column="1"
+                                         Text="Configure Windows ISO"
+                                         Margin="10,0,0,0"
+                                         Foreground="{DynamicResource MainForegroundColor}"
+                                         FontSize="16"
+                                         VerticalAlignment="Center"/>
+                            </Grid>
+
                             <TextBlock Margin="6" Padding="1" TextWrapping="Wrap">Choose Windows SKU</TextBlock>
                             <ComboBox x:Name = "MicrowinWindowsFlavors" Margin="1" />
                             <Rectangle Fill="{DynamicResource MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
@@ -1371,13 +1470,45 @@
                                 Foreground="{DynamicResource LabelboxForegroundColor}"
                                 MaxLength="20"
                             />
-                            <TextBlock Margin="6" Padding="1" TextWrapping="Wrap">Password (characters will not be shown for your security):</TextBlock>
+                            <TextBlock Margin="6" Padding="1" TextWrapping="Wrap">Password:</TextBlock>
                             <PasswordBox Name="MicrowinUserPassword" Background="Transparent" BorderThickness="1" BorderBrush="{DynamicResource MainForegroundColor}"
                                 Margin="6"
                                 PasswordChar="*"
                                 Foreground="{DynamicResource LabelboxForegroundColor}"
                             />
                             <Rectangle Fill="{DynamicResource MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
+                            <TextBlock Margin="6" Padding="1" TextWrapping="Wrap"><Bold>Tweaks (leave empty for default settings)</Bold></TextBlock>
+                            <CheckBox Name="MicroWinWPBT" Margin="{DynamicResource MicrowinCheckBoxMargin}" IsChecked="False" ToolTip="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."><AccessText TextWrapping="Wrap" Text="Disable Windows Platform Binary Table (WPBT) (ADVANCED TWEAK)" /></CheckBox>
+                            <CheckBox Name="MicroWinUnsupported" Margin="{DynamicResource MicrowinCheckBoxMargin}" IsChecked="False" ToolTip="If enabled then it will allow you to upgrade your PC to Windows 11 if your PC does not support Windows 11 yet. This is good for if you do not have a USB and want to upgrade to Windows 11 on unsupported hardware."><AccessText TextWrapping="Wrap" Text="Allow this PC to upgrade to Windows 11" /></CheckBox>
+                            <CheckBox Name="MicroWinESD" Margin="{DynamicResource MicrowinCheckBoxMargin}" IsChecked="False" ToolTip="The ESD file format compresses the installation image even further, therefore reducing ISO file sizes a little more. Select this if you have a small USB."><AccessText TextWrapping="Wrap" Text="Convert this image to ESD (This will take longer)" /></CheckBox>
+                            <CheckBox Name="MicroWinNoFLA" Margin="{DynamicResource MicrowinCheckBoxMargin}" IsChecked="True" ToolTip="The First Logon Animation is an animation that is played when a user logs on for the first time. It can artificially increase wait times. Select this option to automatically close the first logon animation and reach the desktop quicker (additional system preparation will still be done)"><AccessText TextWrapping="Wrap" Text="Skip First Logon Animation" /></CheckBox>
+                            <TextBlock Margin="6" Padding="1" TextWrapping="Wrap">WinUtil configuration file (JSON)</TextBlock>
+                            <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" /> <!-- Takes the remaining space -->
+                                <ColumnDefinition Width="32" /> <!-- Fixed width for Button -->
+                            </Grid.ColumnDefinitions>
+                                <TextBox Name="MicrowinAutoConfigBox" Background="Transparent" BorderBrush="{DynamicResource MainForegroundColor}"
+                                        Text=""
+                                        Margin="2"
+                                        IsReadOnly="False"
+                                        Grid.Column="0"
+                                        ToolTip="Path of your configuration file"
+                                        VerticalAlignment="Center"
+                                        Foreground="{DynamicResource LabelboxForegroundColor}">
+                                </TextBox>
+                                <Button Name="MicrowinAutoConfigBtn"
+                                    Width="Auto"
+                                    Height="Auto"
+                                    Grid.Column="1"
+                                    Margin="2"
+                                    Padding="1"  VerticalAlignment="Center">
+                                    <Button.Content>
+                                    ...
+                                    </Button.Content>
+                                </Button>
+                            </Grid>
+                            <Rectangle Fill="{DynamicResource MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
                             <Button Name="WPFMicrowin" Content="Start the process" Margin="2" Padding="15"/>
                         </StackPanel>
                         <StackPanel HorizontalAlignment="Left" SnapsToDevicePixels="True" Margin="1" Visibility="Collapsed">
@@ -1395,11 +1526,17 @@
                         Grid.Row="0" Grid.Column="1">
                         <StackPanel HorizontalAlignment="Left" Background="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True" Visibility="Visible">
 
-                            <Grid Name = "BusyMessage" Visibility="Collapsed">
-                              <TextBlock Name = "BusyText" Text="NBusy" Padding="22,2,1,1" />
-                              <TextBlock VerticalAlignment="Center" HorizontalAlignment="Left" FontFamily="Segoe MDL2 Assets"
-                                  FontSize="{DynamicResource IconFontSize}" Margin="16,0,0,0">&#xE701;</TextBlock>
-                            </Grid>
+                            <StackPanel x:Name="MicrowinBusyIndicator" Orientation="Horizontal" Margin="15,15,15,0">
+                                <TextBlock x:Name="BusyIcon" FontFamily="Segoe MDL2 Assets" Text="&#xE701;"
+                                         Margin="0,0,8,2"
+                                         FontSize="16"
+                                         VerticalAlignment="Center"
+                                         Foreground="{DynamicResource MicrowinBusyColor}"/>
+                                <TextBlock x:Name="BusyText" Text="Microwin"
+                                         VerticalAlignment="Center"
+                                         TextTrimming="CharacterEllipsis"
+                                         Foreground="{DynamicResource MicrowinBusyColor}"/>
+                            </StackPanel>
 
                             <TextBlock x:Name = "asciiTextBlock"
                                 xml:space ="preserve"
@@ -1440,7 +1577,7 @@
                                 May take several minutes to process the ISO depending on your machine and connection <LineBreak/>
                                 - Put it somewhere on the C:\ drive so it is easily accessible <LineBreak/>
                                 - Launch WinUtil and MicroWin  <LineBreak/>
-                                - Click on the "Select Windows ISO" button and wait for WinUtil to process the image <LineBreak/>
+                                - Click on the "Get Windows ISO" button and wait for WinUtil to process the image <LineBreak/>
                                 It will be processed and unpacked which may take some time <LineBreak/>
                                 - Once complete, choose which Windows flavor you want to base your image on <LineBreak/>
                                 - Click the "Start Process" button <LineBreak/>