Update functions/public/Invoke-WPFUpdateMGMGT.ps1

Co-authored-by: Mr.k <mineshtine28546271@gmail.com>
2025-07-01 10:32:35 -05:00 · 2025-03-07 18:21:14 +01:00 · 2025-03-07 18:16:06 +01:00 · 2025-03-07 18:06:35 +01:00 · 2025-03-07 15:23:29 +01:00 · 2025-03-05 22:40:41 +01:00
55 changed files with 1990 additions and 1342 deletions
--- a/.github/workflows/pre-release.yaml
+++ b/.github/workflows/pre-release.yaml
@ -49,6 +49,31 @@ 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 -TimeStampServer "http://timestamp.digicert.com"
+
+      - 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
@ -11,9 +11,6 @@

 winutil.pdb

-### Preprocessor Hashes ###
-.preprocessor_hashes.json
-
 ### Windows ###

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

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

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

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

-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

-# 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
+    $excludedFiles = @('.\.git\', '.\.gitignore', '.\.gitattributes', '.\.github\CODEOWNERS', '.\LICENSE', "$preprocessingFilePath", '*.png', '*.exe')
+    $msg = "Pre-req: Code Formatting"
+    Invoke-Preprocessing -WorkingDir "$workingdir" -ExcludedFiles $excludedFiles -ProgressStatusMessage $msg -ThrowExceptionOnEmptyFilesList
+}

 # Create the script in memory.
 Update-Progress "Pre-req: Allocating Memory" 0
--- a/README.md
+++ b/README.md
@ -3,7 +3,6 @@
 [![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.

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

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

 ## 🎓 Documentation

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

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

@ -53,7 +52,7 @@ If you have Issues, refer to [Known Issues](https://winutil.christitus.com/known

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

-<!-- sponsors --><a href="https://github.com/TriHydera"><img src="https:&#x2F;&#x2F;github.com&#x2F;TriHydera.png" width="60px" alt="User avatar: TriHydera" /></a><a href="https://github.com/DelDongo"><img src="https:&#x2F;&#x2F;github.com&#x2F;DelDongo.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/markamos"><img src="https:&#x2F;&#x2F;github.com&#x2F;markamos.png" width="60px" alt="User avatar: Mark Amos" /></a><a href="https://github.com/dwelfusius"><img src="https:&#x2F;&#x2F;github.com&#x2F;dwelfusius.png" width="60px" alt="User avatar: " /></a><a href="https://github.com/mews-se"><img src="https:&#x2F;&#x2F;github.com&#x2F;mews-se.png" width="60px" alt="User avatar: Martin Stockzell" /></a><a href="https://github.com/jdiegmueller"><img src="https:&#x2F;&#x2F;github.com&#x2F;jdiegmueller.png" width="60px" alt="User avatar: Jason A. Diegmueller" /></a><a href="https://github.com/robertsandrock"><img src="https:&#x2F;&#x2F;github.com&#x2F;robertsandrock.png" width="60px" alt="User avatar: RMS" /></a><a href="https://github.com/KenichiQaz"><img src="https:&#x2F;&#x2F;github.com&#x2F;KenichiQaz.png" width="60px" alt="User avatar: Stefan" /></a><a href="https://github.com/paulsheets"><img src="https:&#x2F;&#x2F;github.com&#x2F;paulsheets.png" width="60px" alt="User avatar: Paul" /></a><a href="https://github.com/djones369"><img src="https:&#x2F;&#x2F;github.com&#x2F;djones369.png" width="60px" alt="User avatar: Dave J. - WhamGeek" /></a><a href="https://github.com/anthonymendez"><img src="https:&#x2F;&#x2F;github.com&#x2F;anthonymendez.png" width="60px" alt="User avatar: Anthony Mendez" /></a><a href="https://github.com/claudemods"><img src="https:&#x2F;&#x2F;github.com&#x2F;claudemods.png" width="60px" alt="User avatar: claudemods" /></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/Ascent7910"><img src="https:&#x2F;&#x2F;github.com&#x2F;Ascent7910.png" width="60px" alt="User avatar: Max" /></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><!-- 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/jozozovko"><img src="https:&#x2F;&#x2F;github.com&#x2F;jozozovko.png" width="60px" alt="User avatar: " /></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/altugtekiner"><img src="https:&#x2F;&#x2F;github.com&#x2F;altugtekiner.png" width="60px" alt="User avatar: " /></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 Jones" /></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/claudemods"><img src="https:&#x2F;&#x2F;github.com&#x2F;claudemods.png" width="60px" alt="User avatar: Claudemods" /></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/Ascent7910"><img src="https:&#x2F;&#x2F;github.com&#x2F;Ascent7910.png" width="60px" alt="User avatar: Max" /></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><!-- 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,6 +1,5 @@
 # Import the function (adjust the path according to your setup)
-. "./functions/private/Install-WinUtilWinget.ps1"
-. "./functions/private/Test-WinUtilPackageManager.ps1"
+. "./functions/private/Get-WinUtilWingetLatest.ps1"

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

 try {
-    Install-WinUtilWinget
+    # 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
+    }
 } 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": "Wagnardsoft.DisplayDriverUninstaller"
+        "winget": "ddu"
    },
    "deluge": {
        "category": "Utilities",
@ -527,6 +527,14 @@
        "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",
@ -701,7 +709,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.3"
+        "winget": "GIMP.GIMP"
    },
    "git": {
        "category": "Development",
@ -1503,6 +1511,14 @@
        "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",
@ -1683,7 +1699,7 @@
        "category": "Games",
        "choco": "prismlauncher",
        "content": "Prism Launcher",
-        "description": "Prism Launcher is an Open Source Minecraft launcher with the ability to manage multiple instances, accounts and mods.",
+        "description": "Prism Launcher is a game launcher and manager designed to provide a clean and intuitive interface for organizing and launching your games.",
        "link": "https://prismlauncher.org/",
        "winget": "PrismLauncher.PrismLauncher"
    },
@ -1863,6 +1879,14 @@
        "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",
@ -1975,6 +1999,14 @@
        "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",
@ -2902,13 +2934,5 @@
        "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
@ -1,24 +1,31 @@
 {
-    "WPFInstall": {
-        "Content": "Install/Upgrade Applications",
+    "WPFToggleView": {
+        "Content": ["Expanded View", "Compact View"],
        "Category": "____Actions",
-        "Type": "Button",
+        "Type": "ToggleButton",
        "Order": "1",
-        "Description": "Install or upgrade the selected applications"
+        "Description": "Toggle between a list and a compact grid like view"
    },
-    "WPFUninstall": {
-        "Content": "Uninstall Applications",
+    "WPFSelectedFilter": {
+        "Content": [ "Show All", "Show Selected"],
        "Category": "____Actions",
-        "Type": "Button",
+        "Type": "ToggleButton",
        "Order": "2",
-        "Description": "Uninstall the selected applications"
+        "Description": "Toggle between showing all or only the selected applications"
    },
-    "WPFInstallUpgrade": {
-        "Content": "Upgrade all Applications",
+    "WPFClearInstallSelection": {
+        "Content": "Clear Selection",
        "Category": "____Actions",
        "Type": "Button",
        "Order": "3",
-        "Description": "Upgrade all applications to the latest version"
+        "Description": "Clear the selection of applications"
+    },
+    "WPFGetInstalled": {
+        "Content": "Get Installed",
+        "Category": "____Actions",
+        "Type": "Button",
+        "Order": "4",
+        "Description": "Show installed applications"
    },
    "WingetRadioButton": {
        "Content": "Winget",
@ -37,26 +44,5 @@
        "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://winutil.christitus.com/dev/features/features/dotnet"
+    "link": "https://christitustech.github.io/winutil/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://winutil.christitus.com/dev/features/features/hyperv"
+    "link": "https://christitustech.github.io/winutil/dev/features/Features/hyperv"
  },
  "WPFFeatureslegacymedia": {
    "Content": "Legacy Media (WMP, DirectPlay)",
@ -46,7 +46,7 @@
      "LegacyComponents"
    ],
    "InvokeScript": [],
-    "link": "https://winutil.christitus.com/dev/features/features/legacymedia"
+    "link": "https://christitustech.github.io/winutil/dev/features/Features/legacymedia"
  },
  "WPFFeaturewsl": {
    "Content": "Windows Subsystem for Linux",
@ -59,7 +59,7 @@
      "Microsoft-Windows-Subsystem-Linux"
    ],
    "InvokeScript": [],
-    "link": "https://winutil.christitus.com/dev/features/features/wsl"
+    "link": "https://christitustech.github.io/winutil/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://winutil.christitus.com/dev/features/features/nfs"
+    "link": "https://christitustech.github.io/winutil/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://winutil.christitus.com/dev/features/features/enablesearchsuggestions"
+    "link": "https://christitustech.github.io/winutil/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://winutil.christitus.com/dev/features/features/disablesearchsuggestions"
+    "link": "https://christitustech.github.io/winutil/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://winutil.christitus.com/dev/features/features/regbackup"
+    "link": "https://christitustech.github.io/winutil/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://winutil.christitus.com/dev/features/features/enablelegacyrecovery"
+    "link": "https://christitustech.github.io/winutil/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://winutil.christitus.com/dev/features/features/disablelegacyrecovery"
+    "link": "https://christitustech.github.io/winutil/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://winutil.christitus.com/dev/features/features/sandbox"
+    "link": "https://christitustech.github.io/winutil/dev/features/Features/Sandbox"
  },
  "WPFFeatureInstall": {
    "Content": "Install Features",
@ -186,7 +186,7 @@
    "Order": "a060_",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/features/features/install"
+    "link": "https://christitustech.github.io/winutil/dev/features/Features/Install"
  },
  "WPFPanelAutologin": {
    "Content": "Set Up Autologin",
@ -195,7 +195,7 @@
    "panel": "1",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/features/fixes/autologin"
+    "link": "https://christitustech.github.io/winutil/dev/features/Fixes/Autologin"
  },
  "WPFFixesUpdate": {
    "Content": "Reset Windows Update",
@ -204,7 +204,7 @@
    "Order": "a041_",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/features/fixes/update"
+    "link": "https://christitustech.github.io/winutil/dev/features/Fixes/Update"
  },
  "WPFFixesNetwork": {
    "Content": "Reset Network",
@ -213,7 +213,7 @@
    "panel": "1",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/features/fixes/network"
+    "link": "https://christitustech.github.io/winutil/dev/features/Fixes/Network"
  },
  "WPFPanelDISM": {
    "Content": "System Corruption Scan",
@ -222,7 +222,7 @@
    "Order": "a043_",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/features/fixes/dism"
+    "link": "https://christitustech.github.io/winutil/dev/features/Fixes/DISM"
  },
  "WPFFixesWinget": {
    "Content": "WinGet Reinstall",
@ -231,7 +231,7 @@
    "Order": "a044_",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/features/fixes/winget"
+    "link": "https://christitustech.github.io/winutil/dev/features/Fixes/Winget"
  },
  "WPFRunAdobeCCCleanerTool": {
    "Content": "Remove Adobe Creative Cloud",
@ -240,7 +240,7 @@
    "Order": "a045_",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/features/fixes/runadobecccleanertool"
+    "link": "https://christitustech.github.io/winutil/dev/features/Fixes/RunAdobeCCCleanerTool"
  },
  "WPFPanelnetwork": {
    "Content": "Network Connections",
@ -248,7 +248,7 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/network"
+    "link": "https://christitustech.github.io/winutil/dev/features/Legacy-Windows-Panels/network"
  },
  "WPFPanelcontrol": {
    "Content": "Control Panel",
@ -256,7 +256,7 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/control"
+    "link": "https://christitustech.github.io/winutil/dev/features/Legacy-Windows-Panels/control"
  },
  "WPFPanelpower": {
    "Content": "Power Panel",
@ -264,7 +264,7 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/power"
+    "link": "https://christitustech.github.io/winutil/dev/features/Legacy-Windows-Panels/power"
  },
  "WPFPanelregion": {
    "Content": "Region",
@ -272,7 +272,7 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/region"
+    "link": "https://christitustech.github.io/winutil/dev/features/Legacy-Windows-Panels/region"
  },
  "WPFPanelsound": {
    "Content": "Sound Settings",
@ -280,7 +280,7 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/sound"
+    "link": "https://christitustech.github.io/winutil/dev/features/Legacy-Windows-Panels/sound"
  },
  "WPFPanelprinter": {
    "Content": "Printer Panel",
@ -288,7 +288,7 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/printer"
+    "link": "https://christitustech.github.io/winutil/dev/features/Legacy-Windows-Panels/printer"
  },
  "WPFPanelsystem": {
    "Content": "System Properties",
@ -296,7 +296,7 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/system"
+    "link": "https://christitustech.github.io/winutil/dev/features/Legacy-Windows-Panels/system"
  },
  "WPFPaneluser": {
    "Content": "User Accounts",
@ -304,14 +304,7 @@
    "panel": "2",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/features/legacy-windows-panels/user"
-  },
-  "WPFPanelGodMode": {
-    "Content": "God Mode",
-    "category": "Legacy Windows Panels",
-    "panel": "2",
-    "Type": "Button",
-    "ButtonWidth": "300"
+    "link": "https://christitustech.github.io/winutil/dev/features/Legacy-Windows-Panels/user"
  },
  "WPFWinUtilInstallPSProfile": {
    "Content": "Install CTT PowerShell Profile",
--- a/config/preset.json
+++ b/config/preset.json
@ -2,7 +2,6 @@
  "Standard": [
    "WPFTweaksAH",
    "WPFTweaksConsumerFeatures",
-    "WPFTweaksDisableExplorerAutoDiscovery",
    "WPFTweaksDVR",
    "WPFTweaksHiber",
    "WPFTweaksHome",
@ -19,7 +18,6 @@
  ],
  "Minimal": [
    "WPFTweaksConsumerFeatures",
-    "WPFTweaksDisableExplorerAutoDiscovery",
    "WPFTweaksHome",
    "WPFTweaksServices",
    "WPFTweaksTele"
--- a/config/themes.json
+++ b/config/themes.json
@ -1,9 +1,5 @@
 {
    "shared":{
-        "AppEntryWidth":  "130",
-        "AppEntryFontSize":  "11",
-        "AppEntryMargin":  "1,1,1,1",
-        "AppEntryBorderTickness":  "0",
        "CustomDialogFontSize":       "12",
        "CustomDialogFontSizeHeader": "14",
        "CustomDialogLogoSize":       "25",
@ -11,7 +7,7 @@
        "CustomDialogHeight":         "200",
        "FontSize":         "12",
        "FontFamily":       "Arial",
-        "HeaderFontSize":  "16",
+        "HeadingFontSize":  "16",
        "HeaderFontFamily": "Consolas, Monaco",
        "CheckBoxBulletDecoratorSize": "14",
        "CheckBoxMargin": "15,0,0,2",
@ -20,7 +16,6 @@
        "TabButtonWidth":         "110",
        "TabButtonHeight":        "26",
        "TabRowHeightInPixels":   "50",
-        "ToolTipWidth":         "300",
        "IconFontSize":     "14",
        "IconButtonSize":   "35",
        "SettingsIconFontSize":   "18",
@ -43,7 +38,7 @@
        "ButtonCornerRadius": "2"
    },
    "Light": {
-        "AppInstallUnselectedColor": "#F7F7F7",
+        "AppInstallUnselectedColor": "#F0F0F0",
        "AppInstallHighlightedColor": "#CFCFCF",
        "AppInstallSelectedColor": "#C2C2C2",
        "ComboBoxForegroundColor":  "#232629",
@ -76,7 +71,6 @@
        "ButtonForegroundColor":  "#232629",
        "ToggleButtonOnColor":  "#2e77ff",
        "ToggleButtonOffColor": "#707070",
-        "ToolTipBackgroundColor": "#F7F7F7",
        "BorderColor": "#232629",
        "BorderOpacity": "0.2"

@ -115,7 +109,6 @@
        "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://winutil.christitus.com/dev/tweaks/essential-tweaks/ah"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/AH"
  },
  "WPFTweaksHiber": {
    "Content": "Disable Hibernation",
@ -58,7 +58,7 @@
    "UndoScript": [
      "powercfg.exe /hibernate on"
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/hiber"
+    "link": "https://christitustech.github.io/winutil/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://winutil.christitus.com/dev/tweaks/essential-tweaks/laptophibernation"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/LaptopHibernation"
  },
  "WPFTweaksHome": {
    "Content": "Disable Homegroup",
@ -126,7 +126,7 @@
        "OriginalType": "Automatic"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/home"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/Home"
  },
  "WPFTweaksLoc": {
    "Content": "Disable Location Tracking",
@ -164,7 +164,7 @@
        "OriginalValue": "1"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/loc"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/Loc"
  },
  "WPFTweaksServices": {
    "Content": "Set Services to Manual",
@ -423,6 +423,26 @@
        "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",
@ -878,6 +898,11 @@
        "StartupType": "Manual",
        "OriginalType": "Manual"
      },
+      {
+        "Name": "SgrmBroker",
+        "StartupType": "Automatic",
+        "OriginalType": "Automatic"
+      },
      {
        "Name": "SharedAccess",
        "StartupType": "Manual",
@ -908,6 +933,11 @@
        "StartupType": "Manual",
        "OriginalType": "Manual"
      },
+      {
+        "Name": "StateRepository",
+        "StartupType": "Manual",
+        "OriginalType": "Automatic"
+      },
      {
        "Name": "StiSvc",
        "StartupType": "Manual",
@ -943,6 +973,11 @@
        "StartupType": "Automatic",
        "OriginalType": "Automatic"
      },
+      {
+        "Name": "TextInputManagementService",
+        "StartupType": "Manual",
+        "OriginalType": "Automatic"
+      },
      {
        "Name": "Themes",
        "StartupType": "Automatic",
@ -1549,7 +1584,7 @@
        "OriginalType": "Manual"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/services"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/Services"
  },
  "WPFTweaksEdgeDebloat": {
    "Content": "Debloat Edge",
@ -1685,7 +1720,7 @@
        "OriginalValue": "<RemoveEntry>"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/edgedebloat"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/EdgeDebloat"
  },
  "WPFTweaksConsumerFeatures": {
    "Content": "Disable ConsumerFeatures",
@ -1702,7 +1737,7 @@
        "Type": "DWord"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/consumerfeatures"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/ConsumerFeatures"
  },
  "WPFTweaksTele": {
    "Content": "Disable Telemetry",
@ -2074,7 +2109,7 @@
        Set-MpPreference -SubmitSamplesConsent 2 -ErrorAction SilentlyContinue | Out-Null
        "
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/tele"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/Tele"
  },
  "WPFTweaksWifi": {
    "Content": "Disable Wifi-Sense",
@ -2098,7 +2133,7 @@
        "OriginalValue": "1"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/wifi"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/Wifi"
  },
  "WPFTweaksUTC": {
    "Content": "Set Time to UTC (Dual Boot)",
@ -2115,7 +2150,7 @@
        "OriginalValue": "0"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/utc"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/UTC"
  },
  "WPFTweaksRemoveHomeGallery": {
    "Content": "Remove Home and Gallery from explorer",
@ -2137,7 +2172,7 @@
      REG DELETE \"HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced\" /f /v \"LaunchTo\"
      "
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/removehomegallery"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveHomeGallery"
  },
  "WPFTweaksDisplay": {
    "Content": "Set Display for Performance",
@ -2244,7 +2279,7 @@
    "UndoScript": [
      "Remove-ItemProperty -Path \"HKCU:\\Control Panel\\Desktop\" -Name \"UserPreferencesMask\""
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/display"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/Display"
  },
  "WPFTweaksDeBloat": {
    "Content": "Remove ALL MS Store Apps - NOT RECOMMENDED",
@ -2356,7 +2391,7 @@
        }
      "
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/debloat"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/DeBloat"
  },
  "WPFTweaksRestorePoint": {
    "Content": "Create Restore Point",
@ -2407,7 +2442,7 @@
        }
      "
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/restorepoint"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/RestorePoint"
  },
  "WPFTweaksEndTaskOnTaskbar": {
    "Content": "Enable End Task With Right Click",
@ -2441,7 +2476,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://winutil.christitus.com/dev/tweaks/essential-tweaks/endtaskontaskbar"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/EndTaskOnTaskbar"
  },
  "WPFTweaksPowershell7": {
    "Content": "Change Windows Terminal default: PowerShell 5 -> PowerShell 7",
@ -2455,7 +2490,7 @@
    "UndoScript": [
      "Invoke-WPFTweakPS7 -action \"PS5\""
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/powershell7"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/Powershell7"
  },
  "WPFTweaksPowershell7Tele": {
    "Content": "Disable Powershell 7 Telemetry",
@ -2469,7 +2504,7 @@
    "UndoScript": [
      "[Environment]::SetEnvironmentVariable('POWERSHELL_TELEMETRY_OPTOUT', '', 'Machine')"
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/powershell7tele"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/Powershell7Tele"
  },
  "WPFTweaksStorage": {
    "Content": "Disable Storage Sense",
@ -2483,7 +2518,7 @@
    "UndoScript": [
      "Set-ItemProperty -Path \"HKCU:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\StorageSense\\Parameters\\StoragePolicy\" -Name \"01\" -Value 1 -Type Dword -Force"
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/storage"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/Storage"
  },
  "WPFTweaksRemoveEdge": {
    "Content": "Remove Microsoft Edge",
@ -2497,7 +2532,7 @@
    "UndoScript": [
      "Uninstall-WinUtilEdgeBrowser -action \"Install\""
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/removeedge"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveEdge"
  },
  "WPFTweaksRemoveCopilot": {
    "Content": "Disable Microsoft Copilot",
@ -2540,7 +2575,7 @@
      dism /online /add-package /package-name:Microsoft.Windows.Copilot
      "
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/removecopilot"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveCopilot"
  },
  "WPFTweaksRecallOff": {
    "Content": "Disable Recall",
@ -2550,6 +2585,7 @@
    "Order": "a011_",
    "registry": [
      {
+
        "Path": "HKLM:\\SOFTWARE\\Policies\\Microsoft\\Windows\\WindowsAI",
        "Name": "DisableAIDataAnalysis",
        "Type": "DWord",
@ -2571,7 +2607,7 @@
      Write-Host \"Please restart your computer in order for the changes to be fully applied.\"
      "
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/disablerecall"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/DisableRecall"
  },
  "WPFTweaksDisableLMS1": {
    "Content": "Disable Intel MM (vPro LMS)",
@ -2629,7 +2665,7 @@

      "
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/disablelms1"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableLMS1"
  },
  "WPFTweaksDisableWpbtExecution": {
    "Content": "Disable Windows Platform Binary Table (WPBT)",
@ -2752,7 +2788,7 @@
      Start-Process -FilePath winget -ArgumentList \"install -e --accept-source-agreements --accept-package-agreements --silent Microsoft.OneDrive \" -NoNewWindow -Wait
      "
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/removeonedrive"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/RemoveOnedrive"
  },
  "WPFTweaksRazerBlock": {
    "Content": "Block Razer Software Installs",
@ -2794,7 +2830,7 @@
          New-Item -Path \"C:\\Windows\\Installer\\\" -Name \"Razer\" -ItemType \"directory\"
      "
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/razerblock"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/RazerBlock"
  },
  "WPFTweaksDisableNotifications": {
    "Content": "Disable Notification Tray/Calendar",
@ -2818,7 +2854,7 @@
        "OriginalValue": "1"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/disablenotifications"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableNotifications"
  },
  "WPFTweaksDebloatAdobe": {
    "Content": "Adobe Debloat",
@ -2967,7 +3003,7 @@
        "OriginalType": "Automatic"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/debloatadobe"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/DebloatAdobe"
  },
  "WPFTweaksBlockAdobeNet": {
    "Content": "Adobe Network Block",
@ -3075,7 +3111,7 @@
      }
      "
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/blockadobenet"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/BlockAdobeNet"
  },
  "WPFTweaksRightClickMenu": {
    "Content": "Set Classic Right-Click Menu ",
@ -3087,7 +3123,8 @@
      "
      New-Item -Path \"HKCU:\\Software\\Classes\\CLSID\\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\" -Name \"InprocServer32\" -force -value \"\"
      Write-Host Restarting explorer.exe ...
-      Stop-Process -Name \"explorer\" -Force
+      $process = Get-Process -Name \"explorer\"
+      Stop-Process -InputObject $process
      "
    ],
    "UndoScript": [
@ -3095,10 +3132,11 @@
      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 ...
-      Stop-Process -Name \"explorer\" -Force
+      $process = Get-Process -Name \"explorer\"
+      Stop-Process -InputObject $process
      "
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/rightclickmenu"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/RightClickMenu"
  },
  "WPFTweaksDiskCleanup": {
    "Content": "Run Disk Cleanup",
@ -3112,7 +3150,7 @@
      Dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase
      "
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/diskcleanup"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/DiskCleanup"
  },
  "WPFTweaksDeleteTempFiles": {
    "Content": "Delete Temporary Files",
@ -3124,7 +3162,7 @@
      "Get-ChildItem -Path \"C:\\Windows\\Temp\" *.* -Recurse | Remove-Item -Force -Recurse
    Get-ChildItem -Path $env:TEMP *.* -Recurse | Remove-Item -Force -Recurse"
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/deletetempfiles"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/DeleteTempFiles"
  },
  "WPFTweaksDVR": {
    "Content": "Disable GameDVR",
@ -3169,7 +3207,7 @@
        "Type": "DWord"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/dvr"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/DVR"
  },
  "WPFTweaksIPv46": {
    "Content": "Prefer IPv4 over IPv6",
@ -3186,7 +3224,7 @@
        "Type": "DWord"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/essential-tweaks/ipv46"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Essential-Tweaks/IPv46"
  },
  "WPFTweaksTeredo": {
    "Content": "Disable Teredo",
@ -3209,7 +3247,7 @@
    "UndoScript": [
      "netsh interface teredo set state default"
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/teredo"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/Teredo"
  },
  "WPFTweaksDisableipsix": {
    "Content": "Disable IPv6",
@ -3232,7 +3270,7 @@
    "UndoScript": [
      "Enable-NetAdapterBinding -Name \"*\" -ComponentID ms_tcpip6"
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/disableipsix"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/Disableipsix"
  },
  "WPFTweaksDisableBGapps": {
    "Content": "Disable Background Apps",
@ -3249,7 +3287,7 @@
        "Type": "DWord"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/disablebgapps"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableBGapps"
  },
  "WPFTweaksDisableFSO": {
    "Content": "Disable Fullscreen Optimizations",
@ -3266,7 +3304,7 @@
        "Type": "DWord"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/disablefso"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/DisableFSO"
  },
  "WPFToggleDarkMode": {
    "Content": "Dark Theme for Windows",
@ -3309,7 +3347,7 @@
      }
      "
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/darkmode"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/DarkMode"
  },
  "WPFToggleBingSearch": {
    "Content": "Bing Search in Start Menu",
@ -3328,7 +3366,7 @@
        "Type": "DWord"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/bingsearch"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/BingSearch"
  },
  "WPFToggleNumLock": {
    "Content": "NumLock on Startup",
@ -3355,7 +3393,7 @@
        "Type": "DWord"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/numlock"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/NumLock"
  },
  "WPFToggleVerboseLogon": {
    "Content": "Verbose Messages During Logon",
@ -3374,11 +3412,11 @@
        "Type": "DWord"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/verboselogon"
+    "link": "https://christitustech.github.io/winutil/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.",
+    "Description": "If disabled then you will not see recommendations in the Start Menu. | Enables 'iseducationenvironment' | Relogin Required.",
    "category": "Customize Preferences",
    "panel": "2",
    "Order": "a104_",
@ -3409,32 +3447,14 @@
        "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"
-      }
-    ]
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/WPFToggleStartMenuRecommendations"
  },
  "WPFToggleSnapWindow": {
    "Content": "Snap Window",
    "Description": "If enabled you can align windows by dragging them. | Relogin Required",
    "category": "Customize Preferences",
    "panel": "2",
-    "Order": "a106_",
+    "Order": "a105_",
    "Type": "Toggle",
    "registry": [
      {
@ -3446,14 +3466,14 @@
        "Type": "String"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/snapwindow"
+    "link": "https://christitustech.github.io/winutil/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": "a107_",
+    "Order": "a106_",
    "Type": "Toggle",
    "registry": [
      {
@ -3475,14 +3495,14 @@
      Invoke-WinUtilExplorerUpdate -action \"restart\"
      "
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/snapflyout"
+    "link": "https://christitustech.github.io/winutil/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": "a108_",
+    "Order": "a107_",
    "Type": "Toggle",
    "registry": [
      {
@ -3504,14 +3524,14 @@
      Invoke-WinUtilExplorerUpdate -action \"restart\"
      "
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/snapsuggestion"
+    "link": "https://christitustech.github.io/winutil/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": "a109_",
+    "Order": "a108_",
    "Type": "Toggle",
    "registry": [
      {
@ -3539,14 +3559,14 @@
        "Type": "DWord"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/mouseacceleration"
+    "link": "https://christitustech.github.io/winutil/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": "a110_",
+    "Order": "a109_",
    "Type": "Toggle",
    "registry": [
      {
@ -3558,7 +3578,7 @@
        "Type": "DWord"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/stickykeys"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/StickyKeys"
  },
  "WPFToggleHiddenFiles": {
    "Content": "Show Hidden Files",
@ -3587,7 +3607,7 @@
      Invoke-WinUtilExplorerUpdate -action \"restart\"
      "
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/hiddenfiles"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/HiddenFiles"
  },
  "WPFToggleShowExt": {
    "Content": "Show File Extensions",
@ -3616,7 +3636,7 @@
      Invoke-WinUtilExplorerUpdate -action \"restart\"
      "
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/showext"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/ShowExt"
  },
  "WPFToggleTaskbarSearch": {
    "Content": "Search Button in Taskbar",
@ -3635,7 +3655,7 @@
        "Type": "DWord"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/taskbarsearch"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/TaskbarSearch"
  },
  "WPFToggleTaskView": {
    "Content": "Task View Button in Taskbar",
@ -3654,7 +3674,7 @@
        "Type": "DWord"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/taskview"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/TaskView"
  },
  "WPFToggleTaskbarWidgets": {
    "Content": "Widgets Button in Taskbar",
@ -3673,7 +3693,7 @@
        "Type": "DWord"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/taskbarwidgets"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/TaskbarWidgets"
  },
  "WPFToggleTaskbarAlignment": {
    "Content": "Center Taskbar Items",
@ -3692,7 +3712,7 @@
        "Type": "DWord"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/taskbaralignment"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/TaskbarAlignment"
  },
  "WPFToggleDetailedBSoD": {
    "Content": "Detailed BSoD",
@ -3719,7 +3739,7 @@
        "Type": "DWord"
      }
    ],
-    "link": "https://winutil.christitus.com/dev/tweaks/customize-preferences/detailedbsod"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/DetailedBSoD"
  },
  "WPFOOSUbutton": {
    "Content": "Run OO Shutup 10",
@ -3727,7 +3747,7 @@
    "panel": "1",
    "Order": "a039_",
    "Type": "Button",
-    "link": "https://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/oosubutton"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/OOSUbutton"
  },
  "WPFchangedns": {
    "Content": "DNS",
@ -3736,7 +3756,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://winutil.christitus.com/dev/tweaks/z--advanced-tweaks---caution/changedns"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/z--Advanced-Tweaks---CAUTION/changedns"
  },
  "WPFAddUltPerf": {
    "Content": "Add and Activate Ultimate Performance Profile",
@ -3745,7 +3765,7 @@
    "Order": "a080_",
    "Type": "Button",
    "ButtonWidth": "300",
-    "link": "https://winutil.christitus.com/dev/tweaks/performance-plans/addultperf"
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Performance-Plans/AddUltPerf"
  },
  "WPFRemoveUltPerf": {
    "Content": "Remove Ultimate Performance Profile",
@ -3754,61 +3774,6 @@
    "Order": "a081_",
    "Type": "Button",
    "ButtonWidth": "300",
-    "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!
-      "
-    ]
+    "link": "https://christitustech.github.io/winutil/dev/tweaks/Performance-Plans/RemoveUltPerf"
  }
 }
--- a/functions/microwin/Invoke-Microwin.ps1
+++ b/functions/microwin/Invoke-Microwin.ps1
@ -188,8 +188,7 @@ public class PowerManagement {
                }
            }
            catch {
-                # Fall back to what we used to do: delayed disablement
-                Enable-WindowsOptionalFeature -Path "$scratchDir" -FeatureName "Recall"
+                # Do nothing
            }
        }

@ -338,7 +337,6 @@ 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/Microwin-NewFirstRun.ps1
+++ b/functions/microwin/Microwin-NewFirstRun.ps1
@ -54,7 +54,7 @@ function Microwin-NewFirstRun {

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

    }

-    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
@ -160,126 +160,134 @@ function Microwin-NewUnattend {
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
                    <Order>19</Order>
-                    <Path>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\current\device\Start" /v ConfigureStartPins /t REG_SZ /d "{ \"pinnedList\": [] }" /f</Path>
+                    <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>reg.exe add "HKLM\SOFTWARE\Microsoft\PolicyManager\current\device\Start" /v ConfigureStartPins_ProviderSet /t REG_DWORD /d 1 /f</Path>
+                    <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_WinningProvider /t REG_SZ /d B5292708-1619-419B-9923-E5D9F3925E71 /f</Path>
+                    <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>
-                    <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>
+                    <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>
-                    <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>
+                    <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>
-                    <Path>net.exe accounts /maxpwage:UNLIMITED</Path>
+                    <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>
-                    <Path>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f</Path>
+                    <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>
-                    <Path>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Power" /v HiberbootEnabled /t REG_DWORD /d 0 /f</Path>
+                    <Path>net.exe accounts /maxpwage:UNLIMITED</Path>
                </RunSynchronousCommand>
                <RunSynchronousCommand wcm:action="add">
                    <Order>27</Order>
-                    <Path>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Dsh" /v AllowNewsAndInterests /t REG_DWORD /d 0 /f</Path>
+                    <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>
-                    <Path>reg.exe load "HKU\DefaultUser" "C:\Users\Default\NTUSER.DAT"</Path>
+                    <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>
-                    <Path>reg.exe add "HKU\DefaultUser\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "ContentDeliveryAllowed" /t REG_DWORD /d 0 /f</Path>
+                    <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>
-                    <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>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>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>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>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>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>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>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>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>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>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>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>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>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>44</Order>
-                    <Path>reg.exe unload "HKU\DefaultUser"</Path>
-                </RunSynchronousCommand>
-                <RunSynchronousCommand wcm:action="add">
-                    <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>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>47</Order>
                    <Path>reg.exe load "HKU\DefaultUser" "C:\Users\Default\NTUSER.DAT"</Path>
                </RunSynchronousCommand>
+                <RunSynchronousCommand wcm:action="add">
+                    <Order>31</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>
+                    <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>
+                    <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>
+                    <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>
+                    <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>
+                    <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>
+                    <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>
+                    <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>
+                    <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>
+                    <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>
+                    <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>
+                    <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>
+                    <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>
+                    <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>
+                    <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>
+                    <Path>reg.exe unload "HKU\DefaultUser"</Path>
+                </RunSynchronousCommand>
+                <RunSynchronousCommand wcm:action="add">
+                    <Order>47</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>
-                    <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>
+                    <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>
+                    <Path>reg.exe load "HKU\DefaultUser" "C:\Users\Default\NTUSER.DAT"</Path>
+                </RunSynchronousCommand>
+                <RunSynchronousCommand wcm:action="add">
+                    <Order>50</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>
                    <Path>reg.exe unload "HKU\DefaultUser"</Path>
                </RunSynchronousCommand>
            </RunSynchronous>
--- a/functions/microwin/Microwin-RemoveFileOrDirectory.ps1
+++ b/functions/microwin/Microwin-RemoveFileOrDirectory.ps1
@ -12,11 +12,7 @@ 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
@ -90,7 +90,7 @@ function Microwin-RemovePackages {
                $status = "Removing package $package"
                Write-Progress -Activity "Removing Packages" -Status $status -PercentComplete ($counter++/$pkglist.Count*100)
                Write-Debug "Removing package $package"
-                dism /english /image="$scratchDir" /remove-package /packagename=$package /quiet /norestart | Out-Null
+                dism /english /image="$scratchDir" /remove-package /packagename=$package /remove /quiet /norestart | Out-Null
                if ($? -eq $false) {
                    Write-Host "Package $package could not be removed."
                }
--- a/functions/private/Find-AppsByNameOrDescription.ps1
+++ b/functions/private/Find-AppsByNameOrDescription.ps1
@ -12,30 +12,16 @@ function Find-AppsByNameOrDescription {
    )
    # 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
+            Set-CategoryVisibility -Category "*"
+            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*") {
+                if ($sync.configs.applicationsHashtable.$($_.Tag).Content -like "*$SearchString*") {
                    # Show the App and the parent CategoryWrapPanel if the string is found
                    $_.Visibility = [Windows.Visibility]::Visible
                    $_.parent.Visibility = [Windows.Visibility]::Visible
--- a/functions/private/Find-TweaksByNameOrDescription.ps1
+++ b/functions/private/Find-TweaksByNameOrDescription.ps1
@ -1,100 +0,0 @@
-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
@ -1,59 +0,0 @@
-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-WinUtilWingetLatest.ps1
+++ b/functions/private/Get-WinUtilWingetLatest.ps1
@ -0,0 +1,104 @@
+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
@ -5,21 +5,29 @@ function Initialize-InstallAppEntry {
            Used to as part of the Install Tab UI generation
        .PARAMETER TargetElement
            The Element into which the Apps should be placed
-        .PARAMETER appKey
+        .PARAMETER AppKey
            The Key of the app inside the $sync.configs.applicationsHashtable
    #>
        param(
            [Windows.Controls.WrapPanel]$TargetElement,
-            $appKey
+            $AppKey
        )
-
+        $App = $sync.configs.applicationsHashtable.$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]
+        $border.BorderBrush = [Windows.Media.Brushes]::Gray
+        $border.SetResourceReference([Windows.Controls.Control]::BorderThicknessProperty, "AppTileBorderThickness")
+        $border.CornerRadius = 5
+        $border.SetResourceReference([Windows.Controls.Control]::PaddingProperty, "AppTileMargins")
+        $border.SetResourceReference([Windows.Controls.Control]::WidthProperty, "AppTileWidth")
+        $border.VerticalAlignment = "Top"
+        $border.SetResourceReference([Windows.Controls.Control]::MarginProperty, "AppTileMargins")
+        $border.Cursor = [System.Windows.Input.Cursors]::Hand
+        $border.SetResourceReference([Windows.Controls.Control]::BackgroundProperty, "AppInstallUnselectedColor")
+        $border.Tag = $Appkey
+        $border.ToolTip = $App.description
+        $border.Add_MouseUp({
+            $childCheckbox = ($this.Child.Children | Where-Object {$_.Template.TargetType -eq [System.Windows.Controls.Checkbox]})[0]
            $childCheckBox.isChecked = -not $childCheckbox.IsChecked
        })
        $border.Add_MouseEnter({
@ -32,43 +40,158 @@ function Initialize-InstallAppEntry {
                $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
-        })
+        # Create a DockPanel inside the Border
+        $dockPanel = New-Object Windows.Controls.DockPanel
+        $dockPanel.LastChildFill = $true
+        $border.Child = $dockPanel

+        # Create the CheckBox, vertically centered
        $checkBox = New-Object Windows.Controls.CheckBox
-        $checkBox.Name = $appKey
-        $checkbox.Style = $sync.Form.Resources.AppEntryCheckboxStyle
+        $checkBox.Name = $AppKey
+        $checkBox.Background = "Transparent"
+        $checkBox.HorizontalAlignment = "Left"
+        $checkBox.VerticalAlignment = "Center"
+        $checkBox.SetResourceReference([Windows.Controls.Control]::MarginProperty, "AppTileMargins")
+        $checkBox.SetResourceReference([Windows.Controls.Control]::StyleProperty, "CollapsedCheckBoxStyle")
        $checkbox.Add_Checked({
            Invoke-WPFSelectedAppsUpdate -type "Add" -checkbox $this
-            $borderElement = $this.Parent
+            $borderElement = $this.Parent.Parent
            $borderElement.SetResourceReference([Windows.Controls.Control]::BackgroundProperty, "AppInstallSelectedColor")
        })

        $checkbox.Add_Unchecked({
            Invoke-WPFSelectedAppsUpdate -type "Remove" -checkbox $this
-            $borderElement = $this.Parent
+            $borderElement = $this.Parent.Parent
            $borderElement.SetResourceReference([Windows.Controls.Control]::BackgroundProperty, "AppInstallUnselectedColor")
        })
+        $sync.$($checkBox.Name) = $checkBox
+        # Create a StackPanel for the image and name
+        $imageAndNamePanel = New-Object Windows.Controls.StackPanel
+        $imageAndNamePanel.Orientation = "Horizontal"
+        $imageAndNamePanel.VerticalAlignment = "Center"
+
+        # Create the Image and set a placeholder
+        $image = New-Object Windows.Controls.Image
+        # $image.Name = "wpfapplogo" + $App.Name
+        $image.Width = 40
+        $image.Height = 40
+        $image.Margin = New-Object Windows.Thickness(0, 0, 10, 0)
+        $image.Source = $noimage  # Ensure $noimage is defined in your script
+
+        # Clip the image corners
+        $image.Clip = New-Object Windows.Media.RectangleGeometry
+        $image.Clip.Rect = New-Object Windows.Rect(0, 0, $image.Width, $image.Height)
+        $image.Clip.RadiusX = 5
+        $image.Clip.RadiusY = 5
+        $image.SetResourceReference([Windows.Controls.Control]::VisibilityProperty, "AppTileCompactVisibility")
+
+        $imageAndNamePanel.Children.Add($image) | Out-Null

        # Create the TextBlock for the application name
        $appName = New-Object Windows.Controls.TextBlock
-        $appName.Style = $sync.Form.Resources.AppEntryNameStyle
-        $appName.Text = $Apps.$appKey.content
+        $appName.Text = $App.Content
+        $appName.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "AppTileFontSize")
+        $appName.FontWeight = [Windows.FontWeights]::Bold
+        $appName.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "MainForegroundColor")
+        $appName.VerticalAlignment = "Center"
+        $appName.SetResourceReference([Windows.Controls.Control]::MarginProperty, "AppTileMargins")
+        $appName.Background = "Transparent"
+        $imageAndNamePanel.Children.Add($appName) | Out-Null

-        # Add the name to the Checkbox
-        $checkBox.Content = $appName
+        # Add the image and name panel to the Checkbox
+        $checkBox.Content = $imageAndNamePanel

-        # 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)
+        # Add the checkbox to the DockPanel
+        [Windows.Controls.DockPanel]::SetDock($checkBox, [Windows.Controls.Dock]::Left)
+        $dockPanel.Children.Add($checkBox) | Out-Null
+
+        # Create the StackPanel for the buttons and dock it to the right
+        $buttonPanel = New-Object Windows.Controls.StackPanel
+        $buttonPanel.Orientation = "Horizontal"
+        $buttonPanel.HorizontalAlignment = "Right"
+        $buttonPanel.VerticalAlignment = "Center"
+        $buttonPanel.SetResourceReference([Windows.Controls.Control]::MarginProperty, "AppTileMargins")
+        $buttonPanel.SetResourceReference([Windows.Controls.Control]::VisibilityProperty, "AppTileCompactVisibility")
+        [Windows.Controls.DockPanel]::SetDock($buttonPanel, [Windows.Controls.Dock]::Right)
+
+        # Create the "Install" button
+        $installButton = New-Object Windows.Controls.Button
+        $installButton.Width = 45
+        $installButton.Height = 35
+        $installButton.Margin = New-Object Windows.Thickness(0, 0, 10, 0)
+
+        $installIcon = New-Object Windows.Controls.TextBlock
+        $installIcon.Text = [char]0xE118  # Install Icon
+        $installIcon.FontFamily = "Segoe MDL2 Assets"
+        $installIcon.FontSize = 20
+        $installIcon.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "MainForegroundColor")
+        $installIcon.Background = "Transparent"
+        $installIcon.HorizontalAlignment = "Center"
+        $installIcon.VerticalAlignment = "Center"
+
+        $installButton.Content = $installIcon
+        $installButton.ToolTip = "Install or Upgrade the application"
+        $buttonPanel.Children.Add($installButton) | Out-Null
+
+        # Add Click event for the "Install" button
+        $installButton.Add_Click({
+            $appKey = $this.Parent.Parent.Parent.Tag
+            $appObject = $sync.configs.applicationsHashtable.$appKey
+            Invoke-WPFInstall -PackagesToInstall $appObject
+        })
+
+        # Create the "Uninstall" button
+        $uninstallButton = New-Object Windows.Controls.Button
+        $uninstallButton.Width = 45
+        $uninstallButton.Height = 35
+
+        $uninstallIcon = New-Object Windows.Controls.TextBlock
+        $uninstallIcon.Text = [char]0xE74D  # Uninstall Icon
+        $uninstallIcon.FontFamily = "Segoe MDL2 Assets"
+        $uninstallIcon.FontSize = 20
+        $uninstallIcon.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "MainForegroundColor")
+        $uninstallIcon.Background = "Transparent"
+        $uninstallIcon.HorizontalAlignment = "Center"
+        $uninstallIcon.VerticalAlignment = "Center"
+
+        $uninstallButton.Content = $uninstallIcon
+        $buttonPanel.Children.Add($uninstallButton) | Out-Null
+
+        $uninstallButton.ToolTip = "Uninstall the application"
+        $uninstallButton.Add_Click({
+            $appKey = $this.Parent.Parent.Parent.Tag
+            $appObject = $sync.configs.applicationsHashtable.$appKey
+            Invoke-WPFUnInstall -PackagesToUninstall $appObject
+        })
+
+        # Create the "Info" button
+        $infoButton = New-Object Windows.Controls.Button
+        $infoButton.Width = 45
+        $infoButton.Height = 35
+        $infoButton.Margin = New-Object Windows.Thickness(10, 0, 0, 0)
+
+        $infoIcon = New-Object Windows.Controls.TextBlock
+        $infoIcon.Text = [char]0xE946  # Info Icon
+        $infoIcon.FontFamily = "Segoe MDL2 Assets"
+        $infoIcon.FontSize = 20
+        $infoIcon.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "MainForegroundColor")
+        $infoIcon.Background = "Transparent"
+        $infoIcon.HorizontalAlignment = "Center"
+        $infoIcon.VerticalAlignment = "Center"
+
+        $infoButton.Content = $infoIcon
+        $infoButton.ToolTip = "Open the application's website in your default browser"
+        $buttonPanel.Children.Add($infoButton) | Out-Null
+
+        $infoButton.Add_Click({
+            $appKey = $this.Parent.Parent.Parent.Tag
+            $appObject = $sync.configs.applicationsHashtable.$appKey
+            Start-Process $appObject.link
+        })
+
+        # Add the button panel to the DockPanel
+        $dockPanel.Children.Add($buttonPanel) | Out-Null

-        $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
@ -10,36 +10,27 @@

        #>
        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)
+
+        [Windows.Controls.DockPanel]::SetDock($scrollViewer, [Windows.Controls.Dock]::Bottom)
+        $null = $TargetElement.Children.Add($scrollViewer)
        return $itemsControl
    }
--- a/functions/private/Initialize-InstallAppsMainElement.ps1
+++ b/functions/private/Initialize-InstallAppsMainElement.ps1
@ -0,0 +1,28 @@
+function Initialize-InstallAppsMainElement {
+    <#
+        .SYNOPSIS
+            Clears the given WPF Grid and creates a [Windows.Controls.Border] containing a [Windows.Controls.StackPanel]
+            Used to as part of the Install Tab UI generation
+        .PARAMETER TargetGridName
+            The WPF Grid name
+        .OUTPUTS
+            Returns the created [Windows.Controls.StackPanel] element
+    #>
+    param(
+        [Parameter(Mandatory)]
+        [string]$TargetGridName
+    )
+    $targetGrid = $sync.Form.FindName($TargetGridName)
+    $null = $targetGrid.Children.Clear()
+
+    $Border = New-Object Windows.Controls.Border
+    $Border.VerticalAlignment = "Stretch"
+    $Border.SetResourceReference([Windows.Controls.Control]::StyleProperty, "BorderStyle")
+
+    $dockPanel = New-Object Windows.Controls.DockPanel
+    $Border.Child = $dockPanel
+
+    $null = $targetGrid.Children.Add($Border)
+
+    return $dockPanel
+}
--- a/functions/private/Initialize-InstallCategoryAppList.ps1
+++ b/functions/private/Initialize-InstallCategoryAppList.ps1
@ -21,36 +21,52 @@ function Initialize-InstallCategoryAppList {
                [Windows.Controls.ItemsControl]$TargetElement
            )

-            $toggleButton = New-Object Windows.Controls.Label
+            $toggleButton = New-Object Windows.Controls.Primitives.ToggleButton
            $toggleButton.Content = "$Category"
            $toggleButton.Tag = "CategoryToggleButton"
-            $sync.$Category = $Category
-
+            $toggleButton.Cursor = [System.Windows.Input.Cursors]::Hand
+            $toggleButton.SetResourceReference([Windows.Controls.Control]::StyleProperty, "CategoryToggleButtonStyle")
+            $sync.Buttons.Add($toggleButton)
+            $toggleButton.Add_Checked({
+                # Clear the search bar when a category is clicked
+                $sync.SearchBar.Text = ""
+                Set-CategoryVisibility -Category $this.Content -overrideState Expand
+            })
+            $toggleButton.Add_Unchecked({
+                Set-CategoryVisibility -Category $this.Content -overrideState Collapse
+            })
            $null = $TargetElement.Items.Add($toggleButton)
        }

+        $loadingLabel = New-Object Windows.Controls.Label
+        $loadingLabel.Content = "Loading, please wait..."
+        $loadingLabel.HorizontalAlignment = "Center"
+        $loadingLabel.VerticalAlignment = "Center"
+        $loadingLabel.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "FontSizeHeading")
+        $loadingLabel.FontWeight = [Windows.FontWeights]::Bold
+        $loadingLabel.Foreground = [Windows.Media.Brushes]::Gray
+        $sync.LoadingLabel = $loadingLabel

-        # Pre-group apps by category
-        $appsByCategory = @{}
-        foreach ($appKey in $Apps.Keys) {
-            $category = $Apps.$appKey.Category
-            if (-not $appsByCategory.ContainsKey($category)) {
-                $appsByCategory[$category] = @()
+        $TargetElement.Items.Clear()
+        $null = $TargetElement.Items.Add($sync.LoadingLabel)
+        # Use the Dispatcher to make sure the Loading message is shown before the logic loading the apps starts, and only is removed when the loading is complete and the apps are added to the UI
+        $TargetElement.Dispatcher.Invoke([System.Windows.Threading.DispatcherPriority]::Background, [action]{
+
+            $TargetElement.Items.Clear() # Remove the loading message
+            $categories = $Apps.Values | Select-Object -ExpandProperty category -Unique | Sort-Object
+            foreach ($category in $categories) {
+                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]::Collapsed
+                $wrapPanel.Tag = "CategoryWrapPanel_$category"
+                $null = $TargetElement.Items.Add($wrapPanel)
+                $Apps.Keys | Where-Object { $Apps.$_.Category -eq $category } | Sort-Object | ForEach-Object {
+                    Initialize-InstallAppEntry -TargetElement $wrapPanel -AppKey $_
+                }
            }
-            $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/Initialize-InstallHeader.ps1
+++ b/functions/private/Initialize-InstallHeader.ps1
@ -0,0 +1,89 @@
+function Initialize-InstallHeader {
+    <#
+        .SYNOPSIS
+            Creates the Multi Selection Header Elements on the Install Tab
+            Used to as part of the Install Tab UI generation
+        .PARAMETER TargetElement
+            The Parent Element into which the Header should be placed
+    #>
+    param($TargetElement)
+    function New-WPFButton {
+        param (
+            [string]$Name,
+            [string]$Content
+        )
+        $button = New-Object Windows.Controls.Button
+        $button.Name = $Name
+        $button.Content = $Content
+        $button.Margin = New-Object Windows.Thickness(2)
+        $button.HorizontalAlignment = "Stretch"
+        return $button
+    }
+
+    $wrapPanelTop = New-Object Windows.Controls.WrapPanel
+    $wrapPanelTop.SetResourceReference([Windows.Controls.Control]::BackgroundProperty, "MainBackgroundColor")
+    $wrapPanelTop.HorizontalAlignment = "Left"
+    $wrapPanelTop.VerticalAlignment = "Top"
+    $wrapPanelTop.Orientation = "Horizontal"
+    $wrapPanelTop.SetResourceReference([Windows.Controls.Control]::MarginProperty, "TabContentMargin")
+    $buttonConfigs = @(
+        @{Name="WPFInstall"; Content="Install/Upgrade Selected"},
+        @{Name="WPFInstallUpgrade"; Content="Upgrade All"},
+        @{Name="WPFUninstall"; Content="Uninstall Selected"}
+    )
+
+    foreach ($config in $buttonConfigs) {
+        $button = New-WPFButton -Name $config.Name -Content $config.Content
+        $null = $wrapPanelTop.Children.Add($button)
+        $sync[$config.Name] = $button
+    }
+
+    $selectedAppsButton = New-Object Windows.Controls.Button
+    $selectedAppsButton.Name = "WPFselectedAppsButton"
+    $selectedAppsButton.Content = "Selected Apps: 0"
+    $selectedAppsButton.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "FontSizeHeading")
+    $selectedAppsButton.SetResourceReference([Windows.Controls.Control]::MarginProperty, "TabContentMargin")
+    $selectedAppsButton.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "MainForegroundColor")
+    $selectedAppsButton.HorizontalAlignment = "Center"
+    $selectedAppsButton.VerticalAlignment = "Center"
+
+    $selectedAppsPopup = New-Object Windows.Controls.Primitives.Popup
+    $selectedAppsPopup.IsOpen = $false
+    $selectedAppsPopup.PlacementTarget = $selectedAppsButton
+    $selectedAppsPopup.Placement = [System.Windows.Controls.Primitives.PlacementMode]::Bottom
+    $selectedAppsPopup.AllowsTransparency = $true
+
+    $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
+
+    $sync.selectedAppsstackPanel = New-Object Windows.Controls.StackPanel
+    $selectedAppsBorder.Child = $sync.selectedAppsstackPanel
+
+    # Toggle selectedAppsPopup open/close with button
+    $selectedAppsButton.Add_Click({
+        $sync.selectedAppsPopup.IsOpen = -not $sync.selectedAppsPopup.IsOpen
+    })
+    # Close selectedAppsPopup when mouse leaves both button and selectedAppsPopup
+    $selectedAppsButton.Add_MouseLeave({
+        if (-not $sync.selectedAppsPopup.IsMouseOver) {
+            $sync.selectedAppsPopup.IsOpen = $false
+        }
+    })
+    $selectedAppsPopup.Add_MouseLeave({
+        if (-not $selectedAppsButton.IsMouseOver) {
+            $sync.selectedAppsPopup.IsOpen = $false
+        }
+    })
+
+    $null = $wrapPanelTop.Children.Add($selectedAppsButton)
+    $sync.$($selectedAppsButton.Name) = $selectedAppsButton
+
+    [Windows.Controls.DockPanel]::SetDock($wrapPanelTop, [Windows.Controls.Dock]::Top)
+    $null = $TargetElement.Children.Add($wrapPanelTop)
+}
--- a/functions/private/Install-WinUtilWinget.ps1
+++ b/functions/private/Install-WinUtilWinget.ps1
@ -33,44 +33,18 @@ function Install-WinUtilWinget {
            return
        }

-        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
-        }
+        # 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 "An error occurred during WinGet installation: $_"
-        throw
+        Write-Error "Failed to install Winget: $($_.Exception.Message)"
    }
+
 }
--- a/functions/private/Set-CategoryVisibility.ps1
+++ b/functions/private/Set-CategoryVisibility.ps1
@ -0,0 +1,44 @@
+function Set-CategoryVisibility {
+    <#
+        .SYNOPSIS
+            Used to expand or collapse categories and corresponding apps on the install tab
+
+        .PARAMETER Category
+            Can eigther be a specific category name like "Browsers" OR "*" to affect all categories at once
+
+        .PARAMETER overrideState
+            "Expand" => expands the corresponding elements
+            "Collapse" => collapses the corresponding elements
+            N/A => if compactView is active expand, otherwise collapse elements
+    #>
+    param(
+        [Parameter(Mandatory=$true)]
+        [string]$Category,
+        [ValidateSet("Expand", "Collapse")]
+        [string]$overrideState
+    )
+
+    switch ($overrideState) {
+        "Expand"    {$state = $true}
+        "Collapse"  {$state = $false}
+        default     {$state = $sync.CompactView}
+    }
+
+    # If all the Categories are affected, update the Checked state of the ToggleButtons.
+    # Otherwise, the state is not synced when toggling between the display modes
+    if  ($category -eq "*") {
+        $items = $sync.ItemsControl.Items | Where-Object {($_.Tag -like "CategoryWrapPanel_*")}
+        $sync.ItemsControl.Items | Where-Object {($_.Tag -eq "CategoryToggleButton")} | Foreach-Object { $_.Visibility = [Windows.Visibility]::Visible; $_.IsChecked = $state }
+
+    } else {
+        $items = $sync.ItemsControl.Items | Where-Object {($_.Tag -eq "CategoryWrapPanel_$Category")}
+    }
+
+    $elementVisibility = if ($state -eq $true) {[Windows.Visibility]::Visible} else {[Windows.Visibility]::Collapsed}
+    $items | ForEach-Object {
+        $_.Visibility = $elementVisibility
+        }
+    $items.Children | ForEach-Object {
+        $_.Visibility = $elementVisibility
+    }
+}
--- a/functions/private/Set-PackageManagerPreference.ps1
+++ b/functions/private/Set-PackageManagerPreference.ps1
@ -1,43 +0,0 @@
-function Set-PackageManagerPreference {
-    <#
-    .SYNOPSIS
-        Sets the currently selected package manager to global "ManagerPreference" in sync.
-        Also persists preference across Winutil restarts via preference.ini.
-
-        Reads from preference.ini if no argument sent.
-
-    .PARAMETER 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/Show-OnlyCheckedApps.ps1
+++ b/functions/private/Show-OnlyCheckedApps.ps1
@ -0,0 +1,54 @@
+function Show-OnlyCheckedApps {
+    <#
+        .SYNOPSIS
+            Toggle between showing only the actively selected apps on the Install Tab and hiding everything else and displaying every app.
+            If no apps are selected, dont do anything
+        .PARAMETER appKeys
+            Expects a List of appKeys that are selected at the moment
+            If not provided, or empty, the function exits without any visual change to the ui
+        .EXAMPLE
+            Show-OnlyCheckedApps -appKeys $sync.SelectedApps
+            Show-OnlyCheckedApps -appKeys ("WPFInstallChrome", "WPFInstall7zip")
+    #>
+    param (
+        [Parameter(Mandatory=$false)]
+        [String[]]$appKeys
+    )
+    # If no apps are selected, do not allow switching to show only selected
+    if (($false -eq $sync.ShowOnlySelected) -and ($appKeys.Length -eq 0)) {
+        Write-Host "No apps selected"
+        $sync.wpfselectedfilter.IsChecked = $false
+        return
+    }
+    $sync.ShowOnlySelected = -not $sync.ShowOnlySelected
+    if ($sync.ShowOnlySelected) {
+        $sync.Buttons | Where-Object {$_.Name -like "ShowSelectedAppsButton"} | ForEach-Object {
+            $_.Content = "Show All"
+        }
+
+        $sync.ItemsControl.Items | Foreach-Object {
+            # Search for App Container and set them to visible
+            if ($_.Tag -like "CategoryWrapPanel_*") {
+                $_.Visibility = [Windows.Visibility]::Visible
+                # Iterate through all the apps in the container and set them to visible if they are in the appKeys array
+                $_.Children | ForEach-Object {
+                    if ($appKeys -contains $_.Tag) {
+                        $_.Visibility = [Windows.Visibility]::Visible
+                    }
+                    else {
+                        $_.Visibility = [Windows.Visibility]::Collapsed
+                    }
+                }
+            }
+            else {
+                # Set all other items to collapsed
+                $_.Visibility = [Windows.Visibility]::Collapsed
+            }
+        }
+    } else {
+        $sync.Buttons | Where-Object {$_.Name -like "ShowSelectedAppsButton"} | ForEach-Object {
+            $_.Content = "Show Selected"
+        }
+        Set-CategoryVisibility -Category "*"
+    }
+}
--- a/functions/private/Test-WinUtilPackageManager.ps1
+++ b/functions/private/Test-WinUtilPackageManager.ps1
@ -23,22 +23,14 @@ function Test-WinUtilPackageManager {
        # Check if Winget is available while getting it's Version if it's available
        $wingetExists = $true
        try {
-            $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]
-            }
+            $wingetVersionFull = winget --version
        } 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
@ -56,14 +48,13 @@ 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 = 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)
+            $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
            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
@ -1,120 +0,0 @@
-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
@ -26,14 +26,15 @@ function Invoke-WPFButton {
        "WPFStandard" {Invoke-WPFPresets "Standard" -checkboxfilterpattern "WPFTweak*"}
        "WPFMinimal" {Invoke-WPFPresets "Minimal" -checkboxfilterpattern "WPFTweak*"}
        "WPFClearTweaksSelection" {Invoke-WPFPresets -imported $true -checkboxfilterpattern "WPFTweak*"}
-        "WPFClearInstallSelection" {Invoke-WPFPresets -imported $true -checkboxfilterpattern "WPFInstall*"}
+        "WPFClearInstallSelection" {Invoke-WPFPresets -imported $true -checkboxfilterpattern "WPFInstall*"; Show-OnlyCheckedApps; $sync.wpfselectedfilter.IsChecked = $false}
+        "WPFSelectedFilter" {Show-OnlyCheckedApps -appKeys $sync.SelectedApps}
        "WPFtweaksbutton" {Invoke-WPFtweaksbutton}
        "WPFOOSUbutton" {Invoke-WPFOOSU}
        "WPFAddUltPerf" {Invoke-WPFUltimatePerformance -State "Enable"}
        "WPFRemoveUltPerf" {Invoke-WPFUltimatePerformance -State "Disable"}
        "WPFundoall" {Invoke-WPFundoall}
        "WPFFeatureInstall" {Invoke-WPFFeatureInstall}
-        "WPFPanelDISM" {Invoke-WPFSystemRepair}
+        "WPFPanelDISM" {Invoke-WPFPanelDISM}
        "WPFPanelAutologin" {Invoke-WPFPanelAutologin}
        "WPFPanelcontrol" {Invoke-WPFControlPanel -Panel $button}
        "WPFPanelnetwork" {Invoke-WPFControlPanel -Panel $button}
@ -43,7 +44,6 @@ 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}
@ -61,6 +61,10 @@ function Invoke-WPFButton {
        "WPFWinUtilInstallPSProfile" {Invoke-WinUtilInstallPSProfile}
        "WPFWinUtilUninstallPSProfile" {Invoke-WinUtilUninstallPSProfile}
        "WPFWinUtilSSHServer" {Invoke-WPFSSHServer}
-        "WPFselectedAppsButton" {$sync.selectedAppsPopup.IsOpen = -not $sync.selectedAppsPopup.IsOpen}
+        "WPFScanUpdates" {Invoke-WPFUpdatesScan}
+        "WPFShowUpdateHistory" { Invoke-WPFUpdateHistoryToggle }
+        "WPFUpdateSelectedInstall" {Invoke-WPFUpdateMGMT -Selected}
+        "WPFUpdateAllInstall" {Invoke-WPFUpdateMGMT -All}
+        "WPFUpdateScanHistory" {Invoke-WPFUpdateScanHistory}
    }
 }
--- a/functions/public/Invoke-WPFControlPanel.ps1
+++ b/functions/public/Invoke-WPFControlPanel.ps1
@ -19,6 +19,5 @@ 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,7 +6,19 @@ function Invoke-WPFFixesUpdate {
        Performs various tasks in an attempt to repair Windows Update

    .DESCRIPTION
-        1. (Aggressive Only) Scans the system for corruption using the Invoke-WPFSystemRepair function
+        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
        2. Stops Windows Update Services
        3. Remove the QMGR Data file, which stores BITS jobs
        4. (Aggressive Only) Renames the DataStore and CatRoot2 folders
@ -34,7 +46,104 @@ function Invoke-WPFFixesUpdate {
    Start-Sleep -Milliseconds 200

    if ($Aggressive) {
-        Invoke-WPFSystemRepair
+        # 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
    }


--- a/functions/public/Invoke-WPFFormVariables.ps1
+++ b/functions/public/Invoke-WPFFormVariables.ps1
@ -0,0 +1,36 @@
+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
@ -18,22 +18,24 @@ function Invoke-WPFGetInstalled {
    if (($sync.ChocoRadioButton.IsChecked -eq $false) -and ((Test-WinUtilPackageManager -winget) -eq "not-installed") -and $checkbox -eq "winget") {
        return
    }
-    $managerPreference = $sync["ManagerPreference"]
-
-    Invoke-WPFRunspace -ParameterList @(("managerPreference", $managerPreference),("checkbox", $checkbox)) -DebugPreference $DebugPreference -ScriptBlock {
+    $preferChoco = $sync.ChocoRadioButton.IsChecked
+    $sync.ItemsControl.Dispatcher.Invoke([action] {
+            $sync.ItemsControl.Items | ForEach-Object { $_.Visibility = [Windows.Visibility]::Collapsed }
+            $null = $sync.itemsControl.Items.Add($sync.LoadingLabel)
+        })
+    Invoke-WPFRunspace -ParameterList @(("preferChoco", $preferChoco),("checkbox", $checkbox),("ShowOnlyCheckedApps", ${function:Show-OnlyCheckedApps})) -DebugPreference $DebugPreference -ScriptBlock {
        param (
            [string]$checkbox,
-            [PackageManagers]$managerPreference
+            [boolean]$preferChoco,
+            [scriptblock]$ShowOnlyCheckedApps
        )
        $sync.ProcessRunning = $true
        $sync.form.Dispatcher.Invoke([action] { Set-WinUtilTaskbaritem -state "Indeterminate" })

        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 ($preferChoco) { $Checkboxes = Invoke-WinUtilCurrentSystem -CheckBox "choco" }
+            else { $Checkboxes = Invoke-WinUtilCurrentSystem -CheckBox $checkbox }
        }
        elseif ($checkbox -eq "tweaks") {
            Write-Host "Getting Installed Tweaks..."
@ -45,7 +47,11 @@ function Invoke-WPFGetInstalled {
                $sync.$checkbox.ischecked = $True
            }
        })
-
+        $sync.ItemsControl.Dispatcher.Invoke([action] {
+            $ShowOnlyCheckedApps.Invoke($sync.SelectedApps)
+            $sync["WPFSelectedFilter"].IsChecked = $true
+            $sync.ItemsControl.Items.Remove($sync.LoadingLabel)
+        })
        Write-Host "Done..."
        $sync.ProcessRunning = $false
        $sync.form.Dispatcher.Invoke([action] { Set-WinUtilTaskbaritem -state "None" })
--- a/functions/public/Invoke-WPFInstall.ps1
+++ b/functions/public/Invoke-WPFInstall.ps1
@ -21,19 +21,44 @@ function Invoke-WPFInstall {
        [System.Windows.MessageBox]::Show($WarningMsg, $AppTitle, [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
        return
    }
+    $ChocoPreference = $($sync.ChocoRadioButton.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()

-    $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]
+        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)

        try {
            $sync.ProcessRunning = $true
+            $errorPackages = @()
            if($packagesWinget.Count -gt 0) {
                Install-WinUtilWinget
                Install-WinUtilProgramWinget -Action Install -Programs $packagesWinget
--- a/functions/public/Invoke-WPFPanelDISM.ps1
+++ b/functions/public/Invoke-WPFPanelDISM.ps1
@ -0,0 +1,30 @@
+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-WPFSelectedAppsUpdate.ps1
+++ b/functions/public/Invoke-WPFSelectedAppsUpdate.ps1
@ -20,7 +20,7 @@ function Invoke-WPFSelectedAppsUpdate {

    $selectedAppsButton = $sync.WPFselectedAppsButton
    # Get the actual Name from the selectedAppLabel inside the Checkbox
-    $appKey = $checkbox.Parent.Tag
+    $appKey = $checkbox.Parent.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
--- a/functions/public/Invoke-WPFSystemRepair.ps1
+++ b/functions/public/Invoke-WPFSystemRepair.ps1
@ -1,124 +0,0 @@
-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
@ -29,30 +29,4 @@ function Invoke-WPFTab {
        }
    }
    $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-WPFUIApps.ps1
+++ b/functions/public/Invoke-WPFUIApps.ps1
@ -0,0 +1,22 @@
+function Invoke-WPFUIApps {
+    [OutputType([void])]
+    param(
+        [Parameter(Mandatory, Position = 0)]
+        [PSCustomObject[]]$Apps,
+        [Parameter(Mandatory, Position = 1)]
+        [string]$TargetGridName
+    )
+
+    switch ($TargetGridName) {
+        "appspanel" {
+            $dockPanel = Initialize-InstallAppsMainElement -TargetGridName $TargetGridName
+            $null = Initialize-InstallHeader -TargetElement $dockPanel
+            $sync.ItemsControl = Initialize-InstallAppArea -TargetElement $dockPanel
+            Initialize-InstallCategoryAppList -TargetElement $sync.ItemsControl -Apps $Apps
+        }
+        default {
+            Write-Output "$TargetGridName not yet implemented"
+        }
+    }
+}
+
--- a/functions/public/Invoke-WPFUIElements.ps1
+++ b/functions/public/Invoke-WPFUIElements.ps1
@ -93,6 +93,12 @@ 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
+        }
+
    }

    # Initialize panel count
@ -138,7 +144,7 @@ function Invoke-WPFUIElements {

            $label = New-Object Windows.Controls.Label
            $label.Content = $category -replace ".*__", ""
-            $label.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "HeaderFontSize")
+            $label.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "FontSizeHeading")
            $label.SetResourceReference([Windows.Controls.Control]::FontFamilyProperty, "HeaderFontFamily")
            $itemsControl.Items.Add($label) | Out-Null
            $sync[$category] = $label
--- a/functions/public/Invoke-WPFUnInstall.ps1
+++ b/functions/public/Invoke-WPFUnInstall.ps1
@ -29,20 +29,46 @@ function Invoke-WPFUnInstall {
    $confirm = [System.Windows.MessageBox]::Show($Messageboxbody, $MessageboxTitle, $ButtonType, $MessageIcon)

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

-    $ManagerPreference = $sync["ManagerPreference"]
+    Invoke-WPFRunspace -ArgumentList @(("PackagesToUninstall", $PackagesToUninstall),("ChocoPreference", $ChocoPreference)) -DebugPreference $DebugPreference -ScriptBlock {
+        param($PackagesToUninstall, $ChocoPreference, $DebugPreference)
+        if ($PackagesToUninstall.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()

-    Invoke-WPFRunspace -ArgumentList @(("PackagesToUninstall", $PackagesToInstall),("ManagerPreference", $ManagerPreference)) -DebugPreference $DebugPreference -ScriptBlock {
-        param($PackagesToUninstall, $ManagerPreference, $DebugPreference)
-
-        $packagesSorted = Get-WinUtilSelectedPackages -PackageList $PackagesToInstall -Preference $ManagerPreference
-        $packagesWinget = $packagesSorted[[PackageManagers]::Winget]
-        $packagesChoco = $packagesSorted[[PackageManagers]::Choco]
+        foreach ($package in $PackagesToUninstall) {
+            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($PackagesToUninstall)

        try {
            $sync.ProcessRunning = $true

-            # Uninstall all selected programs in new window
+            # Install all selected programs in new window
            if($packagesWinget.Count -gt 0) {
                Install-WinUtilProgramWinget -Action Uninstall -Programs $packagesWinget
            }
--- a/functions/public/Invoke-WPFUpdateHistoryToggle.ps1
+++ b/functions/public/Invoke-WPFUpdateHistoryToggle.ps1
@ -0,0 +1,11 @@
+function Invoke-WPFUpdateHistoryToggle {
+    if ($sync["WPFShowUpdateHistory"].Content -eq "Show History") {
+        $sync["WPFShowUpdateHistory"].Content = "Show available Updates"
+        $sync["HistoryGrid"].Visibility = "Visible"
+        $sync["UpdatesGrid"].Visibility = "Collapsed"
+    } else {
+        $sync["WPFShowUpdateHistory"].Content = "Show History"
+        $sync["HistoryGrid"].Visibility = "Collapsed"
+        $sync["UpdatesGrid"].Visibility = "Visible"
+    }
+}
--- a/functions/public/Invoke-WPFUpdateMGMGT.ps1
+++ b/functions/public/Invoke-WPFUpdateMGMGT.ps1
@ -0,0 +1,63 @@
+function Invoke-WPFUpdateMGMT {
+    param (
+        [switch]$Selected,
+        [switch]$All
+    )
+
+    if ((-not $Selected -and -not $All) -or ($Selected -and $All)) {
+        Write-Host "[Invoke-WPFUpdateMGMT] Use either 'Selected' or 'All' switches, used switches are: 'Selected' is $Selected, 'All' is $All" -ForegroundColor Red
+        return
+    }
+
+    $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
+
+    if ($All) {
+        Write-Host "Installing all available updates ..."
+        Invoke-WPFRunspace -ArgumentList $sync["WPFUpdateVerbose"].IsChecked -DebugPreference $DebugPreference -ScriptBlock {
+            param ($WPFUpdateVerbose)
+            if ($WPFUpdateVerbose) {
+                Install-WindowsUpdate -Verbose -Confirm:$false -IgnoreReboot:$true -IgnoreRebootRequired:$true
+            } else {
+                Install-WindowsUpdate -Confirm:$false -IgnoreReboot:$true -IgnoreRebootRequired:$true
+            }
+            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" })
+            Write-Host "All Update Processes Completed"
+            #catch $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" -overlay "warning" })
+        }
+    } elseif (($Selected) -and ($sync["WPFUpdatesList"].SelectedItems.Count -gt 0)) {
+        write-host "Installing selected updates..."
+        $selectedUpdates = $sync["WPFUpdatesList"].SelectedItems | ForEach-Object {
+            [PSCustomObject]@{
+                ComputerName = $_.ComputerName
+                Title        = $_.LongTitle
+                KB           = $_.KB
+                Size         = $_.Size
+            }
+        }
+        Invoke-WPFRunspace -ParameterList @(("selectedUpdates", $selectedUpdates), ("WPFUpdateVerbose", $sync["WPFUpdateVerbose"].IsChecked)) -DebugPreference $DebugPreference -ScriptBlock {
+            param ($selectedUpdates, $WPFUpdateVerbose)
+            foreach ($update in $selectedUpdates) {
+                Write-Host "Installing update $($update.Title) on $($update.ComputerName)"
+                if ($update.KB -ne "") {
+                    if ($WPFUpdateVerbose) {
+                        Get-WindowsUpdate -ComputerName $update.ComputerName -KBArticleID $update.KB -Install -Confirm:$false -Verbose -IgnoreReboot:$true -IgnoreRebootRequired:$true
+                    } else {
+                        Get-WindowsUpdate -ComputerName $update.ComputerName -KBArticleID $update.KB -Install -Confirm:$false -IgnoreReboot:$true -IgnoreRebootRequired:$true
+                    }
+                } else {
+                    if ($WPFUpdateVerbose) {
+                        Get-WindowsUpdate -ComputerName $update.ComputerName -Title "$($update.Title)" -Install -Confirm:$false -Verbose -IgnoreReboot:$true -IgnoreRebootRequired:$true
+                    } else {
+                        Get-WindowsUpdate -ComputerName $update.ComputerName -Title "$($update.Title)" -Install -Confirm:$false -IgnoreReboot:$true -IgnoreRebootRequired:$true
+                    }
+                }
+            }
+            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" })
+            Write-Host "Selected Update Processes Completed"
+            #catch $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" -overlay "warning" })
+        }
+    } else {
+        Write-Host "No updates selected"
+        return
+    }
+}
--- a/functions/public/Invoke-WPFUpdateScanHistory.ps1
+++ b/functions/public/Invoke-WPFUpdateScanHistory.ps1
@ -0,0 +1,49 @@
+function Invoke-WPFUpdateScanHistory {
+    $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo" })
+    $sync["WPFUpdateHistory"].Items.Clear()
+    Invoke-WPFRunspace -DebugPreference $DebugPreference -ScriptBlock {
+        write-host "Scanning for Windows update history..."
+        $UpdateHistory = Get-WUHistory -Last 50 -ErrorAction SilentlyContinue
+        if ($UpdateHistory) {
+            foreach ($update in $UpdateHistory) {
+                $item = New-Object PSObject -Property @{
+                    ComputerName = $update.ComputerName
+                    Result       = $update.Result
+                    Title        = $update.Title -replace '\s*\(KB\d+\)', '' -replace '\s*KB\d+\b', '' # Remove KB number from title, first in parentheses, then standalone
+                    KB           = $update.KB
+                    Date         = $update.Date
+                }
+                $Computers = $item | Select-Object -ExpandProperty ComputerName -Unique
+                $sync.form.Dispatcher.Invoke([action] {
+                    $sync["WPFUpdateHistory"].Items.Add($item)
+                    if ($item.Result -eq "Succeeded") {
+                        # does not work : $sync["WPFUpdateHistory"].Items[$sync["WPFUpdateHistory"].Items.Count - 1].Foreground = "Green"
+                        #write-host "$($item.Title) was successful"
+                    }
+                    elseif ($item.Result -eq "Failed") {
+                        # does not work : $sync["WPFUpdateHistory"].Items[$sync["WPFUpdateHistory"].Items.Count - 1].Foreground = "Red"
+                        #write-host "$($item.Title) failed"
+                    }
+                })
+            }
+            write-host "Found $($UpdateHistory.Count) updates."
+            $sync.form.Dispatcher.Invoke([action] {
+                if ($Computers.Count -gt 1) {
+                    $sync["WPFUpdateHistory"].Columns[0].Visibility = "Visible"
+                }
+                else {
+                    Write-Debug "Hiding ComputerName column, only $item.ComputerName"
+                    $sync["WPFUpdateHistory"].Columns[0].Visibility = "Collapsed"
+                }
+            })
+            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" })
+            #catch $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" -overlay "warning" })
+        }
+        else {
+            $sync.form.Dispatcher.Invoke([action] {
+                $sync["WPFUpdateHistory"].Items.Clear()
+            })
+            Write-Host "No update history available."
+        }
+    }
+}
--- a/functions/public/Invoke-WPFUpdatesScan.ps1
+++ b/functions/public/Invoke-WPFUpdatesScan.ps1
@ -0,0 +1,67 @@
+function Invoke-WPFUpdatesScan {
+    $sync["WPFScanUpdates"].IsEnabled = $false
+    $sync["WPFUpdateSelectedInstall"].IsEnabled = $false
+    $sync["WPFUpdateAllInstall"].IsEnabled = $false
+    Set-WinUtilTaskbaritem -state "Indeterminate" -value 0.01 -overlay "logo"
+    Invoke-WPFRunspace -DebugPreference $DebugPreference -ScriptBlock {
+        # Check if the PSWindowsUpdate module is installed
+        if (-not (Get-Module -ListAvailable -Name PSWindowsUpdate)) {
+            try {
+                Write-Host "PSWindowsUpdate module not found. Attempting to install..."
+                Install-Module -Name PSWindowsUpdate -Force -Scope CurrentUser
+                Write-Host "PSWindowsUpdate module installed successfully."
+            }
+            catch {
+                Write-Error "Failed to install PSWindowsUpdate module: $_"
+                $sync.form.Dispatcher.Invoke([action] { $sync["WPFScanUpdates"].IsEnabled = $true })
+                return
+            }
+        }
+
+        # Import the module
+        try {
+            Import-Module PSWindowsUpdate -ErrorAction Stop
+            Write-Host "PSWindowsUpdate module imported successfully."
+        }
+        catch {
+            Write-Error "Failed to import PSWindowsUpdate module: $_"
+            $sync.form.Dispatcher.Invoke([action] { $sync["WPFScanUpdates"].IsEnabled = $true })
+            return
+        }
+
+        try {
+            $sync.form.Dispatcher.Invoke([action] { $sync["WPFUpdatesList"].Items.Clear() })
+            Write-Host "Scanning for Windows updates..."
+            $updates = Get-WindowsUpdate -ErrorAction Stop
+            Write-Host "Found $($updates.Count) updates."
+
+            $sync.form.Dispatcher.Invoke([action] {
+                foreach ($update in $updates) {
+                    $item = New-Object PSObject -Property @{
+                        LongTitle = $update.Title
+                        ComputerName = $update.ComputerName
+                        KB = $update.KB
+                        Size = $update.Size
+                        Title = $update.Title -replace '\s*\(KB\d+\)', '' -replace '\s*KB\d+\b', '' # Remove KB number from title, first in parentheses, then standalone
+                        Status = "Not Installed"
+                    }
+                    $Computers = $item | Select-Object -ExpandProperty ComputerName -Unique
+                    $sync["WPFUpdatesList"].Items.Add($item)
+                }
+                if ($Computers.Count -gt 1) {
+                    $sync["WPFUpdatesList"].Columns[0].Visibility = "Visible"
+                } else {
+                    Write-Debug "Hiding ComputerName column, only $item.ComputerName"
+                    $sync["WPFUpdatesList"].Columns[0].Visibility = "Collapsed"
+                }
+            })
+            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" })
+        } catch {
+            Write-Error "Error scanning for updates: $_"
+            $sync.form.Dispatcher.Invoke([action]{ Set-WinUtilTaskbaritem -state "Error" -overlay "warning" })
+        }
+    }
+    $sync["WPFScanUpdates"].IsEnabled = $false
+    $sync["WPFUpdateSelectedInstall"].IsEnabled = $false
+    $sync["WPFUpdateAllInstall"].IsEnabled = $false
+}
--- 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
-  Invoke-WPFRunspace -ParameterList @(,("tweaks",$tweaks)) -DebugPreference $DebugPreference -ScriptBlock {
+  $tweaksHandle = Invoke-WPFRunspace -ParameterList @(,("tweaks",$tweaks)) -DebugPreference $DebugPreference -ScriptBlock {
    param(
      $tweaks,
      $DebugPreference
--- a/functions/public/Show-CTTLogo.ps1
+++ b/functions/public/Show-CTTLogo.ps1
@ -1,38 +0,0 @@
-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,6 +3,7 @@
 {% 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,12 +1,3 @@
-# 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
@ -55,6 +46,7 @@ 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')
@ -117,6 +109,9 @@ $sync.Form.Add_Loaded({
 Invoke-WinutilThemeChange -init $true
 # Load the configuration files

+$noimage = "https://images.emojiterra.com/google/noto-emoji/unicode-15/color/512px/1f4e6.png"
+$noimage = [Windows.Media.Imaging.BitmapImage]::new([Uri]::new($noimage))
+
 $sync.configs.applicationsHashtable = @{}
 $sync.configs.applications.PSObject.Properties | ForEach-Object {
    $sync.configs.applicationsHashtable[$_.Name] = $_.Value
@ -124,14 +119,18 @@ $sync.configs.applications.PSObject.Properties | ForEach-Object {

 # 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"
+# Add logic to handle click to the ToggleView Button on the Install Tab
+$sync.WPFToggleView.Add_Click({
+    $sync.CompactView = -not $sync.CompactView
+    Update-AppTileProperties
+    if ($sync.SearchBar.Text -eq "") {
+        Set-CategoryVisibility -Category "*"
+    }
+})
+Invoke-WPFUIApps -Apps $sync.configs.applicationsHashtable -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

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

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

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

 $sync.keys | ForEach-Object {
@ -187,13 +184,14 @@ $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 = $oldProgressPreference
+        $ProgressPreference = "Continue"
    }

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

 # Print the logo
-Show-CTTLogo
+Invoke-WPFFormVariables
+$sync.CompactView = $false
+$sync.Form.Resources.AppTileWidth = [double]::NaN
+$sync.Form.Resources.AppTileCompactVisibility = [Windows.Visibility]::Visible
+$sync.Form.Resources.AppTileFontSize = [double]16
+$sync.Form.Resources.AppTileMargins = [Windows.Thickness]5
+$sync.Form.Resources.AppTileBorderThickness = [Windows.Thickness]0
+function Update-AppTileProperties {
+    if ($sync.CompactView -eq $true) {
+        $sync.Form.Resources.AppTileWidth = [double]::NaN
+        $sync.Form.Resources.AppTileCompactVisibility = [Windows.Visibility]::Collapsed
+        $sync.Form.Resources.AppTileFontSize = [double]12
+        $sync.Form.Resources.AppTileMargins = [Windows.Thickness]2
+        $sync.Form.Resources.AppTileBorderThickness = [Windows.Thickness]0
+    }
+    else {
+        $sync.Form.Resources.AppTileWidth = $sync.ItemsControl.ActualWidth -20
+        $sync.Form.Resources.AppTileCompactVisibility = [Windows.Visibility]::Visible
+        $sync.Form.Resources.AppTileFontSize = [double]16
+        $sync.Form.Resources.AppTileMargins = [Windows.Thickness]5
+        $sync.Form.Resources.AppTileBorderThickness = [Windows.Thickness]1
+    }
+}
+# We need to update the app tile properties when the form is resized because to fill a WrapPanel update the width of the elemenmt manually (afaik)
+$sync.Form.Add_SizeChanged({
+    Update-AppTileProperties
+})

 # Progress bar in taskbaritem > Set-WinUtilProgressbar
 $sync["Form"].TaskbarItemInfo = New-Object System.Windows.Shell.TaskbarItemInfo
@ -222,42 +246,55 @@ $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
    }

-    # Handle key presses of single keys
-    switch ($_.Key) {
-        "Escape" { $sync.SearchBar.Text = "" }
+    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 Alt key combinations for navigation
    if ($_.KeyboardDevice.Modifiers -eq "Alt") {
-        $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
+        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)"
        }
    }
-    # 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
+    # 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 = ""
        }
+        $sync.SearchBar.Focus()
    }
 }
+
 $sync["Form"].Add_PreViewKeyDown($commonKeyEvents)

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

 $sync["Form"].Add_MouseDoubleClick({
-    if ($_.OriginalSource.Name -eq "NavDockPanel" -or
-        $_.OriginalSource.Name -eq "GridBesideNavDockPanel") {
+    if ($_.OriginalSource -is [System.Windows.Controls.Grid] -or
+        $_.OriginalSource -is [System.Windows.Controls.StackPanel]) {
            if ($sync["Form"].WindowState -eq [Windows.WindowState]::Normal) {
                $sync["Form"].WindowState = [Windows.WindowState]::Maximized
            }
@ -283,6 +320,55 @@ $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
@ -297,12 +383,9 @@ $sync["Form"].Add_ContentRendered({
        Write-Debug "Primary Monitor Height: $screenHeight pixels"

        # Compare with the primary monitor size
-        if ($sync.Form.ActualWidth -gt $screenWidth -or $sync.Form.ActualHeight -gt $screenHeight) {
+        if ($width -gt $screenWidth -or $height -gt $screenHeight) {
            Write-Debug "The specified width and/or height is greater than the primary monitor size."
-            $sync.Form.Left = 0
-            $sync.Form.Top = 0
-            $sync.Form.Width = $screenWidth
-            $sync.Form.Height = $screenHeight
+            [void][Window]::MoveWindow($windowHandle, 0, 0, $screenWidth, $screenHeight, $True)
        } else {
            Write-Debug "The specified width and height are within the primary monitor size limits."
        }
@ -376,34 +459,17 @@ 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
-
-$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"
    }
-    if ($searchBarTimer.IsEnabled) {
-        $searchBarTimer.Stop()
+    switch ($sync.currentTab) {
+        "Install" {
+            Find-AppsByNameOrDescription -SearchString $sync.SearchBar.Text
+        }
    }
-    $searchBarTimer.Start()
 })

 $sync["Form"].Add_Loaded({
@ -442,36 +508,44 @@ $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"
@ -479,8 +553,7 @@ $sync["AboutMenuItem"].Add_Click({

    $authorInfo = @"
 Author   : <a href="https://github.com/ChrisTitusTech">@christitustech</a>
-UI       : <a href="https://github.com/MyDrift-user">@MyDrift-user</a>, <a href="https://github.com/Marterich">@Marterich</a>
-Runspace : <a href="https://github.com/DeveloperDurp">@DeveloperDurp</a>, <a href="https://github.com/Marterich">@Marterich</a>
+Runspace : <a href="https://github.com/DeveloperDurp">@DeveloperDurp</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>
@ -506,5 +579,7 @@ $sync["SponsorMenuItem"].Add_Click({
    Show-CustomDialog -Title "Sponsors" -Message $authorInfo -EnableScroll $true
 })

+
+
 $sync["Form"].ShowDialog() | out-null
 Stop-Transcript
--- a/scripts/start.ps1
+++ b/scripts/start.ps1
@ -40,7 +40,9 @@ $sync.configs = @{}
 $sync.Buttons = [System.Collections.Generic.List[PSObject]]::new()
 $sync.ProcessRunning = $false
 $sync.selectedApps = [System.Collections.Generic.List[string]]::new()
+$sync.ShowOnlySeleced = $false
 $sync.currentTab = "Install"
+$sync.ShowOnlySelected = $false
 $sync.selectedAppsStackPanel
 $sync.selectedAppsPopup

@ -52,27 +54,21 @@ 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 ($PSCommandPath) {
-        "& { & `'$($PSCommandPath)`' $($argList -join ' ') }"
+    $script = if ($MyInvocation.MyCommand.Path) {
+        "& { & '$($MyInvocation.MyCommand.Path)' $argList }"
    } else {
-        "&([ScriptBlock]::Create((irm https://github.com/ChrisTitusTech/winutil/releases/latest/download/winutil.ps1))) $($argList -join ' ')"
+        "iex '& { $(irm https://github.com/ChrisTitusTech/winutil/releases/latest/download/winutil.ps1) } $argList'"
    }

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

-    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
-    }
+    Start-Process $processCmd -ArgumentList "$powershellcmd -ExecutionPolicy Bypass -NoProfile -Command $script" -Verb RunAs

    break
 }
@ -84,5 +80,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 = "WinUtil (Admin)"
+$Host.UI.RawUI.WindowTitle = $myInvocation.MyCommand.Definition + "(Admin)"
 clear-host
--- a/tools/Invoke-Preprocessing.ps1
+++ b/tools/Invoke-Preprocessing.ps1
@ -3,9 +3,15 @@ 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).
+        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.

        .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.
@ -30,23 +36,35 @@ 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(Mandatory, position=1)]
+        [Parameter(position=0)]
+        [switch]$SkipExcludedFilesValidation,
+
+        [Parameter(position=1)]
+        [switch]$ThrowExceptionOnEmptyFilesList,
+
+        [Parameter(Mandatory, position=2)]
        [ValidateScript({[System.IO.Path]::IsPathRooted($_)})]
        [string]$WorkingDir,

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

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

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

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

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

-    # Define a path to store the file hashes
-    $hashFilePath = Join-Path -Path $WorkingDir -ChildPath ".preprocessor_hashes.json"
-
-    # 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
+    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
+        }
    }

    for ($i = 0; $i -lt $numOfFiles; $i++) {
@ -151,13 +139,9 @@ 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,34 +12,19 @@
        Height="Auto"
        MaxWidth="1380"
        MaxHeight="800"
-        Title="WinUtil">
+        Title="Chris Titus Tech's Windows Utility">
    <WindowChrome.WindowChrome>
        <WindowChrome CaptionHeight="0" CornerRadius="10"/>
    </WindowChrome.WindowChrome>
    <Window.Resources>
    <Style TargetType="ToolTip">
-        <Setter Property="Background" Value="{DynamicResource ToolTipBackgroundColor}"/>
+        <Setter Property="Background" Value="{DynamicResource MainBackgroundColor}"/>
        <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource BorderColor}"/>
-        <Setter Property="MaxWidth" Value="{DynamicResource ToolTipWidth}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonBackgroundSelectedColor}"/>
        <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}">
@ -82,89 +67,7 @@
            </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" />
@ -294,6 +197,45 @@
            <Setter Property="Background" Value="{DynamicResource LabelBackgroundColor}"/>
            <Setter Property="FontFamily" Value="{DynamicResource FontFamily}"/>
        </Style>
+        <!-- Category Toggle Button Style for the Apps Window-->
+        <Style x:Key="CategoryToggleButtonStyle" TargetType="ToggleButton">
+            <Setter Property="Foreground" Value="{DynamicResource LabelboxForegroundColor}"/>
+            <Setter Property="Background" Value="{DynamicResource MainBackgroundColor}"/>
+            <Setter Property="FontFamily" Value="{DynamicResource HeaderFontFamily}"/>
+            <Setter Property="FontSize" Value="{DynamicResource FontSizeHeading}"/>
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="HorizontalContentAlignment" Value="Left"/>
+            <Setter Property="Padding" Value="10,2,10,2"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ToggleButton">
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{DynamicResource BorderColor}"
+                                BorderThickness="0"
+                                CornerRadius="{DynamicResource ButtonCornerRadius}">
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+                                <TextBlock x:Name="PrefixTextBlock"/>
+                                <ContentPresenter Content="{TemplateBinding Content}" />
+                            </StackPanel>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsChecked" Value="True">
+                                <Setter TargetName="PrefixTextBlock" Property="Text" Value="[-] "/>
+                            </Trigger>
+                            <Trigger Property="IsChecked" Value="False">
+                                <Setter TargetName="PrefixTextBlock" Property="Text" Value="[+] "/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+                <Trigger Property="IsMouseOver" Value="True">
+                    <Setter Property="Background" Value="{DynamicResource ButtonBackgroundMouseoverColor}"/>
+                </Trigger>
+            </Style.Triggers>
+        </Style>

        <!-- TextBlock template -->
        <Style TargetType="TextBlock">
@ -560,6 +502,19 @@
                 </Setter.Value>
            </Setter>
        </Style>
+    <!-- Collapsed Checkbox Style -->
+    <Style x:Key="CollapsedCheckBoxStyle" TargetType="CheckBox">
+        <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 TargetType="RadioButton">
            <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}"/>
            <Setter Property="Background" Value="{DynamicResource MainBackgroundColor}"/>
@ -887,6 +842,182 @@
                </MultiDataTrigger>
            </Style.Triggers>
        </Style>
+        <Style TargetType="DataGrid">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource BorderColor}" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="FontSize" Value="{DynamicResource FontSize}" />
+            <Setter Property="FontFamily" Value="{DynamicResource FontFamily}" />
+            <Setter Property="RowBackground" Value="Transparent" />
+            <Setter Property="AlternatingRowBackground" Value="{DynamicResource AlternatingRowBackgroundColor}" />
+            <Setter Property="GridLinesVisibility" Value="None" />
+            <Setter Property="HeadersVisibility" Value="Column" />
+            <Setter Property="HorizontalScrollBarVisibility" Value="Auto" />
+            <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+            <Setter Property="SelectionMode" Value="Extended" />
+            <Setter Property="SelectionUnit" Value="FullRow" />
+            <Setter Property="CanUserAddRows" Value="False" />
+            <Setter Property="CanUserDeleteRows" Value="False" />
+            <Setter Property="CanUserReorderColumns" Value="False" />
+            <Setter Property="CanUserResizeRows" Value="True" />
+            <Setter Property="CanUserSortColumns" Value="True" />
+            <Setter Property="AutoGenerateColumns" Value="False" />
+            <Setter Property="Margin" Value="0,10,0,10" />
+            <Setter Property="CellStyle">
+                <Setter.Value>
+                    <Style TargetType="DataGridCell">
+                        <Setter Property="Padding" Value="10,6" />
+                        <Setter Property="BorderThickness" Value="0" />
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="DataGridCell">
+                                    <Border Background="{TemplateBinding Background}"
+                                            BorderBrush="{TemplateBinding BorderBrush}"
+                                            BorderThickness="{TemplateBinding BorderThickness}"
+                                            CornerRadius="4"
+                                            Margin="2,1"
+                                            Padding="{TemplateBinding Padding}">
+                                        <ContentPresenter VerticalAlignment="Center" />
+                                    </Border>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                        <Style.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Background" Value="{DynamicResource ButtonBackgroundMouseoverColor}" />
+                                <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}" />
+                            </Trigger>
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter Property="Background" Value="{DynamicResource ButtonBackgroundSelectedColor}" />
+                                <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}" />
+                                <Setter Property="BorderThickness" Value="0" />
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="RowStyle">
+                <Setter.Value>
+                    <Style TargetType="DataGridRow">
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}" />
+                        <Setter Property="MinHeight" Value="35" />
+                        <Setter Property="VerticalContentAlignment" Value="Center" />
+                        <Setter Property="Margin" Value="0,1" />
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="DataGridRow">
+                                    <Border x:Name="RowBorder"
+                                            BorderThickness="0"
+                                            BorderBrush="{DynamicResource BorderColor}"
+                                            Background="{TemplateBinding Background}"
+                                            CornerRadius="6"
+                                            Margin="4,2"
+                                            SnapsToDevicePixels="True">
+                                        <SelectiveScrollingGrid>
+                                            <SelectiveScrollingGrid.ColumnDefinitions>
+                                                <ColumnDefinition Width="Auto"/>
+                                                <ColumnDefinition Width="*"/>
+                                            </SelectiveScrollingGrid.ColumnDefinitions>
+                                            <SelectiveScrollingGrid.RowDefinitions>
+                                                <RowDefinition Height="*"/>
+                                                <RowDefinition Height="Auto"/>
+                                            </SelectiveScrollingGrid.RowDefinitions>
+                                            <DataGridCellsPresenter Grid.Column="1"
+                                                                  ItemsPanel="{TemplateBinding ItemsPanel}"
+                                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                            <DataGridDetailsPresenter Grid.Column="1" Grid.Row="1"
+                                                                   Visibility="{TemplateBinding DetailsVisibility}"
+                                                                   SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen,
+                                                                                                                                 RelativeSource={RelativeSource AncestorType={x:Type DataGrid}},
+                                                                                                                                 Converter={x:Static DataGrid.RowDetailsScrollingConverter},
+                                                                                                                                 ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}}"/>
+                                            <DataGridRowHeader Grid.RowSpan="2"
+                                                            SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical"
+                                                            Visibility="{Binding HeadersVisibility,
+                                                                                 RelativeSource={RelativeSource AncestorType={x:Type DataGrid}},
+                                                                                 Converter={x:Static DataGrid.HeadersVisibilityConverter},
+                                                                                 ConverterParameter={x:Static DataGridHeadersVisibility.Row}}"/>
+                                        </SelectiveScrollingGrid>
+                                    </Border>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                        <Style.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Background" Value="{DynamicResource ButtonBackgroundMouseoverColor}" />
+                                <Setter Property="Effect">
+                                    <Setter.Value>
+                                        <DropShadowEffect ShadowDepth="0" BlurRadius="5" Opacity="0.2" Color="#000000" />
+                                    </Setter.Value>
+                                </Setter>
+                            </Trigger>
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter Property="Background" Value="{DynamicResource ButtonBackgroundSelectedColor}" />
+                                <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}" />
+                                <Setter Property="Effect">
+                                    <Setter.Value>
+                                        <DropShadowEffect ShadowDepth="1" BlurRadius="7" Opacity="0.3" Color="#000000" />
+                                    </Setter.Value>
+                                </Setter>
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="ColumnHeaderStyle">
+                <Setter.Value>
+                    <Style TargetType="DataGridColumnHeader">
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundColor}" />
+                        <Setter Property="FontSize" Value="{DynamicResource FontSize}" />
+                        <Setter Property="FontFamily" Value="{DynamicResource FontFamily}" />
+                        <Setter Property="FontWeight" Value="SemiBold" />
+                        <Setter Property="Padding" Value="10,8" />
+                        <Setter Property="BorderThickness" Value="0" />
+                        <Setter Property="HorizontalContentAlignment" Value="Left" />
+                        <Setter Property="VerticalContentAlignment" Value="Center" />
+                        <Setter Property="Margin" Value="2,0" />
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="DataGridColumnHeader">
+                                    <Grid>
+                                        <Border Background="{TemplateBinding Background}"
+                                                BorderBrush="{DynamicResource BorderColor}"
+                                                BorderThickness="0,0,0,1"
+                                                Padding="{TemplateBinding Padding}">
+                                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                            SnapsToDevicePixels="True" />
+                                        </Border>
+                                        <Path x:Name="SortArrow" Visibility="Collapsed"
+                                              HorizontalAlignment="Right" VerticalAlignment="Center"
+                                              Margin="0,0,5,0" Fill="{DynamicResource ButtonForegroundColor}"
+                                              Width="8" Height="6" Stretch="Fill" />
+                                    </Grid>
+                                    <ControlTemplate.Triggers>
+                                        <Trigger Property="SortDirection" Value="Ascending">
+                                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible"/>
+                                            <Setter TargetName="SortArrow" Property="Data" Value="M 0,5 L 8,5 L 4,0 Z"/>
+                                        </Trigger>
+                                        <Trigger Property="SortDirection" Value="Descending">
+                                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible"/>
+                                            <Setter TargetName="SortArrow" Property="Data" Value="M 0,0 L 8,0 L 4,5 Z"/>
+                                        </Trigger>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                        <Style.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Foreground" Value="{DynamicResource LinkHoverForegroundColor}" />
+                            </Trigger>
+                        </Style.Triggers>
+                    </Style>
+                </Setter.Value>
+            </Setter>
+        </Style>
    </Window.Resources>
    <Grid Background="{DynamicResource MainBackgroundColor}" ShowGridLines="False" Name="WPFMainGrid" Width="Auto" Height="Auto" HorizontalAlignment="Stretch">
        <Grid.RowDefinitions>
@ -896,7 +1027,7 @@
        <Grid.ColumnDefinitions>
            <ColumnDefinition Width="*"/>
        </Grid.ColumnDefinitions>
-        <DockPanel Name="NavDockPanel" HorizontalAlignment="Stretch" Background="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True" Grid.Row="0" Width="Auto">
+        <DockPanel 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}"
@ -939,7 +1070,7 @@
                    </TextBlock>
                </ToggleButton.Content>
            </ToggleButton>
-            <Grid Name="GridBesideNavDockPanel" Background="{DynamicResource MainBackgroundColor}" ShowGridLines="False" Width="Auto" Height="Auto" HorizontalAlignment="Stretch">
+            <Grid 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 -->
@ -1177,100 +1308,232 @@
                </ScrollViewer>
            </TabItem>
            <TabItem Header="Updates" Visibility="Collapsed" Name="WPFTab4">
-                <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="{DynamicResource TabContentMargin}">
+                <!-- <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="{DynamicResource TabContentMargin}"> -->
                    <Grid Background="Transparent">
                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>  <!-- Row for the 3 columns -->
-                            <RowDefinition Height="Auto"/>  <!-- Row for Windows Version -->
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="Auto"/>
                        </Grid.RowDefinitions>

-                        <!-- Three columns container -->
                        <Grid Grid.Row="0">
                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="200"/>
                                <ColumnDefinition Width="*"/>
                            </Grid.ColumnDefinitions>

-                            <!-- Default Settings -->
-                            <Border Grid.Column="0" Style="{StaticResource BorderStyle}">
-                                <StackPanel>
+                            <!-- Left Column - Update Options -->
+                            <Border Grid.Column="0" Style="{StaticResource BorderStyle}" VerticalAlignment="Stretch">
+                                <StackPanel Margin="5">
+                                    <TextBlock Text="Update Presets" Margin="0,0,0,5"/>
                                    <Button Name="WPFFixesUpdate"
-                                            FontSize="{DynamicResource ConfigTabButtonFontSize}"
-                                            Content="Default Settings"
-                                            Margin="10,5"
-                                            Padding="10"/>
-                                    <TextBlock Margin="10"
-                                             TextWrapping="Wrap"
-                                             Foreground="{DynamicResource MainForegroundColor}">
-                                        <Run FontWeight="Bold">Default Windows Update Configuration</Run>
-                                        <LineBreak/>
-                                         - No modifications to Windows defaults
-                                        <LineBreak/>
-                                         - Removes any custom update settings
-                                        <LineBreak/><LineBreak/>
-                                        <Run FontStyle="Italic" FontSize="11">Note: This resets your Windows Update settings to default out of the box settings. It removes ANY policy or customization that has been done to Windows Update.</Run>
-                                    </TextBlock>
-                                </StackPanel>
-                            </Border>
+                                            Content="Default"
+                                            Width="Auto"
+                                            Margin="0,2"
+                                            ToolTip="Default Windows Update Configuration&#x0a;- No modifications to Windows defaults&#x0a;- Removes any custom update settings&#x0a;&#x0a;Note: This resets your Windows Update settings to default out of the box settings. It removes ANY policy or customization that has been done to Windows Update."/>

-                            <!-- Security Settings -->
-                            <Border Grid.Column="1" Style="{StaticResource BorderStyle}">
-                                <StackPanel>
                                    <Button Name="WPFUpdatessecurity"
-                                            FontSize="{DynamicResource ConfigTabButtonFontSize}"
-                                            Content="Security Settings"
-                                            Margin="10,5"
-                                            Padding="10"/>
-                                    <TextBlock Margin="10"
-                                             TextWrapping="Wrap"
-                                             Foreground="{DynamicResource MainForegroundColor}">
-                                        <Run FontWeight="Bold">Balanced Security Configuration</Run>
-                                        <LineBreak/>
-                                         - Feature updates delayed by 2 years
-                                        <LineBreak/>
-                                         - Security updates installed after 4 days
-                                        <LineBreak/><LineBreak/>
-                                        <Run FontWeight="SemiBold">Feature Updates:</Run> New features and potential bugs
-                                        <LineBreak/>
-                                        <Run FontWeight="SemiBold">Security Updates:</Run> Critical security patches
-                                    <LineBreak/><LineBreak/>
-                                    <Run FontStyle="Italic" FontSize="11">Note: This only applies to Pro systems that can use group policy.</Run>
-                                    </TextBlock>
-                                </StackPanel>
-                            </Border>
+                                            Content="Security"
+                                            Width="Auto"
+                                            Margin="0,2"
+                                            ToolTip="Balanced Security Configuration&#x0a;- Feature updates delayed by 2 years&#x0a;- Security updates installed after 4 days&#x0a;&#x0a;Feature Updates: New features and potential bugs&#x0a;Security Updates: Critical security patches&#x0a;&#x0a;Note: This only applies to Pro systems that can use group policy."/>

-                            <!-- Disable Updates -->
-                            <Border Grid.Column="2" Style="{StaticResource BorderStyle}">
-                                <StackPanel>
                                    <Button Name="WPFUpdatesdisable"
-                                            FontSize="{DynamicResource ConfigTabButtonFontSize}"
-                                            Content="Disable All Updates"
+                                            Content="Disable"
+                                            Width="Auto"
                                            Foreground="Red"
-                                            Margin="10,5"
-                                            Padding="10"/>
-                                    <TextBlock Margin="10"
-                                             TextWrapping="Wrap"
-                                             Foreground="{DynamicResource MainForegroundColor}">
-                                        <Run FontWeight="Bold" Foreground="Red">!! Not Recommended !!</Run>
-                                        <LineBreak/>
-                                         - Disables ALL Windows Updates
-                                        <LineBreak/>
-                                         - Increases security risks
-                                        <LineBreak/>
-                                         - Only use for isolated systems
-                                        <LineBreak/><LineBreak/>
-                                        <Run FontStyle="Italic" FontSize="11">Warning: Your system will be vulnerable without security updates.</Run>
-                                    </TextBlock>
+                                            Margin="0,2"
+                                            ToolTip="!! Not Recommended !!&#x0a;- Disables ALL Windows Updates&#x0a;- Increases security risks&#x0a;- Only use for isolated systems&#x0a;&#x0a;Warning: Your system will be vulnerable without security updates."/>
                                </StackPanel>
                            </Border>
+
+                            <!-- Right Column - Updates List -->
+                            <Border Grid.Column="1" Style="{StaticResource BorderStyle}" VerticalAlignment="Stretch">
+                                <Grid Margin="5,0,0,0">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="*"/>
+                                    </Grid.RowDefinitions>
+
+                                    <!-- Toggle button at the top -->
+                                    <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Right" Margin="5">
+                                        <ToggleButton Name="WPFShowUpdateHistory"
+                                                    Content="Show History"
+                                                    Style="{StaticResource ToggleButtonStyle}"
+                                                    Margin="5"
+                                                    Padding="10,5"
+                                                    ToolTip="Toggle between pending updates and update history"/>
+                                    </StackPanel>
+
+                                    <!-- Updates Grid - Visible by default -->
+                                    <Grid Grid.Row="1" Name="UpdatesGrid" Visibility="Visible">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto"/>
+                                            <RowDefinition Height="*"/>
+                                            <RowDefinition Height="Auto"/>
+                                        </Grid.RowDefinitions>
+
+                                        <Button Name="WPFScanUpdates"
+                                                Content="Scan for Updates"
+                                                Grid.Row="0"
+                                                Margin="5"
+                                                HorizontalAlignment="Left"
+                                                Padding="10,5"/>
+
+                                        <DataGrid Name="WPFUpdatesList"
+                                                Grid.Row="1"
+                                                Margin="5"
+                                                AutoGenerateColumns="False"
+                                                Background="Transparent"
+                                                IsReadOnly="True"
+                                                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                                            <DataGrid.Columns>
+                                                <DataGridTextColumn Header="LongTitle"
+                                                                    Binding="{Binding LongTitle}"
+                                                                    Width="Auto"
+                                                                    Visibility="Collapsed"/>
+                                                <DataGridTextColumn Header="ComputerName"
+                                                                    Binding="{Binding ComputerName}"
+                                                                    Width="Auto"
+                                                                    Visibility="Collapsed"/>
+                                                <DataGridTextColumn Header="Title"
+                                                                    Binding="{Binding Title}"
+                                                                    Width="*"
+                                                                    MinWidth="100"/>
+                                                <DataGridTextColumn Header="KB"
+                                                                    Binding="{Binding KB}"
+                                                                    Width="Auto"
+                                                                    MinWidth="100">
+                                                    <DataGridTextColumn.ElementStyle>
+                                                        <Style TargetType="TextBlock">
+                                                            <Setter Property="TextAlignment" Value="Center"/>
+                                                            <Setter Property="HorizontalAlignment" Value="Center"/>
+                                                        </Style>
+                                                    </DataGridTextColumn.ElementStyle>
+                                                </DataGridTextColumn>
+                                                <DataGridTextColumn Header="Size"
+                                                                    Binding="{Binding Size}"
+                                                                    Width="Auto"
+                                                                    MinWidth="80">
+                                                    <DataGridTextColumn.ElementStyle>
+                                                        <Style TargetType="TextBlock">
+                                                            <Setter Property="TextAlignment" Value="Center"/>
+                                                            <Setter Property="HorizontalAlignment" Value="Center"/>
+                                                        </Style>
+                                                    </DataGridTextColumn.ElementStyle>
+                                                </DataGridTextColumn>
+                                                <DataGridTextColumn Header="Status"
+                                                                    Binding="{Binding Status}"
+                                                                    Width="Auto"
+                                                                    MinWidth="100">
+                                                    <DataGridTextColumn.ElementStyle>
+                                                        <Style TargetType="TextBlock">
+                                                            <Setter Property="TextAlignment" Value="Center"/>
+                                                            <Setter Property="HorizontalAlignment" Value="Center"/>
+                                                        </Style>
+                                                    </DataGridTextColumn.ElementStyle>
+                                                </DataGridTextColumn>
+                                            </DataGrid.Columns>
+                                        </DataGrid>
+
+                                        <StackPanel Grid.Row="2"
+                                                    Orientation="Horizontal"
+                                                    HorizontalAlignment="Right"
+                                                    Margin="5">
+                                            <StackPanel VerticalAlignment="Center">
+                                                <CheckBox x:Name="WPFUpdateVerbose"
+                                                    Content="Verbose Output"
+                                                    Margin="5"
+                                                    Padding="10,5"
+                                                    ToolTip="Verbose output for update installation"
+                                                    IsChecked="True"/>
+                                            </StackPanel>
+                                            <Button Name="WPFUpdateSelectedInstall"
+                                                    Content="Install Selected"
+                                                    Margin="5"
+                                                    Padding="10,5"/>
+                                            <Button Name="WPFUpdateAllInstall"
+                                                    Content="Install All"
+                                                    Margin="5"
+                                                    Padding="10,5"/>
+                                        </StackPanel>
+                                    </Grid>
+
+                                    <!-- History Grid - Collapsed by default -->
+                                    <Grid Grid.Row="1" Name="HistoryGrid" Visibility="Collapsed">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto"/>
+                                            <RowDefinition Height="*"/>
+                                        </Grid.RowDefinitions>
+
+                                        <Button Name="WPFUpdateScanHistory"
+                                                Content="Scan History"
+                                                Grid.Row="0"
+                                                Margin="5"
+                                                HorizontalAlignment="Left"
+                                                Padding="10,5"/>
+
+                                        <DataGrid Name="WPFUpdateHistory"
+                                                Grid.Row="1"
+                                                Margin="5"
+                                                AutoGenerateColumns="False"
+                                                Background="Transparent"
+                                                IsReadOnly="True"
+                                                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                                            <DataGrid.Columns>
+                                                <DataGridTextColumn Header="ComputerName"
+                                                                    Binding="{Binding ComputerName}"
+                                                                    Width="Auto"
+                                                                    Visibility="Collapsed"/>
+
+                                                <DataGridTextColumn Header="Result"
+                                                                    Binding="{Binding Result}"
+                                                                    Width="Auto"
+                                                                    MinWidth="100">
+                                                    <DataGridTextColumn.ElementStyle>
+                                                        <Style TargetType="TextBlock">
+                                                            <Setter Property="TextAlignment" Value="Center"/>
+                                                            <Setter Property="HorizontalAlignment" Value="Center"/>
+                                                        </Style>
+                                                    </DataGridTextColumn.ElementStyle>
+                                                </DataGridTextColumn>
+
+                                                <DataGridTextColumn Header="Title"
+                                                                    Binding="{Binding Title}"
+                                                                    Width="*"/>
+
+                                                <DataGridTextColumn Header="KB"
+                                                                    Binding="{Binding KB}"
+                                                                    Width="Auto"
+                                                                    MinWidth="100">
+                                                    <DataGridTextColumn.ElementStyle>
+                                                        <Style TargetType="TextBlock">
+                                                            <Setter Property="TextAlignment" Value="Center"/>
+                                                            <Setter Property="HorizontalAlignment" Value="Center"/>
+                                                        </Style>
+                                                    </DataGridTextColumn.ElementStyle>
+                                                </DataGridTextColumn>
+
+                                                <DataGridTextColumn Header="Date"
+                                                                    Binding="{Binding Date}"
+                                                                    Width="Auto"
+                                                                    MinWidth="160">
+                                                </DataGridTextColumn>
+                                            </DataGrid.Columns>
+                                        </DataGrid>
+                                    </Grid>
+                                </Grid>
+                            </Border>
                        </Grid>

-                        <!-- Future Implementation: Add Windows Version to updates panel -->
-                        <Grid Name="updatespanel" Grid.Row="1" Background="Transparent">
-                        </Grid>
+                        <Border Grid.Row="1" Style="{StaticResource BorderStyle}">
+                            <StackPanel Background="{DynamicResource MainBackgroundColor}" Orientation="Horizontal" HorizontalAlignment="Left">
+                                <TextBlock Padding="10">
+                                    Note: Updates may require a system restart to complete installation. Make sure to save any work before proceeding.
+                                </TextBlock>
+                            </StackPanel>
+                        </Border>
                    </Grid>
-                </ScrollViewer>
+                <!-- </ScrollViewer> -->
            </TabItem>
            <TabItem Header="MicroWin" Visibility="Collapsed" Name="WPFTab5">
                <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="{DynamicResource TabContentMargin}">
Author	SHA1	Message	Date
MyDrift	27a97e4650	Update functions/public/Invoke-WPFUpdateMGMGT.ps1 Co-authored-by: Mr.k <mineshtine28546271@gmail.com>	2025-03-07 18:21:14 +01:00
MyDrift	dc236b9865	Update functions/public/Invoke-WPFUpdateMGMGT.ps1 Co-authored-by: CodingWonders <101426328+CodingWonders@users.noreply.github.com>	2025-03-07 18:16:06 +01:00
Mr.k	f9878a3472	Disable the 'Scan for Updates' Button when the task is running (#13 ) Co-authored-by: MyDrift <personal@mdiana.ch>	2025-03-07 18:06:35 +01:00
MyDrift	8fabebedf4	Add Taskbaritem indication	2025-03-07 15:23:29 +01:00
MyDrift	a9675fc91b	add installation logic - added verbose checkbox - added longtitle - added install selected logic - added install all logic	2025-03-05 22:40:41 +01:00
MyDrift	e830ff03b1	add Update History - add Computername into DataGrid (if needed) - add toggle for Update History - add Update History interface - add Update Interface Toggle Logic - add Update scan logic - initialize Update selected / all logic - center specific datagrid columns	2025-03-04 20:46:06 +01:00
MyDrift	eea96f596e	refractor Windows Update Tab - move update presets to smaller collumn - add new collumn for windows update manager - add datagrid - add datagrid style	2025-03-03 21:16:27 +01:00