Deploying to main from @ ChrisTitusTech/winutil@59d968e7c4 🚀

Deploying to main from @ ChrisTitusTech/winutil@afe85ad7f0 🚀
Deploying to main from @ ChrisTitusTech/winutil@efb9e5bde6 🚀
2025-06-15 02:48:22 -05:00 · 2025-06-14 15:32:56 +00:00 · 2025-06-06 15:33:48 +00:00 · 2025-06-03 15:35:28 +00:00 · 2025-06-01 10:40:37 -05:00 · 2025-05-30 15:34:17 +00:00
74 changed files with 2542 additions and 1448 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,30 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: 'bug'
-assignees: ''
---
-
-## Describe the bug
-<!-- A clear and concise description of what the bug is. -->
-
-## Steps to reproduce
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See the error.
-
-## Expected behavior
-<!-- A clear and concise description of what you expected to happen. -->
-
-## Screenshots
-<!-- If applicable, add screenshots to help explain your problem. -->
-
-## Additional context
-<!-- Add any other context about the problem here. -->
-
-## Issue validation
- [ ] I checked for duplicate issues.
- [ ] I checked for already existing discussions.
- [ ] I checked for an already existing pull request addressing the issue.
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@ -0,0 +1,62 @@
+name: "Bug report"
+description: "Report a bug to help us identify and fix issues in the project."
+labels: ["bug"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # 🐞 **Issue Report**
+        Thank you for taking the time to report an issue! Please provide as much detail as possible to help us address the problem efficiently.
+
+        ## ⚠️ **IMPORTANT**
+        - 🛠️ **Supported environments only:** We only support Windows 11. Custom ISOs that are not made using Microwin are not supported.
+        - 💡 For general questions, use the [Discussions section](https://github.com/Christitustech/winutil/discussions) or join our Community-driven [Discord Server](https://discord.gg/RUbZUZyByQ).
+
+  - type: checkboxes
+    attributes:
+      label: ⚙️ Issue Checklist
+      options:
+        - label: I have read the guidelines.
+        - label: I checked for duplicate issues.
+        - label: I searched for existing discussions.
+        - label: I checked for an existing pull request that addresses this issue.
+    validations:
+      required: true
+
+  - type: input
+    id: affected_part
+    attributes:
+      label: 📜 What part of Winutil are you having issues with?
+      placeholder: "e.g., Microwin, Tweaks, etc."
+    validations:
+      required: true
+
+  - type: textarea
+    id: issue_description
+    attributes:
+      label: 📝 Provide a clear and concise description of the issue.
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps_to_reproduce
+    attributes:
+      label: 🔄 Steps to reproduce the issue.
+      placeholder: "e.g., Step 1: ..., Step 2: ..."
+    validations:
+      required: true
+
+  - type: textarea
+    id: error_output
+    attributes:
+      label: ❌ Paste the full error output (if available).
+      placeholder: "Include any relevant logs or error messages."
+
+  - type: textarea
+    id: additional_context
+    attributes:
+      label: 🖼️ Additional context.
+      placeholder: "Include screenshots, code blocks (use triple backticks ```), or any other relevant information."
+    validations:
+      required: false
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+    - name: 💻 Community Discord
+      url: https://discord.gg/RUbZUZyByQ
+      about: Join our Community Discord server to chat with other users in the Winutil community.
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -1,24 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: 'enhancement'
-assignees: ''
---
-
-## Is your feature request related to a problem? Please describe
-<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
-
-## Describe the solution you'd like
-<!-- A clear and concise description of what you want to happen. -->
-
-## Describe alternatives you've considered
-<!-- A clear and concise description of any alternative solutions or features you've considered. -->
-
-## Additional context
-<!-- Add any other context or screenshots about the feature request here. -->
-
-## Issue validation
- [ ] I checked for duplicate issues.
- [ ] I checked for already existing discussions.
- [ ] I checked for an already existing pull request addressing the issue.
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@ -0,0 +1,57 @@
+name: "Feature request"
+description: "Suggest a new feature or improvement for the project."
+labels: ["enhancement"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # ✨ **Feature request**
+        Thank you for taking the time to suggest a feature! Please provide as much detail as possible to help us understand and evaluate your request.
+
+        ## ⚠️ **IMPORTANT**
+        - 🛠️ **Supported environments only:** We only support Windows 11.
+        - 💡 For general questions, use the [Discussions section](https://github.com/Christitustech/winutil/discussions) or join our Community-driven [Discord Server](https://discord.gg/RUbZUZyByQ).
+
+  - type: checkboxes
+    attributes:
+      label: ⚙️ Issue Checklist
+      options:
+        - label: I have read the guidelines.
+        - label: I checked for duplicate issues.
+        - label: I searched for existing discussions.
+        - label: I checked for an existing pull request that addresses this request.
+    validations:
+      required: true
+
+  - type: textarea
+    id: problem_statement
+    attributes:
+      label: ❓ Is your feature request related to a problem?
+      placeholder: "Provide a clear and concise description of the issue you're facing. Example: 'I'm always frustrated when [...]'"
+    validations:
+      required: false
+
+  - type: textarea
+    id: proposed_solution
+    attributes:
+      label: 💡 Describe the solution you'd like
+      placeholder: "Provide a clear and concise description of what you want to happen."
+    validations:
+      required: true
+
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: 🔄 Describe alternatives you've considered
+      placeholder: "Provide details on any alternative solutions or features you've thought about."
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional_context
+    attributes:
+      label: 🖼️ Additional context
+      placeholder: "Include screenshots, code blocks (use triple backticks ```), or any other relevant information."
+    validations:
+      required: false
--- a/.github/requirements.txt
+++ b/.github/requirements.txt
@ -15,7 +15,7 @@ gitdb==4.0.11
 GitPython==3.1.43
 htmlmin2==0.1.13
 idna==3.7
-Jinja2==3.1.4
+Jinja2==3.1.5
 jsmin==3.0.1
 Markdown==3.6
 MarkupSafe==2.1.5
--- a/.github/workflows/pre-release.yaml
+++ b/.github/workflows/pre-release.yaml
@ -49,31 +49,6 @@ jobs:
          }
        shell: pwsh

-      - name: Create and import code signing certificate
-        shell: pwsh
-        run: |
-          [System.IO.File]::WriteAllBytes("$env:USERPROFILE\code-signing-cert.pfx", [System.Convert]::FromBase64String("$env:CERTIFICATE_BASE64"))
-          Import-PfxCertificate -FilePath "$env:USERPROFILE\code-signing-cert.pfx" -CertStoreLocation Cert:\CurrentUser\My
-
-      - name: Code sign winutil.ps1
-        shell: pwsh
-        run: |
-          $cert = Get-ChildItem -Path Cert:\CurrentUser\My -CodeSigningCert | Select-Object -First 1
-          if ($null -eq $cert) { throw "Code signing certificate not found" }
-          Set-AuthenticodeSignature -FilePath ./winutil.ps1 -Certificate $cert
-
-      - name: Verify code signature
-        shell: pwsh
-        run: |
-          $signature = Get-AuthenticodeSignature -FilePath ./winutil.ps1
-          if ($signature.Status -ne 'Valid') { throw "Code signing failed" }
-
-      - name: Upload winutil.ps1 as artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: winutil
-          path: ./winutil.ps1
-
      - name: Generate Release Notes
        id: generate_notes
        uses: release-drafter/release-drafter@v6
--- a/.gitignore
+++ b/.gitignore
@ -2,6 +2,7 @@

 # Configuration folder
 .vscode/
+.idea/

 ### Visual Studio ###

@ -10,6 +11,9 @@

 winutil.pdb

+### Preprocessor Hashes ###
+.preprocessor_hashes.json
+
 ### Windows ###

 # Folder config file
@ -46,4 +50,7 @@ True
 test.ps1
 winutil.ps1

-binary/
+# temporary excludes for docs
+.github/site/
+
+binary/
--- a/Compile.ps1
+++ b/Compile.ps1
@ -1,7 +1,6 @@
 param (
    [switch]$Debug,
    [switch]$Run,
-    [switch]$SkipPreprocessing,
    [string]$Arguments
 )

@ -45,17 +44,16 @@ $header = @"
 ################################################################################################################
 "@

-if (-NOT $SkipPreprocessing) {
-    Update-Progress "Pre-req: Running Preprocessor..." 0

-    # Dot source the 'Invoke-Preprocessing' Function from 'tools/Invoke-Preprocessing.ps1' Script
-    $preprocessingFilePath = ".\tools\Invoke-Preprocessing.ps1"
-    . $preprocessingFilePath
+Update-Progress "Pre-req: Running Preprocessor..." 0

-    $excludedFiles = @('.\.git\', '.\.gitignore', '.\.gitattributes', '.\.github\CODEOWNERS', '.\LICENSE', "$preprocessingFilePath", '*.png', '*.exe')
-    $msg = "Pre-req: Code Formatting"
-    Invoke-Preprocessing -WorkingDir "$workingdir" -ExcludedFiles $excludedFiles -ProgressStatusMessage $msg -ThrowExceptionOnEmptyFilesList
-}
+# Dot source the 'Invoke-Preprocessing' Function from 'tools/Invoke-Preprocessing.ps1' Script
+$preprocessingFilePath = ".\tools\Invoke-Preprocessing.ps1"
+. $preprocessingFilePath
+
+$excludedFiles = @('.\.git\', '.\.gitignore', '.\.gitattributes', '.\.github\CODEOWNERS', '.\LICENSE', "$preprocessingFilePath", '*.png', '*.exe','.\.preprocessor_hashes.json')
+$msg = "Pre-req: Code Formatting"
+Invoke-Preprocessing -WorkingDir "$workingdir" -ExcludedFiles $excludedFiles -ProgressStatusMessage $msg

 # Create the script in memory.
 Update-Progress "Pre-req: Allocating Memory" 0
--- a/README.md
+++ b/README.md
@ -3,6 +3,7 @@
 [![Version](https://img.shields.io/github/v/release/ChrisTitusTech/winutil?color=%230567ff&label=Latest%20Release&style=for-the-badge)](https://github.com/ChrisTitusTech/winutil/releases/latest)
 ![GitHub Downloads (specific asset, all releases)](https://img.shields.io/github/downloads/ChrisTitusTech/winutil/winutil.ps1?label=Total%20Downloads&style=for-the-badge)
 [![](https://dcbadge.limes.pink/api/server/https://discord.gg/RUbZUZyByQ?theme=default-inverted&style=for-the-badge)](https://discord.gg/RUbZUZyByQ)
+[![Static Badge](https://img.shields.io/badge/Documentation-_?style=for-the-badge&logo=bookstack&color=grey)](https://winutil.christitus.com/)

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

@ -34,11 +35,11 @@ irm "https://christitus.com/win" | iex
 irm "https://christitus.com/windev" | iex
 ```

-If you have Issues, refer to [Known Issues](https://christitustech.github.io/winutil/KnownIssues/)
+If you have Issues, refer to [Known Issues](https://winutil.christitus.com/knownissues/)

 ## 🎓 Documentation

-### [WinUtil Official Documentation](https://christitustech.github.io/winutil/)
+### [WinUtil Official Documentation](https://winutil.christitus.com/)

 ### [YouTube Tutorial](https://www.youtube.com/watch?v=6UQZ5oQg8XA)

@ -52,7 +53,7 @@ If you have Issues, refer to [Known Issues](https://christitustech.github.io/win

 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;avatars.githubusercontent.com&#x2F;u&#x2F;39857764?u&#x3D;5dbda638f45530582eee1703b4473f2a5e229e28&amp;v&#x3D;4" width="60px" alt="TriHydera" /></a><a href="https://github.com/jozozovko"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;3272468?u&#x3D;4391ed4655e4fd8b56e23b4169e44e2ac9b6cd97&amp;v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/DelDongo"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;127976398?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/markamos"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;9561861?u&#x3D;3cca179dcff0413538591e57a3abea116d65ce56&amp;v&#x3D;4" width="60px" alt="Mark Amos" /></a><a href="https://github.com/dwelfusius"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;54533224?u&#x3D;a49ea000a8f52adb31382ea69a1a7501b27fefdd&amp;v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/mews-se"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;58894405?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/jdiegmueller"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;18660571?u&#x3D;601d0a23040a271c86b5d40339f899a6dbf27086&amp;v&#x3D;4" width="60px" alt="Jason A. Diegmueller" /></a><a href="https://github.com/AlanTristar"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;105566568?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/zepled112"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;65176625?v&#x3D;4" width="60px" alt="wyatt" /></a><a href="https://github.com/altugtekiner"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;105917451?u&#x3D;ee73ff639c7bd9feb4708ab4ba7b14eff80196f7&amp;v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/robertsandrock"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;12015331?v&#x3D;4" width="60px" alt="RMS" /></a><a href="https://github.com/mmomega"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;71956566?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/KenichiQaz"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;31177857?u&#x3D;efdbae734a4c60a7bb95df4659d0535e60a6fd57&amp;v&#x3D;4" width="60px" alt="Stefan" /></a><a href="https://github.com/paulsheets"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;45240946?u&#x3D;d4db66f8e8d7a2606fe7a5521daf48ca9f097105&amp;v&#x3D;4" width="60px" alt="Paul" /></a><a href="https://github.com/djones369"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;4107092?v&#x3D;4" width="60px" alt="Dave Jones" /></a><a href="https://github.com/anthonymendez"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;19240897?u&#x3D;f82b4be098cac65c8421421b70ebd2d1da85c67e&amp;v&#x3D;4" width="60px" alt="Anthony Mendez" /></a><a href="https://github.com/claudemods"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;73653396?u&#x3D;d64c656fb8db24ef56bb000197532df9b618d06c&amp;v&#x3D;4" width="60px" alt="Claudemods" /></a><a href="https://github.com/FatBastard0"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;173957728?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/Ascent7910"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;118260621?v&#x3D;4" width="60px" alt="Max" /></a><a href="https://github.com/DursleyGuy"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;140165544?v&#x3D;4" width="60px" alt="DursleyGuy" /></a><a href="https://github.com/YamiSandman616"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;183505690?u&#x3D;c3bd20157058b6215e28f7568d4f8c4fbbe92838&amp;v&#x3D;4" width="60px" alt="Sandman616" /></a><a href="https://github.com/realmuddy"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;30978236?v&#x3D;4" width="60px" alt="Phillip Waters" /></a><a href="https://github.com/Tariq-Al-Zahrani"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;187593049?v&#x3D;4" width="60px" alt="" /></a><a href="https://github.com/quaszi"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;51266738?u&#x3D;2e3185214607e51239c5969c866ddd5eb1bdee48&amp;v&#x3D;4" width="60px" alt="" /></a><!-- sponsors -->
+<!-- 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 -->

 ## 🏅 Thanks to all Contributors
 Thanks a lot for spending your time helping Winutil grow. Thanks a lot! Keep rocking 🍻.
--- a/Test-WingetInstall.ps1
+++ b/Test-WingetInstall.ps1
@ -1,5 +1,6 @@
 # Import the function (adjust the path according to your setup)
-. "./functions/private/Get-WinUtilWingetLatest.ps1"
+. "./functions/private/Install-WinUtilWinget.ps1"
+. "./functions/private/Test-WinUtilPackageManager.ps1"

 # Set up Information stream to be visible
 $InformationPreference = "Continue"
@ -7,20 +8,7 @@ $InformationPreference = "Continue"
 Write-Host "Starting Winget installation test..." -ForegroundColor Cyan

 try {
-    # Test the function with verbose output
-    Write-Host "Attempting to run Get-WinUtilWingetLatest..." -ForegroundColor Cyan
-    Get-WinUtilWingetLatest -Verbose
-
-    # Verify Winget is working
-    if (Get-Command winget -ErrorAction SilentlyContinue) {
-        Write-Host "Success! Winget is installed and accessible." -ForegroundColor Green
-
-        # Display Winget version
-        Write-Host "`nWinget version:" -ForegroundColor Cyan
-        winget --version
-    } else {
-        Write-Host "Warning: Winget is installed but not accessible in the current session. You may need to restart your terminal." -ForegroundColor Yellow
-    }
+    Install-WinUtilWinget
 } catch {
    Write-Host "Error occurred during testing: $($_.Exception.Message)" -ForegroundColor Red
    Write-Host "Stack Trace:" -ForegroundColor Red
--- a/config/applications.json
+++ b/config/applications.json
@ -349,7 +349,7 @@
        "content": "Display Driver Uninstaller",
        "description": "Display Driver Uninstaller (DDU) is a tool for completely uninstalling graphics drivers from NVIDIA, AMD, and Intel. It is useful for troubleshooting graphics driver-related issues.",
        "link": "https://www.wagnardsoft.com/display-driver-uninstaller-DDU-",
-        "winget": "ddu"
+        "winget": "Wagnardsoft.DisplayDriverUninstaller"
    },
    "deluge": {
        "category": "Utilities",
@ -527,14 +527,6 @@
        "link": "https://espanso.org/",
        "winget": "Espanso.Espanso"
    },
-    "etcher": {
-        "category": "Utilities",
-        "choco": "etcher",
-        "content": "Etcher USB Creator",
-        "description": "Etcher is a powerful tool for creating bootable USB drives with ease.",
-        "link": "https://www.balena.io/etcher/",
-        "winget": "Balena.Etcher"
-    },
    "falkon": {
        "category": "Browsers",
        "choco": "falkon",
@ -683,9 +675,9 @@
        "category": "Multimedia Tools",
        "choco": "fxsound",
        "content": "FxSound",
-        "description": "FxSound is a cutting-edge audio enhancement software that elevates your listening experience across all media.",
+        "description": "FxSound is free open-source software to boost sound quality, volume, and bass. Including an equalizer, effects, and presets for customized audio.",
        "link": "https://www.fxsound.com/",
-        "winget": "FxSoundLLC.FxSound"
+        "winget": "FxSound.FxSound"
    },
    "fzf": {
        "category": "Utilities",
@ -709,7 +701,7 @@
        "content": "GIMP (Image Editor)",
        "description": "GIMP is a versatile open-source raster graphics editor used for tasks such as photo retouching, image editing, and image composition.",
        "link": "https://www.gimp.org/",
-        "winget": "GIMP.GIMP"
+        "winget": "GIMP.GIMP.3"
    },
    "git": {
        "category": "Development",
@ -916,7 +908,7 @@
        "choco": "imgburn",
        "content": "ImgBurn",
        "description": "ImgBurn is a lightweight CD, DVD, HD-DVD, and Blu-ray burning application with advanced features for creating and burning disc images.",
-        "link": "http://www.imgburn.com/",
+        "link": "https://www.imgburn.com/",
        "winget": "LIGHTNINGUK.ImgBurn"
    },
    "inkscape": {
@ -988,7 +980,7 @@
        "choco": "jdownloader",
        "content": "JDownloader",
        "description": "JDownloader is a feature-rich download manager with support for various file hosting services.",
-        "link": "http://jdownloader.org/",
+        "link": "https://jdownloader.org/",
        "winget": "AppWork.JDownloader"
    },
    "jellyfinmediaplayer": {
@ -1380,7 +1372,7 @@
        "choco": "na",
        "content": "nGlide (3dfx compatibility)",
        "description": "nGlide is a 3Dfx Voodoo Glide wrapper. It allows you to play games that use Glide API on modern graphics cards without the need for a 3Dfx Voodoo graphics card.",
-        "link": "http://www.zeus-software.com/downloads/nglide",
+        "link": "https://www.zeus-software.com/downloads/nglide",
        "winget": "ZeusSoftware.nGlide"
    },
    "nmap": {
@ -1511,14 +1503,6 @@
        "link": "https://github.com/namazso/OpenHashTab/",
        "winget": "namazso.OpenHashTab"
    },
-    "openoffice": {
-        "category": "Document",
-        "choco": "openoffice",
-        "content": "Apache OpenOffice",
-        "description": "Apache OpenOffice is an open-source office software suite for word processing, spreadsheets, presentations, and more.",
-        "link": "https://www.openoffice.org/",
-        "winget": "Apache.OpenOffice"
-    },
    "openrgb": {
        "category": "Utilities",
        "choco": "openrgb",
@ -1699,7 +1683,7 @@
        "category": "Games",
        "choco": "prismlauncher",
        "content": "Prism Launcher",
-        "description": "Prism Launcher is a game launcher and manager designed to provide a clean and intuitive interface for organizing and launching your games.",
+        "description": "Prism Launcher is an Open Source Minecraft launcher with the ability to manage multiple instances, accounts and mods.",
        "link": "https://prismlauncher.org/",
        "winget": "PrismLauncher.PrismLauncher"
    },
@ -1879,14 +1863,6 @@
        "link": "https://sagethumbs.en.lo4d.com/windows",
        "winget": "CherubicSoftware.SageThumbs"
    },
-    "samsungmagician": {
-        "category": "Utilities",
-        "choco": "samsung-magician",
-        "content": "Samsung Magician",
-        "description": "Samsung Magician is a utility for managing and optimizing Samsung SSDs.",
-        "link": "https://semiconductor.samsung.com/consumer-storage/magician/",
-        "winget": "Samsung.SamsungMagician"
-    },
    "sandboxie": {
        "category": "Utilities",
        "choco": "sandboxie",
@ -1999,14 +1975,6 @@
        "link": "http://www.uderzo.it/main_products/space_sniffer/",
        "winget": "UderzoSoftware.SpaceSniffer"
    },
-    "spotube": {
-        "category": "Multimedia Tools",
-        "choco": "spotube",
-        "content": "Spotube",
-        "description": "Open source Spotify client that doesn't require Premium nor uses Electron! Available for both desktop & mobile! ",
-        "link": "https://github.com/KRTirtho/spotube",
-        "winget": "KRTirtho.Spotube"
-    },
    "starship": {
        "category": "Development",
        "choco": "starship",
@ -2204,7 +2172,7 @@
        "choco": "na",
        "content": "Thorium Browser AVX2",
        "description": "Browser built for speed over vanilla chromium. It is built with AVX2 optimizations and is the fastest browser on the market.",
-        "link": "http://thorium.rocks/",
+        "link": "https://thorium.rocks/",
        "winget": "Alex313031.Thorium.AVX2"
    },
    "thunderbird": {
@ -2461,7 +2429,7 @@
        "content": "UniGetUI",
        "description": "UniGetUI is a GUI for Winget, Chocolatey, and other Windows CLI package managers.",
        "link": "https://www.marticliment.com/wingetui/",
-        "winget": "SomePythonThings.WingetUIStore"
+        "winget": "MartiCliment.UniGetUI"
    },
    "winmerge": {
        "category": "Document",
@ -2934,5 +2902,13 @@
        "description": "Fork - a fast and friendly git client.",
        "link": "https://git-fork.com/",
        "winget": "Fork.Fork"
+    },
+    "ZenBrowser": {
+        "category": "Browsers",
+        "choco": "na",
+        "content": "Zen Browser",
+        "description": "The modern, privacy-focused, performance-driven browser built on Firefox",
+        "link": "https://zen-browser.app/",
+        "winget": "Zen-Team.Zen-Browser"
    }
 }
--- a/config/appnavigation.json
+++ b/config/appnavigation.json
@ -0,0 +1,62 @@
+{
+    "WPFInstall": {
+        "Content": "Install/Upgrade Applications",
+        "Category": "____Actions",
+        "Type": "Button",
+        "Order": "1",
+        "Description": "Install or upgrade the selected applications"
+    },
+    "WPFUninstall": {
+        "Content": "Uninstall Applications",
+        "Category": "____Actions",
+        "Type": "Button",
+        "Order": "2",
+        "Description": "Uninstall the selected applications"
+    },
+    "WPFInstallUpgrade": {
+        "Content": "Upgrade all Applications",
+        "Category": "____Actions",
+        "Type": "Button",
+        "Order": "3",
+        "Description": "Upgrade all applications to the latest version"
+    },
+    "WingetRadioButton": {
+        "Content": "Winget",
+        "Category": "__Package Manager",
+        "Type": "RadioButton",
+        "GroupName": "PackageManagerGroup",
+        "Checked": true,
+        "Order": "1",
+        "Description": "Use Winget for package management"
+    },
+    "ChocoRadioButton": {
+        "Content": "Chocolatey",
+        "Category": "__Package Manager",
+        "Type": "RadioButton",
+        "GroupName": "PackageManagerGroup",
+        "Checked": false,
+        "Order": "2",
+        "Description": "Use Chocolatey for package management"
+    },
+    "WPFClearInstallSelection": {
+        "Content": "Clear Selection",
+        "Category": "__Selection",
+        "Type": "Button",
+        "Order": "1",
+        "Description": "Clear the selection of applications"
+    },
+    "WPFGetInstalled": {
+        "Content": "Get Installed",
+        "Category": "__Selection",
+        "Type": "Button",
+        "Order": "2",
+        "Description": "Show installed applications"
+    },
+    "WPFselectedAppsButton": {
+        "Content": "Selected Apps: 0",
+        "Category": "__Selection",
+        "Type": "Button",
+        "Order": "3",
+        "Description": "Show the selected applications"
+    }
+}
--- a/config/feature.json
+++ b/config/feature.json
@ -10,7 +10,7 @@
      "NetFx3"
    ],
    "InvokeScript": [],
-    "link": "https://christitustech.github.io/winutil/dev/features/Features/dotnet"
+    "link": "https://winutil.christitus.com/dev/features/features/dotnet"
  },
  "WPFFeatureshyperv": {
    "Content": "HyperV Virtualization",
@ -31,7 +31,7 @@
    "InvokeScript": [
      "Start-Process -FilePath cmd.exe -ArgumentList '/c bcdedit /set hypervisorschedulertype classic' -Wait"
    ],
-    "link": "https://christitustech.github.io/winutil/dev/features/Features/hyperv"
+    "link": "https://winutil.christitus.com/dev/features/features/hyperv"
  },
  "WPFFeatureslegacymedia": {
    "Content": "Legacy Media (WMP, DirectPlay)",
@ -46,7 +46,7 @@
      "LegacyComponents"
    ],
    "InvokeScript": [],
-    "link": "https://christitustech.github.io/winutil/dev/features/Features/legacymedia"
+    "link": "https://winutil.christitus.com/dev/features/features/legacymedia"
  },
  "WPFFeaturewsl": {
    "Content": "Windows Subsystem for Linux",
@ -59,7 +59,7 @@
      "Microsoft-Windows-Subsystem-Linux"
    ],
    "InvokeScript": [],
-    "link": "https://christitustech.github.io/winutil/dev/features/Features/wsl"
+    "link": "https://winutil.christitus.com/dev/features/features/wsl"
  },
  "WPFFeaturenfs": {
    "Content": "NFS - Network File System",
@ -79,7 +79,7 @@
      "nfsadmin client start",
      "nfsadmin client localhost config fileaccess=755 SecFlavors=+sys -krb5 -krb5i"
    ],
-    "link": "https://christitustech.github.io/winutil/dev/features/Features/nfs"
+    "link": "https://winutil.christitus.com/dev/features/features/nfs"
  },
  "WPFFeatureEnableSearchSuggestions": {
    "Content": "Enable Search Box Web Suggestions in Registry(explorer restart)",
@ -97,7 +97,7 @@
      Stop-Process -name explorer -force
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/features/Features/EnableSearchSuggestions"
+    "link": "https://winutil.christitus.com/dev/features/features/enablesearchsuggestions"
  },
  "WPFFeatureDisableSearchSuggestions": {
    "Content": "Disable Search Box Web Suggestions in Registry(explorer restart)",
@ -115,7 +115,7 @@
      Stop-Process -name explorer -force
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/features/Features/DisableSearchSuggestions"
+    "link": "https://winutil.christitus.com/dev/features/features/disablesearchsuggestions"
  },
  "WPFFeatureRegBackup": {
    "Content": "Enable Daily Registry Backup Task 12.30am",
@ -133,7 +133,7 @@
      Register-ScheduledTask -Action $action -Trigger $trigger -TaskName 'AutoRegBackup' -Description 'Create System Registry Backups' -User 'System'
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/features/Features/RegBackup"
+    "link": "https://winutil.christitus.com/dev/features/features/regbackup"
  },
  "WPFFeatureEnableLegacyRecovery": {
    "Content": "Enable Legacy F8 Boot Recovery",
@ -151,7 +151,7 @@
      Start-Process -FilePath cmd.exe -ArgumentList '/c bcdedit /Set {Current} BootMenuPolicy Legacy' -Wait
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/features/Features/EnableLegacyRecovery"
+    "link": "https://winutil.christitus.com/dev/features/features/enablelegacyrecovery"
  },
  "WPFFeatureDisableLegacyRecovery": {
    "Content": "Disable Legacy F8 Boot Recovery",
@ -169,7 +169,7 @@
      Start-Process -FilePath cmd.exe -ArgumentList '/c bcdedit /Set {Current} BootMenuPolicy Standard' -Wait
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/features/Features/DisableLegacyRecovery"
+    "link": "https://winutil.christitus.com/dev/features/features/disablelegacyrecovery"
  },
  "WPFFeaturesSandbox": {
    "Content": "Windows Sandbox",
@ -177,7 +177,7 @@
    "panel": "1",
    "Order": "a021_",
    "Description": "Windows Sandbox is a lightweight virtual machine that provides a temporary desktop environment to safely run applications and programs in isolation.",
-    "link": "https://christitustech.github.io/winutil/dev/features/Features/Sandbox"
+    "link": "https://winutil.christitus.com/dev/features/features/sandbox"
  },
  "WPFFeatureInstall": {
    "Content": "Install Features",
@ -186,7 +186,7 @@
    "Order": "a060_",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/features/Features/Install"
+    "link": "https://winutil.christitus.com/dev/features/features/install"
  },
  "WPFPanelAutologin": {
    "Content": "Set Up Autologin",
@ -195,7 +195,7 @@
    "panel": "1",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/features/Fixes/Autologin"
+    "link": "https://winutil.christitus.com/dev/features/fixes/autologin"
  },
  "WPFFixesUpdate": {
    "Content": "Reset Windows Update",
@ -204,7 +204,7 @@
    "Order": "a041_",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/features/Fixes/Update"
+    "link": "https://winutil.christitus.com/dev/features/fixes/update"
  },
  "WPFFixesNetwork": {
    "Content": "Reset Network",
@ -213,7 +213,7 @@
    "panel": "1",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/features/Fixes/Network"
+    "link": "https://winutil.christitus.com/dev/features/fixes/network"
  },
  "WPFPanelDISM": {
    "Content": "System Corruption Scan",
@ -222,7 +222,7 @@
    "Order": "a043_",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/features/Fixes/DISM"
+    "link": "https://winutil.christitus.com/dev/features/fixes/dism"
  },
  "WPFFixesWinget": {
    "Content": "WinGet Reinstall",
@ -231,7 +231,7 @@
    "Order": "a044_",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/features/Fixes/Winget"
+    "link": "https://winutil.christitus.com/dev/features/fixes/winget"
  },
  "WPFRunAdobeCCCleanerTool": {
    "Content": "Remove Adobe Creative Cloud",
@ -240,7 +240,7 @@
    "Order": "a045_",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/features/Fixes/RunAdobeCCCleanerTool"
+    "link": "https://winutil.christitus.com/dev/features/fixes/runadobecccleanertool"
  },
  "WPFPanelnetwork": {
    "Content": "Network Connections",
@ -248,7 +248,7 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/features/Legacy-Windows-Panels/network"
+    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/network"
  },
  "WPFPanelcontrol": {
    "Content": "Control Panel",
@ -256,7 +256,7 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/features/Legacy-Windows-Panels/control"
+    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/control"
  },
  "WPFPanelpower": {
    "Content": "Power Panel",
@ -264,7 +264,7 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/features/Legacy-Windows-Panels/power"
+    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/power"
  },
  "WPFPanelregion": {
    "Content": "Region",
@ -272,7 +272,7 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/features/Legacy-Windows-Panels/region"
+    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/region"
  },
  "WPFPanelsound": {
    "Content": "Sound Settings",
@ -280,7 +280,7 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/features/Legacy-Windows-Panels/sound"
+    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/sound"
  },
  "WPFPanelprinter": {
    "Content": "Printer Panel",
@ -288,7 +288,7 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/features/Legacy-Windows-Panels/printer"
+    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/printer"
  },
  "WPFPanelsystem": {
    "Content": "System Properties",
@ -296,7 +296,7 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/features/Legacy-Windows-Panels/system"
+    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/system"
  },
  "WPFPaneluser": {
    "Content": "User Accounts",
@ -304,7 +304,14 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/features/Legacy-Windows-Panels/user"
+    "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"
  },
  "WPFWinUtilInstallPSProfile": {
    "Content": "Install CTT PowerShell Profile",
@ -312,8 +319,7 @@
    "panel": "2",
    "Order": "a083_",
    "Type": "Button",
-    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/features/Powershell-Profile/PSProfileInstall"
+    "ButtonWidth": "300"
  },
  "WPFWinUtilUninstallPSProfile": {
    "Content": "Uninstall CTT PowerShell Profile",
@ -321,8 +327,7 @@
    "panel": "2",
    "Order": "a084_",
    "Type": "Button",
-    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/features/Powershell-Profile/PSProfileUninstall"
+    "ButtonWidth": "300"
  },
  "WPFWinUtilSSHServer": {
    "Content": "Enable OpenSSH Server",
--- a/config/preset.json
+++ b/config/preset.json
@ -2,6 +2,7 @@
  "Standard": [
    "WPFTweaksAH",
    "WPFTweaksConsumerFeatures",
+    "WPFTweaksDisableExplorerAutoDiscovery",
    "WPFTweaksDVR",
    "WPFTweaksHiber",
    "WPFTweaksHome",
@ -14,11 +15,11 @@
    "WPFTweaksDeleteTempFiles",
    "WPFTweaksEndTaskOnTaskbar",
    "WPFTweaksRestorePoint",
-    "WPFTweaksIPv46",
    "WPFTweaksPowershell7Tele"
  ],
  "Minimal": [
    "WPFTweaksConsumerFeatures",
+    "WPFTweaksDisableExplorerAutoDiscovery",
    "WPFTweaksHome",
    "WPFTweaksServices",
    "WPFTweaksTele"
--- a/config/themes.json
+++ b/config/themes.json
@ -1,5 +1,9 @@
 {
    "shared":{
+        "AppEntryWidth":  "130",
+        "AppEntryFontSize":  "11",
+        "AppEntryMargin":  "1,1,1,1",
+        "AppEntryBorderTickness":  "0",
        "CustomDialogFontSize":       "12",
        "CustomDialogFontSizeHeader": "14",
        "CustomDialogLogoSize":       "25",
@ -7,7 +11,7 @@
        "CustomDialogHeight":         "200",
        "FontSize":         "12",
        "FontFamily":       "Arial",
-        "HeadingFontSize":  "16",
+        "HeaderFontSize":  "16",
        "HeaderFontFamily": "Consolas, Monaco",
        "CheckBoxBulletDecoratorSize": "14",
        "CheckBoxMargin": "15,0,0,2",
@ -16,6 +20,7 @@
        "TabButtonWidth":         "110",
        "TabButtonHeight":        "26",
        "TabRowHeightInPixels":   "50",
+        "ToolTipWidth":         "300",
        "IconFontSize":     "14",
        "IconButtonSize":   "35",
        "SettingsIconFontSize":   "18",
@ -38,6 +43,9 @@
        "ButtonCornerRadius": "2"
    },
    "Light": {
+        "AppInstallUnselectedColor": "#F7F7F7",
+        "AppInstallHighlightedColor": "#CFCFCF",
+        "AppInstallSelectedColor": "#C2C2C2",
        "ComboBoxForegroundColor":  "#232629",
        "ComboBoxBackgroundColor":  "#F7F7F7",
        "LabelboxForegroundColor":  "#232629",
@ -68,11 +76,15 @@
        "ButtonForegroundColor":  "#232629",
        "ToggleButtonOnColor":  "#2e77ff",
        "ToggleButtonOffColor": "#707070",
+        "ToolTipBackgroundColor": "#F7F7F7",
        "BorderColor": "#232629",
        "BorderOpacity": "0.2"

    },
    "Dark": {
+        "AppInstallUnselectedColor": "#232629",
+        "AppInstallHighlightedColor": "#3C3C3C",
+        "AppInstallSelectedColor": "#4C4C4C",
        "ComboBoxForegroundColor":  "#F7F7F7",
        "ComboBoxBackgroundColor":  "#1E3747",
        "LabelboxForegroundColor":  "#0567ff",
@ -103,6 +115,7 @@
        "ButtonForegroundColor":  "#F7F7F7",
        "ToggleButtonOnColor": "#2e77ff",
        "ToggleButtonOffColor": "#707070",
+        "ToolTipBackgroundColor": "#2F373D",
        "BorderColor": "#2F373D",
        "BorderOpacity": "0.2"
    }
--- a/config/tweaks.json
+++ b/config/tweaks.json
@ -28,7 +28,7 @@
        "OriginalValue": "<RemoveEntry>"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/AH"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/ah"
  },
  "WPFTweaksHiber": {
    "Content": "Disable Hibernation",
@ -58,7 +58,7 @@
    "UndoScript": [
      "powercfg.exe /hibernate on"
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/Hiber"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/hiber"
  },
  "WPFTweaksLaptopHibernation": {
    "Content": "Set Hibernation as default (good for laptops)",
@ -106,7 +106,7 @@
      Start-Process -FilePath powercfg -ArgumentList \"/change monitor-timeout-dc 15\" -NoNewWindow -Wait
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/LaptopHibernation"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/laptophibernation"
  },
  "WPFTweaksHome": {
    "Content": "Disable Homegroup",
@ -126,7 +126,7 @@
        "OriginalType": "Automatic"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/Home"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/home"
  },
  "WPFTweaksLoc": {
    "Content": "Disable Location Tracking",
@ -164,7 +164,7 @@
        "OriginalValue": "1"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/Loc"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/loc"
  },
  "WPFTweaksServices": {
    "Content": "Set Services to Manual",
@ -423,26 +423,6 @@
        "StartupType": "Automatic",
        "OriginalType": "Automatic"
      },
-      {
-        "Name": "DoSvc",
-        "StartupType": "AutomaticDelayedStart",
-        "OriginalType": "Automatic"
-      },
-      {
-        "Name": "DsSvc",
-        "StartupType": "Manual",
-        "OriginalType": "Manual"
-      },
-      {
-        "Name": "DsmSvc",
-        "StartupType": "Manual",
-        "OriginalType": "Manual"
-      },
-      {
-        "Name": "DusmSvc",
-        "StartupType": "Automatic",
-        "OriginalType": "Automatic"
-      },
      {
        "Name": "EFS",
        "StartupType": "Manual",
@ -898,11 +878,6 @@
        "StartupType": "Manual",
        "OriginalType": "Manual"
      },
-      {
-        "Name": "SgrmBroker",
-        "StartupType": "Automatic",
-        "OriginalType": "Automatic"
-      },
      {
        "Name": "SharedAccess",
        "StartupType": "Manual",
@ -933,11 +908,6 @@
        "StartupType": "Manual",
        "OriginalType": "Manual"
      },
-      {
-        "Name": "StateRepository",
-        "StartupType": "Manual",
-        "OriginalType": "Automatic"
-      },
      {
        "Name": "StiSvc",
        "StartupType": "Manual",
@ -973,11 +943,6 @@
        "StartupType": "Automatic",
        "OriginalType": "Automatic"
      },
-      {
-        "Name": "TextInputManagementService",
-        "StartupType": "Manual",
-        "OriginalType": "Automatic"
-      },
      {
        "Name": "Themes",
        "StartupType": "Automatic",
@ -1584,7 +1549,7 @@
        "OriginalType": "Manual"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/Services"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/services"
  },
  "WPFTweaksEdgeDebloat": {
    "Content": "Debloat Edge",
@ -1720,7 +1685,7 @@
        "OriginalValue": "<RemoveEntry>"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/EdgeDebloat"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/edgedebloat"
  },
  "WPFTweaksConsumerFeatures": {
    "Content": "Disable ConsumerFeatures",
@ -1737,7 +1702,7 @@
        "Type": "DWord"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/ConsumerFeatures"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/consumerfeatures"
  },
  "WPFTweaksTele": {
    "Content": "Disable Telemetry",
@ -2109,7 +2074,7 @@
        Set-MpPreference -SubmitSamplesConsent 2 -ErrorAction SilentlyContinue | Out-Null
        "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/Tele"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/tele"
  },
  "WPFTweaksWifi": {
    "Content": "Disable Wifi-Sense",
@ -2133,7 +2098,7 @@
        "OriginalValue": "1"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/Wifi"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/wifi"
  },
  "WPFTweaksUTC": {
    "Content": "Set Time to UTC (Dual Boot)",
@ -2150,7 +2115,7 @@
        "OriginalValue": "0"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/UTC"
+    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/utc"
  },
  "WPFTweaksRemoveHomeGallery": {
    "Content": "Remove Home and Gallery from explorer",
@ -2172,7 +2137,7 @@
      REG DELETE \"HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced\" /f /v \"LaunchTo\"
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveHomeGallery"
+    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/removehomegallery"
  },
  "WPFTweaksDisplay": {
    "Content": "Set Display for Performance",
@ -2279,7 +2244,7 @@
    "UndoScript": [
      "Remove-ItemProperty -Path \"HKCU:\\Control Panel\\Desktop\" -Name \"UserPreferencesMask\""
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/Display"
+    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/display"
  },
  "WPFTweaksDeBloat": {
    "Content": "Remove ALL MS Store Apps - NOT RECOMMENDED",
@ -2320,17 +2285,10 @@
      "microsoft.windowscommunicationsapps",
      "Microsoft.WindowsFeedbackHub",
      "Microsoft.WindowsMaps",
-      "Microsoft.YourPhone",
      "Microsoft.WindowsSoundRecorder",
-      "Microsoft.XboxApp",
      "Microsoft.ConnectivityStore",
      "Microsoft.ScreenSketch",
-      "Microsoft.Xbox.TCUI",
-      "Microsoft.XboxGameOverlay",
-      "Microsoft.XboxGameCallableUI",
-      "Microsoft.XboxSpeechToTextOverlay",
      "Microsoft.MixedReality.Portal",
-      "Microsoft.XboxIdentityProvider",
      "Microsoft.ZuneMusic",
      "Microsoft.ZuneVideo",
      "Microsoft.Getstarted",
@ -2398,7 +2356,7 @@
        }
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/DeBloat"
+    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/debloat"
  },
  "WPFTweaksRestorePoint": {
    "Content": "Create Restore Point",
@ -2449,7 +2407,7 @@
        }
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/RestorePoint"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/restorepoint"
  },
  "WPFTweaksEndTaskOnTaskbar": {
    "Content": "Enable End Task With Right Click",
@ -2483,7 +2441,7 @@
      # Set the property, creating it if it doesn't exist
      New-ItemProperty -Path $path -Name $name -PropertyType DWord -Value $value -Force | Out-Null"
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/EndTaskOnTaskbar"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/endtaskontaskbar"
  },
  "WPFTweaksPowershell7": {
    "Content": "Change Windows Terminal default: PowerShell 5 -> PowerShell 7",
@ -2497,7 +2455,7 @@
    "UndoScript": [
      "Invoke-WPFTweakPS7 -action \"PS5\""
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/Powershell7"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/powershell7"
  },
  "WPFTweaksPowershell7Tele": {
    "Content": "Disable Powershell 7 Telemetry",
@ -2511,7 +2469,7 @@
    "UndoScript": [
      "[Environment]::SetEnvironmentVariable('POWERSHELL_TELEMETRY_OPTOUT', '', 'Machine')"
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/Powershell7Tele"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/powershell7tele"
  },
  "WPFTweaksStorage": {
    "Content": "Disable Storage Sense",
@ -2525,7 +2483,7 @@
    "UndoScript": [
      "Set-ItemProperty -Path \"HKCU:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\StorageSense\\Parameters\\StoragePolicy\" -Name \"01\" -Value 1 -Type Dword -Force"
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/Storage"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/storage"
  },
  "WPFTweaksRemoveEdge": {
    "Content": "Remove Microsoft Edge",
@ -2539,7 +2497,7 @@
    "UndoScript": [
      "Uninstall-WinUtilEdgeBrowser -action \"Install\""
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveEdge"
+    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/removeedge"
  },
  "WPFTweaksRemoveCopilot": {
    "Content": "Disable Microsoft Copilot",
@ -2582,7 +2540,7 @@
      dism /online /add-package /package-name:Microsoft.Windows.Copilot
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveCopilot"
+    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/removecopilot"
  },
  "WPFTweaksRecallOff": {
    "Content": "Disable Recall",
@ -2592,7 +2550,6 @@
    "Order": "a011_",
    "registry": [
      {
-
        "Path": "HKLM:\\SOFTWARE\\Policies\\Microsoft\\Windows\\WindowsAI",
        "Name": "DisableAIDataAnalysis",
        "Type": "DWord",
@ -2603,16 +2560,18 @@
    "InvokeScript": [
      "
      Write-Host \"Disable Recall\"
-      DISM /Online /Disable-Feature /FeatureName:Recall
+      DISM /Online /Disable-Feature /FeatureName:Recall /Quiet /NoRestart
+      Write-Host \"Please restart your computer in order for the changes to be fully applied.\"
      "
    ],
    "UndoScript": [
      "
      Write-Host \"Enable Recall\"
-      DISM /Online /Enable-Feature /FeatureName:Recall
+      DISM /Online /Enable-Feature /FeatureName:Recall /Quiet /NoRestart
+      Write-Host \"Please restart your computer in order for the changes to be fully applied.\"
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/DisableRecall"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/disablerecall"
  },
  "WPFTweaksDisableLMS1": {
    "Content": "Disable Intel MM (vPro LMS)",
@ -2670,7 +2629,23 @@

      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableLMS1"
+    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/disablelms1"
+  },
+  "WPFTweaksDisableWpbtExecution": {
+    "Content": "Disable Windows Platform Binary Table (WPBT)",
+    "Description": "If enabled then allows your computer vendor to execute a program each time it boots. It enables computer vendors to force install anti-theft software, software drivers, or a software program conveniently. This could also be a security risk.",
+    "category": "z__Advanced Tweaks - CAUTION",
+    "panel": "1",
+    "Order": "a027_",
+    "registry": [
+      {
+        "Path": "HKLM:\\SYSTEM\\CurrentControlSet\\Control\\Session Manager",
+        "Name": "DisableWpbtExecution",
+        "Value": "1",
+        "OriginalValue": "<RemoveEntry>",
+        "Type": "DWord"
+      }
+    ]
  },
  "WPFTweaksRemoveOnedrive": {
    "Content": "Remove OneDrive",
@ -2777,7 +2752,7 @@
      Start-Process -FilePath winget -ArgumentList \"install -e --accept-source-agreements --accept-package-agreements --silent Microsoft.OneDrive \" -NoNewWindow -Wait
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveOnedrive"
+    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/removeonedrive"
  },
  "WPFTweaksRazerBlock": {
    "Content": "Block Razer Software Installs",
@ -2819,7 +2794,7 @@
          New-Item -Path \"C:\\Windows\\Installer\\\" -Name \"Razer\" -ItemType \"directory\"
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/RazerBlock"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/razerblock"
  },
  "WPFTweaksDisableNotifications": {
    "Content": "Disable Notification Tray/Calendar",
@ -2843,7 +2818,7 @@
        "OriginalValue": "1"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableNotifications"
+    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/disablenotifications"
  },
  "WPFTweaksDebloatAdobe": {
    "Content": "Adobe Debloat",
@ -2992,7 +2967,7 @@
        "OriginalType": "Automatic"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/DebloatAdobe"
+    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/debloatadobe"
  },
  "WPFTweaksBlockAdobeNet": {
    "Content": "Adobe Network Block",
@ -3100,7 +3075,7 @@
      }
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/BlockAdobeNet"
+    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/blockadobenet"
  },
  "WPFTweaksRightClickMenu": {
    "Content": "Set Classic Right-Click Menu ",
@ -3112,8 +3087,7 @@
      "
      New-Item -Path \"HKCU:\\Software\\Classes\\CLSID\\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\" -Name \"InprocServer32\" -force -value \"\"
      Write-Host Restarting explorer.exe ...
-      $process = Get-Process -Name \"explorer\"
-      Stop-Process -InputObject $process
+      Stop-Process -Name \"explorer\" -Force
      "
    ],
    "UndoScript": [
@ -3121,11 +3095,10 @@
      Remove-Item -Path \"HKCU:\\Software\\Classes\\CLSID\\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\" -Recurse -Confirm:$false -Force
      # Restarting Explorer in the Undo Script might not be necessary, as the Registry change without restarting Explorer does work, but just to make sure.
      Write-Host Restarting explorer.exe ...
-      $process = Get-Process -Name \"explorer\"
-      Stop-Process -InputObject $process
+      Stop-Process -Name \"explorer\" -Force
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/RightClickMenu"
+    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/rightclickmenu"
  },
  "WPFTweaksDiskCleanup": {
    "Content": "Run Disk Cleanup",
@ -3139,7 +3112,7 @@
      Dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/DiskCleanup"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/diskcleanup"
  },
  "WPFTweaksDeleteTempFiles": {
    "Content": "Delete Temporary Files",
@ -3151,7 +3124,7 @@
      "Get-ChildItem -Path \"C:\\Windows\\Temp\" *.* -Recurse | Remove-Item -Force -Recurse
    Get-ChildItem -Path $env:TEMP *.* -Recurse | Remove-Item -Force -Recurse"
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/DeleteTempFiles"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/deletetempfiles"
  },
  "WPFTweaksDVR": {
    "Content": "Disable GameDVR",
@ -3196,14 +3169,14 @@
        "Type": "DWord"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/DVR"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/dvr"
  },
  "WPFTweaksIPv46": {
    "Content": "Prefer IPv4 over IPv6",
    "Description": "To set the IPv4 preference can have latency and security benefits on private networks where IPv6 is not configured.",
-    "category": "Essential Tweaks",
+    "category": "z__Advanced Tweaks - CAUTION",
    "panel": "1",
-    "Order": "a005_",
+    "Order": "a023_",
    "registry": [
      {
        "Path": "HKLM:\\SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Parameters",
@ -3213,7 +3186,7 @@
        "Type": "DWord"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/IPv46"
+    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/ipv46"
  },
  "WPFTweaksTeredo": {
    "Content": "Disable Teredo",
@ -3236,7 +3209,7 @@
    "UndoScript": [
      "netsh interface teredo set state default"
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/Teredo"
+    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/teredo"
  },
  "WPFTweaksDisableipsix": {
    "Content": "Disable IPv6",
@ -3259,7 +3232,7 @@
    "UndoScript": [
      "Enable-NetAdapterBinding -Name \"*\" -ComponentID ms_tcpip6"
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/Disableipsix"
+    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/disableipsix"
  },
  "WPFTweaksDisableBGapps": {
    "Content": "Disable Background Apps",
@ -3276,7 +3249,7 @@
        "Type": "DWord"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableBGapps"
+    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/disablebgapps"
  },
  "WPFTweaksDisableFSO": {
    "Content": "Disable Fullscreen Optimizations",
@ -3293,7 +3266,7 @@
        "Type": "DWord"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableFSO"
+    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/disablefso"
  },
  "WPFToggleDarkMode": {
    "Content": "Dark Theme for Windows",
@ -3308,6 +3281,7 @@
        "Name": "AppsUseLightTheme",
        "Value": "0",
        "OriginalValue": "1",
+        "DefaultState": "false",
        "Type": "DWord"
      },
      {
@ -3315,6 +3289,7 @@
        "Name": "SystemUsesLightTheme",
        "Value": "0",
        "OriginalValue": "1",
+        "DefaultState": "false",
        "Type": "DWord"
      }
    ],
@ -3334,7 +3309,7 @@
      }
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/DarkMode"
+    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/darkmode"
  },
  "WPFToggleBingSearch": {
    "Content": "Bing Search in Start Menu",
@ -3349,10 +3324,11 @@
        "Name": "BingSearchEnabled",
        "Value": "1",
        "OriginalValue": "0",
+        "DefaultState": "true",
        "Type": "DWord"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/BingSearch"
+    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/bingsearch"
  },
  "WPFToggleNumLock": {
    "Content": "NumLock on Startup",
@ -3367,6 +3343,7 @@
        "Name": "InitialKeyboardIndicators",
        "Value": "2",
        "OriginalValue": "0",
+        "DefaultState": "false",
        "Type": "DWord"
      },
      {
@ -3374,10 +3351,11 @@
        "Name": "InitialKeyboardIndicators",
        "Value": "2",
        "OriginalValue": "0",
+        "DefaultState": "false",
        "Type": "DWord"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/NumLock"
+    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/numlock"
  },
  "WPFToggleVerboseLogon": {
    "Content": "Verbose Messages During Logon",
@ -3392,17 +3370,71 @@
        "Name": "VerboseStatus",
        "Value": "1",
        "OriginalValue": "0",
+        "DefaultState": "false",
        "Type": "DWord"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/VerboseLogon"
+    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/verboselogon"
+  },
+  "WPFToggleStartMenuRecommendations": {
+    "Content": "Recommendations in Start Menu",
+    "Description": "If disabled then you will not see recommendations in the Start Menu. | Enables 'iseducationenvironment' | Relogin Required. | WARNING: This will also disable Windows Spotlight on your Lock Screen as a side effect.",
+    "category": "Customize Preferences",
+    "panel": "2",
+    "Order": "a104_",
+    "Type": "Toggle",
+    "registry": [
+      {
+        "Path": "HKLM:\\SOFTWARE\\Microsoft\\PolicyManager\\current\\device\\Start",
+        "Name": "HideRecommendedSection",
+        "Value": "0",
+        "OriginalValue": "1",
+        "DefaultState": "true",
+        "Type": "DWord"
+      },
+      {
+        "Path": "HKLM:\\SOFTWARE\\Microsoft\\PolicyManager\\current\\device\\Education",
+        "Name": "IsEducationEnvironment",
+        "Value": "0",
+        "OriginalValue": "1",
+        "DefaultState": "true",
+        "Type": "DWord"
+      },
+      {
+        "Path": "HKLM:\\SOFTWARE\\Policies\\Microsoft\\Windows\\Explorer",
+        "Name": "HideRecommendedSection",
+        "Value": "0",
+        "OriginalValue": "1",
+        "DefaultState": "true",
+        "Type": "DWord"
+      }
+    ],
+    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/wpftogglestartmenurecommendations"
+  },
+  "WPFToggleHideSettingsHome": {
+    "Content": "Remove Settings Home Page",
+    "Description": "Removes the Home page in the Windows Settings app.",
+    "category": "Customize Preferences",
+    "panel": "2",
+    "Order": "a105_",
+    "Type": "Toggle",
+    "registry": [
+      {
+        "Path": "HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer",
+        "Name": "SettingsPageVisibility",
+        "Type": "String",
+        "Value": "hide:home",
+        "OriginalValue": "show:home",
+        "DefaultState": "false"
+      }
+    ]
  },
  "WPFToggleSnapWindow": {
    "Content": "Snap Window",
    "Description": "If enabled you can align windows by dragging them. | Relogin Required",
    "category": "Customize Preferences",
    "panel": "2",
-    "Order": "a104_",
+    "Order": "a106_",
    "Type": "Toggle",
    "registry": [
      {
@ -3410,17 +3442,18 @@
        "Name": "WindowArrangementActive",
        "Value": "1",
        "OriginalValue": "0",
+        "DefaultState": "true",
        "Type": "String"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/SnapWindow"
+    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/snapwindow"
  },
  "WPFToggleSnapFlyout": {
    "Content": "Snap Assist Flyout",
    "Description": "If enabled then Snap preview is disabled when maximize button is hovered.",
    "category": "Customize Preferences",
    "panel": "2",
-    "Order": "a105_",
+    "Order": "a107_",
    "Type": "Toggle",
    "registry": [
      {
@ -3428,6 +3461,7 @@
        "Name": "EnableSnapAssistFlyout",
        "Value": "1",
        "OriginalValue": "0",
+        "DefaultState": "true",
        "Type": "DWord"
      }
    ],
@ -3441,14 +3475,14 @@
      Invoke-WinUtilExplorerUpdate -action \"restart\"
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/SnapFlyout"
+    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/snapflyout"
  },
  "WPFToggleSnapSuggestion": {
    "Content": "Snap Assist Suggestion",
    "Description": "If enabled then you will get suggestions to snap other applications in the left over spaces.",
    "category": "Customize Preferences",
    "panel": "2",
-    "Order": "a106_",
+    "Order": "a108_",
    "Type": "Toggle",
    "registry": [
      {
@ -3456,6 +3490,7 @@
        "Name": "SnapAssist",
        "Value": "1",
        "OriginalValue": "0",
+        "DefaultState": "true",
        "Type": "DWord"
      }
    ],
@ -3469,14 +3504,14 @@
      Invoke-WinUtilExplorerUpdate -action \"restart\"
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/SnapSuggestion"
+    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/snapsuggestion"
  },
  "WPFToggleMouseAcceleration": {
    "Content": "Mouse Acceleration",
    "Description": "If Enabled then Cursor movement is affected by the speed of your physical mouse movements.",
    "category": "Customize Preferences",
    "panel": "2",
-    "Order": "a107_",
+    "Order": "a109_",
    "Type": "Toggle",
    "registry": [
      {
@ -3484,6 +3519,7 @@
        "Name": "MouseSpeed",
        "Value": "1",
        "OriginalValue": "0",
+        "DefaultState": "true",
        "Type": "DWord"
      },
      {
@ -3491,6 +3527,7 @@
        "Name": "MouseThreshold1",
        "Value": "6",
        "OriginalValue": "0",
+        "DefaultState": "true",
        "Type": "DWord"
      },
      {
@ -3498,17 +3535,18 @@
        "Name": "MouseThreshold2",
        "Value": "10",
        "OriginalValue": "0",
+        "DefaultState": "true",
        "Type": "DWord"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/MouseAcceleration"
+    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/mouseacceleration"
  },
  "WPFToggleStickyKeys": {
    "Content": "Sticky Keys",
    "Description": "If Enabled then Sticky Keys is activated - Sticky keys is an accessibility feature of some graphical user interfaces which assists users who have physical disabilities or help users reduce repetitive strain injury.",
    "category": "Customize Preferences",
    "panel": "2",
-    "Order": "a108_",
+    "Order": "a110_",
    "Type": "Toggle",
    "registry": [
      {
@ -3516,10 +3554,11 @@
        "Name": "Flags",
        "Value": "510",
        "OriginalValue": "58",
+        "DefaultState": "true",
        "Type": "DWord"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/StickyKeys"
+    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/stickykeys"
  },
  "WPFToggleHiddenFiles": {
    "Content": "Show Hidden Files",
@ -3534,6 +3573,7 @@
        "Name": "Hidden",
        "Value": "1",
        "OriginalValue": "0",
+        "DefaultState": "false",
        "Type": "DWord"
      }
    ],
@ -3547,7 +3587,7 @@
      Invoke-WinUtilExplorerUpdate -action \"restart\"
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/HiddenFiles"
+    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/hiddenfiles"
  },
  "WPFToggleShowExt": {
    "Content": "Show File Extensions",
@ -3562,6 +3602,7 @@
        "Name": "HideFileExt",
        "Value": "0",
        "OriginalValue": "1",
+        "DefaultState": "false",
        "Type": "DWord"
      }
    ],
@ -3575,7 +3616,7 @@
      Invoke-WinUtilExplorerUpdate -action \"restart\"
      "
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/ShowExt"
+    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/showext"
  },
  "WPFToggleTaskbarSearch": {
    "Content": "Search Button in Taskbar",
@ -3590,10 +3631,11 @@
        "Name": "SearchboxTaskbarMode",
        "Value": "1",
        "OriginalValue": "0",
+        "DefaultState": "true",
        "Type": "DWord"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/TaskbarSearch"
+    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/taskbarsearch"
  },
  "WPFToggleTaskView": {
    "Content": "Task View Button in Taskbar",
@ -3608,10 +3650,11 @@
        "Name": "ShowTaskViewButton",
        "Value": "1",
        "OriginalValue": "0",
+        "DefaultState": "true",
        "Type": "DWord"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/TaskView"
+    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/taskview"
  },
  "WPFToggleTaskbarWidgets": {
    "Content": "Widgets Button in Taskbar",
@ -3626,10 +3669,11 @@
        "Name": "TaskbarDa",
        "Value": "1",
        "OriginalValue": "0",
+        "DefaultState": "true",
        "Type": "DWord"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/TaskbarWidgets"
+    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/taskbarwidgets"
  },
  "WPFToggleTaskbarAlignment": {
    "Content": "Center Taskbar Items",
@ -3644,10 +3688,11 @@
        "Name": "TaskbarAl",
        "Value": "1",
        "OriginalValue": "0",
+        "DefaultState": "true",
        "Type": "DWord"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/TaskbarAlignment"
+    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/taskbaralignment"
  },
  "WPFToggleDetailedBSoD": {
    "Content": "Detailed BSoD",
@ -3662,6 +3707,7 @@
        "Name": "DisplayParameters",
        "Value": "1",
        "OriginalValue": "0",
+        "DefaultState": "false",
        "Type": "DWord"
      },
      {
@ -3669,10 +3715,11 @@
        "Name": "DisableEmoticon",
        "Value": "1",
        "OriginalValue": "0",
+        "DefaultState": "false",
        "Type": "DWord"
      }
    ],
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/DetailedBSoD"
+    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/detailedbsod"
  },
  "WPFOOSUbutton": {
    "Content": "Run OO Shutup 10",
@ -3680,7 +3727,7 @@
    "panel": "1",
    "Order": "a039_",
    "Type": "Button",
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/OOSUbutton"
+    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/oosubutton"
  },
  "WPFchangedns": {
    "Content": "DNS",
@ -3689,7 +3736,7 @@
    "Order": "a040_",
    "Type": "Combobox",
    "ComboItems": "Default DHCP Google Cloudflare Cloudflare_Malware Cloudflare_Malware_Adult Open_DNS Quad9 AdGuard_Ads_Trackers AdGuard_Ads_Trackers_Malware_Adult dns0.eu_Open dns0.eu_ZERO dns0.eu_KIDS",
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/changedns"
+    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/changedns"
  },
  "WPFAddUltPerf": {
    "Content": "Add and Activate Ultimate Performance Profile",
@ -3698,7 +3745,7 @@
    "Order": "a080_",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Performance-Plans/AddUltPerf"
+    "link": "https://winutil.christitus.com/dev/tweaks/performance-plans/addultperf"
  },
  "WPFRemoveUltPerf": {
    "Content": "Remove Ultimate Performance Profile",
@ -3707,6 +3754,61 @@
    "Order": "a081_",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://christitustech.github.io/winutil/dev/tweaks/Performance-Plans/RemoveUltPerf"
+    "link": "https://winutil.christitus.com/dev/tweaks/performance-plans/removeultperf"
+  },
+  "WPFTweaksDisableExplorerAutoDiscovery": {
+    "Content": "Disable Explorer Automatic Folder Discovery",
+    "Description": "Windows Explorer automatically tries to guess the type of the folder based on its contents, slowing down the browsing experience.",
+    "category": "Essential Tweaks",
+    "panel": "1",
+    "Order": "a005_",
+    "InvokeScript": [
+      "
+      # Previously detected folders
+      $bags = \"HKCU:\\Software\\Classes\\Local Settings\\Software\\Microsoft\\Windows\\Shell\\Bags\"
+
+      # Folder types lookup table
+      $bagMRU = \"HKCU:\\Software\\Classes\\Local Settings\\Software\\Microsoft\\Windows\\Shell\\BagMRU\"
+
+      # Flush explorer view database
+      Remove-Item -Path $bags -Recurse -Force
+      Write-Host \"Removed $bags\"
+
+      Remove-Item -Path $bagMRU -Recurse -Force
+      Write-Host \"Removed $bagMRU\"
+
+      # Every folder
+      $allFolders = \"HKCU:\\Software\\Classes\\Local Settings\\Software\\Microsoft\\Windows\\Shell\\Bags\\AllFolders\\Shell\"
+
+      if (!(Test-Path $allFolders)) {
+        New-Item -Path $allFolders -Force
+        Write-Host \"Created $allFolders\"
+      }
+
+      # Generic view
+      New-ItemProperty -Path $allFolders -Name \"FolderType\" -Value \"NotSpecified\" -PropertyType String -Force
+      Write-Host \"Set FolderType to NotSpecified\"
+
+      Write-Host Please sign out and back in, or restart your computer to apply the changes!
+      "
+    ],
+    "UndoScript": [
+      "
+      # Previously detected folders
+      $bags = \"HKCU:\\Software\\Classes\\Local Settings\\Software\\Microsoft\\Windows\\Shell\\Bags\"
+
+      # Folder types lookup table
+      $bagMRU = \"HKCU:\\Software\\Classes\\Local Settings\\Software\\Microsoft\\Windows\\Shell\\BagMRU\"
+
+      # Flush explorer view database
+      Remove-Item -Path $bags -Recurse -Force
+      Write-Host \"Removed $bags\"
+
+      Remove-Item -Path $bagMRU -Recurse -Force
+      Write-Host \"Removed $bagMRU\"
+
+      Write-Host Please sign out and back in, or restart your computer to apply the changes!
+      "
+    ]
  }
 }
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@ -6,7 +6,7 @@

 #### **Run the latest pre-release**
   ```ps1
-   irm christitus.com/windev | iex
+   irm https://christitus.com/windev | iex
   ```

 !!! bug "Keep in mind"
--- a/docs/KnownIssues.md
+++ b/docs/KnownIssues.md
@ -6,7 +6,7 @@ Windows Security (formerly Defender) and other anti-virus software are known to
 To resolve this, allow/whitelist the script in your anti-virus software settings, or temporarily disable real-time protection. Since the project is open source, you may audit the code if security is a concern.

 ### Download not working
-If `christitus.com/win` is not working, or you want to download the code from GitHub directly, you can use the direct download link:
+If `https://christitus.com/win` is not working, or you want to download the code from GitHub directly, you can use the direct download link:

 ```ps1
 irm https://github.com/ChrisTitusTech/winutil/releases/latest/download/winutil.ps1 | iex
@ -34,7 +34,7 @@ If you are still having issues, try using a **VPN**, or changing your **DNS prov
 2. In the PowerShell window, type this to allow unsigned code to execute and run the installation script:
    ```ps1
    Set-ExecutionPolicy Unrestricted -Scope Process -Force
-    irm christitus.com/win | iex
+    irm https://christitus.com/win | iex
    ```

 ## Runtime Issues
--- a/docs/dev/features/PowerShell-Profile/PSProfileInstall.md
+++ b/docs/dev/features/PowerShell-Profile/PSProfileInstall.md
@ -1,38 +0,0 @@
-# Install CTT PowerShell Profile
-
-Last Updated: 2024-10-01
-
-
-!!! info
-     The Development Documentation is auto generated for every compilation of WinUtil, meaning a part of it will always stay up-to-date. **Developers do have the ability to add custom content, which won't be updated automatically.**
-
-
-<!-- BEGIN CUSTOM CONTENT -->
-
-<!-- END CUSTOM CONTENT -->
-
-<details>
-<summary>Preview Code</summary>
-
-```json
-{
-  "Content": "Install CTT PowerShell Profile",
-  "category": "Powershell Profile",
-  "panel": "2",
-  "Order": "a083_",
-  "Type": "Button",
-  "ButtonWidth": "300",
-  "link": "https://christitustech.github.io/winutil/dev/features/Powershell-Profile/PSProfileInstall"
-}
-```
-
-</details>
-
-
-<!-- BEGIN SECOND CUSTOM CONTENT -->
-
-<!-- END SECOND CUSTOM CONTENT -->
-
-
-[View the JSON file](https://github.com/ChrisTitusTech/winutil/tree/main/config/feature.json)
-
--- a/docs/dev/features/PowerShell-Profile/PSProfileUninstall.md
+++ b/docs/dev/features/PowerShell-Profile/PSProfileUninstall.md
@ -1,38 +0,0 @@
-# Uninstall CTT PowerShell Profile
-
-Last Updated: 2024-10-01
-
-
-!!! info
-     The Development Documentation is auto generated for every compilation of WinUtil, meaning a part of it will always stay up-to-date. **Developers do have the ability to add custom content, which won't be updated automatically.**
-
-
-<!-- BEGIN CUSTOM CONTENT -->
-
-<!-- END CUSTOM CONTENT -->
-
-<details>
-<summary>Preview Code</summary>
-
-```json
-{
-  "Content": "Uninstall CTT PowerShell Profile",
-  "category": "Powershell Profile",
-  "panel": "2",
-  "Order": "a084_",
-  "Type": "Button",
-  "ButtonWidth": "300",
-  "link": "https://christitustech.github.io/winutil/dev/features/Powershell-Profile/PSProfileUninstall"
-}
-```
-
-</details>
-
-
-<!-- BEGIN SECOND CUSTOM CONTENT -->
-
-<!-- END SECOND CUSTOM CONTENT -->
-
-
-[View the JSON file](https://github.com/ChrisTitusTech/winutil/tree/main/config/feature.json)
-
--- a/docs/devdocs.md
+++ b/docs/devdocs.md
@ -5,104 +5,104 @@

 ### Essential-Tweaks

- [Change Windows Terminal default: PowerShell 5 -> PowerShell 7](../docs/dev/tweaks/Essential-Tweaks/Powershell7.md)
- [Create Restore Point](../docs/dev/tweaks/Essential-Tweaks/RestorePoint.md)
- [Debloat Edge](../docs/dev/tweaks/Essential-Tweaks/EdgeDebloat.md)
- [Delete Temporary Files](../docs/dev/tweaks/Essential-Tweaks/DeleteTempFiles.md)
- [Disable Activity History](../docs/dev/tweaks/Essential-Tweaks/AH.md)
- [Disable ConsumerFeatures](../docs/dev/tweaks/Essential-Tweaks/ConsumerFeatures.md)
- [Disable GameDVR](../docs/dev/tweaks/Essential-Tweaks/DVR.md)
- [Disable Hibernation](../docs/dev/tweaks/Essential-Tweaks/Hiber.md)
- [Disable Homegroup](../docs/dev/tweaks/Essential-Tweaks/Home.md)
- [Disable Location Tracking](../docs/dev/tweaks/Essential-Tweaks/Loc.md)
- [Disable Powershell 7 Telemetry](../docs/dev/tweaks/Essential-Tweaks/Powershell7Tele.md)
- [Disable Storage Sense](../docs/dev/tweaks/Essential-Tweaks/Storage.md)
- [Disable Telemetry](../docs/dev/tweaks/Essential-Tweaks/Tele.md)
- [Disable Wifi-Sense](../docs/dev/tweaks/Essential-Tweaks/Wifi.md)
- [Enable End Task With Right Click](../docs/dev/tweaks/Essential-Tweaks/EndTaskOnTaskbar.md)
- [Prefer IPv4 over IPv6](../docs/dev/tweaks/Essential-Tweaks/IPv46.md)
- [Run Disk Cleanup](../docs/dev/tweaks/Essential-Tweaks/DiskCleanup.md)
- [Set Hibernation as default (good for laptops)](../docs/dev/tweaks/Essential-Tweaks/LaptopHibernation.md)
- [Set Services to Manual](../docs/dev/tweaks/Essential-Tweaks/Services.md)
+- [Change Windows Terminal default: PowerShell 5 -> PowerShell 7](../dev/tweaks/Essential-Tweaks/Powershell7/)
+- [Create Restore Point](../dev/tweaks/Essential-Tweaks/RestorePoint/)
+- [Debloat Edge](../dev/tweaks/Essential-Tweaks/EdgeDebloat/)
+- [Delete Temporary Files](../dev/tweaks/Essential-Tweaks/DeleteTempFiles/)
+- [Disable Activity History](../dev/tweaks/Essential-Tweaks/AH/)
+- [Disable ConsumerFeatures](../dev/tweaks/Essential-Tweaks/ConsumerFeatures/)
+- [Disable GameDVR](../dev/tweaks/Essential-Tweaks/DVR/)
+- [Disable Hibernation](../dev/tweaks/Essential-Tweaks/Hiber/)
+- [Disable Homegroup](../dev/tweaks/Essential-Tweaks/Home/)
+- [Disable Location Tracking](../dev/tweaks/Essential-Tweaks/Loc/)
+- [Disable Powershell 7 Telemetry](../dev/tweaks/Essential-Tweaks/Powershell7Tele/)
+- [Disable Storage Sense](../dev/tweaks/Essential-Tweaks/Storage/)
+- [Disable Telemetry](../dev/tweaks/Essential-Tweaks/Tele/)
+- [Disable Wifi-Sense](../dev/tweaks/Essential-Tweaks/Wifi/)
+- [Enable End Task With Right Click](../dev/tweaks/Essential-Tweaks/EndTaskOnTaskbar/)
+- [Prefer IPv4 over IPv6](../dev/tweaks/Essential-Tweaks/IPv46/)
+- [Run Disk Cleanup](../dev/tweaks/Essential-Tweaks/DiskCleanup/)
+- [Set Hibernation as default (good for laptops)](../dev/tweaks/Essential-Tweaks/LaptopHibernation/)
+- [Set Services to Manual](../dev/tweaks/Essential-Tweaks/Services/)
 ### Shortcuts

- [Create WinUtil Shortcut](../docs/dev/tweaks/Shortcuts/Shortcut.md)
+- [Create WinUtil Shortcut](../dev/tweaks/Shortcuts/Shortcut/)
 ### z--Advanced-Tweaks---CAUTION

- [Adobe Debloat](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/DebloatAdobe.md)
- [Adobe Network Block](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/BlockAdobeNet.md)
- [Disable Background Apps](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableBGapps.md)
- [Disable Fullscreen Optimizations](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableFSO.md)
- [Disable Intel MM (vPro LMS)](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableLMS1.md)
- [Disable IPv6](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/Disableipsix.md)
- [Disable Microsoft Copilot](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveCopilot.md)
- [Disable Notification Tray/Calendar](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableNotifications.md)
- [Disable Teredo](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/Teredo.md)
- [DNS](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/changedns.md)
- [Remove ALL MS Store Apps - NOT RECOMMENDED](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/DeBloat.md)
- [Remove Home and Gallery from explorer](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveHomeGallery.md)
- [Remove Microsoft Edge](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveEdge.md)
- [Remove OneDrive](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveOnedrive.md)
- [Run OO Shutup 10](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/OOSUbutton.md)
- [Set Classic Right-Click Menu ](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/RightClickMenu.md)
- [Set Display for Performance](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/Display.md)
- [Set Time to UTC (Dual Boot)](../docs/dev/tweaks/z--Advanced-Tweaks---CAUTION/UTC.md)
+- [Adobe Debloat](../dev/tweaks/z--Advanced-Tweaks---CAUTION/DebloatAdobe/)
+- [Adobe Network Block](../dev/tweaks/z--Advanced-Tweaks---CAUTION/BlockAdobeNet/)
+- [Disable Background Apps](../dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableBGapps/)
+- [Disable Fullscreen Optimizations](../dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableFSO/)
+- [Disable Intel MM (vPro LMS)](../dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableLMS1/)
+- [Disable IPv6](../dev/tweaks/z--Advanced-Tweaks---CAUTION/Disableipsix/)
+- [Disable Microsoft Copilot](../dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveCopilot/)
+- [Disable Notification Tray/Calendar](../dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableNotifications/)
+- [Disable Teredo](../dev/tweaks/z--Advanced-Tweaks---CAUTION/Teredo/)
+- [DNS](../dev/tweaks/z--Advanced-Tweaks---CAUTION/changedns/)
+- [Remove ALL MS Store Apps - NOT RECOMMENDED](../dev/tweaks/z--Advanced-Tweaks---CAUTION/DeBloat/)
+- [Remove Home and Gallery from explorer](../dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveHomeGallery/)
+- [Remove Microsoft Edge](../dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveEdge/)
+- [Remove OneDrive](../dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveOnedrive/)
+- [Run OO Shutup 10](../dev/tweaks/z--Advanced-Tweaks---CAUTION/OOSUbutton/)
+- [Set Classic Right-Click Menu ](../dev/tweaks/z--Advanced-Tweaks---CAUTION/RightClickMenu/)
+- [Set Display for Performance](../dev/tweaks/z--Advanced-Tweaks---CAUTION/Display/)
+- [Set Time to UTC (Dual Boot)](../dev/tweaks/z--Advanced-Tweaks---CAUTION/UTC/)
 ### Customize-Preferences

- [Bing Search in Start Menu](../docs/dev/tweaks/Customize-Preferences/BingSearch.md)
- [Center Taskbar Items](../docs/dev/tweaks/Customize-Preferences/TaskbarAlignment.md)
- [Dark Theme for Windows](../docs/dev/tweaks/Customize-Preferences/DarkMode.md)
- [Detailed BSoD](../docs/dev/tweaks/Customize-Preferences/DetailedBSoD.md)
- [Mouse Acceleration](../docs/dev/tweaks/Customize-Preferences/MouseAcceleration.md)
- [NumLock on Startup](../docs/dev/tweaks/Customize-Preferences/NumLock.md)
- [Search Button in Taskbar](../docs/dev/tweaks/Customize-Preferences/TaskbarSearch.md)
- [Show File Extensions](../docs/dev/tweaks/Customize-Preferences/ShowExt.md)
- [Show Hidden Files](../docs/dev/tweaks/Customize-Preferences/HiddenFiles.md)
- [Snap Assist Flyout](../docs/dev/tweaks/Customize-Preferences/SnapFlyout.md)
- [Snap Assist Suggestion](../docs/dev/tweaks/Customize-Preferences/SnapSuggestion.md)
- [Snap Window](../docs/dev/tweaks/Customize-Preferences/SnapWindow.md)
- [Sticky Keys](../docs/dev/tweaks/Customize-Preferences/StickyKeys.md)
- [Task View Button in Taskbar](../docs/dev/tweaks/Customize-Preferences/TaskView.md)
- [Verbose Messages During Logon](../docs/dev/tweaks/Customize-Preferences/VerboseLogon.md)
- [Widgets Button in Taskbar](../docs/dev/tweaks/Customize-Preferences/TaskbarWidgets.md)
+- [Bing Search in Start Menu](../dev/tweaks/Customize-Preferences/BingSearch/)
+- [Center Taskbar Items](../dev/tweaks/Customize-Preferences/TaskbarAlignment/)
+- [Dark Theme for Windows](../dev/tweaks/Customize-Preferences/DarkMode/)
+- [Detailed BSoD](../dev/tweaks/Customize-Preferences/DetailedBSoD/)
+- [Mouse Acceleration](../dev/tweaks/Customize-Preferences/MouseAcceleration/)
+- [NumLock on Startup](../dev/tweaks/Customize-Preferences/NumLock/)
+- [Search Button in Taskbar](../dev/tweaks/Customize-Preferences/TaskbarSearch/)
+- [Show File Extensions](../dev/tweaks/Customize-Preferences/ShowExt/)
+- [Show Hidden Files](../dev/tweaks/Customize-Preferences/HiddenFiles/)
+- [Snap Assist Flyout](../dev/tweaks/Customize-Preferences/SnapFlyout/)
+- [Snap Assist Suggestion](../dev/tweaks/Customize-Preferences/SnapSuggestion/)
+- [Snap Window](../dev/tweaks/Customize-Preferences/SnapWindow/)
+- [Sticky Keys](../dev/tweaks/Customize-Preferences/StickyKeys/)
+- [Task View Button in Taskbar](../dev/tweaks/Customize-Preferences/TaskView/)
+- [Verbose Messages During Logon](../dev/tweaks/Customize-Preferences/VerboseLogon/)
+- [Widgets Button in Taskbar](../dev/tweaks/Customize-Preferences/TaskbarWidgets/)
 ### Performance-Plans

- [Add and Activate Ultimate Performance Profile](../docs/dev/tweaks/Performance-Plans/AddUltPerf.md)
- [Remove Ultimate Performance Profile](../docs/dev/tweaks/Performance-Plans/RemoveUltPerf.md)
+- [Add and Activate Ultimate Performance Profile](../dev/tweaks/Performance-Plans/AddUltPerf/)
+- [Remove Ultimate Performance Profile](../dev/tweaks/Performance-Plans/RemoveUltPerf/)

 ## Features

 ### Fixes

- [Remove Adobe Creative Cloud](../docs/dev/features/Fixes/RunAdobeCCCleanerTool.md)
- [Reset Network](../docs/dev/features/Fixes/Network.md)
- [Reset Windows Update](../docs/dev/features/Fixes/Update.md)
- [Set Up Autologin](../docs/dev/features/Fixes/Autologin.md)
- [System Corruption Scan](../docs/dev/features/Fixes/DISM.md)
- [WinGet Reinstall](../docs/dev/features/Fixes/Winget.md)
+- [Remove Adobe Creative Cloud](../dev/features/Fixes/RunAdobeCCCleanerTool/)
+- [Reset Network](../dev/features/Fixes/Network/)
+- [Reset Windows Update](../dev/features/Fixes/Update/)
+- [Set Up Autologin](../dev/features/Fixes/Autologin/)
+- [System Corruption Scan](../dev/features/Fixes/DISM/)
+- [WinGet Reinstall](../dev/features/Fixes/Winget/)
 ### Legacy-Windows-Panels

- [Control Panel](../docs/dev/features/Legacy-Windows-Panels/control.md)
- [Network Connections](../docs/dev/features/Legacy-Windows-Panels/network.md)
- [Power Panel](../docs/dev/features/Legacy-Windows-Panels/power.md)
- [Printer Settings](../docs/dev/features/Legacy-Windows-Panels/printer.md)
- [Region](../docs/dev/features/Legacy-Windows-Panels/region.md)
- [Sound Settings](../docs/dev/features/Legacy-Windows-Panels/sound.md)
- [System Properties](../docs/dev/features/Legacy-Windows-Panels/system.md)
- [User Accounts](../docs/dev/features/Legacy-Windows-Panels/user.md)
+- [Control Panel](../dev/features/Legacy-Windows-Panels/control/)
+- [Network Connections](../dev/features/Legacy-Windows-Panels/network/)
+- [Power Panel](../dev/features/Legacy-Windows-Panels/power/)
+- [Printer Settings](../dev/features/Legacy-Windows-Panels/printer/)
+- [Region](../dev/features/Legacy-Windows-Panels/region/)
+- [Sound Settings](../dev/features/Legacy-Windows-Panels/sound/)
+- [System Properties](../dev/features/Legacy-Windows-Panels/system/)
+- [User Accounts](../dev/features/Legacy-Windows-Panels/user/)
 ### Features

- [All .Net Framework (2,3,4)](../docs/dev/features/Features/dotnet.md)
- [Disable Legacy F8 Boot Recovery](../docs/dev/features/Features/DisableLegacyRecovery.md)
- [Disable Search Box Web Suggestions in Registry(explorer restart)](../docs/dev/features/Features/DisableSearchSuggestions.md)
- [Enable Daily Registry Backup Task 12.30am](../docs/dev/features/Features/RegBackup.md)
- [Enable Legacy F8 Boot Recovery](../docs/dev/features/Features/EnableLegacyRecovery.md)
- [Enable Search Box Web Suggestions in Registry(explorer restart)](../docs/dev/features/Features/EnableSearchSuggestions.md)
- [HyperV Virtualization](../docs/dev/features/Features/hyperv.md)
- [Install Features](../docs/dev/features/Features/Install.md)
- [Legacy Media (WMP, DirectPlay)](../docs/dev/features/Features/legacymedia.md)
- [NFS - Network File System](../docs/dev/features/Features/nfs.md)
- [Windows Sandbox](../docs/dev/features/Features/Sandbox.md)
- [Windows Subsystem for Linux](../docs/dev/features/Features/wsl.md)
+- [All .Net Framework (2,3,4)](../dev/features/Features/dotnet/)
+- [Disable Legacy F8 Boot Recovery](../dev/features/Features/DisableLegacyRecovery/)
+- [Disable Search Box Web Suggestions in Registry(explorer restart)](../dev/features/Features/DisableSearchSuggestions/)
+- [Enable Daily Registry Backup Task 12.30am](../dev/features/Features/RegBackup/)
+- [Enable Legacy F8 Boot Recovery](../dev/features/Features/EnableLegacyRecovery/)
+- [Enable Search Box Web Suggestions in Registry(explorer restart)](../dev/features/Features/EnableSearchSuggestions/)
+- [HyperV Virtualization](../dev/features/Features/hyperv/)
+- [Install Features](../dev/features/Features/Install/)
+- [Legacy Media (WMP, DirectPlay)](../dev/features/Features/legacymedia/)
+- [NFS - Network File System](../dev/features/Features/nfs/)
+- [Windows Sandbox](../dev/features/Features/Sandbox/)
+- [Windows Subsystem for Linux](../dev/features/Features/wsl/)


--- a/docs/index.md
+++ b/docs/index.md
@ -11,7 +11,7 @@ Welcome to the official documentation for WinUtil, your go-to utility for optimi
 * You will first need to start a Powershell terminal **as Admin**.
 * Now you can run the following command:
   ```ps1
-   irm christitus.com/win | iex
+   irm https://christitus.com/win | iex
   ```

 !!! info
--- a/docs/userguide.md
+++ b/docs/userguide.md
@ -258,6 +258,6 @@ With MicroWin, you can also configure your user before proceeding if you don't w

 * On any supported Windows machine, open PowerShell **as Admin** and run the following command to automatically apply tweaks and install apps from the config file.
    ```ps1
-    iex "& { $(irm christitus.com/win) } -Config [path-to-your-config] -Run"
+    iex "& { $(irm https://christitus.com/win) } -Config [path-to-your-config] -Run"
    ```
 * Have a cup of coffee! Come back when it's done.
--- a/functions/microwin/Invoke-Microwin.ps1
+++ b/functions/microwin/Invoke-Microwin.ps1
@ -55,6 +55,8 @@ public class PowerManagement {
    $injectDrivers = $sync.MicrowinInjectDrivers.IsChecked
    $importDrivers = $sync.MicrowinImportDrivers.IsChecked

+    $importVirtIO = $sync.MicrowinCopyVirtIO.IsChecked
+
    $mountDir = $sync.MicrowinMountDir.Text
    $scratchDir = $sync.MicrowinScratchDir.Text

@ -109,7 +111,7 @@ public class PowerManagement {
        Write-Host "Mounting Windows image. This may take a while."
        Mount-WindowsImage -ImagePath "$mountDir\sources\install.wim" -Index $index -Path "$scratchDir"
        if ($?) {
-            Write-Host "Mounting complete! Performing removal of applications..."
+            Write-Host "The Windows image has been mounted successfully. Continuing processing..."
        } else {
            Write-Host "Could not mount image. Exiting..."
            Set-WinUtilTaskbaritem -state "Error" -value 1 -overlay "warning"
@ -155,13 +157,18 @@ public class PowerManagement {
            }
        }

+        if ($importVirtIO) {
+            Write-Host "Copying VirtIO drivers..."
+            Microwin-CopyVirtIO
+        }
+
        Write-Host "Remove Features from the image"
-        Microwin-RemoveFeatures
+        Microwin-RemoveFeatures -UseCmdlets $true
        Write-Host "Removing features complete!"
        Write-Host "Removing OS packages"
-        Microwin-RemovePackages
+        Microwin-RemovePackages -UseCmdlets $true
        Write-Host "Removing Appx Bloat"
-        Microwin-RemoveProvisionedPackages
+        Microwin-RemoveProvisionedPackages -UseCmdlets $true

        # Detect Windows 11 24H2 and add dependency to FileExp to prevent Explorer look from going back - thanks @WitherOrNot and @thecatontheceiling
        if ((Microwin-TestCompatibleImage $imgVersion $([System.Version]::new(10,0,26100,1))) -eq $true) {
@ -181,7 +188,8 @@ public class PowerManagement {
                }
            }
            catch {
-                # Do nothing
+                # Fall back to what we used to do: delayed disablement
+                Enable-WindowsOptionalFeature -Path "$scratchDir" -FeatureName "Recall"
            }
        }

@ -189,8 +197,6 @@ public class PowerManagement {
        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Windows\DiagTrack" -Directory
        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Windows\InboxApps" -Directory
        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Windows\System32\LocationNotificationWindows.exe"
-        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Windows Photo Viewer" -Directory
-        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Windows Photo Viewer" -Directory
        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Windows Media Player" -Directory
        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Program Files\Windows Media Player" -Directory
        Microwin-RemoveFileOrDirectory -pathToDelete "$($scratchDir)\Program Files (x86)\Windows Mail" -Directory
@ -280,20 +286,22 @@ public class PowerManagement {
        reg add "HKLM\zSYSTEM\Setup\LabConfig" /v "BypassTPMCheck" /t REG_DWORD /d 1 /f
        reg add "HKLM\zSYSTEM\Setup\MoSetup" /v "AllowUpgradesWithUnsupportedTPMOrCPU" /t REG_DWORD /d 1 /f

-        # Prevent Windows Update Installing so called Expedited Apps
-        @(
-            'EdgeUpdate',
-            'DevHomeUpdate',
-            'OutlookUpdate',
-            'CrossDeviceUpdate'
-        ) | ForEach-Object {
-            Write-Host "Removing Windows Expedited App: $_"
+        # Prevent Windows Update Installing so called Expedited Apps - 24H2 and newer
+        if ((Microwin-TestCompatibleImage $imgVersion $([System.Version]::new(10,0,26100,1))) -eq $true) {
+            @(
+                'EdgeUpdate',
+                'DevHomeUpdate',
+                'OutlookUpdate',
+                '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
+                # 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
+                # When in Offline Image
+                reg delete "HKLM\zSOFTWARE\Microsoft\WindowsUpdate\Orchestrator\UScheduler_Oobe\$_" /f | Out-Null
+            }
        }

        reg add "HKLM\zSOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "SearchboxTaskbarMode" /t REG_DWORD /d 0 /f
@ -330,6 +338,7 @@ public class PowerManagement {
            reg add "HKLM\zNTUSER\SOFTWARE\Microsoft\Windows\CurrentVersion\SearchSettings" /v "IsDynamicSearchBoxEnabled" /t REG_DWORD /d 0 /f
            reg add "HKLM\zSOFTWARE\Policies\Microsoft\Dsh" /v "AllowNewsAndInterests" /t REG_DWORD /d 0 /f
            reg add "HKLM\zNTUSER\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "TraySearchBoxVisible" /t REG_DWORD /d 1 /f
+            reg add "HKLM\zSOFTWARE\Policies\Microsoft\Windows\Windows Feeds" /v "EnableFeeds" /t REG_DWORD /d 0 /f
        }

    } catch {
--- a/functions/microwin/Invoke-MicrowinGetIso.ps1
+++ b/functions/microwin/Invoke-MicrowinGetIso.ps1
@ -169,7 +169,7 @@ function Invoke-MicrowinGetIso {
    try {
        Write-Host "Mounting Iso. Please wait."
        $mountedISO = Mount-DiskImage -PassThru "$filePath"
-        Write-Host "Done mounting Iso $mountedISO"
+        Write-Host "Done mounting Iso `"$($mountedISO.ImagePath)`""
        $driveLetter = (Get-Volume -DiskImage $mountedISO).DriveLetter
        Write-Host "Iso mounted to '$driveLetter'"
    } catch {
@ -189,7 +189,7 @@ function Invoke-MicrowinGetIso {
        $sync.MicrowinScratchDirBox.Text =""
    }

-     $UseISOScratchDir = $sync.WPFMicrowinISOScratchDir.IsChecked
+    $UseISOScratchDir = $sync.WPFMicrowinISOScratchDir.IsChecked

    if ($UseISOScratchDir) {
        $sync.MicrowinScratchDirBox.Text=$mountedISOPath
@ -220,10 +220,10 @@ function Invoke-MicrowinGetIso {
    $sync.BusyText.Text=" - Mounting"
    Write-Host "Mounting Iso. Please wait."
    if ($sync.MicrowinScratchDirBox.Text -eq "") {
-    $mountDir = Join-Path $env:TEMP $randomMicrowin
-    $scratchDir = Join-Path $env:TEMP $randomMicrowinScratch
+        $mountDir = Join-Path $env:TEMP $randomMicrowin
+        $scratchDir = Join-Path $env:TEMP $randomMicrowinScratch
    } else {
-        $scratchDir = $sync.MicrowinScratchDirBox.Text+"Scrach"
+        $scratchDir = $sync.MicrowinScratchDirBox.Text+"Scratch"
        $mountDir = $sync.MicrowinScratchDirBox.Text+"micro"
    }

@ -242,8 +242,8 @@ function Invoke-MicrowinGetIso {

        # 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 }
-        Write-Host "Copy complete! Total Time: $($totalTime.Minutes)m$($totalTime.Seconds)s"
+        $totalTime = Measure-Command { Copy-Files "$($driveLetter):" "$mountDir" -Recurse -Force }
+        Write-Host "Copy complete! Total Time: $($totalTime.Minutes) minutes, $($totalTime.Seconds) seconds"

        $wimFile = "$mountDir\sources\install.wim"
        Write-Host "Getting image information $wimFile"
--- a/functions/microwin/Microwin-CopyToUSB.ps1
+++ b/functions/microwin/Microwin-CopyToUSB.ps1
@ -16,6 +16,54 @@ function Microwin-CopyToUSB([string]$fileToCopy) {
                }

            Write-Host "File copied to Ventoy drive $($volume.DriveLetter)"
+
+            # Detect if config files are present, move them if they are, and configure the Ventoy drive to not bypass the requirements
+            $customVentoyConfig = @'
+{
+    "control":[
+        { "VTOY_WIN11_BYPASS_CHECK": "0" },
+        { "VTOY_WIN11_BYPASS_NRO": "0" }
+    ],
+    "control_legacy":[
+        { "VTOY_WIN11_BYPASS_CHECK": "0" },
+        { "VTOY_WIN11_BYPASS_NRO": "0" }
+    ],
+    "control_uefi":[
+        { "VTOY_WIN11_BYPASS_CHECK": "0" },
+        { "VTOY_WIN11_BYPASS_NRO": "0" }
+    ],
+    "control_ia32":[
+        { "VTOY_WIN11_BYPASS_CHECK": "0" },
+        { "VTOY_WIN11_BYPASS_NRO": "0" }
+    ],
+    "control_aa64":[
+        { "VTOY_WIN11_BYPASS_CHECK": "0" },
+        { "VTOY_WIN11_BYPASS_NRO": "0" }
+    ],
+    "control_mips":[
+        { "VTOY_WIN11_BYPASS_CHECK": "0" },
+        { "VTOY_WIN11_BYPASS_NRO": "0" }
+    ]
+}
+'@
+
+            try {
+                Write-Host "Writing custom Ventoy configuration. Please wait..."
+                if (Test-Path -Path "$($volume.DriveLetter):\ventoy\ventoy.json" -PathType Leaf) {
+                    Write-Host "A Ventoy configuration file exists. Moving it..."
+                    Move-Item -Path "$($volume.DriveLetter):\ventoy\ventoy.json" -Destination "$($volume.DriveLetter):\ventoy\ventoy.json.old" -Force
+                    Write-Host "Existing Ventoy configuration has been moved to `"ventoy.json.old`". Feel free to put your config back into the `"ventoy.json`" file."
+                }
+                if (-not (Test-Path -Path "$($volume.DriveLetter):\ventoy")) {
+                    New-Item -Path "$($volume.DriveLetter):\ventoy" -ItemType Directory -Force | Out-Null
+                }
+                $customVentoyConfig | Out-File -FilePath "$($volume.DriveLetter):\ventoy\ventoy.json" -Encoding utf8 -Force
+                Write-Host "The Ventoy drive has been successfully configured."
+            } catch {
+                Write-Host "Could not configure Ventoy drive. Error: $($_.Exception.Message)`n"
+                Write-Host "Be sure to add the following configuration to the Ventoy drive by either creating a `"ventoy.json`" file in the `"ventoy`" directory (create it if it doesn't exist) or by editing an existing one: `n`n$customVentoyConfig`n"
+                Write-Host "Failure to do this will cause conflicts with your target ISO file."
+            }
            return
        }
    }
--- a/functions/microwin/Microwin-CopyVirtIO.ps1
+++ b/functions/microwin/Microwin-CopyVirtIO.ps1
@ -0,0 +1,40 @@
+function Microwin-CopyVirtIO {
+    <#
+        .SYNOPSIS
+            Downloads and copies the VirtIO Guest Tools drivers to the target MicroWin ISO
+        .NOTES
+            A network connection must be available and the servers of Fedora People must be up. Automatic driver installation will not be added yet - I want this implementation to be reliable.
+    #>
+
+    try {
+        Write-Host "Checking existing files..."
+        if (Test-Path -Path "$($env:TEMP)\virtio.iso" -PathType Leaf) {
+            Write-Host "VirtIO ISO has been detected. Deleting..."
+            Remove-Item -Path "$($env:TEMP)\virtio.iso" -Force
+        }
+        Write-Host "Getting latest VirtIO drivers. Please wait. This can take some time, depending on your network connection speed and the speed of the servers..."
+        Start-BitsTransfer -Source "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso" -Destination "$($env:TEMP)\virtio.iso" -DisplayName "Downloading VirtIO drivers..."
+        # Do everything else if the VirtIO ISO exists
+        if (Test-Path -Path "$($env:TEMP)\virtio.iso" -PathType Leaf) {
+            Write-Host "Mounting ISO. Please wait."
+            $virtIO_ISO = Mount-DiskImage -PassThru "$($env:TEMP)\virtio.iso"
+            $driveLetter = (Get-Volume -DiskImage $virtIO_ISO).DriveLetter
+            # Create new directory for VirtIO on ISO
+            New-Item -Path "$mountDir\VirtIO" -ItemType Directory | Out-Null
+            $totalTime = Measure-Command { Copy-Files "$($driveLetter):" "$mountDir\VirtIO" -Recurse -Force }
+            Write-Host "VirtIO contents have been successfully copied. Time taken: $($totalTime.Minutes) minutes, $($totalTime.Seconds) seconds`n"
+            Get-Volume $driveLetter | Get-DiskImage | Dismount-DiskImage
+            Remove-Item -Path "$($env:TEMP)\virtio.iso" -Force -ErrorAction SilentlyContinue
+            Write-Host "To proceed with installation of the MicroWin image in QEMU/Proxmox VE:"
+            Write-Host "1. Proceed with Setup until you reach the disk selection screen, in which you won't see any drives"
+            Write-Host "2. Click `"Load Driver`" and click Browse"
+            Write-Host "3. In the folder selection dialog, point to this path:`n`n    `"D:\VirtIO\vioscsi\w11\amd64`" (replace amd64 with ARM64 if you are using Windows on ARM, and `"D:`" with the drive letter of the ISO)`n"
+            Write-Host "4. Select all drivers that will appear in the list box and click OK"
+        } else {
+            throw "Could not download VirtIO drivers"
+        }
+    } catch {
+        Write-Host "We could not download and/or prepare the VirtIO drivers. Error information: $_`n"
+        Write-Host "You will need to download these drivers manually. Location: https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso"
+    }
+}
--- a/functions/microwin/Microwin-NewFirstRun.ps1
+++ b/functions/microwin/Microwin-NewFirstRun.ps1
@ -54,7 +54,7 @@ function Microwin-NewFirstRun {

    try
    {
-        if ((Get-WindowsOptionalFeature -Online | Where-Object { $_.FeatureName -like "Recall" }).Count -gt 0)
+        if ((Get-WindowsOptionalFeature -Online | Where-Object { $_.State -eq 'Enabled' -and $_.FeatureName -like "Recall" }).Count -gt 0)
        {
            Disable-WindowsOptionalFeature -Online -FeatureName "Recall" -Remove
        }
@ -63,6 +63,29 @@ function Microwin-NewFirstRun {
    {

    }
+
+    # Get BCD entries and set bootmgr timeout accordingly
+    try
+    {
+        # Check if the number of occurrences of "path" is 2 - this fixes the Boot Manager screen issue (#2562)
+        if ((bcdedit | Select-String "path").Count -eq 2)
+        {
+            # Set bootmgr timeout to 0
+            bcdedit /set `{bootmgr`} timeout 0
+        }
+    }
+    catch
+    {
+
+    }
+
+    reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Notifications\Settings\Windows.SystemToast.Suggested" /f
+    reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Notifications\Settings\Windows.SystemToast.Suggested" /v Enabled /t REG_DWORD /d 0 /f
+    reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Notifications\Settings\Windows.SystemToast.StartupApp" /f
+    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
+
 '@
    $firstRun | Out-File -FilePath "$env:temp\FirstStartup.ps1" -Force
 }
--- a/functions/microwin/Microwin-NewUnattend.ps1
+++ b/functions/microwin/Microwin-NewUnattend.ps1
@ -31,7 +31,7 @@ function Microwin-NewUnattend {
                            <Group>Administrators</Group>
                            <Password>
                                <Value>PW-REPLACEME</Value>
-                                <PlainText>true</PlainText>
+                                <PlainText>PT-STATUS</PlainText>
                            </Password>
                        </LocalAccount>
                    </LocalAccounts>
@ -42,7 +42,7 @@ function Microwin-NewUnattend {
                    <LogonCount>1</LogonCount>
                    <Password>
                        <Value>PW-REPLACEME</Value>
-                        <PlainText>true</PlainText>
+                        <PlainText>PT-STATUS</PlainText>
                    </Password>
                </AutoLogon>
                <OOBE>
@ -160,134 +160,126 @@ function Microwin-NewUnattend {
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
                    <Order>19</Order>
-                    <Path>powershell.exe -NoProfile -Command "Get-Content -LiteralPath 'C:\Windows\Temp\Microwin-RemovePackages.ps1' -Raw | Invoke-Expression;"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>20</Order>
-                    <Path>powershell.exe -NoProfile -Command "Get-Content -LiteralPath 'C:\Windows\Temp\remove-caps.ps1' -Raw | Invoke-Expression;"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>21</Order>
                    <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\current\device\Start" /v ConfigureStartPins /t REG_SZ /d "{ \"pinnedList\": [] }" /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>22</Order>
+                    <Order>20</Order>
                    <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\current\device\Start" /v ConfigureStartPins_ProviderSet /t REG_DWORD /d 1 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>23</Order>
+                    <Order>21</Order>
                    <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\current\device\Start" /v ConfigureStartPins_WinningProvider /t REG_SZ /d B5292708-1619-419B-9923-E5D9F3925E71 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>24</Order>
+                    <Order>22</Order>
                    <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\providers\B5292708-1619-419B-9923-E5D9F3925E71\default\Device\Start" /v ConfigureStartPins /t REG_SZ /d "{ \"pinnedList\": [] }" /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>25</Order>
+                    <Order>23</Order>
                    <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\providers\B5292708-1619-419B-9923-E5D9F3925E71\default\Device\Start" /v ConfigureStartPins_LastWrite /t REG_DWORD /d 1 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>26</Order>
+                    <Order>24</Order>
                    <Path>net.exe accounts /maxpwage:UNLIMITED</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>27</Order>
+                    <Order>25</Order>
                    <Path>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>28</Order>
+                    <Order>26</Order>
                    <Path>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Power" /v HiberbootEnabled /t REG_DWORD /d 0 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>29</Order>
+                    <Order>27</Order>
                    <Path>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Dsh" /v AllowNewsAndInterests /t REG_DWORD /d 0 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>30</Order>
+                    <Order>28</Order>
                    <Path>reg.exe load "HKU\DefaultUser" "C:\Users\Default\NTUSER.DAT"</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>31</Order>
+                    <Order>29</Order>
                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "ContentDeliveryAllowed" /t REG_DWORD /d 0 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>32</Order>
+                    <Order>30</Order>
                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "FeatureManagementEnabled" /t REG_DWORD /d 0 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>33</Order>
+                    <Order>31</Order>
                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "OEMPreInstalledAppsEnabled" /t REG_DWORD /d 0 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>34</Order>
+                    <Order>32</Order>
                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "PreInstalledAppsEnabled" /t REG_DWORD /d 0 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>35</Order>
+                    <Order>33</Order>
                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "PreInstalledAppsEverEnabled" /t REG_DWORD /d 0 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>36</Order>
+                    <Order>34</Order>
                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SilentInstalledAppsEnabled" /t REG_DWORD /d 0 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>37</Order>
+                    <Order>35</Order>
                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SoftLandingEnabled" /t REG_DWORD /d 0 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>38</Order>
+                    <Order>36</Order>
                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContentEnabled" /t REG_DWORD /d 0 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>39</Order>
+                    <Order>37</Order>
                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-310093Enabled" /t REG_DWORD /d 0 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>40</Order>
+                    <Order>38</Order>
                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338387Enabled" /t REG_DWORD /d 0 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>41</Order>
+                    <Order>39</Order>
                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338388Enabled" /t REG_DWORD /d 0 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>42</Order>
+                    <Order>40</Order>
                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338389Enabled" /t REG_DWORD /d 0 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>43</Order>
+                    <Order>41</Order>
                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338393Enabled" /t REG_DWORD /d 0 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>44</Order>
+                    <Order>42</Order>
                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-353698Enabled" /t REG_DWORD /d 0 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>45</Order>
+                    <Order>43</Order>
                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SystemPaneSuggestionsEnabled" /t REG_DWORD /d 0 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>46</Order>
+                    <Order>44</Order>
                    <Path>reg.exe unload "HKU\DefaultUser"</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>47</Order>
+                    <Order>45</Order>
                    <Path>reg.exe add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v "DisableWindowsConsumerFeatures" /t REG_DWORD /d 0 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>48</Order>
+                    <Order>46</Order>
                    <Path>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\BitLocker" /v "PreventDeviceEncryption" /t REG_DWORD /d 1 /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>49</Order>
+                    <Order>47</Order>
                    <Path>reg.exe load "HKU\DefaultUser" "C:\Users\Default\NTUSER.DAT"</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>50</Order>
+                    <Order>48</Order>
                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\Runonce" /v "ClassicContextMenu" /t REG_SZ /d "reg.exe add \"HKCU\Software\Classes\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\InprocServer32\" /ve /f" /f</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
-                    <Order>51</Order>
+                    <Order>49</Order>
                    <Path>reg.exe unload "HKU\DefaultUser"</Path>
                </RunSynchronousCommand>
            </RunSynchronous>
@ -295,15 +287,40 @@ function Microwin-NewUnattend {
    </settings>
 '@
    if ((Microwin-TestCompatibleImage $imgVersion $([System.Version]::new(10,0,22000,1))) -eq $false) {
-    # Replace the placeholder text with an empty string to make it valid for Windows 10 Setup
-    $unattend = $unattend.Replace("<#REPLACEME#>", "").Trim()
+        # Replace the placeholder text with an empty string to make it valid for Windows 10 Setup
+        $unattend = $unattend.Replace("<#REPLACEME#>", "").Trim()
    } else {
-    # Replace the placeholder text with the Specialize pass
-    $unattend = $unattend.Replace("<#REPLACEME#>", $specPass).Trim()
+        # Replace the placeholder text with the Specialize pass
+        $unattend = $unattend.Replace("<#REPLACEME#>", $specPass).Trim()
    }
+
+    # User password in Base64. According to Microsoft, this is the way you can hide this sensitive information.
+    # More information can be found here: https://learn.microsoft.com/en-us/windows-hardware/customize/desktop/wsim/hide-sensitive-data-in-an-answer-file
+    # Yeah, I know this is not the best way to protect this kind of data, but we all know how Microsoft is - "the Apple of security" (in a sense, it takes them
+    # an eternity to implement basic security features right. Just look at the NTLM and Kerberos situation!)
+
+    $b64pass = ""
+
    # Replace default User and Password values with the provided parameters
    $unattend = $unattend.Replace("USER-REPLACEME", $userName).Trim()
-    $unattend = $unattend.Replace("PW-REPLACEME", $userPassword).Trim()
+    try {
+        # I want to play it safe here - I don't want encoding mismatch problems like last time
+
+        # NOTE: "Password" needs to be appended to the password specified by the user. Otherwise, a parse error will occur when processing oobeSystem.
+        # This will not be added to the actual password stored in the target system's SAM file - only the provided password
+        $b64pass = [Convert]::ToBase64String([System.Text.Encoding]::Unicode.GetBytes("$($userPassword)Password"))
+    } catch {
+        $b64pass = ""
+    }
+    if ($b64pass -ne "") {
+        # If we could encode the password with Base64, put it in the answer file and indicate that it's NOT in plain text
+        $unattend = $unattend.Replace("PW-REPLACEME", $b64pass).Trim()
+        $unattend = $unattend.Replace("PT-STATUS", "false").Trim()
+        $b64pass = ""
+    } else {
+        $unattend = $unattend.Replace("PW-REPLACEME", $userPassword).Trim()
+        $unattend = $unattend.Replace("PT-STATUS", "true").Trim()
+    }

    # Save unattended answer file with UTF-8 encoding
    $unattend | Out-File -FilePath "$env:temp\unattend.xml" -Force -Encoding utf8
--- a/functions/microwin/Microwin-RemoveFeatures.ps1
+++ b/functions/microwin/Microwin-RemoveFeatures.ps1
@ -3,38 +3,80 @@ function Microwin-RemoveFeatures() {
        .SYNOPSIS
            Removes certain features from ISO image

-        .PARAMETER Name
-            No Params
+        .PARAMETER UseCmdlets
+            Determines whether or not to use the DISM cmdlets for processing.
+            - If true, DISM cmdlets will be used
+            - If false, calls to the DISM executable will be made whilst selecting bits and pieces from the output as a string (that was how MicroWin worked before
+              the DISM conversion to cmdlets)

        .EXAMPLE
-            Microwin-RemoveFeatures
+            Microwin-RemoveFeatures -UseCmdlets $true
    #>
+    param (
+        [Parameter(Mandatory = $true, Position = 0)] [bool]$UseCmdlets
+    )
    try {
-        $featlist = (Get-WindowsOptionalFeature -Path $scratchDir)
+        if ($UseCmdlets) {
+            $featlist = (Get-WindowsOptionalFeature -Path "$scratchDir")

-        $featlist = $featlist | Where-Object {
-            $_.FeatureName -NotLike "*Defender*" -AND
-            $_.FeatureName -NotLike "*Printing*" -AND
-            $_.FeatureName -NotLike "*TelnetClient*" -AND
-            $_.FeatureName -NotLike "*PowerShell*" -AND
-            $_.FeatureName -NotLike "*NetFx*" -AND
-            $_.FeatureName -NotLike "*Media*" -AND
-            $_.FeatureName -NotLike "*NFS*" -AND
-            $_.FeatureName -NotLike "*SearchEngine*" -AND
-            $_.FeatureName -NotLike "*RemoteDesktop*" -AND
-            $_.State -ne "Disabled"
+            $featlist = $featlist | Where-Object {
+                $_.FeatureName -NotLike "*Defender*" -AND
+                $_.FeatureName -NotLike "*Printing*" -AND
+                $_.FeatureName -NotLike "*TelnetClient*" -AND
+                $_.FeatureName -NotLike "*PowerShell*" -AND
+                $_.FeatureName -NotLike "*NetFx*" -AND
+                $_.FeatureName -NotLike "*Media*" -AND
+                $_.FeatureName -NotLike "*NFS*" -AND
+                $_.FeatureName -NotLike "*SearchEngine*" -AND
+                $_.FeatureName -NotLike "*RemoteDesktop*" -AND
+                $_.State -ne "Disabled"
+            }
+        } else {
+            $featList = dism /english /image="$scratchDir" /get-features | Select-String -Pattern "Feature Name : " -CaseSensitive -SimpleMatch
+            if ($?) {
+                $featList = $featList -split "Feature Name : " | Where-Object {$_}
+                # Exclude the same items. Note: for now, this doesn't exclude those features that are disabled.
+                # This will appear in the future
+                $featList = $featList | Where-Object {
+                    $_ -NotLike "*Defender*" -AND
+                    $_ -NotLike "*Printing*" -AND
+                    $_ -NotLike "*TelnetClient*" -AND
+                    $_ -NotLike "*PowerShell*" -AND
+                    $_ -NotLike "*NetFx*" -AND
+                    $_ -NotLike "*Media*" -AND
+                    $_ -NotLike "*NFS*" -AND
+                    $_ -NotLike "*SearchEngine*" -AND
+                    $_ -NotLike "*RemoteDesktop*"
+                }
+            } else {
+                Write-Host "Features could not be obtained with DISM. MicroWin processing will continue, but features will be skipped."
+                return
+            }
        }

-        foreach($feature in $featlist) {
-            $status = "Removing feature $($feature.FeatureName)"
-            Write-Progress -Activity "Removing features" -Status $status -PercentComplete ($counter++/$featlist.Count*100)
-            Write-Debug "Removing feature $($feature.FeatureName)"
-            Disable-WindowsOptionalFeature -Path "$scratchDir" -FeatureName $($feature.FeatureName) -Remove  -ErrorAction SilentlyContinue -NoRestart
+        if ($UseCmdlets) {
+            foreach ($feature in $featList) {
+                $status = "Removing feature $($feature.FeatureName)"
+                Write-Progress -Activity "Removing features" -Status $status -PercentComplete ($counter++/$featlist.Count*100)
+                Write-Debug "Removing feature $($feature.FeatureName)"
+                Disable-WindowsOptionalFeature -Path "$scratchDir" -FeatureName $($feature.FeatureName) -Remove  -ErrorAction SilentlyContinue -NoRestart
+            }
+        } else {
+            foreach ($feature in $featList) {
+                $status = "Removing feature $feature"
+                Write-Progress -Activity "Removing features" -Status $status -PercentComplete ($counter++/$featlist.Count*100)
+                Write-Debug "Removing feature $feature"
+                dism /english /image="$scratchDir" /disable-feature /featurename=$feature /remove /quiet /norestart | Out-Null
+                if ($? -eq $false) {
+                    Write-Host "Feature $feature could not be disabled."
+                }
+            }
        }
        Write-Progress -Activity "Removing features" -Status "Ready" -Completed
        Write-Host "You can re-enable the disabled features at any time, using either Windows Update or the SxS folder in <installation media>\Sources."
    } catch {
-        Write-Host "Unable to get information about the features. MicroWin processing will continue, but features will not be processed"
+        Write-Host "Unable to get information about the features. A fallback will be used..."
        Write-Host "Error information: $($_.Exception.Message)" -ForegroundColor Yellow
+        Microwin-RemoveFeatures -UseCmdlets $false
    }
 }
--- a/functions/microwin/Microwin-RemoveFileOrDirectory.ps1
+++ b/functions/microwin/Microwin-RemoveFileOrDirectory.ps1
@ -12,7 +12,11 @@ function Microwin-RemoveFileOrDirectory([string]$pathToDelete, [string]$mask = "
        [void]$itemsToDelete.Add($pathToDelete)
    } else {
        Write-Debug "Adding $($pathToDelete) to array and mask is $($mask)"
-        if ($Directory) { $itemsToDelete = Get-ChildItem $pathToDelete -Include $mask -Recurse -Directory } else { $itemsToDelete = Get-ChildItem $pathToDelete -Include $mask -Recurse }
+        if ($Directory) {
+            $itemsToDelete = Get-ChildItem $pathToDelete -Include $mask -Recurse -Directory
+        } else {
+            $itemsToDelete = Get-ChildItem $pathToDelete -Include $mask -Recurse
+        }
    }

    foreach($itemToDelete in $itemsToDelete) {
--- a/functions/microwin/Microwin-RemovePackages.ps1
+++ b/functions/microwin/Microwin-RemovePackages.ps1
@ -1,71 +1,103 @@
 function Microwin-RemovePackages {
+    <#
+        .SYNOPSIS
+            Removes certain packages from ISO image
+
+        .PARAMETER UseCmdlets
+            Determines whether or not to use the DISM cmdlets for processing.
+            - If true, DISM cmdlets will be used
+            - If false, calls to the DISM executable will be made whilst selecting bits and pieces from the output as a string (that was how MicroWin worked before
+              the DISM conversion to cmdlets)
+
+        .EXAMPLE
+            Microwin-RemovePackages -UseCmdlets $true
+    #>
+    param (
+        [Parameter(Mandatory = $true, Position = 0)] [bool]$UseCmdlets
+    )
    try {
-        $pkglist = (Get-WindowsPackage -Path "$scratchDir").PackageName
+        if ($useCmdlets) {
+            $pkglist = (Get-WindowsPackage -Path "$scratchDir").PackageName

-        $pkglist = $pkglist | Where-Object {
-                $_ -NotLike "*ApplicationModel*" -AND
-                $_ -NotLike "*indows-Client-LanguagePack*" -AND
-                $_ -NotLike "*LanguageFeatures-Basic*" -AND
-                $_ -NotLike "*Package_for_ServicingStack*" -AND
-                $_ -NotLike "*.NET*" -AND
-                $_ -NotLike "*Store*" -AND
-                $_ -NotLike "*VCLibs*" -AND
-                $_ -NotLike "*AAD.BrokerPlugin",
-                $_ -NotLike "*LockApp*" -AND
-                $_ -NotLike "*Notepad*" -AND
-                $_ -NotLike "*immersivecontrolpanel*" -AND
-                $_ -NotLike "*ContentDeliveryManager*" -AND
-                $_ -NotLike "*PinningConfirMationDialog*" -AND
-                $_ -NotLike "*SecHealthUI*" -AND
-                $_ -NotLike "*SecureAssessmentBrowser*" -AND
-                $_ -NotLike "*PrintDialog*" -AND
-                $_ -NotLike "*AssignedAccessLockApp*" -AND
-                $_ -NotLike "*OOBENetworkConnectionFlow*" -AND
-                $_ -NotLike "*Apprep.ChxApp*" -AND
-                $_ -NotLike "*CBS*" -AND
-                $_ -NotLike "*OOBENetworkCaptivePortal*" -AND
-                $_ -NotLike "*PeopleExperienceHost*" -AND
-                $_ -NotLike "*ParentalControls*" -AND
-                $_ -NotLike "*Win32WebViewHost*" -AND
-                $_ -NotLike "*InputApp*" -AND
-                $_ -NotLike "*DirectPlay*" -AND
-                $_ -NotLike "*AccountsControl*" -AND
-                $_ -NotLike "*AsyncTextService*" -AND
-                $_ -NotLike "*CapturePicker*" -AND
-                $_ -NotLike "*CredDialogHost*" -AND
-                $_ -NotLike "*BioEnrollMent*" -AND
-                $_ -NotLike "*ShellExperienceHost*" -AND
-                $_ -NotLike "*DesktopAppInstaller*" -AND
-                $_ -NotLike "*WebMediaExtensions*" -AND
-                $_ -NotLike "*WMIC*" -AND
-                $_ -NotLike "*UI.XaML*" -AND
-                $_ -NotLike "*Ethernet*" -AND
-                $_ -NotLike "*Wifi*" -AND
-                $_ -NotLike "*FodMetadata*" -AND
-                $_ -NotLike "*Foundation*" -AND
-                $_ -NotLike "*LanguageFeatures*" -AND
-                $_ -NotLike "*VBSCRIPT*" -AND
-                $_ -NotLike "*License*"
+            $pkglist = $pkglist | Where-Object {
+                    $_ -NotLike "*ApplicationModel*" -AND
+                    $_ -NotLike "*indows-Client-LanguagePack*" -AND
+                    $_ -NotLike "*LanguageFeatures-Basic*" -AND
+                    $_ -NotLike "*Package_for_ServicingStack*" -AND
+                    $_ -NotLike "*DotNet*" -AND
+                    $_ -NotLike "*Notepad*" -AND
+                    $_ -NotLike "*WMIC*" -AND
+                    $_ -NotLike "*Ethernet*" -AND
+                    $_ -NotLike "*Wifi*" -AND
+                    $_ -NotLike "*FodMetadata*" -AND
+                    $_ -NotLike "*Foundation*" -AND
+                    $_ -NotLike "*LanguageFeatures*" -AND
+                    $_ -NotLike "*VBSCRIPT*" -AND
+                    $_ -NotLike "*License*" -AND
+                    $_ -NotLike "*Hello-Face*" -AND
+                    $_ -NotLike "*ISE*" -AND
+                    $_ -NotLike "*OpenSSH*"
+                }
+        } else {
+            $pkgList = dism /english /image="$scratchDir" /get-packages | Select-String -Pattern "Package Identity : " -CaseSensitive -SimpleMatch
+            if ($?) {
+                $pkgList = $pkgList -split "Package Identity : " | Where-Object {$_}
+                # Exclude the same items.
+                $pkgList = $pkgList | Where-Object {
+                    $_ -NotLike "*ApplicationModel*" -AND
+                    $_ -NotLike "*indows-Client-LanguagePack*" -AND
+                    $_ -NotLike "*LanguageFeatures-Basic*" -AND
+                    $_ -NotLike "*Package_for_ServicingStack*" -AND
+                    $_ -NotLike "*DotNet*" -AND
+                    $_ -NotLike "*Notepad*" -AND
+                    $_ -NotLike "*WMIC*" -AND
+                    $_ -NotLike "*Ethernet*" -AND
+                    $_ -NotLike "*Wifi*" -AND
+                    $_ -NotLike "*FodMetadata*" -AND
+                    $_ -NotLike "*Foundation*" -AND
+                    $_ -NotLike "*LanguageFeatures*" -AND
+                    $_ -NotLike "*VBSCRIPT*" -AND
+                    $_ -NotLike "*License*" -AND
+                    $_ -NotLike "*Hello-Face*" -AND
+                    $_ -NotLike "*ISE*" -AND
+                    $_ -NotLike "*OpenSSH*"
+                }
+            } else {
+                Write-Host "Packages could not be obtained with DISM. MicroWin processing will continue, but packages will be skipped."
+                return
            }
+        }

-        $failedCount = 0
+        if ($UseCmdlets) {
+            $failedCount = 0

-        $erroredPackages = [System.Collections.Generic.List[ErroredPackage]]::new()
+            $erroredPackages = [System.Collections.Generic.List[ErroredPackage]]::new()

-        foreach ($pkg in $pkglist) {
-            try {
-                $status = "Removing $pkg"
+            foreach ($pkg in $pkglist) {
+                try {
+                    $status = "Removing $pkg"
+                    Write-Progress -Activity "Removing Packages" -Status $status -PercentComplete ($counter++/$pkglist.Count*100)
+                    Remove-WindowsPackage -Path "$scratchDir" -PackageName $pkg -NoRestart -ErrorAction SilentlyContinue
+                } catch {
+                    # This can happen if the package that is being removed is a permanent one
+                    $erroredPackages.Add([ErroredPackage]::new($pkg, $_.Exception.Message))
+                    $failedCount += 1
+                    continue
+                }
+            }
+        } else {
+            foreach ($package in $pkgList) {
+                $status = "Removing package $package"
                Write-Progress -Activity "Removing Packages" -Status $status -PercentComplete ($counter++/$pkglist.Count*100)
-                Remove-WindowsPackage -Path "$scratchDir" -PackageName $pkg -NoRestart -ErrorAction SilentlyContinue
-            } catch {
-                # This can happen if the package that is being removed is a permanent one
-                $erroredPackages.Add([ErroredPackage]::new($pkg, $_.Exception.Message))
-                $failedCount += 1
-                continue
+                Write-Debug "Removing package $package"
+                dism /english /image="$scratchDir" /remove-package /packagename=$package /quiet /norestart | Out-Null
+                if ($? -eq $false) {
+                    Write-Host "Package $package could not be removed."
+                }
            }
        }
        Write-Progress -Activity "Removing Packages" -Status "Ready" -Completed
-        if ($failedCount -gt 0)
+        if ($UseCmdlets -and $failedCount -gt 0)
        {
            Write-Host "$failedCount package(s) could not be removed. Your image will still work fine, however. Below is information on what packages failed to be removed and why."
            if ($erroredPackages.Count -gt 0)
@ -90,7 +122,8 @@ function Microwin-RemovePackages {
            }
        }
    } catch {
-        Write-Host "Unable to get information about the packages. MicroWin processing will continue, but packages will not be processed"
+        Write-Host "Unable to get information about the packages. A fallback will be used..."
        Write-Host "Error information: $($_.Exception.Message)" -ForegroundColor Yellow
+        Microwin-RemovePackages -UseCmdlets $false
    }
 }
--- a/functions/microwin/Microwin-RemoveProvisionedPackages.ps1
+++ b/functions/microwin/Microwin-RemoveProvisionedPackages.ps1
@ -3,49 +3,94 @@ function Microwin-RemoveProvisionedPackages() {
        .SYNOPSIS
        Removes AppX packages from a Windows image during MicroWin processing

-        .PARAMETER Name
-        No Params
+        .PARAMETER UseCmdlets
+            Determines whether or not to use the DISM cmdlets for processing.
+            - If true, DISM cmdlets will be used
+            - If false, calls to the DISM executable will be made whilst selecting bits and pieces from the output as a string (that was how MicroWin worked before
+              the DISM conversion to cmdlets)

        .EXAMPLE
        Microwin-RemoveProvisionedPackages
    #>
+    param (
+        [Parameter(Mandatory = $true, Position = 0)] [bool]$UseCmdlets
+    )
    try
    {
-        $appxProvisionedPackages = Get-AppxProvisionedPackage -Path "$($scratchDir)" | Where-Object {
-                $_.PackageName -NotLike "*AppInstaller*" -AND
-                $_.PackageName -NotLike "*Store*" -and
-                $_.PackageName -NotLike "*Notepad*" -and
-                $_.PackageName -NotLike "*Printing*" -and
-                $_.PackageName -NotLike "*YourPhone*" -and
-                $_.PackageName -NotLike "*Xbox*" -and
-                $_.PackageName -NotLike "*WindowsTerminal*" -and
-                $_.PackageName -NotLike "*Calculator*" -and
-                $_.PackageName -NotLike "*Photos*" -and
-                $_.PackageName -NotLike "*VCLibs*" -and
-                $_.PackageName -NotLike "*Paint*" -and
-                $_.PackageName -NotLike "*Gaming*" -and
-                $_.PackageName -NotLike "*Extension*" -and
-                $_.PackageName -NotLike "*SecHealthUI*" -and
-                $_.PackageName -NotLike "*ScreenSketch*"
+        if ($UseCmdlets) {
+            $appxProvisionedPackages = Get-AppxProvisionedPackage -Path "$($scratchDir)" | Where-Object {
+                    $_.PackageName -NotLike "*AppInstaller*" -AND
+                    $_.PackageName -NotLike "*Store*" -and
+                    $_.PackageName -NotLike "*Notepad*" -and
+                    $_.PackageName -NotLike "*Printing*" -and
+                    $_.PackageName -NotLike "*YourPhone*" -and
+                    $_.PackageName -NotLike "*Xbox*" -and
+                    $_.PackageName -NotLike "*WindowsTerminal*" -and
+                    $_.PackageName -NotLike "*Calculator*" -and
+                    $_.PackageName -NotLike "*Photos*" -and
+                    $_.PackageName -NotLike "*VCLibs*" -and
+                    $_.PackageName -NotLike "*Paint*" -and
+                    $_.PackageName -NotLike "*Gaming*" -and
+                    $_.PackageName -NotLike "*Extension*" -and
+                    $_.PackageName -NotLike "*SecHealthUI*" -and
+                    $_.PackageName -NotLike "*ScreenSketch*"
+            }
+        } else {
+            $appxProvisionedPackages = dism /english /image="$scratchDir" /get-provisionedappxpackages | Select-String -Pattern "PackageName : " -CaseSensitive -SimpleMatch
+            if ($?) {
+                $appxProvisionedPackages = $appxProvisionedPackages -split "PackageName : " | Where-Object {$_}
+                # Exclude the same items.
+                $appxProvisionedPackages = $appxProvisionedPackages | Where-Object {
+                    $_ -NotLike "*AppInstaller*" -AND
+                    $_ -NotLike "*Store*" -and
+                    $_ -NotLike "*Notepad*" -and
+                    $_ -NotLike "*Printing*" -and
+                    $_ -NotLike "*YourPhone*" -and
+                    $_ -NotLike "*Xbox*" -and
+                    $_ -NotLike "*WindowsTerminal*" -and
+                    $_ -NotLike "*Calculator*" -and
+                    $_ -NotLike "*Photos*" -and
+                    $_ -NotLike "*VCLibs*" -and
+                    $_ -NotLike "*Paint*" -and
+                    $_ -NotLike "*Gaming*" -and
+                    $_ -NotLike "*Extension*" -and
+                    $_ -NotLike "*SecHealthUI*" -and
+                    $_ -NotLike "*ScreenSketch*"
+                }
+            } else {
+                Write-Host "AppX packages could not be obtained with DISM. MicroWin processing will continue, but AppX packages will be skipped."
+                return
+            }
        }

        $counter = 0
-        foreach ($appx in $appxProvisionedPackages) {
-            $status = "Removing Provisioned $($appx.PackageName)"
-            Write-Progress -Activity "Removing Provisioned Apps" -Status $status -PercentComplete ($counter++/$appxProvisionedPackages.Count*100)
-            try {
-                Remove-AppxProvisionedPackage -Path "$scratchDir" -PackageName $appx.PackageName -ErrorAction SilentlyContinue
-            } catch {
-                Write-Host "Application $($appx.PackageName) could not be removed"
-                continue
+        if ($UseCmdlets) {
+            foreach ($appx in $appxProvisionedPackages) {
+                $status = "Removing Provisioned $($appx.PackageName)"
+                Write-Progress -Activity "Removing Provisioned Apps" -Status $status -PercentComplete ($counter++/$appxProvisionedPackages.Count*100)
+                try {
+                    Remove-AppxProvisionedPackage -Path "$scratchDir" -PackageName $appx.PackageName -ErrorAction SilentlyContinue
+                } catch {
+                    Write-Host "Application $($appx.PackageName) could not be removed"
+                    continue
+                }
+            }
+        } else {
+            foreach ($appx in $appxProvisionedPackages) {
+                $status = "Removing Provisioned $appx"
+                Write-Progress -Activity "Removing Provisioned Apps" -Status $status -PercentComplete ($counter++/$appxProvisionedPackages.Count*100)
+                dism /english /image="$scratchDir" /remove-provisionedappxpackage /packagename=$appx /quiet /norestart | Out-Null
+                if ($? -eq $false) {
+                    Write-Host "AppX package $appx could not be removed."
+                }
            }
        }
        Write-Progress -Activity "Removing Provisioned Apps" -Status "Ready" -Completed
    }
    catch
    {
-        # This can happen if getting AppX packages fails
-        Write-Host "Unable to get information about the AppX packages. MicroWin processing will continue, but AppX packages will not be processed"
+        Write-Host "Unable to get information about the AppX packages. A fallback will be used..."
        Write-Host "Error information: $($_.Exception.Message)" -ForegroundColor Yellow
+        Microwin-RemoveProvisionedPackages -UseCmdlets $false
    }
 }
--- a/functions/private/Add-SelectedAppsMenuItem.ps1
+++ b/functions/private/Add-SelectedAppsMenuItem.ps1
@ -0,0 +1,50 @@
+    function Add-SelectedAppsMenuItem {
+        <#
+        .SYNOPSIS
+            This is a helper function that generates and adds the Menu Items to the Selected Apps Popup.
+
+        .Parameter name
+            The actual Name of an App like "Chrome" or "Brave"
+            This name is contained in the "Content" property inside the applications.json
+        .PARAMETER key
+            The key which identifies an app object in applications.json
+            For Chrome this would be "WPFInstallchrome" because "WPFInstall" is prepended automatically for each key in applications.json
+        #>
+
+        param ([string]$name, [string]$key)
+
+        $selectedAppGrid = New-Object Windows.Controls.Grid
+
+        $selectedAppGrid.ColumnDefinitions.Add((New-Object System.Windows.Controls.ColumnDefinition -Property @{Width = "*"}))
+        $selectedAppGrid.ColumnDefinitions.Add((New-Object System.Windows.Controls.ColumnDefinition -Property @{Width = "30"}))
+
+        # Sets the name to the Content as well as the Tooltip, because the parent Popup Border has a fixed width and text could "overflow".
+        # With the tooltip, you can still read the whole entry on hover
+        $selectedAppLabel = New-Object Windows.Controls.Label
+        $selectedAppLabel.Content = $name
+        $selectedAppLabel.ToolTip = $name
+        $selectedAppLabel.HorizontalAlignment = "Left"
+        $selectedAppLabel.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "MainForegroundColor")
+        [System.Windows.Controls.Grid]::SetColumn($selectedAppLabel, 0)
+        $selectedAppGrid.Children.Add($selectedAppLabel)
+
+        $selectedAppRemoveButton = New-Object Windows.Controls.Button
+        $selectedAppRemoveButton.FontFamily = "Segoe MDL2 Assets"
+        $selectedAppRemoveButton.Content = [string]([char]0xE711)
+        $selectedAppRemoveButton.HorizontalAlignment = "Center"
+        $selectedAppRemoveButton.Tag = $key
+        $selectedAppRemoveButton.ToolTip = "Remove the App from Selection"
+        $selectedAppRemoveButton.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "MainForegroundColor")
+        $selectedAppRemoveButton.SetResourceReference([Windows.Controls.Control]::StyleProperty, "HoverButtonStyle")
+
+        # Highlight the Remove icon on Hover
+        $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
+        })
+        [System.Windows.Controls.Grid]::SetColumn($selectedAppRemoveButton, 1)
+        $selectedAppGrid.Children.Add($selectedAppRemoveButton)
+        # Add new Element to Popup
+        $sync.selectedAppsstackPanel.Children.Add($selectedAppGrid)
+    }
--- a/functions/private/Copy-Files.ps1
+++ b/functions/private/Copy-Files.ps1
@ -2,11 +2,17 @@ function Copy-Files {
    <#

        .DESCRIPTION
-        This function will make all modifications to the registry
-
+            Copies the contents of a given ISO file to a given destination
+        .PARAMETER Path
+            The source of the files to copy
+        .PARAMETER Destination
+            The destination to copy the files to
+        .PARAMETER Recurse
+            Determines whether or not to copy all files of the ISO file, including those in subdirectories
+        .PARAMETER Force
+            Determines whether or not to overwrite existing files
        .EXAMPLE
-
-        Set-WinUtilRegistry -Name "PublishUserActivities" -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\System" -Type "DWord" -Value "0"
+            Copy-Files "D:" "C:\ISOFile" -Recurse -Force

    #>
    param (
@ -23,7 +29,7 @@ function Copy-Files {

        foreach ($file in $files) {
            $status = "Copying file {0} of {1}: {2}" -f $counter, $files.Count, $file.Name
-            Write-Progress -Activity "Copy Windows files" -Status $status -PercentComplete ($counter++/$files.count*100)
+            Write-Progress -Activity "Copy disc image files" -Status $status -PercentComplete ($counter++/$files.count*100)
            $restpath = $file.FullName -Replace $path, ''

            if ($file.PSIsContainer -eq $true) {
@ -35,7 +41,7 @@ function Copy-Files {
                Set-ItemProperty -Path ($destination+$restpath) -Name IsReadOnly -Value $false
            }
        }
-        Write-Progress -Activity "Copy Windows files" -Status "Ready" -Completed
+        Write-Progress -Activity "Copy disc image files" -Status "Ready" -Completed
    } catch {
        Write-Host "Unable to Copy all the files due to an unhandled exception" -ForegroundColor Yellow
        Write-Host "Error information: $($_.Exception.Message)`n" -ForegroundColor Yellow
--- a/functions/private/Find-AppsByNameOrDescription.ps1
+++ b/functions/private/Find-AppsByNameOrDescription.ps1
@ -0,0 +1,49 @@
+function Find-AppsByNameOrDescription {
+    <#
+        .SYNOPSIS
+            Searches through the Apps on the Install Tab and hides all entries that do not match the string
+
+        .PARAMETER SearchString
+            The string to be searched for
+    #>
+    param(
+        [Parameter(Mandatory=$false)]
+        [string]$SearchString = ""
+    )
+    # Reset the visibility if the search string is empty or the search is cleared
+    if ([string]::IsNullOrWhiteSpace($SearchString)) {
+        $sync.ItemsControl.Items | ForEach-Object {
+            $_.Visibility = [Windows.Visibility]::Visible
+            $_.Children | ForEach-Object {
+                if ($null -ne $_) {
+                    $_.Visibility = [Windows.Visibility]::Visible
+                }
+
+            }
+        }
+        return
+    }
+    $sync.ItemsControl.Items | ForEach-Object {
+        # Ensure ToggleButtons remain visible
+        if ($_.Tag -like "CategoryToggleButton") {
+            $_.Visibility = [Windows.Visibility]::Visible
+            return
+        }
+        # Hide all CategoryWrapPanel and ToggleButton
+        $_.Visibility = [Windows.Visibility]::Collapsed
+        if ($_.Tag -like "CategoryWrapPanel_*") {
+            # Search for Apps that match the search string
+            $_.Children | Foreach-Object {
+                $appEntry = $sync.configs.applicationsHashtable.$($_.Tag)
+                if ($appEntry.Content -like "*$SearchString*" -or $appEntry.Description -like "*$SearchString*") {
+                    # Show the App and the parent CategoryWrapPanel if the string is found
+                    $_.Visibility = [Windows.Visibility]::Visible
+                    $_.parent.Visibility = [Windows.Visibility]::Visible
+                }
+                else {
+                    $_.Visibility = [Windows.Visibility]::Collapsed
+                }
+            }
+        }
+    }
+}
--- a/functions/private/Find-TweaksByNameOrDescription.ps1
+++ b/functions/private/Find-TweaksByNameOrDescription.ps1
@ -0,0 +1,100 @@
+function Find-TweaksByNameOrDescription {
+    <#
+        .SYNOPSIS
+            Searches through the Tweaks on the Tweaks Tab and hides all entries that do not match the search string
+
+        .PARAMETER SearchString
+            The string to be searched for
+    #>
+    param(
+        [Parameter(Mandatory=$false)]
+        [string]$SearchString = ""
+    )
+
+    # Reset the visibility if the search string is empty or the search is cleared
+    if ([string]::IsNullOrWhiteSpace($SearchString)) {
+        # Show all categories
+        $tweakspanel = $sync.Form.FindName("tweakspanel")
+        $tweakspanel.Children | ForEach-Object {
+            $_.Visibility = [Windows.Visibility]::Visible
+
+            # Foreach category section, show all items
+            if ($_ -is [Windows.Controls.Border]) {
+                $_.Visibility = [Windows.Visibility]::Visible
+
+                # Find ItemsControl
+                $dockPanel = $_.Child
+                if ($dockPanel -is [Windows.Controls.DockPanel]) {
+                    $itemsControl = $dockPanel.Children | Where-Object { $_ -is [Windows.Controls.ItemsControl] }
+                    if ($itemsControl) {
+                        # Show items in the category
+                        foreach ($item in $itemsControl.Items) {
+                            if ($item -is [Windows.Controls.Label]) {
+                                $item.Visibility = [Windows.Visibility]::Visible
+                            } elseif ($item -is [Windows.Controls.DockPanel] -or
+                                      $item -is [Windows.Controls.StackPanel]) {
+                                $item.Visibility = [Windows.Visibility]::Visible
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return
+    }
+
+    # Search for matching tweaks when search string is not null
+    $tweakspanel = $sync.Form.FindName("tweakspanel")
+
+    $tweakspanel.Children | ForEach-Object {
+        $categoryBorder = $_
+        $categoryVisible = $false
+
+        if ($_ -is [Windows.Controls.Border]) {
+            # Find the ItemsControl
+            $dockPanel = $_.Child
+            if ($dockPanel -is [Windows.Controls.DockPanel]) {
+                $itemsControl = $dockPanel.Children | Where-Object { $_ -is [Windows.Controls.ItemsControl] }
+                if ($itemsControl) {
+                    $categoryLabel = $null
+
+                    # Process all items in the ItemsControl
+                    for ($i = 0; $i -lt $itemsControl.Items.Count; $i++) {
+                        $item = $itemsControl.Items[$i]
+
+                        if ($item -is [Windows.Controls.Label]) {
+                            $categoryLabel = $item
+                            $item.Visibility = [Windows.Visibility]::Collapsed
+                        } elseif ($item -is [Windows.Controls.DockPanel]) {
+                            $checkbox = $item.Children | Where-Object { $_ -is [Windows.Controls.CheckBox] } | Select-Object -First 1
+                            $label = $item.Children | Where-Object { $_ -is [Windows.Controls.Label] } | Select-Object -First 1
+
+                            if ($label -and ($label.Content -like "*$SearchString*" -or $label.ToolTip -like "*$SearchString*")) {
+                                $item.Visibility = [Windows.Visibility]::Visible
+                                if ($categoryLabel) { $categoryLabel.Visibility = [Windows.Visibility]::Visible }
+                                $categoryVisible = $true
+                            } else {
+                                $item.Visibility = [Windows.Visibility]::Collapsed
+                            }
+                        } elseif ($item -is [Windows.Controls.StackPanel]) {
+                            # StackPanel which contain checkboxes or other elements
+                            $checkbox = $item.Children | Where-Object { $_ -is [Windows.Controls.CheckBox] } | Select-Object -First 1
+
+                            if ($checkbox -and ($checkbox.Content -like "*$SearchString*" -or $checkbox.ToolTip -like "*$SearchString*")) {
+                                $item.Visibility = [Windows.Visibility]::Visible
+                                if ($categoryLabel) { $categoryLabel.Visibility = [Windows.Visibility]::Visible }
+                                $categoryVisible = $true
+                            } else {
+                                $item.Visibility = [Windows.Visibility]::Collapsed
+                            }
+                        }
+                    }
+                }
+            }
+
+            # Set the visibility based on if any item matched
+            $categoryBorder.Visibility = if ($categoryVisible) { [Windows.Visibility]::Visible } else { [Windows.Visibility]::Collapsed }
+
+        }
+    }
+}
--- a/functions/private/Get-WinUtilSelectedPackages.ps1
+++ b/functions/private/Get-WinUtilSelectedPackages.ps1
@ -0,0 +1,59 @@
+function Get-WinUtilSelectedPackages
+{
+     <#
+    .SYNOPSIS
+        Sorts given packages based on installer preference and availability.
+
+    .OUTPUTS
+        Hashtable. Key = Package Manager, Value = ArrayList of packages to install
+    #>
+    param (
+        [Parameter(Mandatory=$true)]
+        $PackageList,
+        [Parameter(Mandatory=$true)]
+        [PackageManagers]$Preference
+    )
+
+    if ($PackageList.count -eq 1) {
+        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
+    } else {
+        $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" })
+    }
+
+    $packages = [System.Collections.Hashtable]::new()
+    $packagesWinget = [System.Collections.ArrayList]::new()
+    $packagesChoco = [System.Collections.ArrayList]::new()
+    $packages[[PackageManagers]::Winget] = $packagesWinget
+    $packages[[PackageManagers]::Choco] = $packagesChoco
+
+    Write-Debug "Checking packages using Preference '$($Preference)'"
+
+    foreach ($package in $PackageList) {
+        switch ($Preference) {
+            "Choco" {
+                if ($package.choco -eq "na") {
+                    Write-Debug "$($package.content) has no Choco value."
+                    $packagesWinget.add($package.winget)
+                    Write-Host "Queueing $($package.winget) for Winget"
+                } else {
+                    $null = $packagesChoco.add($package.choco)
+                    Write-Host "Queueing $($package.choco) for Chocolatey"
+                }
+                break
+            }
+            "Winget" {
+                if ($package.winget -eq "na") {
+                    Write-Debug "$($package.content) has no Winget value."
+                    $packagesChoco.add($package.choco)
+                    Write-Host "Queueing $($package.choco) for Chocolatey"
+                } else {
+                    $null = $packagesWinget.add($($package.winget))
+                    Write-Host "Queueing $($package.winget) for Winget"
+                }
+                break
+            }
+        }
+    }
+
+    return $packages
+}
--- a/functions/private/Get-WinUtilToggleStatus.ps1
+++ b/functions/private/Get-WinUtilToggleStatus.ps1
@ -35,6 +35,9 @@ Function Get-WinUtilToggleStatus {

        foreach ($regentry in $ToggleSwitchReg) {
            try {
+                if (!(Test-Path $regentry.Path)) {
+                    New-Item -Path $regentry.Path -Force | Out-Null
+                }
                $regstate = (Get-ItemProperty -path $regentry.Path).$($regentry.Name)
                if ($regstate -eq $regentry.Value) {
                    $count += 1
@ -42,8 +45,23 @@ Function Get-WinUtilToggleStatus {
                } else {
                    Write-Debug "$($regentry.Name) is false (state: $regstate, value: $($regentry.Value), original: $($regentry.OriginalValue))"
                }
+                if (!$regstate) {
+                    switch ($regentry.DefaultState) {
+                        "true" {
+                            $regstate = $regentry.Value
+                            $count += 1
+                        }
+                        "false" {
+                            $regstate = $regentry.OriginalValue
+                        }
+                        default {
+                            Write-Error "Entry for $($regentry.Name) does not exist and no DefaultState is defined."
+                            $regstate = $regentry.OriginalValue
+                        }
+                    }
+                }
            } catch {
-                Write-Error "An error occurred while accessing registry entry $($regentry.Path): $_"
+                Write-Error "An unexpected error occurred: $_"
            }
        }

--- a/functions/private/Get-WinUtilWingetLatest.ps1
+++ b/functions/private/Get-WinUtilWingetLatest.ps1
@ -1,104 +0,0 @@
-function Get-WinUtilWingetLatest {
-    [CmdletBinding()]
-    param()
-
-    <#
-    .SYNOPSIS
-        Uses GitHub API to check for the latest release of Winget.
-    .DESCRIPTION
-        This function first attempts to update WinGet using winget itself, then falls back to manual installation if needed.
-    #>
-    $ProgressPreference = "SilentlyContinue"
-    $InformationPreference = 'Continue'
-
-    try {
-        $wingetCmd = Get-Command winget -ErrorAction Stop
-        Write-Information "Attempting to update WinGet using WinGet..."
-        $result = Start-Process -FilePath "`"$($wingetCmd.Source)`"" -ArgumentList "install -e --accept-source-agreements --accept-package-agreements Microsoft.AppInstaller" -Wait -NoNewWindow -PassThru
-        if ($result.ExitCode -ne 0) {
-            throw "WinGet update failed with exit code: $($result.ExitCode)"
-        }
-        return $true
-    }
-    catch {
-        Write-Information "WinGet not found or update failed. Attempting to install from Microsoft Store..."
-        try {
-            # Try to close any running WinGet processes
-            Get-Process -Name "DesktopAppInstaller", "winget" -ErrorAction SilentlyContinue | ForEach-Object {
-                Write-Information "Stopping running WinGet process..."
-                $_.Kill()
-                Start-Sleep -Seconds 2
-            }
-
-            # Try to load Windows Runtime assemblies more reliably
-            $null = [System.Runtime.WindowsRuntime.WindowsRuntimeSystemExtensions]
-            Add-Type -AssemblyName System.Runtime.WindowsRuntime
-
-            # Load required assemblies from Windows SDK
-            $null = @(
-                [Windows.Management.Deployment.PackageManager, Windows.Management.Deployment, ContentType = WindowsRuntime]
-                [Windows.Foundation.Uri, Windows.Foundation, ContentType = WindowsRuntime]
-                [Windows.Management.Deployment.DeploymentOptions, Windows.Management.Deployment, ContentType = WindowsRuntime]
-            )
-
-            # Initialize PackageManager
-            $packageManager = New-Object Windows.Management.Deployment.PackageManager
-
-            # Rest of the Microsoft Store installation logic
-            $appxPackage = "https://aka.ms/getwinget"
-            $uri = New-Object Windows.Foundation.Uri($appxPackage)
-            $deploymentOperation = $packageManager.AddPackageAsync($uri, $null, "Add")
-
-            # Add timeout check for deployment operation
-            $timeout = 300
-            $timer = [System.Diagnostics.Stopwatch]::StartNew()
-
-            while ($deploymentOperation.Status -eq 0) {
-                if ($timer.Elapsed.TotalSeconds -gt $timeout) {
-                    throw "Installation timed out after $timeout seconds"
-                }
-                Start-Sleep -Milliseconds 100
-            }
-
-            if ($deploymentOperation.Status -eq 1) {
-                Write-Information "Successfully installed WinGet from Microsoft Store"
-                return $true
-            } else {
-                throw "Installation failed with status: $($deploymentOperation.Status)"
-            }
-        }
-        catch [System.Management.Automation.RuntimeException] {
-            Write-Information "Windows Runtime components not available. Attempting manual download..."
-            try {
-                # Try to close any running WinGet processes
-                Get-Process -Name "DesktopAppInstaller", "winget" -ErrorAction SilentlyContinue | ForEach-Object {
-                    Write-Information "Stopping running WinGet process..."
-                    $_.Kill()
-                    Start-Sleep -Seconds 2
-                }
-
-                # Fallback to direct download from GitHub
-                $apiUrl = "https://api.github.com/repos/microsoft/winget-cli/releases/latest"
-                $release = Invoke-RestMethod -Uri $apiUrl
-                $msixBundleUrl = ($release.assets | Where-Object { $_.name -like "*.msixbundle" }).browser_download_url
-
-                $tempFile = Join-Path $env:TEMP "Microsoft.DesktopAppInstaller.msixbundle"
-                Invoke-WebRequest -Uri $msixBundleUrl -OutFile $tempFile
-
-                Add-AppxPackage -Path $tempFile -ErrorAction Stop
-                Remove-Item $tempFile -Force
-
-                Write-Information "Successfully installed WinGet from GitHub release"
-                return $true
-            }
-            catch {
-                Write-Error "Failed to install WinGet: $_"
-                return $false
-            }
-        }
-        catch {
-            Write-Error "Failed to install WinGet: $_"
-            return $false
-        }
-    }
-}
--- a/functions/private/Initalize-InstallAppEntry.ps1
+++ b/functions/private/Initalize-InstallAppEntry.ps1
@ -0,0 +1,74 @@
+function Initialize-InstallAppEntry {
+    <#
+        .SYNOPSIS
+            Creates the app entry to be placed on the isntall 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
+        .PARAMETER appKey
+            The Key of the app inside the $sync.configs.applicationsHashtable
+    #>
+        param(
+            [Windows.Controls.WrapPanel]$TargetElement,
+            $appKey
+        )
+
+        # Create the outer Border for the application type
+        $border = New-Object Windows.Controls.Border
+        $border.Style = $sync.Form.Resources.AppEntryBorderStyle
+        $border.Tag = $appKey
+        $border.ToolTip = $Apps.$appKey.description
+        $border.Add_MouseLeftButtonUp({
+            $childCheckbox = ($this.Child | Where-Object {$_.Template.TargetType -eq [System.Windows.Controls.Checkbox]})[0]
+            $childCheckBox.isChecked = -not $childCheckbox.IsChecked
+        })
+        $border.Add_MouseEnter({
+            if (($sync.$($this.Tag).IsChecked) -eq $false) {
+                $this.SetResourceReference([Windows.Controls.Control]::BackgroundProperty, "AppInstallHighlightedColor")
+            }
+        })
+        $border.Add_MouseLeave({
+            if (($sync.$($this.Tag).IsChecked) -eq $false) {
+                $this.SetResourceReference([Windows.Controls.Control]::BackgroundProperty, "AppInstallUnselectedColor")
+            }
+        })
+        $border.Add_MouseRightButtonUp({
+            # Store the selected app in a global variable so it can be used in the popup
+            $sync.appPopupSelectedApp = $this.Tag
+            # Set the popup position to the current mouse position
+            $sync.appPopup.PlacementTarget = $this
+            $sync.appPopup.IsOpen = $true
+        })
+
+        $checkBox = New-Object Windows.Controls.CheckBox
+        $checkBox.Name = $appKey
+        $checkbox.Style = $sync.Form.Resources.AppEntryCheckboxStyle
+        $checkbox.Add_Checked({
+            Invoke-WPFSelectedAppsUpdate -type "Add" -checkbox $this
+            $borderElement = $this.Parent
+            $borderElement.SetResourceReference([Windows.Controls.Control]::BackgroundProperty, "AppInstallSelectedColor")
+        })
+
+        $checkbox.Add_Unchecked({
+            Invoke-WPFSelectedAppsUpdate -type "Remove" -checkbox $this
+            $borderElement = $this.Parent
+            $borderElement.SetResourceReference([Windows.Controls.Control]::BackgroundProperty, "AppInstallUnselectedColor")
+        })
+
+        # Create the TextBlock for the application name
+        $appName = New-Object Windows.Controls.TextBlock
+        $appName.Style = $sync.Form.Resources.AppEntryNameStyle
+        $appName.Text = $Apps.$appKey.content
+
+        # Add the name to the Checkbox
+        $checkBox.Content = $appName
+
+        # Add accessibility properties to make the elements screen reader friendly
+        $checkBox.SetValue([Windows.Automation.AutomationProperties]::NameProperty, $Apps.$appKey.content)
+        $border.SetValue([Windows.Automation.AutomationProperties]::NameProperty, $Apps.$appKey.content)
+
+        $border.Child = $checkBox
+        # Add the border to the corresponding Category
+        $TargetElement.Children.Add($border) | Out-Null
+        return $checkbox
+    }
--- a/functions/private/Initialize-InstallAppArea.ps1
+++ b/functions/private/Initialize-InstallAppArea.ps1
@ -0,0 +1,45 @@
+    function Initialize-InstallAppArea {
+        <#
+            .SYNOPSIS
+                Creates a [Windows.Controls.ScrollViewer] containing a [Windows.Controls.ItemsControl] which is setup to use Virtualization to only load the visible elements for performance reasons.
+                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
+
+            .PARAMETER TargetElement
+                The element to which the AppArea shoud be added
+
+        #>
+        param($TargetElement)
+        $targetGrid = $sync.Form.FindName($TargetElement)
+        $null = $targetGrid.Children.Clear()
+
+        # Create the outer Border for the aren where the apps will be placed
+        $Border = New-Object Windows.Controls.Border
+        $Border.VerticalAlignment = "Stretch"
+        $Border.SetResourceReference([Windows.Controls.Control]::StyleProperty, "BorderStyle")
+
+        # Add a ScrollViewer, because the ItemsControl does not support scrolling by itself
+        $scrollViewer = New-Object Windows.Controls.ScrollViewer
+        $scrollViewer.VerticalScrollBarVisibility = 'Auto'
+        $scrollViewer.HorizontalAlignment = 'Stretch'
+        $scrollViewer.VerticalAlignment = 'Stretch'
+        $scrollViewer.CanContentScroll = $true
+
+        ## 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'
+
+        # 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
+        $factory = New-Object Windows.FrameworkElementFactory ([Windows.Controls.VirtualizingStackPanel])
+        $itemsPanelTemplate.VisualTree = $factory
+        $itemsControl.ItemsPanel = $itemsPanelTemplate
+        $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)
+        return $itemsControl
+    }
--- a/functions/private/Initialize-InstallCategoryAppList.ps1
+++ b/functions/private/Initialize-InstallCategoryAppList.ps1
@ -0,0 +1,56 @@
+function Initialize-InstallCategoryAppList {
+    <#
+        .SYNOPSIS
+            Clears the Target Element and sets up a "Loading" message. This is done, because loading of all apps can take a bit of time in some scenarios
+            Iterates through all Categories and Apps and adds them to the UI
+            Used to as part of the Install Tab UI generation
+        .PARAMETER TargetElement
+            The Element into which the Categories and Apps should be placed
+        .PARAMETER Apps
+            The Hashtable of Apps to be added to the UI
+            The Categories are also extracted from the Apps Hashtable
+
+    #>
+        param(
+            $TargetElement,
+            $Apps
+        )
+        function Add-Category {
+            param(
+                [string]$Category,
+                [Windows.Controls.ItemsControl]$TargetElement
+            )
+
+            $toggleButton = New-Object Windows.Controls.Label
+            $toggleButton.Content = "$Category"
+            $toggleButton.Tag = "CategoryToggleButton"
+            $sync.$Category = $Category
+
+            $null = $TargetElement.Items.Add($toggleButton)
+        }
+
+
+        # Pre-group apps by category
+        $appsByCategory = @{}
+        foreach ($appKey in $Apps.Keys) {
+            $category = $Apps.$appKey.Category
+            if (-not $appsByCategory.ContainsKey($category)) {
+                $appsByCategory[$category] = @()
+            }
+            $appsByCategory[$category] += $appKey
+        }
+        foreach ($category in $($appsByCategory.Keys | Sort-Object)) {
+            Add-Category -Category $category -TargetElement $TargetElement
+            $wrapPanel = New-Object Windows.Controls.WrapPanel
+            $wrapPanel.Orientation = "Horizontal"
+            $wrapPanel.HorizontalAlignment = "Stretch"
+            $wrapPanel.VerticalAlignment = "Center"
+            $wrapPanel.Margin = New-Object Windows.Thickness(0, 0, 0, 20)
+            $wrapPanel.Visibility = [Windows.Visibility]::Visible
+            $wrapPanel.Tag = "CategoryWrapPanel_$category"
+            $null = $TargetElement.Items.Add($wrapPanel)
+            $appsByCategory[$category] |Sort-Object | ForEach-Object {
+                $sync.$_ =  $(Initialize-InstallAppEntry -TargetElement $wrapPanel -AppKey $_)
+            }
+        }
+    }
--- a/functions/private/Install-WinUtilWinget.ps1
+++ b/functions/private/Install-WinUtilWinget.ps1
@ -33,18 +33,44 @@ function Install-WinUtilWinget {
            return
        }

-        # Install Winget via GitHub method.
-        # Used part of my own script with some modification: ruxunderscore/windows-initialization
-        Write-Host "Downloading Winget and License File`r"
-        Get-WinUtilWingetLatest
-        Write-Host "Enabling NuGet and Module..."
-        Install-PackageProvider -Name NuGet -Force
-        Install-Module -Name Microsoft.WinGet.Client -Force
-        # Winget only needs a refresh of the environment variables to be used.
-        Write-Output "Refreshing Environment Variables...`n"
-        $ENV:PATH = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
-    } catch {
-        Write-Error "Failed to install Winget: $($_.Exception.Message)"
-    }
+        Write-Host "Attempting to install/update Winget`r"
+        try {
+            $wingetCmd = Get-Command winget -ErrorAction Stop
+            Write-Information "Attempting to update WinGet using WinGet..."
+            $result = Start-Process -FilePath "`"$($wingetCmd.Source)`"" -ArgumentList "install -e --accept-source-agreements --accept-package-agreements Microsoft.AppInstaller" -Wait -NoNewWindow -PassThru
+            if ($result.ExitCode -ne 0) {
+                throw "WinGet update failed with exit code: $($result.ExitCode)"
+            }
+            Write-Output "Refreshing Environment Variables...`n"
+            $ENV:PATH = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
+            return
+        } catch {
+            Write-Information "WinGet not found or update failed. Attempting to install from Microsoft Store..."
+        }
+        try {
+            Write-Host "Attempting to repair WinGet using Repair-WinGetPackageManager..." -ForegroundColor Yellow

+            # Check if Windows version supports Repair-WinGetPackageManager (24H2 and above)
+            if ([System.Environment]::OSVersion.Version.Build -ge 26100) {
+                Repair-WinGetPackageManager -Force -Latest -Verbose
+                # Verify if repair was successful
+                $wingetCmd = Get-Command winget -ErrorAction Stop
+                Write-Host "WinGet repair successful!" -ForegroundColor Green
+            } else {
+                Write-Host "Repair-WinGetPackageManager is only available on Windows 24H2 and above. Your version doesn't support this method." -ForegroundColor Yellow
+                throw "Windows version not supported for repair method"
+            }
+
+            Write-Output "Refreshing Environment Variables...`n"
+            $ENV:PATH = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
+            return
+
+        } catch {
+            Write-Error "All installation methods failed. Unable to install WinGet."
+            throw
+        }
+    } catch {
+        Write-Error "An error occurred during WinGet installation: $_"
+        throw
+    }
 }
--- a/functions/private/Invoke-WinUtilUninstallPSProfile.ps1
+++ b/functions/private/Invoke-WinUtilUninstallPSProfile.ps1
@ -38,6 +38,32 @@ function Invoke-WinUtilUninstallPSProfile {
            if (-not $Fonts) {
                Write-Host "===> Successfully Uninstalled: Nerd Fonts. <===" -ForegroundColor Yellow
            }
+
+        }
+
+        # Helper function used to uninstall a specific Nerd Fonts font corresponding registry keys.
+        function Uninstall-NerdFontRegKeys {
+            # Define the parameters block for the Uninstall-NerdFontsRegKey function.
+            param (
+                [string]$FontsRegPath = "HKCU:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts",
+                [string]$FontFamilyName = "CaskaydiaCove"
+            )
+
+            try {
+                # Get all properties (font registrations) from the registry path
+                $registryProperties = Get-ItemProperty -Path $FontsRegPath
+
+                # Filter and remove properties that match the font family name
+                $registryProperties.PSObject.Properties |
+                Where-Object { $_.Name -match $FontFamilyName } |
+                ForEach-Object {
+                    If ($_.Name -like "*$FontFamilyName*") {
+                        Remove-ItemProperty -path $FontsRegPath -Name $_.Name -ErrorAction SilentlyContinue
+                    }
+                }
+            } catch {
+                Write-Host "Error removing registry keys: $($_.exception.message)" -ForegroundColor Red
+            }
        }

        # Check if Chris Titus Tech's PowerShell profile is currently available in the PowerShell profile folder.
@ -87,11 +113,28 @@ function Invoke-WinUtilUninstallPSProfile {

                    # Call the function used to uninstall the specified Nerd Fonts package from the system.
                    Uninstall-NerdFonts -FontsPath $FontsPath -FontFamilyName $FontFamilyName
+
                } catch {
                    # Let the user know that an error was encountered when uninstalling Nerd Fonts.
                    Write-Host "Failed to uninstall Nerd Fonts. Error: $_" -ForegroundColor Red
                }

+                # Attempt to uninstall the specified Nerd Fonts registry keys from the system.
+                try {
+                    # Specify the registry path that the specified font registry keys will be uninstalled from.
+                    [string]$FontsRegPath = "HKCU:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"
+
+                    # Specify the name of the font registry keys that is to be uninstalled from the system.
+                    [string]$FontFamilyName = "CaskaydiaCove"
+
+                    # Call the function used to uninstall the specified Nerd Fonts registry keys from the system.
+                    Uninstall-NerdFontRegKeys -FontsPath $FontsRegPath -FontFamilyName $FontFamilyName
+
+                } catch {
+                    # Let the user know that an error was encountered when uninstalling Nerd Font registry keys.
+                    Write-Host "Failed to uninstall Nerd Font Registry Keys. Error: $_" -ForegroundColor Red
+                }
+
                # Attempt to uninstall the Terminal-Icons PowerShell module from the system.
                try {
                    # Get the content of the backup PowerShell profile and store it in-memory.
@ -185,3 +228,4 @@ function Invoke-WinUtilUninstallPSProfile {
        }
    }
 }
+
--- a/functions/private/Invoke-WinUtilpsProfile.ps1
+++ b/functions/private/Invoke-WinUtilpsProfile.ps1
@ -1,50 +0,0 @@
-function Invoke-WinUtilpsProfile {
-    <#
-    .SYNOPSIS
-        Installs & applies the CTT Powershell Profile
-    #>
-    Invoke-WPFRunspace -Argumentlist $PROFILE -DebugPreference $DebugPreference -ScriptBlock {
-        param ( $psprofile)
-        function Invoke-PSSetup {
-            $url = "https://raw.githubusercontent.com/ChrisTitusTech/powershell-profile/main/Microsoft.PowerShell_profile.ps1"
-            $oldhash = Get-FileHash $psprofile -ErrorAction SilentlyContinue
-            Invoke-RestMethod $url -OutFile "$env:temp/Microsoft.PowerShell_profile.ps1"
-            $newhash = Get-FileHash "$env:temp/Microsoft.PowerShell_profile.ps1"
-            if ($newhash.Hash -ne $oldhash.Hash) {
-                    write-host "===> Installing Profile.. <===" -ForegroundColor Yellow
-                    # Starting new hidden shell process bc setup does not work in a runspace
-                    Start-Process -FilePath "pwsh" -ArgumentList "-ExecutionPolicy Bypass -NoProfile -Command `"Invoke-Expression (Invoke-WebRequest `'https://github.com/ChrisTitusTech/powershell-profile/raw/main/setup.ps1`')`"" -WindowStyle Hidden -Wait
-                    Write-Host "Profile has been installed. Please restart your shell to reflect changes!" -ForegroundColor Magenta
-                    write-host "===> Finished <===" -ForegroundColor Yellow
-            } else {
-                Write-Host "Profile is up to date" -ForegroundColor Green
-            }
-        }
-
-        if (Get-Command "pwsh" -ErrorAction SilentlyContinue) {
-            if ($PSVersionTable.PSVersion.Major -ge 7) {
-                Invoke-PSSetup
-            }
-            else {
-                write-host "Profile requires Powershell 7, which is currently installed but not used!" -ForegroundColor Red
-                # Load the necessary assembly for Windows Forms
-                Add-Type -AssemblyName System.Windows.Forms
-                # Display the Yes/No message box
-                $question = [System.Windows.Forms.MessageBox]::Show("Profile requires Powershell 7, which is currently installed but not used! Do you want to install Profile for Powershell 7?", "Question",
-                    [System.Windows.Forms.MessageBoxButtons]::YesNo,
-                    [System.Windows.Forms.MessageBoxIcon]::Question)
-
-                # Check the result
-                if ($question -eq [System.Windows.Forms.DialogResult]::Yes) {
-                    Invoke-PSSetup
-                }
-                else {
-                    Write-Host "Not proceeding with the profile setup!"
-                }
-            }
-        }
-        else {
-            write-host "Profile requires Powershell 7, which is not installed!" -ForegroundColor Red
-        }
-    }
-}
--- a/functions/private/Set-PackageManagerPreference.ps1
+++ b/functions/private/Set-PackageManagerPreference.ps1
@ -0,0 +1,43 @@
+function Set-PackageManagerPreference {
+    <#
+    .SYNOPSIS
+        Sets the currently selected package manager to global "ManagerPreference" in sync.
+        Also persists preference across Winutil restarts via preference.ini.
+
+        Reads from preference.ini if no argument sent.
+
+    .PARAMETER preferedPackageManager
+        The PackageManager that was selected.
+    #>
+    param(
+        [Parameter(Position=0, Mandatory=$false)]
+        [PackageManagers]$preferedPackageManager
+    )
+
+    $preferencePath = "$env:LOCALAPPDATA\winutil\preferences.ini"
+    $oldChocoPath = "$env:LOCALAPPDATA\winutil\preferChocolatey.ini"
+
+    #Try loading from file if no argument given.
+    if ($null -eq $preferedPackageManager) {
+        # Backwards compat for preferChocolatey.ini
+        if (Test-Path -Path $oldChocoPath) {
+            $preferedPackageManager = [PackageManagers]::Choco
+            Remove-Item -Path $oldChocoPath
+        }
+        elseif (Test-Path -Path $preferencePath) {
+            $potential = Get-Content -Path $preferencePath -TotalCount 1
+            $preferedPackageManager = [PackageManagers]$potential
+        }
+        else {
+            Write-Debug "Creating new preference file, defaulting to winget."
+            $preferedPackageManager = [PackageManagers]::Winget
+        }
+    }
+
+    $sync["ManagerPreference"] = [PackageManagers]::$preferedPackageManager
+    Write-Debug "Manager Preference changed to '$($sync["ManagerPreference"])'"
+
+
+    # Write preference to file to persist across restarts.
+    Out-File -FilePath $preferencePath -InputObject $sync["ManagerPreference"]
+}
--- a/functions/private/Set-WinUtilRegistry.ps1
+++ b/functions/private/Set-WinUtilRegistry.ps1
@ -47,6 +47,8 @@ function Set-WinUtilRegistry {
        Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
    } catch [System.Management.Automation.ItemNotFoundException] {
        Write-Warning $psitem.Exception.ErrorRecord
+    } catch [System.UnauthorizedAccessException] {
+       Write-Warning $psitem.Exception.Message
    } catch {
        Write-Warning "Unable to set $Name due to unhandled exception"
        Write-Warning $psitem.Exception.StackTrace
--- a/functions/private/Test-WinUtilPackageManager.ps1
+++ b/functions/private/Test-WinUtilPackageManager.ps1
@ -23,14 +23,22 @@ function Test-WinUtilPackageManager {
        # Check if Winget is available while getting it's Version if it's available
        $wingetExists = $true
        try {
-            $wingetVersionFull = winget --version
+            $wingetInfo = winget --info
+            # Extract the package version from the output
+            $wingetVersionFull = ($wingetInfo | Select-String -Pattern 'Microsoft\.DesktopAppInstaller v\d+\.\d+\.\d+\.\d+').Matches.Value
+            if ($wingetVersionFull) {
+                $wingetVersionFull = $wingetVersionFull.Split(' ')[-1].TrimStart('v')
+            } else {
+                # Fallback in case the pattern isn't found
+                $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"
            $wingetExists = $false
        } catch {
            Write-Warning "Winget was not found due to un-known reasons, The Stack Trace is:`n$($psitem.Exception.StackTrace)"
            $wingetExists = $false
-    }
+        }

        # 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
@ -48,13 +56,14 @@ 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.
-            $response = Invoke-RestMethod -Uri "https://api.github.com/repos/microsoft/Winget-cli/releases/latest" -Method Get -ErrorAction Stop
-            $wingetLatestVersion = [System.Version]::Parse(($response.tag_name).Trim('v')) #Stores version number of latest release.
-            $wingetOutdated = $wingetCurrentVersion -lt $wingetLatestVersion
+            $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
+            Write-Host "Current Installed Version: $wingetCurrentVersion" -ForegroundColor White
+            $wingetOutdated = $wingetCurrentVersion -lt [System.Version]::Parse($wingetLatestVersion)
            Write-Host "===========================================" -ForegroundColor Green
            Write-Host "---        Winget is installed          ---" -ForegroundColor Green
            Write-Host "===========================================" -ForegroundColor Green
-            Write-Host "Version: $wingetVersionFull" -ForegroundColor White

            if (!$wingetPreview) {
                Write-Host "    - Winget is a release version." -ForegroundColor Green
--- a/functions/public/Initialize-WPFUI.ps1
+++ b/functions/public/Initialize-WPFUI.ps1
@ -0,0 +1,120 @@
+function Initialize-WPFUI {
+    [OutputType([void])]
+    param(
+        [Parameter(Mandatory)]
+        [string]$TargetGridName
+    )
+
+    switch ($TargetGridName) {
+        "appscategory"{
+            # TODO
+            # Switch UI generation of the sidebar to this function
+            # $sync.ItemsControl = Initialize-InstallAppArea -TargetElement $TargetGridName
+            # ...
+
+            # Create and configure a popup for displaying selected apps
+            $selectedAppsPopup = New-Object Windows.Controls.Primitives.Popup
+            $selectedAppsPopup.IsOpen = $false
+            $selectedAppsPopup.PlacementTarget = $sync.WPFselectedAppsButton
+            $selectedAppsPopup.Placement = [System.Windows.Controls.Primitives.PlacementMode]::Bottom
+            $selectedAppsPopup.AllowsTransparency = $true
+
+            # Style the popup with a border and background
+            $selectedAppsBorder = New-Object Windows.Controls.Border
+            $selectedAppsBorder.SetResourceReference([Windows.Controls.Control]::BackgroundProperty, "MainBackgroundColor")
+            $selectedAppsBorder.SetResourceReference([Windows.Controls.Control]::BorderBrushProperty, "MainForegroundColor")
+            $selectedAppsBorder.SetResourceReference([Windows.Controls.Control]::BorderThicknessProperty, "ButtonBorderThickness")
+            $selectedAppsBorder.Width = 200
+            $selectedAppsBorder.Padding = 5
+            $selectedAppsPopup.Child = $selectedAppsBorder
+            $sync.selectedAppsPopup = $selectedAppsPopup
+
+            # Add a stack panel inside the popup's border to organize its child elements
+            $sync.selectedAppsstackPanel = New-Object Windows.Controls.StackPanel
+            $selectedAppsBorder.Child = $sync.selectedAppsstackPanel
+
+            # Close selectedAppsPopup when mouse leaves both button and selectedAppsPopup
+            $sync.WPFselectedAppsButton.Add_MouseLeave({
+                if (-not $sync.selectedAppsPopup.IsMouseOver) {
+                    $sync.selectedAppsPopup.IsOpen = $false
+                }
+            })
+            $selectedAppsPopup.Add_MouseLeave({
+                if (-not $sync.WPFselectedAppsButton.IsMouseOver) {
+                    $sync.selectedAppsPopup.IsOpen = $false
+                }
+            })
+
+            # Creates the popup that is displayed when the user right-clicks on an app entry
+            # This popup contains buttons for installing, uninstalling, and viewing app information
+
+            $appPopup = New-Object Windows.Controls.Primitives.Popup
+            $appPopup.StaysOpen = $false
+            $appPopup.Placement = [System.Windows.Controls.Primitives.PlacementMode]::Bottom
+            $appPopup.AllowsTransparency = $true
+            # Store the popup globally so the position can be set later
+            $sync.appPopup = $appPopup
+
+            $appPopupStackPanel = New-Object Windows.Controls.StackPanel
+            $appPopupStackPanel.Orientation = "Horizontal"
+            $appPopupStackPanel.Add_MouseLeave({
+                $sync.appPopup.IsOpen = $false
+            })
+            $appPopup.Child = $appPopupStackPanel
+
+            $appButtons = @(
+            [PSCustomObject]@{ Name = "Install";    Icon = [char]0xE118 },
+            [PSCustomObject]@{ Name = "Uninstall";  Icon = [char]0xE74D },
+            [PSCustomObject]@{ Name = "Info";       Icon = [char]0xE946 }
+            )
+            foreach ($button in $appButtons) {
+                $newButton = New-Object Windows.Controls.Button
+                $newButton.Style = $sync.Form.Resources.AppEntryButtonStyle
+                $newButton.Content = $button.Icon
+                $appPopupStackPanel.Children.Add($newButton) | Out-Null
+
+                # Dynamically load the selected app object so the buttons can be reused and do not need to be created for each app
+                switch ($button.Name) {
+                    "Install" {
+                        $newButton.Add_MouseEnter({
+                            $appObject = $sync.configs.applicationsHashtable.$($sync.appPopupSelectedApp)
+                            $this.ToolTip = "Install or Upgrade $($appObject.content)"
+                        })
+                        $newButton.Add_Click({
+                            $appObject = $sync.configs.applicationsHashtable.$($sync.appPopupSelectedApp)
+                            Invoke-WPFInstall -PackagesToInstall $appObject
+                        })
+                    }
+                    "Uninstall" {
+                        $newButton.Add_MouseEnter({
+                            $appObject = $sync.configs.applicationsHashtable.$($sync.appPopupSelectedApp)
+                            $this.ToolTip = "Uninstall $($appObject.content)"
+                        })
+                        $newButton.Add_Click({
+                            $appObject = $sync.configs.applicationsHashtable.$($sync.appPopupSelectedApp)
+                            Invoke-WPFUnInstall -PackagesToUninstall $appObject
+                        })
+                    }
+                    "Info" {
+                        $newButton.Add_MouseEnter({
+                            $appObject = $sync.configs.applicationsHashtable.$($sync.appPopupSelectedApp)
+                            $this.ToolTip = "Open the application's website in your default browser`n$($appObject.link)"
+                        })
+                        $newButton.Add_Click({
+                            $appObject = $sync.configs.applicationsHashtable.$($sync.appPopupSelectedApp)
+                            Start-Process $appObject.link
+                        })
+                    }
+                }
+            }
+        }
+        "appspanel" {
+            $sync.ItemsControl = Initialize-InstallAppArea -TargetElement $TargetGridName
+            Initialize-InstallCategoryAppList -TargetElement $sync.ItemsControl -Apps $sync.configs.applicationsHashtable
+        }
+        default {
+            Write-Output "$TargetGridName not yet implemented"
+        }
+    }
+}
+
--- a/functions/public/Invoke-WPFButton.ps1
+++ b/functions/public/Invoke-WPFButton.ps1
@ -33,7 +33,7 @@ function Invoke-WPFButton {
        "WPFRemoveUltPerf" {Invoke-WPFUltimatePerformance -State "Disable"}
        "WPFundoall" {Invoke-WPFundoall}
        "WPFFeatureInstall" {Invoke-WPFFeatureInstall}
-        "WPFPanelDISM" {Invoke-WPFPanelDISM}
+        "WPFPanelDISM" {Invoke-WPFSystemRepair}
        "WPFPanelAutologin" {Invoke-WPFPanelAutologin}
        "WPFPanelcontrol" {Invoke-WPFControlPanel -Panel $button}
        "WPFPanelnetwork" {Invoke-WPFControlPanel -Panel $button}
@ -43,6 +43,7 @@ function Invoke-WPFButton {
        "WPFPanelprinter" {Invoke-WPFControlPanel -Panel $button}
        "WPFPanelsystem" {Invoke-WPFControlPanel -Panel $button}
        "WPFPaneluser" {Invoke-WPFControlPanel -Panel $button}
+        "WPFPanelGodMode" {Invoke-WPFControlPanel -Panel $button}
        "WPFUpdatesdefault" {Invoke-WPFFixesUpdate}
        "WPFFixesUpdate" {Invoke-WPFFixesUpdate}
        "WPFFixesWinget" {Invoke-WPFFixesWinget}
@ -59,6 +60,7 @@ function Invoke-WPFButton {
        "MicrowinScratchDirBT" {Invoke-ScratchDialog}
        "WPFWinUtilInstallPSProfile" {Invoke-WinUtilInstallPSProfile}
        "WPFWinUtilUninstallPSProfile" {Invoke-WinUtilUninstallPSProfile}
-        "WPFWinUtilSSHServer" {Invoke-WinUtilSSHServer}
+        "WPFWinUtilSSHServer" {Invoke-WPFSSHServer}
+        "WPFselectedAppsButton" {$sync.selectedAppsPopup.IsOpen = -not $sync.selectedAppsPopup.IsOpen}
    }
 }
--- a/functions/public/Invoke-WPFControlPanel.ps1
+++ b/functions/public/Invoke-WPFControlPanel.ps1
@ -19,5 +19,6 @@ function Invoke-WPFControlPanel {
        "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}"}
    }
 }
--- a/functions/public/Invoke-WPFFixesUpdate.ps1
+++ b/functions/public/Invoke-WPFFixesUpdate.ps1
@ -6,19 +6,7 @@ function Invoke-WPFFixesUpdate {
        Performs various tasks in an attempt to repair Windows Update

    .DESCRIPTION
-        1. (Aggressive Only) Scans the system for corruption using chkdsk, SFC, and DISM
-            Steps:
-                1. Runs chkdsk /scan /perf
-                    /scan - Runs an online scan on the volume
-                    /perf - Uses more system resources to complete a scan as fast as possible
-                2. Runs SFC /scannow
-                    /scannow - Scans integrity of all protected system files and repairs files with problems when possible
-                3. Runs DISM /Online /Cleanup-Image /RestoreHealth
-                    /Online - Targets the running operating system
-                    /Cleanup-Image - Performs cleanup and recovery operations on the image
-                    /RestoreHealth - Scans the image for component store corruption and attempts to repair the corruption using Windows Update
-                4. Runs SFC /scannow
-                    Ran twice in case DISM repaired SFC
+        1. (Aggressive Only) Scans the system for corruption using the Invoke-WPFSystemRepair function
        2. Stops Windows Update Services
        3. Remove the QMGR Data file, which stores BITS jobs
        4. (Aggressive Only) Renames the DataStore and CatRoot2 folders
@ -46,104 +34,7 @@ function Invoke-WPFFixesUpdate {
    Start-Sleep -Milliseconds 200

    if ($Aggressive) {
-        # Scan system for corruption
-        Write-Progress -Id 0 -Activity "Repairing Windows Update" -Status "Scanning for corruption..." -PercentComplete 0
-        Write-Progress -Id 1 -ParentId 0 -Activity "Scanning for corruption" -Status "Running chkdsk..." -PercentComplete 0
-        # 2>&1 redirects stdout, alowing iteration over the output
-        chkdsk.exe /scan /perf 2>&1 | ForEach-Object {
-            # Write stdout to the Verbose stream
-            Write-Verbose $_
-
-            # Get the index of the total percentage
-            $index = $_.IndexOf("Total:")
-            if (
-                # If the percent is found
-                ($percent = try {(
-                    $_.Substring(
-                        $index + 6,
-                        $_.IndexOf("%", $index) - $index - 6
-                    )
-                ).Trim()} catch {0}) `
-                <# And the current percentage is greater than the previous one #>`
-                -and $percent -gt $oldpercent
-            ) {
-                # Update the progress bar
-                $oldpercent = $percent
-                Write-Progress -Id 1 -ParentId 0 -Activity "Scanning for corruption" -Status "Running chkdsk... ($percent%)" -PercentComplete $percent
-            }
-        }
-
-        Write-Progress -Id 1 -ParentId 0 -Activity "Scanning for corruption" -Status "Running SFC..." -PercentComplete 0
-        $oldpercent = 0
-        # SFC has a bug when redirected which causes it to output only when the stdout buffer is full, causing the progress bar to move in chunks
-        sfc /scannow 2>&1 | ForEach-Object {
-            # Write stdout to the Verbose stream
-            Write-Verbose $_
-
-            # Filter for lines that contain a percentage that is greater than the previous one
-            if (
-                (
-                    # Use a different method to get the percentage that accounts for SFC's Unicode output
-                    [int]$percent = try {(
-                        (
-                            $_.Substring(
-                                $_.IndexOf("n") + 2,
-                                $_.IndexOf("%") - $_.IndexOf("n") - 2
-                            ).ToCharArray() | Where-Object {$_}
-                        ) -join ''
-                    ).TrimStart()} catch {0}
-                ) -and $percent -gt $oldpercent
-            ) {
-                # Update the progress bar
-                $oldpercent = $percent
-                Write-Progress -Id 1 -ParentId 0 -Activity "Scanning for corruption" -Status "Running SFC... ($percent%)" -PercentComplete $percent
-            }
-        }
-
-        Write-Progress -Id 1 -ParentId 0 -Activity "Scanning for corruption" -Status "Running DISM..." -PercentComplete 0
-        $oldpercent = 0
-        DISM /Online /Cleanup-Image /RestoreHealth | ForEach-Object {
-            # Write stdout to the Verbose stream
-            Write-Verbose $_
-
-            # Filter for lines that contain a percentage that is greater than the previous one
-            if (
-                ($percent = try {
-                    [int]($_ -replace "\[" -replace "=" -replace " " -replace "%" -replace "\]")
-                } catch {0}) `
-                -and $percent -gt $oldpercent
-            ) {
-                # Update the progress bar
-                $oldpercent = $percent
-                Write-Progress -Id 1 -ParentId 0 -Activity "Scanning for corruption" -Status "Running DISM... ($percent%)" -PercentComplete $percent
-            }
-        }
-
-        Write-Progress -Id 1 -ParentId 0 -Activity "Scanning for corruption" -Status "Running SFC again..." -PercentComplete 0
-        $oldpercent = 0
-        sfc /scannow 2>&1 | ForEach-Object {
-            # Write stdout to the Verbose stream
-            Write-Verbose $_
-
-            # Filter for lines that contain a percentage that is greater than the previous one
-            if (
-                (
-                    [int]$percent = try {(
-                        (
-                            $_.Substring(
-                                $_.IndexOf("n") + 2,
-                                $_.IndexOf("%") - $_.IndexOf("n") - 2
-                            ).ToCharArray() | Where-Object {$_}
-                        ) -join ''
-                    ).TrimStart()} catch {0}
-                ) -and $percent -gt $oldpercent
-            ) {
-                # Update the progress bar
-                $oldpercent = $percent
-                Write-Progress -Id 1 -ParentId 0 -Activity "Scanning for corruption" -Status "Running SFC... ($percent%)" -PercentComplete $percent
-            }
-        }
-        Write-Progress -Id 1 -ParentId 0 -Activity "Scanning for corruption" -Status "Completed" -PercentComplete 100
+        Invoke-WPFSystemRepair
    }


--- a/functions/public/Invoke-WPFFormVariables.ps1
+++ b/functions/public/Invoke-WPFFormVariables.ps1
@ -1,36 +0,0 @@
-Function Invoke-WPFFormVariables {
-    <#
-
-    .SYNOPSIS
-        Prints the logo
-
-    #>
-    #If ($global:ReadmeDisplay -ne $true) { Write-Host "If you need to reference this display again, run Get-FormVariables" -ForegroundColor Yellow; $global:ReadmeDisplay = $true }
-
-
-    Write-Host ""
-    Write-Host "    CCCCCCCCCCCCCTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT   "
-    Write-Host " CCC::::::::::::CT:::::::::::::::::::::TT:::::::::::::::::::::T   "
-    Write-Host "CC:::::::::::::::CT:::::::::::::::::::::TT:::::::::::::::::::::T  "
-    Write-Host "C:::::CCCCCCCC::::CT:::::TT:::::::TT:::::TT:::::TT:::::::TT:::::T "
-    Write-Host "C:::::C       CCCCCCTTTTTT  T:::::T  TTTTTTTTTTTT  T:::::T  TTTTTT"
-    Write-Host "C:::::C                     T:::::T                T:::::T        "
-    Write-Host "C:::::C                     T:::::T                T:::::T        "
-    Write-Host "C:::::C                     T:::::T                T:::::T        "
-    Write-Host "C:::::C                     T:::::T                T:::::T        "
-    Write-Host "C:::::C                     T:::::T                T:::::T        "
-    Write-Host "C:::::C                     T:::::T                T:::::T        "
-    Write-Host "C:::::C       CCCCCC        T:::::T                T:::::T        "
-    Write-Host "C:::::CCCCCCCC::::C      TT:::::::TT            TT:::::::TT       "
-    Write-Host "CC:::::::::::::::C       T:::::::::T            T:::::::::T       "
-    Write-Host "CCC::::::::::::C         T:::::::::T            T:::::::::T       "
-    Write-Host "  CCCCCCCCCCCCC          TTTTTTTTTTT            TTTTTTTTTTT       "
-    Write-Host ""
-    Write-Host "====Chris Titus Tech====="
-    Write-Host "=====Windows Toolbox====="
-
-    #====DEBUG GUI Elements====
-
-    #Write-Host "Found the following interactable elements from our form" -ForegroundColor Cyan
-    #get-variable WPF*
-}
--- a/functions/public/Invoke-WPFGetInstalled.ps1
+++ b/functions/public/Invoke-WPFGetInstalled.ps1
@ -9,38 +9,39 @@ function Invoke-WPFGetInstalled {

    #>
    param($checkbox)
-
-    if($sync.ProcessRunning) {
+    if ($sync.ProcessRunning) {
        $msg = "[Invoke-WPFGetInstalled] Install process is currently running."
        [System.Windows.MessageBox]::Show($msg, "Winutil", [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
        return
    }

-    if(($sync.WPFpreferChocolatey.IsChecked -eq $false) -and ((Test-WinUtilPackageManager -winget) -eq "not-installed") -and $checkbox -eq "winget") {
+    if (($sync.ChocoRadioButton.IsChecked -eq $false) -and ((Test-WinUtilPackageManager -winget) -eq "not-installed") -and $checkbox -eq "winget") {
        return
    }
-    $preferChoco = $sync.WPFpreferChocolatey.IsChecked
-    Invoke-WPFRunspace -ArgumentList $checkbox, $preferChoco -DebugPreference $DebugPreference -ScriptBlock {
-        param($checkbox, $preferChoco, $DebugPreference)
+    $managerPreference = $sync["ManagerPreference"]

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

-        if($checkbox -eq "winget") {
+        if ($checkbox -eq "winget") {
            Write-Host "Getting Installed Programs..."
+            switch ($managerPreference) {
+                "Choco"{$Checkboxes = Invoke-WinUtilCurrentSystem -CheckBox "choco"; break}
+                "Winget"{$Checkboxes = Invoke-WinUtilCurrentSystem -CheckBox $checkbox; break}
+            }
        }
-        if($checkbox -eq "tweaks") {
+        elseif ($checkbox -eq "tweaks") {
            Write-Host "Getting Installed Tweaks..."
-        }
-        if ($preferChoco -and $checkbox -eq "winget") {
-            $Checkboxes = Invoke-WinUtilCurrentSystem -CheckBox "choco"
-        }
-        else{
            $Checkboxes = Invoke-WinUtilCurrentSystem -CheckBox $checkbox
        }

        $sync.form.Dispatcher.invoke({
-            foreach($checkbox in $Checkboxes) {
+            foreach ($checkbox in $Checkboxes) {
                $sync.$checkbox.ischecked = $True
            }
        })
--- a/functions/public/Invoke-WPFImpex.ps1
+++ b/functions/public/Invoke-WPFImpex.ps1
@ -46,7 +46,7 @@ function Invoke-WPFImpex {
                if ($Config) {
                    $jsonFile = Get-WinUtilCheckBoxes -unCheck $false | ConvertTo-Json
                    $jsonFile | Out-File $Config -Force
-                    "iex ""& { `$(irm christitus.com/win) } -Config '$Config'""" | Set-Clipboard
+                    "iex ""& { `$(irm https://christitus.com/win) } -Config '$Config'""" | Set-Clipboard
                }
            } catch {
                Write-Error "An error occurred while exporting: $_"
--- a/functions/public/Invoke-WPFInstall.ps1
+++ b/functions/public/Invoke-WPFInstall.ps1
@ -1,4 +1,8 @@
 function Invoke-WPFInstall {
+    param (
+        [Parameter(Mandatory=$false)]
+        [PSObject[]]$PackagesToInstall = $($sync.selectedApps | Foreach-Object { $sync.configs.applicationsHashtable.$_ })
+    )
    <#

    .SYNOPSIS
@ -12,51 +16,24 @@ function Invoke-WPFInstall {
        return
    }

-    $PackagesToInstall = (Get-WinUtilCheckBoxes)["Install"]
-    Write-Host $PackagesToInstall
    if ($PackagesToInstall.Count -eq 0) {
        $WarningMsg = "Please select the program(s) to install or upgrade"
        [System.Windows.MessageBox]::Show($WarningMsg, $AppTitle, [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
        return
    }
-    $ChocoPreference = $($sync.WPFpreferChocolatey.IsChecked)
-    $installHandle = Invoke-WPFRunspace -ParameterList @(("PackagesToInstall", $PackagesToInstall),("ChocoPreference", $ChocoPreference)) -DebugPreference $DebugPreference -ScriptBlock {
-        param($PackagesToInstall, $ChocoPreference, $DebugPreference)
-        if ($PackagesToInstall.count -eq 1) {
-            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
-        } else {
-            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" })
-        }
-        $packagesWinget, $packagesChoco = {
-            $packagesWinget = [System.Collections.ArrayList]::new()
-            $packagesChoco = [System.Collections.ArrayList]::new()

-        foreach ($package in $PackagesToInstall) {
-            if ($ChocoPreference) {
-                if ($package.choco -eq "na") {
-                    $packagesWinget.add($package.winget)
-                    Write-Host "Queueing $($package.winget) for Winget install"
-                } else {
-                    $null = $packagesChoco.add($package.choco)
-                    Write-Host "Queueing $($package.choco) for Chocolatey install"
-                }
-            }
-            else {
-                if ($package.winget -eq "na") {
-                    $packagesChoco.add($package.choco)
-                    Write-Host "Queueing $($package.choco) for Chocolatey install"
-                } else {
-                    $null = $packagesWinget.add($($package.winget))
-                    Write-Host "Queueing $($package.winget) for Winget install"
-                }
-            }
-        }
-        return $packagesWinget, $packagesChoco
-        }.Invoke($PackagesToInstall)
+    $ManagerPreference = $sync["ManagerPreference"]
+
+    Invoke-WPFRunspace -ParameterList @(("PackagesToInstall", $PackagesToInstall),("ManagerPreference", $ManagerPreference)) -DebugPreference $DebugPreference -ScriptBlock {
+        param($PackagesToInstall, $ManagerPreference, $DebugPreference)
+
+        $packagesSorted = Get-WinUtilSelectedPackages -PackageList $PackagesToInstall -Preference $ManagerPreference
+
+        $packagesWinget = $packagesSorted[[PackageManagers]::Winget]
+        $packagesChoco = $packagesSorted[[PackageManagers]::Choco]

        try {
            $sync.ProcessRunning = $true
-            $errorPackages = @()
            if($packagesWinget.Count -gt 0) {
                Install-WinUtilWinget
                Install-WinUtilProgramWinget -Action Install -Programs $packagesWinget
--- a/functions/public/Invoke-WPFInstallUpgrade.ps1
+++ b/functions/public/Invoke-WPFInstallUpgrade.ps1
@ -5,7 +5,7 @@ function Invoke-WPFInstallUpgrade {
        Invokes the function that upgrades all installed programs

    #>
-    if ($sync.WPFpreferChocolatey.IsChecked) {
+    if ($sync.ChocoRadioButton.IsChecked) {
        Install-WinUtilChoco
        $chocoUpgradeStatus = (Start-Process "choco" -ArgumentList "upgrade all -y" -Wait -PassThru -NoNewWindow).ExitCode
        if ($chocoUpgradeStatus -eq 0) {
--- a/functions/public/Invoke-WPFPanelDISM.ps1
+++ b/functions/public/Invoke-WPFPanelDISM.ps1
@ -1,30 +0,0 @@
-function Invoke-WPFPanelDISM {
-    <#
-
-    .SYNOPSIS
-        Checks for system corruption using Chkdsk, SFC, and DISM
-
-    .DESCRIPTION
-        1. Chkdsk    - Fixes disk and filesystem corruption
-        2. SFC Run 1 - Fixes system file corruption, and fixes DISM if it was corrupted
-        3. DISM      - Fixes system image corruption, and fixes SFC's system image if it was corrupted
-        4. SFC Run 2 - Fixes system file corruption, this time with an almost guaranteed uncorrupted system image
-
-    .NOTES
-        Command Arguments:
-            1. Chkdsk
-                /Scan - Runs an online scan on the system drive, attempts to fix any corruption, and queues other corruption for fixing on reboot
-            2. SFC
-                /ScanNow - Performs a scan of the system files and fixes any corruption
-            3. DISM      - Fixes system image corruption, and fixes SFC's system image if it was corrupted
-                /Online - Fixes the currently running system image
-                /Cleanup-Image - Performs cleanup operations on the image, could remove some unneeded temporary files
-                /Restorehealth - Performs a scan of the image and fixes any corruption
-
-    #>
-    Start-Process PowerShell -ArgumentList "Write-Host '(1/4) Chkdsk' -ForegroundColor Green; Chkdsk /scan;
-    Write-Host '`n(2/4) SFC - 1st scan' -ForegroundColor Green; sfc /scannow;
-    Write-Host '`n(3/4) DISM' -ForegroundColor Green; DISM /Online /Cleanup-Image /Restorehealth;
-    Write-Host '`n(4/4) SFC - 2nd scan' -ForegroundColor Green; sfc /scannow;
-    Read-Host '`nPress Enter to Continue'" -verb runas
-}
--- a/functions/public/Invoke-WPFSSHServer.ps1
+++ b/functions/public/Invoke-WPFSSHServer.ps1
@ -0,0 +1,17 @@
+function Invoke-WPFSSHServer {
+    <#
+
+    .SYNOPSIS
+        Invokes the OpenSSH Server install in a runspace
+
+  #>
+
+    Invoke-WPFRunspace -DebugPreference $DebugPreference -ScriptBlock {
+
+        Invoke-WinUtilSSHServer
+
+        Write-Host "======================================="
+        Write-Host "--     OpenSSH Server installed!    ---"
+        Write-Host "======================================="
+    }
+}
--- a/functions/public/Invoke-WPFSelectedAppsUpdate.ps1
+++ b/functions/public/Invoke-WPFSelectedAppsUpdate.ps1
@ -0,0 +1,43 @@
+function Invoke-WPFSelectedAppsUpdate {
+    <#
+        .SYNOPSIS
+            This is a helper function that is called by the Checked and Unchecked events of the Checkboxes on the install tab.
+            It Updates the "Selected Apps" selectedAppLabel on the Install Tab to represent the current collection
+        .PARAMETER type
+            Eigther: Add | Remove
+        .PARAMETER checkbox
+            should contain the current instance of the checkbox that triggered the Event.
+            Most of the time will be the automatic variable $this
+        .EXAMPLE
+            $checkbox.Add_Unchecked({Invoke-WPFSelectedAppsUpdate -type "Remove" -checkbox $this})
+            OR
+            Invoke-WPFSelectedAppsUpdate -type "Add" -checkbox $specificCheckbox
+    #>
+    param (
+        $type,
+        $checkbox
+    )
+
+    $selectedAppsButton = $sync.WPFselectedAppsButton
+    # Get the actual Name from the selectedAppLabel inside the Checkbox
+    $appKey = $checkbox.Parent.Tag
+    if ($type -eq "Add") {
+        $sync.selectedApps.Add($appKey)
+        # The List type needs to be specified again, because otherwise Sort-Object will convert the list to a string if there is only a single entry
+        [System.Collections.Generic.List[pscustomobject]]$sync.selectedApps = $sync.SelectedApps | Sort-Object
+
+    }
+    elseif ($type -eq "Remove") {
+        $sync.SelectedApps.Remove($appKey)
+    }
+    else{
+        Write-Error "Type: $type not implemented"
+    }
+
+    $count = $sync.SelectedApps.Count
+    $selectedAppsButton.Content = "Selected Apps: $count"
+    # On every change, remove all entries inside the Popup Menu. This is done, so we can keep the alphabetical order even if elements are selected in a random way
+    $sync.selectedAppsstackPanel.Children.Clear()
+    $sync.SelectedApps | Foreach-Object { Add-SelectedAppsMenuItem -name $($sync.configs.applicationsHashtable.$_.Content) -key $_ }
+
+}
--- a/functions/public/Invoke-WPFSystemRepair.ps1
+++ b/functions/public/Invoke-WPFSystemRepair.ps1
@ -0,0 +1,124 @@
+function Invoke-WPFSystemRepair {
+    <#
+    .SYNOPSIS
+        Checks for system corruption using Chkdsk, SFC, and DISM
+
+    .DESCRIPTION
+        1. Chkdsk    - Fixes disk and filesystem corruption
+        2. SFC Run 1 - Fixes system file corruption, and fixes DISM if it was corrupted
+        3. DISM      - Fixes system image corruption, and fixes SFC's system image if it was corrupted
+        4. SFC Run 2 - Fixes system file corruption, this time with an almost guaranteed uncorrupted system image
+    #>
+
+    function Invoke-Chkdsk {
+        <#
+        .SYNOPSIS
+            Runs chkdsk on the system drive
+        .DESCRIPTION
+            Chkdsk /Scan - Runs an online scan on the system drive, attempts to fix any corruption, and queues other corruption for fixing on reboot
+        #>
+        param(
+            [int]$parentProgressId = 0
+        )
+
+        Write-Progress -Id 1 -ParentId $parentProgressId -Activity $childProgressBarActivity -Status "Running chkdsk..." -PercentComplete 0
+        $oldpercent = 0
+        # 2>&1 redirects stdout, allowing iteration over the output
+        chkdsk.exe /scan /perf 2>&1 | ForEach-Object {
+            Write-Debug $_
+            # Regex to match the total percentage regardless of windows locale (it's always the second percentage in the status output)
+            if ($_ -match "%.*?(\d+)%") {
+                [int]$percent = $matches[1]
+                if ($percent -gt $oldpercent) {
+                    Write-Progress -Id 1 -Activity $childProgressBarActivity -Status "Running chkdsk... ($percent%)" -PercentComplete $percent
+                    $oldpercent = $percent
+                }
+            }
+        }
+        Write-Progress -Id 1 -Activity $childProgressBarActivity -Status "chkdsk Completed" -PercentComplete 100 -Completed
+    }
+
+    function Invoke-SFC {
+        <#
+        .SYNOPSIS
+            Runs sfc on the system drive
+        .DESCRIPTION
+            SFC /ScanNow - Performs a scan of the system files and fixes any corruption
+        .NOTES
+            ErrorActionPreference is set locally within a script block & {...} to isolate their effects.
+            ErrorActionPreference suppresses false errors caused by sfc.exe output redirection.
+            A bug in SFC output buffering causes progress updates to appear in chunks when redirecting output
+        #>
+        param(
+            [int]$parentProgressId = 0
+        )
+        & {
+            $ErrorActionPreference = "SilentlyContinue"
+            Write-Progress -Id 1 -ParentId $parentProgressId -Activity $childProgressBarActivity -Status "Running SFC..." -PercentComplete 0
+            $oldpercent = 0
+            sfc.exe /scannow 2>&1 | ForEach-Object {
+                Write-Debug $_
+                if ($_ -ne "") {
+                    # sfc.exe /scannow outputs unicode characters, so we directly remove null characters for optimization
+                    $utf8line = $_ -replace "`0", ""
+                    if ($utf8line -match "(\d+)\s*%") {
+                        [int]$percent = $matches[1]
+                        if ($percent -gt $oldpercent) {
+                            Write-Progress -Id 1 -Activity $childProgressBarActivity -Status "Running SFC... ($percent%)" -PercentComplete $percent
+                            $oldpercent = $percent
+                        }
+                    }
+                }
+            }
+            Write-Progress -Id 1 -Activity $childProgressBarActivity -Status "SFC Completed" -PercentComplete 100 -Completed
+        }
+    }
+
+    function Invoke-DISM {
+        <#
+        .SYNOPSIS
+            Runs DISM on the system drive
+        .DESCRIPTION
+            DISM                - Fixes system image corruption, and fixes SFC's system image if it was corrupted
+              /Online           - Fixes the currently running system image
+              /Cleanup-Image    - Performs cleanup operations on the image, could remove some unneeded temporary files
+              /Restorehealth    - Performs a scan of the image and fixes any corruption
+        #>
+        param(
+            [int]$parentProgressId = 0
+        )
+        Write-Progress -Id 1 -ParentId $parentProgressId -Activity $childProgressBarActivity -Status "Running DISM..." -PercentComplete 0
+        $oldpercent = 0
+        DISM /Online /Cleanup-Image /RestoreHealth | ForEach-Object {
+            Write-Debug $_
+            # Filter for lines that contain a percentage that is greater than the previous one
+            if ($_ -match "(\d+)[.,]\d+%") {
+                [int]$percent = $matches[1]
+                if ($percent -gt $oldpercent) {
+                    # Update the progress bar
+                    Write-Progress -Id 1 -Activity $childProgressBarActivity -Status "Running DISM... ($percent%)" -PercentComplete $percent
+                    $oldpercent = $percent
+                }
+            }
+        }
+        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
+
+    # 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
+}
--- a/functions/public/Invoke-WPFTab.ps1
+++ b/functions/public/Invoke-WPFTab.ps1
@ -28,4 +28,31 @@ function Invoke-WPFTab {
            $sync.$tabNav.Items[$tabNumber].IsSelected = $true
        }
    }
+    $sync.currentTab = $sync.$tabNav.Items[$tabNumber].Header
+
+    # Always reset the filter for the current tab
+    if ($sync.currentTab -eq "Install") {
+        # Reset Install tab filter
+        Find-AppsByNameOrDescription -SearchString ""
+    } elseif ($sync.currentTab -eq "Tweaks") {
+        # Reset Tweaks tab filter
+        Find-TweaksByNameOrDescription -SearchString ""
+    }
+
+    # Show search bar in Install and Tweaks tabs
+    if ($tabNumber -eq 0 -or $tabNumber -eq 1) {
+        $sync.SearchBar.Visibility = "Visible"
+        $searchIcon = ($sync.Form.FindName("SearchBar").Parent.Children | Where-Object { $_ -is [System.Windows.Controls.TextBlock] -and $_.Text -eq [char]0xE721 })[0]
+        if ($searchIcon) {
+            $searchIcon.Visibility = "Visible"
+        }
+    } else {
+        $sync.SearchBar.Visibility = "Collapsed"
+        $searchIcon = ($sync.Form.FindName("SearchBar").Parent.Children | Where-Object { $_ -is [System.Windows.Controls.TextBlock] -and $_.Text -eq [char]0xE721 })[0]
+        if ($searchIcon) {
+            $searchIcon.Visibility = "Collapsed"
+        }
+        # Hide the clear button if it's visible
+        $sync.SearchBarClearButton.Visibility = "Collapsed"
+    }
 }
--- a/functions/public/Invoke-WPFUIElements.ps1
+++ b/functions/public/Invoke-WPFUIElements.ps1
@ -11,26 +11,26 @@ function Invoke-WPFUIElements {
    .EXAMPLE
        Invoke-WPFUIElements -configVariable $sync.configs.applications -targetGridName "install" -columncount 5
    .NOTES
-        Future me/contributer: If possible please wrap this into a runspace to make it load all panels at the same time.
+        Future me/contributor: If possible, please wrap this into a runspace to make it load all panels at the same time.
    #>

    param(
-        [Parameter(Mandatory, position=0)]
+        [Parameter(Mandatory, Position = 0)]
        [PSCustomObject]$configVariable,

-        [Parameter(Mandatory, position=1)]
+        [Parameter(Mandatory, Position = 1)]
        [string]$targetGridName,

-        [Parameter(Mandatory, position=2)]
+        [Parameter(Mandatory, Position = 2)]
        [int]$columncount
    )

-    $window = $sync["Form"]
+    $window = $sync.form

-    $theme = $sync.Form.Resources
    $borderstyle = $window.FindResource("BorderStyle")
    $HoverTextBlockStyle = $window.FindResource("HoverTextBlockStyle")
    $ColorfulToggleSwitchStyle = $window.FindResource("ColorfulToggleSwitchStyle")
+    $ToggleButtonStyle = $window.FindResource("ToggleButtonStyle")

    if (!$borderstyle -or !$HoverTextBlockStyle -or !$ColorfulToggleSwitchStyle) {
        throw "Failed to retrieve Styles using 'FindResource' from main window element."
@ -59,6 +59,8 @@ function Invoke-WPFUIElements {
        $configHashtable[$_] = $configVariable.$_
    }

+    $radioButtonGroups = @{}
+
    $organizedData = @{}
    # Iterate through JSON data and organize by panel and category
    foreach ($entry in $configHashtable.Keys) {
@ -66,19 +68,18 @@ function Invoke-WPFUIElements {

        # Create an object for the application
        $entryObject = [PSCustomObject]@{
-            Name = $entry
-            Order = $entryInfo.order
-            Category = $entryInfo.Category
-            Content = $entryInfo.Content
-            Choco = $entryInfo.choco
-            Winget = $entryInfo.winget
-            Panel = if ($entryInfo.Panel) { $entryInfo.Panel } else { "0" }
-            Link = $entryInfo.link
+            Name        = $entry
+            Order       = $entryInfo.order
+            Category    = $entryInfo.Category
+            Content     = $entryInfo.Content
+            Panel       = if ($entryInfo.Panel) { $entryInfo.Panel } else { "0" }
+            Link        = $entryInfo.link
            Description = $entryInfo.description
-            Type = $entryInfo.type
-            ComboItems = $entryInfo.ComboItems
-            Checked = $entryInfo.Checked
+            Type        = $entryInfo.type
+            ComboItems  = $entryInfo.ComboItems
+            Checked     = $entryInfo.Checked
            ButtonWidth = $entryInfo.ButtonWidth
+            GroupName   = $entryInfo.GroupName  # Added for RadioButton groupings
        }

        if (-not $organizedData.ContainsKey($entryObject.Panel)) {
@ -92,15 +93,11 @@ function Invoke-WPFUIElements {
        # Store application data in an array under the category
        $organizedData[$entryObject.Panel][$entryObject.Category] += $entryObject

-        # Only apply the logic for distributing entries across columns if the targetGridName is "appspanel"
-        if ($targetGridName -eq "appspanel") {
-            $panelcount = 0
-            $entrycount = $configHashtable.Keys.Count + $organizedData["0"].Keys.Count
-            $maxcount = [Math]::Round($entrycount / $columncount + 0.5)
-        }
-
    }

+    # Initialize panel count
+    $panelcount = 0
+
    # Iterate through 'organizedData' by panel, category, and application
    $count = 0
    foreach ($panelKey in ($organizedData.Keys | Sort-Object)) {
@ -111,78 +108,46 @@ function Invoke-WPFUIElements {
        $border.style = $borderstyle
        $targetGrid.Children.Add($border) | Out-Null

-        # Create a StackPanel inside the Border
-        $stackPanel = New-Object Windows.Controls.StackPanel
-        $stackPanel.Background = [Windows.Media.Brushes]::Transparent
-        $stackPanel.SnapsToDevicePixels = $true
-        $stackPanel.VerticalAlignment = "Stretch"
-        $border.Child = $stackPanel
+        # Use a DockPanel to contain the content
+        $dockPanelContainer = New-Object Windows.Controls.DockPanel
+        $border.Child = $dockPanelContainer
+
+        # Create an ItemsControl for application content
+        $itemsControl = New-Object Windows.Controls.ItemsControl
+        $itemsControl.HorizontalAlignment = 'Stretch'
+        $itemsControl.VerticalAlignment = 'Stretch'
+
+        # Set the ItemsPanel to a VirtualizingStackPanel
+        $itemsPanelTemplate = New-Object Windows.Controls.ItemsPanelTemplate
+        $factory = New-Object Windows.FrameworkElementFactory ([Windows.Controls.VirtualizingStackPanel])
+        $itemsPanelTemplate.VisualTree = $factory
+        $itemsControl.ItemsPanel = $itemsPanelTemplate
+
+        # Set virtualization properties
+        $itemsControl.SetValue([Windows.Controls.VirtualizingStackPanel]::IsVirtualizingProperty, $true)
+        $itemsControl.SetValue([Windows.Controls.VirtualizingStackPanel]::VirtualizationModeProperty, [Windows.Controls.VirtualizationMode]::Recycling)
+
+        # Add the ItemsControl directly to the DockPanel
+        [Windows.Controls.DockPanel]::SetDock($itemsControl, [Windows.Controls.Dock]::Bottom)
+        $dockPanelContainer.Children.Add($itemsControl) | Out-Null
        $panelcount++

-        # Add Windows Version label if this is the updates panel
-        if ($targetGridName -eq "updatespanel") {
-            $windowsVersion = (Get-ItemProperty "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion").ProductName
-            $versionLabel = New-Object Windows.Controls.Label
-            $versionLabel.Content = "Windows Version: $windowsVersion"
-            $versionLabel.FontSize = $theme.FontSize
-            $versionLabel.HorizontalAlignment = "Left"
-            $stackPanel.Children.Add($versionLabel) | Out-Null
-        }
-
+        # Now proceed with adding category labels and entries to $itemsControl
        foreach ($category in ($organizedData[$panelKey].Keys | Sort-Object)) {
            $count++
-            if ($targetGridName -eq "appspanel" -and $columncount -gt 0) {
-                $panelcount2 = [Int](($count) / $maxcount - 0.5)
-                if ($panelcount -eq $panelcount2) {
-                    # Create a new Border for the new column
-                    $border = New-Object Windows.Controls.Border
-                    $border.VerticalAlignment = "Stretch"
-                    [System.Windows.Controls.Grid]::SetColumn($border, $panelcount)
-                    $border.style = $borderstyle
-                    $targetGrid.Children.Add($border) | Out-Null
-
-                    # Create a new StackPanel inside the Border
-                    $stackPanel = New-Object Windows.Controls.StackPanel
-                    $stackPanel.Background = [Windows.Media.Brushes]::Transparent
-                    $stackPanel.SnapsToDevicePixels = $true
-                    $stackPanel.VerticalAlignment = "Stretch"
-                    $border.Child = $stackPanel
-                    $panelcount++
-                }
-            }

            $label = New-Object Windows.Controls.Label
            $label.Content = $category -replace ".*__", ""
-            $label.FontSize = $theme.HeadingFontSize
-            $label.FontFamily = $theme.HeaderFontFamily
-            $stackPanel.Children.Add($label) | Out-Null
-
+            $label.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "HeaderFontSize")
+            $label.SetResourceReference([Windows.Controls.Control]::FontFamilyProperty, "HeaderFontFamily")
+            $itemsControl.Items.Add($label) | Out-Null
            $sync[$category] = $label

-            # Sort entries by Order and then by Name, but only display Name
+            # Sort entries by Order and then by Name
            $entries = $organizedData[$panelKey][$category] | Sort-Object Order, Name
            foreach ($entryInfo in $entries) {
                $count++
-                if ($targetGridName -eq "appspanel" -and $columncount -gt 0) {
-                    $panelcount2 = [Int](($count) / $maxcount - 0.5)
-                    if ($panelcount -eq $panelcount2) {
-                        # Create a new Border for the new column
-                        $border = New-Object Windows.Controls.Border
-                        $border.VerticalAlignment = "Stretch"
-                        [System.Windows.Controls.Grid]::SetColumn($border, $panelcount)
-                        $border.style = $borderstyle
-                        $targetGrid.Children.Add($border) | Out-Null
-
-                        # Create a new StackPanel inside the Border
-                        $stackPanel = New-Object Windows.Controls.StackPanel
-                        $stackPanel.Background = [Windows.Media.Brushes]::Transparent
-                        $stackPanel.SnapsToDevicePixels = $true
-                        $stackPanel.VerticalAlignment = "Stretch"
-                        $border.Child = $stackPanel
-                        $panelcount++
-                    }
-                }
-
+                # Create the UI elements based on the entry type
                switch ($entryInfo.Type) {
                    "Toggle" {
                        $dockPanel = New-Object Windows.Controls.DockPanel
@ -196,10 +161,10 @@ function Invoke-WPFUIElements {
                        $label.Content = $entryInfo.Content
                        $label.ToolTip = $entryInfo.Description
                        $label.HorizontalAlignment = "Left"
-                        $label.FontSize = $theme.FontSize
+                        $label.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "FontSize")
                        $label.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "MainForegroundColor")
                        $dockPanel.Children.Add($label) | Out-Null
-                        $stackPanel.Children.Add($dockPanel) | Out-Null
+                        $itemsControl.Items.Add($dockPanel) | Out-Null

                        $sync[$entryInfo.Name] = $checkBox

@ -217,35 +182,29 @@ function Invoke-WPFUIElements {
                    }

                    "ToggleButton" {
-                        $toggleButton = New-Object Windows.Controls.ToggleButton
+                        $toggleButton = New-Object Windows.Controls.Primitives.ToggleButton
                        $toggleButton.Name = $entryInfo.Name
-                        $toggleButton.Name = "WPFTab" + ($stackPanel.Children.Count + 1) + "BT"
+                        $toggleButton.Content = $entryInfo.Content[1]
+                        $toggleButton.ToolTip = $entryInfo.Description
                        $toggleButton.HorizontalAlignment = "Left"
-                        $toggleButton.Height = $theme.TabButtonHeight
-                        $toggleButton.Width = $theme.TabButtonWidth
-                        $toggleButton.SetResourceReference([Windows.Controls.Control]::BackgroundProperty, "ButtonInstallBackgroundColor")
-                        $toggleButton.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "MainForegroundColor")
-                        $toggleButton.FontWeight = [Windows.FontWeights]::Bold
+                        $toggleButton.Style = $ToggleButtonStyle

-                        $textBlock = New-Object Windows.Controls.TextBlock
-                        $textBlock.FontSize = $theme.TabButtonFontSize
-                        $textBlock.Background = [Windows.Media.Brushes]::Transparent
-                        $textBlock.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "ButtonInstallForegroundColor")
+                        $toggleButton.Tag = @{
+                            contentOn = if ($entryInfo.Content.Count -ge 1) { $entryInfo.Content[0] } else { "" }
+                            contentOff = if ($entryInfo.Content.Count -ge 2) { $entryInfo.Content[1] } else { $contentOn }
+                        }

-                        $underline = New-Object Windows.Documents.Underline
-                        $underline.Inlines.Add($entryInfo.name -replace "(.).*", "`$1")
-
-                        $run = New-Object Windows.Documents.Run
-                        $run.Text = $entryInfo.name -replace "^.", ""
-
-                        $textBlock.Inlines.Add($underline)
-                        $textBlock.Inlines.Add($run)
-
-                        $toggleButton.Content = $textBlock
-
-                        $stackPanel.Children.Add($toggleButton) | Out-Null
+                        $itemsControl.Items.Add($toggleButton) | Out-Null

                        $sync[$entryInfo.Name] = $toggleButton
+
+                        $sync[$entryInfo.Name].Add_Checked({
+                            $this.Content = $this.Tag.contentOn
+                        })
+
+                        $sync[$entryInfo.Name].Add_Unchecked({
+                            $this.Content = $this.Tag.contentOff
+                        })
                    }

                    "Combobox" {
@ -257,26 +216,26 @@ function Invoke-WPFUIElements {
                        $label.Content = $entryInfo.Content
                        $label.HorizontalAlignment = "Left"
                        $label.VerticalAlignment = "Center"
-                        $label.FontSize = $theme.ButtonFontSize
+                        $label.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "ButtonFontSize")
                        $horizontalStackPanel.Children.Add($label) | Out-Null

                        $comboBox = New-Object Windows.Controls.ComboBox
                        $comboBox.Name = $entryInfo.Name
-                        $comboBox.Height = $theme.ButtonHeight
-                        $comboBox.Width = $theme.ButtonWidth
+                        $comboBox.SetResourceReference([Windows.Controls.Control]::HeightProperty, "ButtonHeight")
+                        $comboBox.SetResourceReference([Windows.Controls.Control]::WidthProperty, "ButtonWidth")
                        $comboBox.HorizontalAlignment = "Left"
                        $comboBox.VerticalAlignment = "Center"
-                        $comboBox.Margin = $theme.ButtonMargin
+                        $comboBox.SetResourceReference([Windows.Controls.Control]::MarginProperty, "ButtonMargin")

                        foreach ($comboitem in ($entryInfo.ComboItems -split " ")) {
                            $comboBoxItem = New-Object Windows.Controls.ComboBoxItem
                            $comboBoxItem.Content = $comboitem
-                            $comboBoxItem.FontSize = $theme.ButtonFontSize
+                            $comboBoxItem.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "ButtonFontSize")
                            $comboBox.Items.Add($comboBoxItem) | Out-Null
                        }

                        $horizontalStackPanel.Children.Add($comboBox) | Out-Null
-                        $stackPanel.Children.Add($horizontalStackPanel) | Out-Null
+                        $itemsControl.Items.Add($horizontalStackPanel) | Out-Null

                        $comboBox.SelectedIndex = 0

@ -288,16 +247,50 @@ function Invoke-WPFUIElements {
                        $button.Name = $entryInfo.Name
                        $button.Content = $entryInfo.Content
                        $button.HorizontalAlignment = "Left"
-                        $button.Margin = $theme.ButtonMargin
-                        $button.FontSize = $theme.ButtonFontSize
+                        $button.SetResourceReference([Windows.Controls.Control]::MarginProperty, "ButtonMargin")
+                        $button.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "ButtonFontSize")
                        if ($entryInfo.ButtonWidth) {
                            $button.Width = $entryInfo.ButtonWidth
                        }
-                        $stackPanel.Children.Add($button) | Out-Null
+                        $itemsControl.Items.Add($button) | Out-Null

                        $sync[$entryInfo.Name] = $button
                    }

+                    "RadioButton" {
+                        # Check if a container for this GroupName already exists
+                        if (-not $radioButtonGroups.ContainsKey($entryInfo.GroupName)) {
+                            # Create a StackPanel for this group
+                            $groupStackPanel = New-Object Windows.Controls.StackPanel
+                            $groupStackPanel.Orientation = "Vertical"
+
+                            # Add the group container to the ItemsControl
+                            $itemsControl.Items.Add($groupStackPanel) | Out-Null
+                        }
+                        else {
+                            # Retrieve the existing group container
+                            $groupStackPanel = $radioButtonGroups[$entryInfo.GroupName]
+                        }
+
+                        # Create the RadioButton
+                        $radioButton = New-Object Windows.Controls.RadioButton
+                        $radioButton.Name = $entryInfo.Name
+                        $radioButton.GroupName = $entryInfo.GroupName
+                        $radioButton.Content = $entryInfo.Content
+                        $radioButton.HorizontalAlignment = "Left"
+                        $radioButton.SetResourceReference([Windows.Controls.Control]::MarginProperty, "CheckBoxMargin")
+                        $radioButton.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "ButtonFontSize")
+                        $radioButton.ToolTip = $entryInfo.Description
+
+                        if ($entryInfo.Checked -eq $true) {
+                            $radioButton.IsChecked = $true
+                        }
+
+                        # Add the RadioButton to the group container
+                        $groupStackPanel.Children.Add($radioButton) | Out-Null
+                        $sync[$entryInfo.Name] = $radioButton
+                    }
+
                    default {
                        $horizontalStackPanel = New-Object Windows.Controls.StackPanel
                        $horizontalStackPanel.Orientation = "Horizontal"
@ -305,9 +298,9 @@ function Invoke-WPFUIElements {
                        $checkBox = New-Object Windows.Controls.CheckBox
                        $checkBox.Name = $entryInfo.Name
                        $checkBox.Content = $entryInfo.Content
-                        $checkBox.FontSize = $theme.FontSize
+                        $checkBox.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "FontSize")
                        $checkBox.ToolTip = $entryInfo.Description
-                        $checkBox.Margin = $theme.CheckBoxMargin
+                        $checkBox.SetResourceReference([Windows.Controls.Control]::MarginProperty, "CheckBoxMargin")
                        if ($entryInfo.Checked -eq $true) {
                            $checkBox.IsChecked = $entryInfo.Checked
                        }
@ -325,7 +318,7 @@ function Invoke-WPFUIElements {
                            $sync[$textBlock.Name] = $textBlock
                        }

-                        $stackPanel.Children.Add($horizontalStackPanel) | Out-Null
+                        $itemsControl.Items.Add($horizontalStackPanel) | Out-Null
                        $sync[$entryInfo.Name] = $checkBox
                    }
                }
--- a/functions/public/Invoke-WPFUnInstall.ps1
+++ b/functions/public/Invoke-WPFUnInstall.ps1
@ -1,9 +1,12 @@
 function Invoke-WPFUnInstall {
+    param(
+        [Parameter(Mandatory=$false)]
+        [PSObject[]]$PackagesToUninstall = $($sync.selectedApps | Foreach-Object { $sync.configs.applicationsHashtable.$_ })
+    )
    <#

    .SYNOPSIS
        Uninstalls the selected programs
-
    #>

    if($sync.ProcessRunning) {
@ -12,9 +15,7 @@ function Invoke-WPFUnInstall {
        return
    }

-    $PackagesToInstall = (Get-WinUtilCheckBoxes)["Install"]
-
-    if ($PackagesToInstall.Count -eq 0) {
+    if ($PackagesToUninstall.Count -eq 0) {
        $WarningMsg = "Please select the program(s) to uninstall"
        [System.Windows.MessageBox]::Show($WarningMsg, $AppTitle, [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
        return
@ -22,52 +23,26 @@ function Invoke-WPFUnInstall {

    $ButtonType = [System.Windows.MessageBoxButton]::YesNo
    $MessageboxTitle = "Are you sure?"
-    $Messageboxbody = ("This will uninstall the following applications: `n $($PackagesToInstall | Format-Table | Out-String)")
+    $Messageboxbody = ("This will uninstall the following applications: `n $($PackagesToUninstall | Select-Object Name, Description| Out-String)")
    $MessageIcon = [System.Windows.MessageBoxImage]::Information

    $confirm = [System.Windows.MessageBox]::Show($Messageboxbody, $MessageboxTitle, $ButtonType, $MessageIcon)

    if($confirm -eq "No") {return}
-    $ChocoPreference = $($sync.WPFpreferChocolatey.IsChecked)

-    Invoke-WPFRunspace -ArgumentList @(("PackagesToInstall", $PackagesToInstall),("ChocoPreference", $ChocoPreference)) -DebugPreference $DebugPreference -ScriptBlock {
-        param($PackagesToInstall, $ChocoPreference, $DebugPreference)
-        if ($PackagesToInstall.count -eq 1) {
-            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
-        } else {
-            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" })
-        }
-        $packagesWinget, $packagesChoco = {
-            $packagesWinget = [System.Collections.ArrayList]::new()
-            $packagesChoco = [System.Collections.ArrayList]::new()
+    $ManagerPreference = $sync["ManagerPreference"]

-        foreach ($package in $PackagesToInstall) {
-            if ($ChocoPreference) {
-                if ($package.choco -eq "na") {
-                    $packagesWinget.add($package.winget)
-                    Write-Host "Queueing $($package.winget) for Winget uninstall"
-                } else {
-                    $null = $packagesChoco.add($package.choco)
-                    Write-Host "Queueing $($package.choco) for Chocolatey uninstall"
-                }
-            }
-            else {
-                if ($package.winget -eq "na") {
-                    $packagesChoco.add($package.choco)
-                    Write-Host "Queueing $($package.choco) for Chocolatey uninstall"
-                } else {
-                    $null = $packagesWinget.add($($package.winget))
-                    Write-Host "Queueing $($package.winget) for Winget uninstall"
-                }
-            }
-        }
-        return $packagesWinget, $packagesChoco
-        }.Invoke($PackagesToInstall)
+    Invoke-WPFRunspace -ArgumentList @(("PackagesToUninstall", $PackagesToUninstall),("ManagerPreference", $ManagerPreference)) -DebugPreference $DebugPreference -ScriptBlock {
+        param($PackagesToUninstall, $ManagerPreference, $DebugPreference)
+
+        $packagesSorted = Get-WinUtilSelectedPackages -PackageList $PackagesToUninstall -Preference $ManagerPreference
+        $packagesWinget = $packagesSorted[[PackageManagers]::Winget]
+        $packagesChoco = $packagesSorted[[PackageManagers]::Choco]

        try {
            $sync.ProcessRunning = $true

-            # Install all selected programs in new window
+            # Uninstall all selected programs in new window
            if($packagesWinget.Count -gt 0) {
                Install-WinUtilProgramWinget -Action Uninstall -Programs $packagesWinget
            }
--- a/functions/public/Invoke-WPFtweaksbutton.ps1
+++ b/functions/public/Invoke-WPFtweaksbutton.ps1
@ -25,7 +25,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
-  $tweaksHandle = Invoke-WPFRunspace -ParameterList @(,("tweaks",$tweaks)) -DebugPreference $DebugPreference -ScriptBlock {
+  Invoke-WPFRunspace -ParameterList @(,("tweaks",$tweaks)) -DebugPreference $DebugPreference -ScriptBlock {
    param(
      $tweaks,
      $DebugPreference
--- a/functions/public/Show-CTTLogo.ps1
+++ b/functions/public/Show-CTTLogo.ps1
@ -0,0 +1,38 @@
+Function Show-CTTLogo {
+    <#
+        .SYNOPSIS
+            Displays the CTT logo in ASCII art.
+        .DESCRIPTION
+            This function displays the CTT logo in ASCII art format.
+        .PARAMETER None
+            No parameters are required for this function.
+        .EXAMPLE
+            Show-CTTLogo
+            Prints the CTT logo in ASCII art format to the console.
+    #>
+
+    $asciiArt = @"
+    CCCCCCCCCCCCCTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT
+ CCC::::::::::::CT:::::::::::::::::::::TT:::::::::::::::::::::T
+CC:::::::::::::::CT:::::::::::::::::::::TT:::::::::::::::::::::T
+C:::::CCCCCCCC::::CT:::::TT:::::::TT:::::TT:::::TT:::::::TT:::::T
+C:::::C       CCCCCCTTTTTT  T:::::T  TTTTTTTTTTTT  T:::::T  TTTTTT
+C:::::C                     T:::::T                T:::::T
+C:::::C                     T:::::T                T:::::T
+C:::::C                     T:::::T                T:::::T
+C:::::C                     T:::::T                T:::::T
+C:::::C                     T:::::T                T:::::T
+C:::::C                     T:::::T                T:::::T
+C:::::C       CCCCCC        T:::::T                T:::::T
+C:::::CCCCCCCC::::C      TT:::::::TT            TT:::::::TT
+CC:::::::::::::::C       T:::::::::T            T:::::::::T
+CCC::::::::::::C         T:::::::::T            T:::::::::T
+  CCCCCCCCCCCCC          TTTTTTTTTTT            TTTTTTTTTTT
+
+====Chris Titus Tech=====
+=====Windows Toolbox=====
+"@
+
+    Write-Host $asciiArt
+}
+
--- a/overrides/main.html
+++ b/overrides/main.html
@ -3,7 +3,6 @@
 {% block header %}
    {{ super() }}
    <div style="color: red; text-align: center; padding: 10px; font-size: 20px;">
-        <strong>Announcement:</strong> We are currently not adding any applications to WinUtil and any apps that will be added through a PR will be declined by the maintainer.
        <strong>Announcement:</strong> We are currently reworking the docs to use Hugo rather then mkdocs.
    </div>
 {% endblock %}
--- a/scripts/main.ps1
+++ b/scripts/main.ps1
@ -1,3 +1,12 @@
+# Create enums
+Add-Type @"
+public enum PackageManagers
+{
+    Winget,
+    Choco
+}
+"@
+
 # SPDX-License-Identifier: MIT
 # Set the maximum number of threads for the RunspacePool to the number of threads on the machine
 $maxthreads = [int]$env:NUMBER_OF_PROCESSORS
@ -46,7 +55,6 @@ class GenericException : Exception {
    GenericException($Message) : base($Message) {}
 }

-
 $inputXML = $inputXML -replace 'mc:Ignorable="d"', '' -replace "x:N", 'N' -replace '^<Win.*', '<Window'

 [void][System.Reflection.Assembly]::LoadWithPartialName('presentationframework')
@ -108,10 +116,22 @@ $sync.Form.Add_Loaded({

 Invoke-WinutilThemeChange -init $true
 # Load the configuration files
-#Invoke-WPFUIElements -configVariable $sync.configs.nav -targetGridName "WPFMainGrid"
-Invoke-WPFUIElements -configVariable $sync.configs.applications -targetGridName "appspanel" -columncount 5
+
+$sync.configs.applicationsHashtable = @{}
+$sync.configs.applications.PSObject.Properties | ForEach-Object {
+    $sync.configs.applicationsHashtable[$_.Name] = $_.Value
+}
+
+# Now call the function with the final merged config
+Invoke-WPFUIElements -configVariable $sync.configs.appnavigation -targetGridName "appscategory" -columncount 1
+Initialize-WPFUI -targetGridName "appscategory"
+
+Initialize-WPFUI -targetGridName "appspanel"
+
 Invoke-WPFUIElements -configVariable $sync.configs.tweaks -targetGridName "tweakspanel" -columncount 2
+
 Invoke-WPFUIElements -configVariable $sync.configs.feature -targetGridName "featurespanel" -columncount 2
+
 # Future implementation: Add Windows Version to updates panel
 #Invoke-WPFUIElements -configVariable $sync.configs.updates -targetGridName "updatespanel" -columncount 1

@ -121,12 +141,14 @@ Invoke-WPFUIElements -configVariable $sync.configs.feature -targetGridName "feat

 $xaml.SelectNodes("//*[@Name]") | ForEach-Object {$sync["$("$($psitem.Name)")"] = $sync["Form"].FindName($psitem.Name)}

-#Persist the Chocolatey preference across winutil restarts
-$ChocoPreferencePath = "$env:LOCALAPPDATA\winutil\preferChocolatey.ini"
-$sync.WPFpreferChocolatey.Add_Checked({New-Item -Path $ChocoPreferencePath -Force })
-$sync.WPFpreferChocolatey.Add_Unchecked({Remove-Item $ChocoPreferencePath -Force})
-if (Test-Path $ChocoPreferencePath) {
-    $sync.WPFpreferChocolatey.IsChecked = $true
+#Persist Package Manager preference across winutil restarts
+$sync.ChocoRadioButton.Add_Checked({Set-PackageManagerPreference Choco})
+$sync.WingetRadioButton.Add_Checked({Set-PackageManagerPreference Winget})
+Set-PackageManagerPreference
+
+switch ($sync["ManagerPreference"]) {
+    "Choco" {$sync.ChocoRadioButton.IsChecked = $true; break}
+    "Winget" {$sync.WingetRadioButton.IsChecked = $true; break}
 }

 $sync.keys | ForEach-Object {
@ -165,14 +187,13 @@ $sync.keys | ForEach-Object {
 # Load computer information in the background
 Invoke-WPFRunspace -ScriptBlock {
    try {
-        $oldProgressPreference = $ProgressPreference
        $ProgressPreference = "SilentlyContinue"
        $sync.ConfigLoaded = $False
        $sync.ComputerInfo = Get-ComputerInfo
        $sync.ConfigLoaded = $True
    }
    finally{
-        $ProgressPreference = "Continue"
+        $ProgressPreference = $oldProgressPreference
    }

 } | Out-Null
@ -182,7 +203,7 @@ Invoke-WPFRunspace -ScriptBlock {
 #===========================================================================

 # Print the logo
-Invoke-WPFFormVariables
+Show-CTTLogo

 # Progress bar in taskbaritem > Set-WinUtilProgressbar
 $sync["Form"].TaskbarItemInfo = New-Object System.Windows.Shell.TaskbarItemInfo
@ -201,55 +222,42 @@ $sync["Form"].Add_Closing({
 $sync.SearchBarClearButton.Add_Click({
    $sync.SearchBar.Text = ""
    $sync.SearchBarClearButton.Visibility = "Collapsed"
+
+    # Focus the search bar after clearing the text
+    $sync.SearchBar.Focus()
+    $sync.SearchBar.SelectAll()
 })

 # add some shortcuts for people that don't like clicking
 $commonKeyEvents = {
+    # Prevent shortcuts from executing if a process is already running
    if ($sync.ProcessRunning -eq $true) {
        return
    }

-    if ($_.Key -eq "Escape") {
-        $sync.SearchBar.SelectAll()
-        $sync.SearchBar.Text = ""
-        $sync.SearchBarClearButton.Visibility = "Collapsed"
-        return
-    }
-
-    # don't ask, I know what I'm doing, just go...
-    if (($_.Key -eq "Q" -and $_.KeyboardDevice.Modifiers -eq "Ctrl")) {
-        $this.Close()
+    # Handle key presses of single keys
+    switch ($_.Key) {
+        "Escape" { $sync.SearchBar.Text = "" }
    }
+    # Handle Alt key combinations for navigation
    if ($_.KeyboardDevice.Modifiers -eq "Alt") {
-        if ($_.SystemKey -eq "I") {
-            Invoke-WPFButton "WPFTab1BT"
-        }
-        if ($_.SystemKey -eq "T") {
-            Invoke-WPFButton "WPFTab2BT"
-        }
-        if ($_.SystemKey -eq "C") {
-            Invoke-WPFButton "WPFTab3BT"
-        }
-        if ($_.SystemKey -eq "U") {
-            Invoke-WPFButton "WPFTab4BT"
-        }
-        if ($_.SystemKey -eq "M") {
-            Invoke-WPFButton "WPFTab5BT"
-        }
-        if ($_.SystemKey -eq "P") {
-            Write-Host "Your Windows Product Key: $((Get-WmiObject -query 'select * from SoftwareLicensingService').OA3xOriginalProductKey)"
+        $keyEventArgs = $_
+        switch ($_.SystemKey) {
+            "I" { Invoke-WPFButton "WPFTab1BT"; $keyEventArgs.Handled = $true } # Navigate to Install tab and suppress Windows Warning Sound
+            "T" { Invoke-WPFButton "WPFTab2BT"; $keyEventArgs.Handled = $true } # Navigate to Tweaks tab
+            "C" { Invoke-WPFButton "WPFTab3BT"; $keyEventArgs.Handled = $true } # Navigate to Config tab
+            "U" { Invoke-WPFButton "WPFTab4BT"; $keyEventArgs.Handled = $true } # Navigate to Updates tab
+            "M" { Invoke-WPFButton "WPFTab5BT"; $keyEventArgs.Handled = $true } # Navigate to MicroWin tab
        }
    }
-    # shortcut for the filter box
-    if ($_.Key -eq "F" -and $_.KeyboardDevice.Modifiers -eq "Ctrl") {
-        if ($sync.SearchBar.Text -eq "Ctrl-F to filter") {
-            $sync.SearchBar.SelectAll()
-            $sync.SearchBar.Text = ""
+    # Handle Ctrl key combinations for specific actions
+    if ($_.KeyboardDevice.Modifiers -eq "Ctrl") {
+        switch ($_.Key) {
+            "F" { $sync.SearchBar.Focus() } # Focus on the search bar
+            "Q" { $this.Close() } # Close the application
        }
-        $sync.SearchBar.Focus()
    }
 }
-
 $sync["Form"].Add_PreViewKeyDown($commonKeyEvents)

 $sync["Form"].Add_MouseLeftButtonDown({
@ -258,8 +266,8 @@ $sync["Form"].Add_MouseLeftButtonDown({
 })

 $sync["Form"].Add_MouseDoubleClick({
-    if ($_.OriginalSource -is [System.Windows.Controls.Grid] -or
-        $_.OriginalSource -is [System.Windows.Controls.StackPanel]) {
+    if ($_.OriginalSource.Name -eq "NavDockPanel" -or
+        $_.OriginalSource.Name -eq "GridBesideNavDockPanel") {
            if ($sync["Form"].WindowState -eq [Windows.WindowState]::Normal) {
                $sync["Form"].WindowState = [Windows.WindowState]::Maximized
            }
@ -275,55 +283,6 @@ $sync["Form"].Add_Deactivated({
 })

 $sync["Form"].Add_ContentRendered({
-
-    try {
-        [void][Window]
-    } catch {
-Add-Type @"
-        using System;
-        using System.Runtime.InteropServices;
-        public class Window {
-            [DllImport("user32.dll")]
-            public static extern IntPtr SendMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
-
-            [DllImport("user32.dll")]
-            [return: MarshalAs(UnmanagedType.Bool)]
-            public static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
-
-            [DllImport("user32.dll")]
-            [return: MarshalAs(UnmanagedType.Bool)]
-            public static extern bool MoveWindow(IntPtr handle, int x, int y, int width, int height, bool redraw);
-
-            [DllImport("user32.dll")]
-            public static extern int GetSystemMetrics(int nIndex);
-        };
-        public struct RECT {
-            public int Left;   // x position of upper-left corner
-            public int Top;    // y position of upper-left corner
-            public int Right;  // x position of lower-right corner
-            public int Bottom; // y position of lower-right corner
-        }
-"@
-    }
-
-   foreach ($proc in (Get-Process).where{ $_.MainWindowTitle -and $_.MainWindowTitle -like "*titus*" }) {
-        # Check if the process's MainWindowHandle is valid
-        if ($proc.MainWindowHandle -ne [System.IntPtr]::Zero) {
-            Write-Debug "MainWindowHandle: $($proc.Id) $($proc.MainWindowTitle) $($proc.MainWindowHandle)"
-            $windowHandle = $proc.MainWindowHandle
-        } else {
-            Write-Warning "Process found, but no MainWindowHandle: $($proc.Id) $($proc.MainWindowTitle)"
-
-        }
-    }
-
-    $rect = New-Object RECT
-    [Window]::GetWindowRect($windowHandle, [ref]$rect)
-    $width  = $rect.Right  - $rect.Left
-    $height = $rect.Bottom - $rect.Top
-
-    Write-Debug "UpperLeft:$($rect.Left),$($rect.Top) LowerBottom:$($rect.Right),$($rect.Bottom). Width:$($width) Height:$($height)"
-
    # Load the Windows Forms assembly
    Add-Type -AssemblyName System.Windows.Forms
    $primaryScreen = [System.Windows.Forms.Screen]::PrimaryScreen
@ -338,9 +297,12 @@ Add-Type @"
        Write-Debug "Primary Monitor Height: $screenHeight pixels"

        # Compare with the primary monitor size
-        if ($width -gt $screenWidth -or $height -gt $screenHeight) {
+        if ($sync.Form.ActualWidth -gt $screenWidth -or $sync.Form.ActualHeight -gt $screenHeight) {
            Write-Debug "The specified width and/or height is greater than the primary monitor size."
-            [void][Window]::MoveWindow($windowHandle, 0, 0, $screenWidth, $screenHeight, $True)
+            $sync.Form.Left = 0
+            $sync.Form.Top = 0
+            $sync.Form.Width = $screenWidth
+            $sync.Form.Height = $screenHeight
        } else {
            Write-Debug "The specified width and height are within the primary monitor size limits."
        }
@ -414,73 +376,39 @@ if ($sync["ISOLanguage"].Items.Count -eq 1) {
 }
 $sync["ISOLanguage"].SelectedIndex = 0

+# The SearchBarTimer is used to delay the search operation until the user has stopped typing for a short period
+# This prevents the ui from stuttering when the user types quickly as it dosnt need to update the ui for every keystroke

-# Load Checkboxes and Labels outside of the Filter function only once on startup for performance reasons
-$filter = Get-WinUtilVariables -Type CheckBox
-$CheckBoxes = ($sync.GetEnumerator()).where{ $psitem.Key -in $filter }
-
-$filter = Get-WinUtilVariables -Type Label
-$labels = @{}
-($sync.GetEnumerator()).where{$PSItem.Key -in $filter} | ForEach-Object {$labels[$_.Key] = $_.Value}
-
-$allCategories = $checkBoxes.Name | ForEach-Object {$sync.configs.applications.$_} | Select-Object  -Unique -ExpandProperty category
+$searchBarTimer = New-Object System.Windows.Threading.DispatcherTimer
+$searchBarTimer.Interval = [TimeSpan]::FromMilliseconds(300)
+$searchBarTimer.IsEnabled = $false

+$searchBarTimer.add_Tick({
+    $searchBarTimer.Stop()
+    switch ($sync.currentTab) {
+        "Install" {
+            Find-AppsByNameOrDescription -SearchString $sync.SearchBar.Text
+        }
+        "Tweaks" {
+            Find-TweaksByNameOrDescription -SearchString $sync.SearchBar.Text
+        }
+    }
+})
 $sync["SearchBar"].Add_TextChanged({
    if ($sync.SearchBar.Text -ne "") {
        $sync.SearchBarClearButton.Visibility = "Visible"
    } else {
        $sync.SearchBarClearButton.Visibility = "Collapsed"
    }
-
-    $activeApplications = @()
-
-    $textToSearch = $sync.SearchBar.Text.ToLower()
-
-    foreach ($CheckBox in $CheckBoxes) {
-        # Skip if the checkbox is null, it doesn't have content or it is the prefer Choco checkbox
-        if ($CheckBox -eq $null -or $CheckBox.Value -eq $null -or $CheckBox.Value.Content -eq $null -or $CheckBox.Name -eq "WPFpreferChocolatey") {
-            continue
-        }
-
-        $checkBoxName = $CheckBox.Key
-        $textBlockName = $checkBoxName + "Link"
-
-        # Retrieve the corresponding text block based on the generated name
-        $textBlock = $sync[$textBlockName]
-
-        if ($CheckBox.Value.Content.ToString().ToLower().Contains($textToSearch)) {
-            $CheckBox.Value.Visibility = "Visible"
-            $activeApplications += $sync.configs.applications.$checkboxName
-            # Set the corresponding text block visibility
-            if ($textBlock -ne $null -and $textBlock -is [System.Windows.Controls.TextBlock]) {
-                $textBlock.Visibility = "Visible"
-            }
-        } else {
-            $CheckBox.Value.Visibility = "Collapsed"
-            # Set the corresponding text block visibility
-            if ($textBlock -ne $null -and $textBlock -is [System.Windows.Controls.TextBlock]) {
-                $textBlock.Visibility = "Collapsed"
-            }
-        }
-    }
-
-    $activeCategories = $activeApplications | Select-Object -ExpandProperty category -Unique
-
-    foreach ($category in $activeCategories) {
-        $sync[$category].Visibility = "Visible"
-    }
-    if ($activeCategories) {
-        $inactiveCategories = Compare-Object -ReferenceObject $allCategories -DifferenceObject $activeCategories -PassThru
-    } else {
-        $inactiveCategories = $allCategories
-    }
-    foreach ($category in $inactiveCategories) {
-        $sync[$category].Visibility = "Collapsed"
+    if ($searchBarTimer.IsEnabled) {
+        $searchBarTimer.Stop()
    }
+    $searchBarTimer.Start()
 })

 $sync["Form"].Add_Loaded({
    param($e)
+    $sync.Form.MinWidth = "1000"
    $sync["Form"].MaxWidth = [Double]::PositiveInfinity
    $sync["Form"].MaxHeight = [Double]::PositiveInfinity
 })
@ -514,44 +442,36 @@ $sync["Form"].Add_Activated({
 $sync["ThemeButton"].Add_Click({
    Write-Debug "ThemeButton clicked"
    Invoke-WPFPopup -PopupActionTable @{ "Settings" = "Hide"; "Theme" = "Toggle" }
-    $_.Handled = $false
 })
 $sync["AutoThemeMenuItem"].Add_Click({
    Write-Debug "About clicked"
    Invoke-WPFPopup -Action "Hide" -Popups @("Theme")
    Invoke-WinutilThemeChange -theme "Auto"
-    $_.Handled = $false
 })
 $sync["DarkThemeMenuItem"].Add_Click({
    Write-Debug "Dark Theme clicked"
    Invoke-WPFPopup -Action "Hide" -Popups @("Theme")
    Invoke-WinutilThemeChange -theme "Dark"
-    $_.Handled = $false
 })
 $sync["LightThemeMenuItem"].Add_Click({
    Write-Debug "Light Theme clicked"
    Invoke-WPFPopup -Action "Hide" -Popups @("Theme")
    Invoke-WinutilThemeChange -theme "Light"
-    $_.Handled = $false
 })

-
 $sync["SettingsButton"].Add_Click({
    Write-Debug "SettingsButton clicked"
    Invoke-WPFPopup -PopupActionTable @{ "Settings" = "Toggle"; "Theme" = "Hide" }
-    $_.Handled = $false
 })
 $sync["ImportMenuItem"].Add_Click({
    Write-Debug "Import clicked"
    Invoke-WPFPopup -Action "Hide" -Popups @("Settings")
    Invoke-WPFImpex -type "import"
-    $_.Handled = $false
 })
 $sync["ExportMenuItem"].Add_Click({
    Write-Debug "Export clicked"
    Invoke-WPFPopup -Action "Hide" -Popups @("Settings")
    Invoke-WPFImpex -type "export"
-    $_.Handled = $false
 })
 $sync["AboutMenuItem"].Add_Click({
    Write-Debug "About clicked"
@ -559,7 +479,8 @@ $sync["AboutMenuItem"].Add_Click({

    $authorInfo = @"
 Author   : <a href="https://github.com/ChrisTitusTech">@christitustech</a>
-Runspace : <a href="https://github.com/DeveloperDurp">@DeveloperDurp</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>
 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>
--- a/scripts/start.ps1
+++ b/scripts/start.ps1
@ -37,7 +37,13 @@ $sync = [Hashtable]::Synchronized(@{})
 $sync.PSScriptRoot = $PSScriptRoot
 $sync.version = "#{replaceme}"
 $sync.configs = @{}
+$sync.Buttons = [System.Collections.Generic.List[PSObject]]::new()
 $sync.ProcessRunning = $false
+$sync.selectedApps = [System.Collections.Generic.List[string]]::new()
+$sync.currentTab = "Install"
+$sync.selectedAppsStackPanel
+$sync.selectedAppsPopup
+

 if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) {
    Write-Output "Winutil needs to be run as Administrator. Attempting to relaunch."
@ -46,21 +52,27 @@ if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]:
    $PSBoundParameters.GetEnumerator() | ForEach-Object {
        $argList += if ($_.Value -is [switch] -and $_.Value) {
            "-$($_.Key)"
+        } elseif ($_.Value -is [array]) {
+            "-$($_.Key) $($_.Value -join ',')"
        } elseif ($_.Value) {
-            "-$($_.Key) `"$($_.Value)`""
+            "-$($_.Key) '$($_.Value)'"
        }
    }

-    $script = if ($MyInvocation.MyCommand.Path) {
-        "& { & '$($MyInvocation.MyCommand.Path)' $argList }"
+    $script = if ($PSCommandPath) {
+        "& { & `'$($PSCommandPath)`' $($argList -join ' ') }"
    } else {
-        "iex '& { $(irm https://github.com/ChrisTitusTech/winutil/releases/latest/download/winutil.ps1) } $argList'"
+        "&([ScriptBlock]::Create((irm https://github.com/ChrisTitusTech/winutil/releases/latest/download/winutil.ps1))) $($argList -join ' ')"
    }

-    $powershellcmd = if (Get-Command pwsh -ErrorAction SilentlyContinue) { "pwsh" } else { "powershell" }
-    $processCmd = if (Get-Command wt.exe -ErrorAction SilentlyContinue) { "wt.exe" } else { $powershellcmd }
+    $powershellCmd = if (Get-Command pwsh -ErrorAction SilentlyContinue) { "pwsh" } else { "powershell" }
+    $processCmd = if (Get-Command wt.exe -ErrorAction SilentlyContinue) { "wt.exe" } else { "$powershellCmd" }

-    Start-Process $processCmd -ArgumentList "$powershellcmd -ExecutionPolicy Bypass -NoProfile -Command $script" -Verb RunAs
+    if ($processCmd -eq "wt.exe") {
+        Start-Process $processCmd -ArgumentList "$powershellCmd -ExecutionPolicy Bypass -NoProfile -Command `"$script`"" -Verb RunAs
+    } else {
+        Start-Process $processCmd -ArgumentList "-ExecutionPolicy Bypass -NoProfile -Command `"$script`"" -Verb RunAs
+    }

    break
 }
@ -72,5 +84,5 @@ $logdir = "$env:localappdata\winutil\logs"
 Start-Transcript -Path "$logdir\winutil_$dateTime.log" -Append -NoClobber | Out-Null

 # Set PowerShell window title
-$Host.UI.RawUI.WindowTitle = $myInvocation.MyCommand.Definition + "(Admin)"
+$Host.UI.RawUI.WindowTitle = "WinUtil (Admin)"
 clear-host
--- a/sign.bat
+++ b/sign.bat
@ -0,0 +1 @@
+signtool.exe sign /td sha256 /tr http://timestamp.digicert.com /fd sha256 /n "CT Tech Group LLC" .\winutil.ps1
--- a/tools/Invoke-Preprocessing.ps1
+++ b/tools/Invoke-Preprocessing.ps1
@ -3,15 +3,9 @@ function Invoke-Preprocessing {
        .SYNOPSIS
        A function that does Code Formatting using RegEx, useful when trying to force specific coding standard(s) to a project.

-        .PARAMETER ThrowExceptionOnEmptyFilesList
-        A switch which'll throw an exception upon not finding any files inside the provided 'WorkingDir'.
-
-        .PARAMETER SkipExcludedFilesValidation
-        A switch to stop file path validation on 'ExcludedFiles' list.
-
        .PARAMETER ExcludedFiles
        A list of file paths which're *relative to* 'WorkingDir' Folder, every item in the list can be pointing to File (doesn't end with '\') or Directory (ends with '\') or None-Existing File/Directory.
-        By default, it checks if everyitem exists, and throws an exception if one or more are not found (None-Existing), if you want to skip this validation, please consider providing the '-SkipExcludedFilesValidation' switch to skip this check.
+        By default, it checks if everyitem exists, and throws an exception if one or more are not found (None-Existing).

        .PARAMETER WorkingDir
        The folder to search inside recursively for files which're going to be Preprocessed (Code Formatted), unless they're found in 'ExcludedFiles' List.
@ -36,35 +30,23 @@ function Invoke-Preprocessing {

        Same as Example No. 1, but uses 'ProgressActivity' which's used in Progress Bar.

-        .EXAMPLE
-        Invoke-Preprocessing -ThrowExceptionOnEmptyFilesList -WorkingDir "DRIVE:\Path\To\Folder\" -ExcludedFiles @('file.txt', '.\.git\', '*.png') -ProgressStatusMessage "Doing Preprocessing"
-
-        Same as Example No. 1, but uses '-ThrowExceptionOnEmptyFilesList', which's an optional parameter that'll make 'Invoke-Preprocessing' throw an exception when no files are found in 'WorkingDir' (not including the ExcludedFiles, of course), useful when you want to double check your parameters & you're sure there's files to process in the 'WorkingDir'.
-
        .EXAMPLE
        Invoke-Preprocessing -Skip -WorkingDir "DRIVE:\Path\To\Folder\" -ExcludedFiles @('file.txt', '.\.git\', '*.png') -ProgressStatusMessage "Doing Preprocessing"

-        Same as Example No. 1, but uses '-SkipExcludedFilesValidation', which'll skip the validation step for 'ExcludedFiles' list. This can be useful when 'ExcludedFiles' list is generated from another function, or from unreliable source (you can't guarantee every item in list is a valid path), but you want to silently continue through the function.
    #>

    param (
-        [Parameter(position=0)]
-        [switch]$SkipExcludedFilesValidation,
-
-        [Parameter(position=1)]
-        [switch]$ThrowExceptionOnEmptyFilesList,
-
-        [Parameter(Mandatory, position=2)]
+        [Parameter(Mandatory, position=1)]
        [ValidateScript({[System.IO.Path]::IsPathRooted($_)})]
        [string]$WorkingDir,

-        [Parameter(position=3)]
+        [Parameter(position=2)]
        [string[]]$ExcludedFiles,

-        [Parameter(Mandatory, position=4)]
+        [Parameter(Mandatory, position=3)]
        [string]$ProgressStatusMessage,

-        [Parameter(position=5)]
+        [Parameter(position=4)]
        [string]$ProgressActivity = "Preprocessing"
    )

@ -76,9 +58,8 @@ function Invoke-Preprocessing {
    ForEach ($excludedFile in $ExcludedFiles) {
        $InternalExcludedFiles.Add($excludedFile) | Out-Null
    }
-
-    # Validate the ExcludedItems List before continuing on,
-    # that's if there's a list in the first place, and '-SkipInternalExcludedFilesValidation' was not provided.
+    
+    # Validate the ExcludedItems List before continuing on
    if ($ExcludedFiles.Count -gt 0) {
        ForEach ($excludedFile in $ExcludedFiles) {
            $filePath = "$(($WorkingDir -replace ('\\$', '')) + '\' + ($excludedFile -replace ('\.\\', '')))"
@ -90,8 +71,8 @@ function Invoke-Preprocessing {
            } else { $failedFilesList += "'$filePath', " }
        }
        $failedFilesList = $failedFilesList -replace (',\s*$', '')
-        if ((-not $failedFilesList -eq "") -and (-not $SkipExcludedFilesValidation)) {
-            throw "[Invoke-Preprocessing] One or more File Paths and/or File Patterns were not found, you can use '-SkipExcludedFilesValidation' switch to skip this check, the failed to validate are: $failedFilesList"
+        if ((-not $failedFilesList -eq "")) {
+            Write-Warning "[Invoke-Preprocessing] One or more File Paths and/or File Patterns were not found: $failedFilesList"
        }
    }

@ -111,16 +92,47 @@ function Invoke-Preprocessing {
        if ($index -ge 0) { $files.RemoveAt($index) }
    }

-    $numOfFiles = $files.Count
+    # Define a path to store the file hashes
+    $hashFilePath = Join-Path -Path $WorkingDir -ChildPath ".preprocessor_hashes.json"

-    if ($numOfFiles -eq 0) {
-        if ($ThrowExceptionOnEmptyFilesList) {
-            throw "[Invoke-Preprocessing] Found 0 Files to Preprocess inside 'WorkingDir' Directory and '-ThrowExceptionOnEmptyFilesList' Switch is provided, value of 'WorkingDir': '$WorkingDir'."
-        } else {
-            return # Do an early return, there's nothing else to do
+    # Load existing hashes if the file exists
+    $existingHashes = @{}
+    if (Test-Path -Path $hashFilePath) {
+        # intentionally dosn't use ConvertFrom-Json -AsHashtable as it isn't supported on old powershell versions
+        $file_content = Get-Content -Path $hashFilePath | ConvertFrom-Json 
+        foreach ($property in $file_content.PSObject.Properties) {
+            $existingHashes[$property.Name] = $property.Value
        }
    }

+    $newHashes = @{}
+    $changedFiles = @()
+    $hashingAlgorithm = "MD5"
+    foreach ($file in $files){
+        # Calculate the hash of the file
+        $hash = Get-FileHash -Path $file -Algorithm $hashingAlgorithm | Select-Object -ExpandProperty Hash
+        $newHashes[$file] = $hash
+
+        # Check if the hash already exists in the existing hashes
+        if (($existingHashes.ContainsKey($file) -and $existingHashes[$file] -eq $hash)) {
+            # Skip processing this file as it hasn't changed
+            continue;
+        }
+        else {
+            # If the hash doesn't exist or has changed, add it to the changed files list
+            $changedFiles += $file
+        }
+    }
+
+    $files = $changedFiles
+    $numOfFiles = $files.Count
+    Write-Debug "[Invoke-Preprocessing] Files Changed: $numOfFiles"
+
+    if ($numOfFiles -eq 0){
+        Write-Debug "[Invoke-Preprocessing] Found 0 Files to Preprocess inside 'WorkingDir' Directory : '$WorkingDir'."
+        return
+    }
+
    for ($i = 0; $i -lt $numOfFiles; $i++) {
        $fullFileName = $files[$i]

@ -139,9 +151,13 @@ function Invoke-Preprocessing {
            -replace ('\}\s*Catch\s*(?<exceptions>\[.*?\])\s*\{', '} catch ${exceptions} {') `
            -replace ('(?<parameter_type>\[[^$0-9]+\])\s*(?<str_after_type>\$.*?)', '${parameter_type}${str_after_type}') `
        | Set-Content "$fullFileName"
+        $newHashes[$fullFileName] = Get-FileHash -Path $fullFileName -Algorithm $hashingAlgorithm | Select-Object -ExpandProperty Hash

        Write-Progress -Activity $ProgressActivity -Status "$ProgressStatusMessage - Finished $i out of $numOfFiles" -PercentComplete (($i/$numOfFiles)*100)
    }

    Write-Progress -Activity $ProgressActivity -Status "$ProgressStatusMessage - Finished Task Successfully" -Completed
+
+    # Save the new hashes to the file  
+    $newHashes | ConvertTo-Json -Depth 10 | Set-Content -Path $hashFilePath
 }
--- a/xaml/inputXML.xaml
+++ b/xaml/inputXML.xaml
@ -12,19 +12,34 @@
        Height="Auto"
        MaxWidth="1380"
        MaxHeight="800"
-        Title="Chris Titus Tech's Windows Utility">
+        Title="WinUtil">
    <WindowChrome.WindowChrome>
        <WindowChrome CaptionHeight="0" CornerRadius="10"/>
    </WindowChrome.WindowChrome>
    <Window.Resources>
    <Style TargetType="ToolTip">
-        <Setter Property="Background" Value="{DynamicResource MainBackgroundColor}"/>
+        <Setter Property="Background" Value="{DynamicResource ToolTipBackgroundColor}"/>
        <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource ButtonBackgroundSelectedColor}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderColor}"/>
+        <Setter Property="MaxWidth" Value="{DynamicResource ToolTipWidth}"/>
        <Setter Property="BorderThickness" Value="1"/>
        <Setter Property="Padding" Value="5"/>
        <Setter Property="FontSize" Value="{DynamicResource FontSize}"/>
        <Setter Property="FontFamily" Value="{DynamicResource FontFamily}"/>
+        <!-- This ContentTemplate ensures that the content of the ToolTip wraps text properly for better readability -->
+        <Setter Property="ContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <ContentPresenter Content="{TemplateBinding Content}">
+                        <ContentPresenter.Resources>
+                            <Style TargetType="TextBlock">
+                                <Setter Property="TextWrapping" Value="Wrap"/>
+                            </Style>
+                        </ContentPresenter.Resources>
+                    </ContentPresenter>
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
    </Style>

    <Style TargetType="{x:Type MenuItem}">
@ -67,7 +82,89 @@
            </Trigger>
        </Style.Triggers>
    </Style>
+    <Style x:Key="AppEntryBorderStyle" TargetType="Border">
+        <Setter Property="BorderBrush" Value="Gray"/>
+        <Setter Property="BorderThickness" Value="{DynamicResource AppEntryBorderThickness}"/>
+        <Setter Property="CornerRadius" Value="5"/>
+        <Setter Property="Padding" Value="{DynamicResource AppEntryMargin}"/>
+        <Setter Property="Width" Value="{DynamicResource AppEntryWidth}"/>
+        <Setter Property="VerticalAlignment" Value="Top"/>
+        <Setter Property="Margin" Value="{DynamicResource AppEntryMargin}"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Background" Value="{DynamicResource AppInstallUnselectedColor}"/>
+    </Style>
+    <Style x:Key="AppEntryCheckboxStyle" TargetType="CheckBox">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Margin" Value="{DynamicResource AppEntryMargin}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CheckBox">
+                    <ContentPresenter Content="{TemplateBinding Content}"
+                                    VerticalAlignment="Center"
+                                    HorizontalAlignment="Left"
+                                    Margin="{TemplateBinding Padding}"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="AppEntryNameStyle" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="{DynamicResource AppEntryFontSize}"/>
+        <Setter Property="FontWeight" Value="Bold"/>
+        <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Margin" Value="{DynamicResource AppEntryMargin}"/>
+        <Setter Property="Background" Value="Transparent"/>
+    </Style>
+    <Style x:Key="AppEntryButtonStyle" TargetType="Button">
+        <Setter Property="Width" Value="{DynamicResource IconButtonSize}"/>
+        <Setter Property="Height" Value="{DynamicResource IconButtonSize}"/>
+        <Setter Property="Margin" Value="{DynamicResource AppEntryMargin}"/>
+        <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundColor}"/>
+        <Setter Property="Background" Value="{DynamicResource ButtonBackgroundColor}"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="ContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <TextBlock  Text="{Binding}"
+                                FontFamily="Segoe MDL2 Assets"
+                                FontSize="{DynamicResource IconFontSize}"
+                                Background="Transparent"/>
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Grid>
+                            <Border x:Name="BackgroundBorder"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{DynamicResource ButtonBorderThickness}"
+                                    CornerRadius="{DynamicResource ButtonCornerRadius}">
+                                <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            </Border>
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter TargetName="BackgroundBorder" Property="Background" Value="{DynamicResource ButtonBackgroundPressedColor}"/>
+                            </Trigger>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Cursor" Value="Hand"/>
+                                <Setter TargetName="BackgroundBorder" Property="Background" Value="{DynamicResource ButtonBackgroundMouseoverColor}"/>
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter TargetName="BackgroundBorder" Property="Background" Value="{DynamicResource ButtonBackgroundSelectedColor}"/>
+                                <Setter Property="Foreground" Value="DimGray"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>

+    </Style>
    <Style TargetType="Button" x:Key="HoverButtonStyle">
        <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}" />
        <Setter Property="FontWeight" Value="Normal" />
@ -298,6 +395,103 @@
                </Setter.Value>
            </Setter>
        </Style>
+
+        <Style x:Key="ToggleButtonStyle" TargetType="ToggleButton">
+            <Setter Property="Margin" Value="{DynamicResource ButtonMargin}"/>
+            <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundColor}"/>
+            <Setter Property="Background" Value="{DynamicResource ButtonBackgroundColor}"/>
+            <Setter Property="Height" Value="{DynamicResource ButtonHeight}"/>
+            <Setter Property="Width" Value="{DynamicResource ButtonWidth}"/>
+            <Setter Property="FontSize" Value="{DynamicResource ButtonFontSize}"/>
+            <Setter Property="FontFamily" Value="{DynamicResource FontFamily}"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ToggleButton">
+                        <Grid>
+                            <Border x:Name="BackgroundBorder"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{DynamicResource ButtonBorderThickness}"
+                                    CornerRadius="{DynamicResource ButtonCornerRadius}">
+                                <Grid>
+                                    <!-- Toggle Dot Background -->
+                                    <Ellipse Width="8" Height="16"
+                                            Fill="{DynamicResource ToggleButtonOnColor}"
+                                            HorizontalAlignment="Right"
+                                            VerticalAlignment="Top"
+                                            Margin="0,3,5,0" />
+
+                                    <!-- Toggle Dot with hover grow effect -->
+                                    <Ellipse x:Name="ToggleDot"
+                                            Width="8" Height="8"
+                                            Fill="{DynamicResource ButtonForegroundColor}"
+                                            HorizontalAlignment="Right"
+                                            VerticalAlignment="Top"
+                                            Margin="0,3,5,0"
+                                            RenderTransformOrigin="0.5,0.5">
+                                        <Ellipse.RenderTransform>
+                                            <ScaleTransform ScaleX="1" ScaleY="1"/>
+                                        </Ellipse.RenderTransform>
+                                    </Ellipse>
+
+                                    <!-- Content Presenter -->
+                                    <ContentPresenter HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"
+                                                    Margin="10,2,10,2"/>
+                                </Grid>
+                            </Border>
+                        </Grid>
+
+                        <!-- Triggers for ToggleButton states -->
+                        <ControlTemplate.Triggers>
+                            <!-- Hover effect -->
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="BackgroundBorder" Property="Background" Value="{DynamicResource ButtonBackgroundMouseoverColor}"/>
+                                <Trigger.EnterActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <!-- Animation to grow the dot when hovered -->
+                                            <DoubleAnimation Storyboard.TargetName="ToggleDot"
+                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)"
+                                                            To="1.2" Duration="0:0:0.1"/>
+                                            <DoubleAnimation Storyboard.TargetName="ToggleDot"
+                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)"
+                                                            To="1.2" Duration="0:0:0.1"/>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.EnterActions>
+                                <Trigger.ExitActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <!-- Animation to shrink the dot back to original size when not hovered -->
+                                            <DoubleAnimation Storyboard.TargetName="ToggleDot"
+                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)"
+                                                            To="1.0" Duration="0:0:0.1"/>
+                                            <DoubleAnimation Storyboard.TargetName="ToggleDot"
+                                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)"
+                                                            To="1.0" Duration="0:0:0.1"/>
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.ExitActions>
+                            </Trigger>
+
+                            <!-- IsChecked state -->
+                            <Trigger Property="IsChecked" Value="True">
+                                <Setter TargetName="ToggleDot" Property="VerticalAlignment" Value="Bottom"/>
+                                <Setter TargetName="ToggleDot" Property="Margin" Value="0,0,5,3"/>
+                            </Trigger>
+
+                            <!-- IsEnabled state -->
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter TargetName="BackgroundBorder" Property="Background" Value="{DynamicResource ButtonBackgroundSelectedColor}"/>
+                                <Setter Property="Foreground" Value="DimGray"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
        <Style x:Key="SearchBarClearButtonStyle" TargetType="Button">
            <Setter Property="FontFamily" Value="{DynamicResource FontFamily}"/>
            <Setter Property="FontSize" Value="{DynamicResource SearchBarClearButtonFontSize}"/>
@ -702,7 +896,7 @@
        <Grid.ColumnDefinitions>
            <ColumnDefinition Width="*"/>
        </Grid.ColumnDefinitions>
-        <DockPanel HorizontalAlignment="Stretch" Background="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True" Grid.Row="0" Width="Auto">
+        <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">
            </StackPanel>
            <ToggleButton Margin="0,0,5,0" HorizontalAlignment="Left" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
@ -745,7 +939,7 @@
                    </TextBlock>
                </ToggleButton.Content>
            </ToggleButton>
-            <Grid Background="{DynamicResource MainBackgroundColor}" ShowGridLines="False" Width="Auto" Height="Auto" HorizontalAlignment="Stretch">
+            <Grid Name="GridBesideNavDockPanel" Background="{DynamicResource MainBackgroundColor}" ShowGridLines="False" Width="Auto" Height="Auto" HorizontalAlignment="Stretch">
                <Grid.ColumnDefinitions>
                    <ColumnDefinition Width="*"/> <!-- Main content area -->
                    <ColumnDefinition Width="Auto"/><!-- Space for options button -->
@ -864,7 +1058,6 @@
                    </Border>
                </Popup>

-
                <Button Name="SettingsButton"
                    Style="{StaticResource HoverButtonStyle}"
                    Grid.Column="3" BorderBrush="Transparent"
@ -917,29 +1110,18 @@
            <TabItem Header="Install" Visibility="Collapsed" Name="WPFTab1">
                <Grid Background="Transparent" >

-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="45px"/>
-                        <RowDefinition Height="0.95*"/>
-                    </Grid.RowDefinitions>
-                    <StackPanel Background="{DynamicResource MainBackgroundColor}" Orientation="Horizontal" Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.Column="0" Grid.ColumnSpan="3" Margin="{DynamicResource TabContentMargin}">
-                        <Button Name="WPFInstall" Content=" Install/Upgrade Selected" Margin="2" />
-                        <Button Name="WPFInstallUpgrade" Content=" Upgrade All" Margin="2"/>
-                        <Button Name="WPFUninstall" Content=" Uninstall Selected" Margin="2"/>
-                        <Button Name="WPFGetInstalled" Content=" Get Installed" Margin="2"/>
-                        <Button Name="WPFClearInstallSelection" Content=" Clear Selection" Margin="2"/>
-                        <CheckBox Name="WPFpreferChocolatey" VerticalAlignment="Center" VerticalContentAlignment="Center">
-                            <TextBlock Text="Prefer Chocolatey" ToolTip="Prefers Chocolatey as Download Engine instead of Winget" VerticalAlignment="Center" />
-                        </CheckBox>
-                    </StackPanel>
+                    <Grid Grid.Row="0" Grid.Column="0" Margin="{DynamicResource TabContentMargin}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="225" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>

-                    <ScrollViewer x:Name="scrollViewer" Grid.Row="1" Grid.Column="0" Margin="{DynamicResource TabContentMargin}" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"
-                                BorderBrush="Transparent" BorderThickness="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                        <Grid Name="appspanel" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                        <Grid Name="appscategory" Grid.Column="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                        </Grid>
-                    </ScrollViewer>
-
-                    <Rectangle Grid.Row="1" Grid.Column="0" Width="22" Height="22" Fill="{DynamicResource MainBackgroundColor}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Style="{StaticResource ScrollVisibilityRectangle}"/>

+                        <Grid Name="appspanel" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                        </Grid>
+                    </Grid>
                </Grid>
            </TabItem>
            <TabItem Header="Tweaks" Visibility="Collapsed" Name="WPFTab2">
@ -1111,8 +1293,10 @@
                                Choose a Windows ISO file that you've downloaded <LineBreak/>
                                Check the status in the console
                            </TextBlock>
+                            <Rectangle Fill="{DynamicResource MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
+                            <TextBlock Margin="5" Padding="1" TextWrapping="Wrap" Foreground="{DynamicResource ComboBoxForegroundColor}" ToolTip="Scratch directories act as a custom destination for image files"><Bold>Scratch directory settings (optional)</Bold></TextBlock>
                            <CheckBox x:Name="WPFMicrowinISOScratchDir" Content="Use ISO directory for ScratchDir " IsChecked="False" Margin="{DynamicResource MicrowinCheckBoxMargin}"
-                                ToolTip="Use ISO directory for ScratchDir " />
+                                ToolTip="Check this to use the path of the ISO file you specify as a scratch directory" />
                            <Grid>
                            <Grid.ColumnDefinitions>
                                <ColumnDefinition Width="*" /> <!-- Takes the remaining space -->
@ -1122,7 +1306,7 @@
                                        Text="Scratch"
                                        Margin="2"
                                        IsReadOnly="False"
-                                        ToolTip="Alt Path For Scratch Directory"
+                                        ToolTip="Specify an alternate path for the scratch directory"
                                        Grid.Column="0"
                                        VerticalAlignment="Center"
                                        Foreground="{DynamicResource LabelboxForegroundColor}">
@ -1138,6 +1322,7 @@
                                    </Button.Content>
                                </Button>
                            </Grid>
+                            <Rectangle Fill="{DynamicResource MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
                            <TextBox Name="MicrowinFinalIsoLocation" Background="Transparent" BorderBrush="{DynamicResource MainForegroundColor}"
                                Text="ISO location will be printed here"
                                Margin="2"
@ -1172,6 +1357,7 @@
                                ToolTip="Path to unpacked drivers all sys and inf files for devices that need drivers"
                            />
                            <CheckBox Name="MicrowinImportDrivers" Content="Import drivers from current system" Margin="{DynamicResource MicrowinCheckBoxMargin}" IsChecked="False" ToolTip="Export all third-party drivers from your system and inject them to the MicroWin image"/>
+                            <CheckBox Name="MicrowinCopyVirtIO" Content="Include VirtIO drivers" Margin="{DynamicResource MicrowinCheckBoxMargin}" IsChecked="False" ToolTip="Copy VirtIO Guest Tools drivers to your ISO file. Check this only if you want to use it on QEMU/Proxmox VE"/>
                            <Rectangle Fill="{DynamicResource MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
                            <CheckBox Name="WPFMicrowinCopyToUsb" Content="Copy to Ventoy" Margin="{DynamicResource MicrowinCheckBoxMargin}" IsChecked="False" ToolTip="Copy to USB disk with a label Ventoy"/>
                            <Rectangle Fill="{DynamicResource MainForegroundColor}" Height="2" HorizontalAlignment="Stretch" Margin="0,10,0,10"/>
@ -1262,7 +1448,13 @@
                                - Once complete, the target ISO file will be in the directory you have specified <LineBreak/>
                                - Copy this image to your Ventoy USB Stick, boot to this image, gg
                                <LineBreak/>
-                                If you are injecting drivers ensure you put all your inf, sys, and dll files for each driver into a separate directory
+                                If you are injecting drivers ensure you put all your inf, sys, and dll files for each driver into a separate directory <LineBreak/><LineBreak/>
+                                <Bold>Installing VirtIO drivers</Bold><LineBreak/>
+                                If you plan on using your ISO on QEMU/Proxmox VE, you can bundle VirtIO drivers with your ISO to automatically install drivers. Simply tick the "Include VirtIO drivers" checkbox before starting the process. Then, follow these instructions:<LineBreak/><LineBreak/>
+                                    <TextBlock TextWrapping="WrapWithOverflow" Margin="15,0,0,0" Text="1. Proceed with Setup until you reach the disk selection screen, in which you won't see any drives" Foreground="{DynamicResource ComboBoxForegroundColor}"/><LineBreak/>
+                                    <TextBlock TextWrapping="WrapWithOverflow" Margin="15,0,0,0" Text="2. Click &quot;Load Driver&quot; and click Browse" Foreground="{DynamicResource ComboBoxForegroundColor}"/><LineBreak/>
+                                    <TextBlock TextWrapping="WrapWithOverflow" Margin="15,0,0,0" Text="3. In the folder selection dialog, point to this path: &quot;D:\VirtIO\vioscsi\w11\amd64&quot; (replace amd64 with ARM64 if you are using Windows on ARM, and &quot;D:&quot; with the drive letter of the ISO)" Foreground="{DynamicResource ComboBoxForegroundColor}"/><LineBreak/>
+                                    <TextBlock TextWrapping="WrapWithOverflow" Margin="15,0,0,0" Text="4. Select all drivers that will appear in the list box and click OK" Foreground="{DynamicResource ComboBoxForegroundColor}"/><LineBreak/>
                            </TextBlock>
                            <TextBlock Margin="15,0,15,15"
                                Padding = "1"
@ -1273,7 +1465,7 @@
                                Foreground = "{DynamicResource ComboBoxForegroundColor}"
                                xml:space = "preserve"
                            >
-<Bold>Example:</Bold>
+<Bold>Driver structure example:</Bold>
     C:\drivers\
          |-- Driver1\
          |   |-- Driver1.inf
@ -1282,7 +1474,7 @@
          |   |-- Driver2.inf
          |   |-- Driver2.sys
          |-- OtherFiles...
-                                </TextBlock>
+                            </TextBlock>
                            </StackPanel>
                        </Border>
                    </Grid>
				`@ -0,0 +1 @@`
				`signtool.exe sign /td sha256 /tr http://timestamp.digicert.com /fd sha256 /n "CT Tech Group LLC" .\winutil.ps1`