Removing Github and Nuget method. Revamp of Version check to use DesktopAppInstaller

2025-07-02 19:13:30 -05:00 · 2025-03-04 14:21:54 -06:00
23 changed files with 278 additions and 439 deletions
--- a/.gitignore
+++ b/.gitignore
@ -47,7 +47,4 @@ True
 test.ps1
 winutil.ps1

-# temporary excludes for docs
-.github/site/
-
 binary/
--- 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://christitustech.github.io/winutil/)

 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.

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

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

-<!-- sponsors --><a href="https://github.com/TriHydera"><img src="https:&#x2F;&#x2F;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/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 -->
+<!-- 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/config/applications.json
+++ b/config/applications.json
@ -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",
@ -1691,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"
    },
@ -2926,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/feature.json
+++ b/config/feature.json
@ -306,13 +306,6 @@
    "ButtonWidth": "300",
    "link": "https://christitustech.github.io/winutil/dev/features/Legacy-Windows-Panels/user"
  },
-  "WPFPanelGodMode": {
-    "Content": "God Mode",
-    "category": "Legacy Windows Panels",
-    "panel": "2",
-    "Type": "Button",
-    "ButtonWidth": "300"
-  },
  "WPFWinUtilInstallPSProfile": {
    "Content": "Install CTT PowerShell Profile",
    "category": "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
@ -7,7 +7,7 @@
        "CustomDialogHeight":         "200",
        "FontSize":         "12",
        "FontFamily":       "Arial",
-        "HeaderFontSize":  "16",
+        "HeadingFontSize":  "16",
        "HeaderFontFamily": "Consolas, Monaco",
        "CheckBoxBulletDecoratorSize": "14",
        "CheckBoxMargin": "15,0,0,2",
@ -35,8 +35,7 @@
        "CheckboxMouseOverColor": "#999999",
        "ButtonBorderThickness":  "1",
        "ButtonMargin":  "1",
-        "ButtonCornerRadius": "2",
-        "AppTileImageSize": "40"
+        "ButtonCornerRadius": "2"
    },
    "Light": {
        "AppInstallUnselectedColor": "#F0F0F0",
--- a/config/tweaks.json
+++ b/config/tweaks.json
@ -3414,30 +3414,12 @@
    ],
    "link": "https://christitustech.github.io/winutil/dev/tweaks/Customize-Preferences/WPFToggleStartMenuRecommendations"
  },
-  "WPFToggleHideSettingsHome": {
-    "Content": "Remove Settings Home Page",
-    "Description": "Removes the Home page in the Windows Settings app.",
-    "category": "Customize Preferences",
-    "panel": "2",
-    "Order": "a105_",
-    "Type": "Toggle",
-    "registry": [
-      {
-        "Path": "HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer",
-        "Name": "SettingsPageVisibility",
-        "Type": "String",
-        "Value": "hide:home",
-        "OriginalValue": "show:home",
-        "DefaultState": "false"
-      }
-    ]
-  },
  "WPFToggleSnapWindow": {
    "Content": "Snap Window",
    "Description": "If enabled you can align windows by dragging them. | Relogin Required",
    "category": "Customize Preferences",
    "panel": "2",
-    "Order": "a106_",
+    "Order": "a105_",
    "Type": "Toggle",
    "registry": [
      {
@ -3456,7 +3438,7 @@
    "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": [
      {
@ -3485,7 +3467,7 @@
    "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": [
      {
@ -3514,7 +3496,7 @@
    "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": [
      {
@ -3549,7 +3531,7 @@
    "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": [
      {
@ -3758,60 +3740,5 @@
    "Type": "Button",
    "ButtonWidth": "300",
    "link": "https://christitustech.github.io/winutil/dev/tweaks/Performance-Plans/RemoveUltPerf"
-  },
-  "WPFTweaksDisableExplorerAutoDiscovery": {
-    "Content": "Disable Explorer Automatic Folder Discovery",
-    "Description": "Windows Explorer automatically tries to guess the type of the folder based on its contents, slowing down the browsing experience.",
-    "category": "Essential Tweaks",
-    "panel": "1",
-    "Order": "a005_",
-    "InvokeScript": [
-      "
-      # Previously detected folders
-      $bags = \"HKCU:\\Software\\Classes\\Local Settings\\Software\\Microsoft\\Windows\\Shell\\Bags\"
-
-      # Folder types lookup table
-      $bagMRU = \"HKCU:\\Software\\Classes\\Local Settings\\Software\\Microsoft\\Windows\\Shell\\BagMRU\"
-
-      # Flush explorer view database
-      Remove-Item -Path $bags -Recurse -Force
-      Write-Host \"Removed $bags\"
-
-      Remove-Item -Path $bagMRU -Recurse -Force
-      Write-Host \"Removed $bagMRU\"
-
-      # Every folder
-      $allFolders = \"HKCU:\\Software\\Classes\\Local Settings\\Software\\Microsoft\\Windows\\Shell\\Bags\\AllFolders\\Shell\"
-
-      if (!(Test-Path $allFolders)) {
-        New-Item -Path $allFolders -Force
-        Write-Host \"Created $allFolders\"
-      }
-
-      # Generic view
-      New-ItemProperty -Path $allFolders -Name \"FolderType\" -Value \"NotSpecified\" -PropertyType String -Force
-      Write-Host \"Set FolderType to NotSpecified\"
-
-      Write-Host Please sign out and back in, or restart your computer to apply the changes!
-      "
-    ],
-    "UndoScript": [
-      "
-      # Previously detected folders
-      $bags = \"HKCU:\\Software\\Classes\\Local Settings\\Software\\Microsoft\\Windows\\Shell\\Bags\"
-
-      # Folder types lookup table
-      $bagMRU = \"HKCU:\\Software\\Classes\\Local Settings\\Software\\Microsoft\\Windows\\Shell\\BagMRU\"
-
-      # Flush explorer view database
-      Remove-Item -Path $bags -Recurse -Force
-      Write-Host \"Removed $bags\"
-
-      Remove-Item -Path $bagMRU -Recurse -Force
-      Write-Host \"Removed $bagMRU\"
-
-      Write-Host Please sign out and back in, or restart your computer to apply the changes!
-      "
-    ]
  }
 }
--- a/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/Initalize-InstallAppEntry.ps1
+++ b/functions/private/Initalize-InstallAppEntry.ps1
@ -5,23 +5,28 @@ 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.AppTileBorderStyle
-        $border.Tag = $appKey
-        $border.ToolTip = $Apps.$appKey.description
+        $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({
-            if ($_.ChangedButton -eq [System.Windows.Input.MouseButton]::Right) {
-                Invoke-WPFPresets -imported $true -checkboxfilterpattern "WPFInstall*";
-            }
            $childCheckbox = ($this.Child.Children | Where-Object {$_.Template.TargetType -eq [System.Windows.Controls.Checkbox]})[0]
            $childCheckBox.isChecked = -not $childCheckbox.IsChecked
        })
@ -42,8 +47,12 @@ function Initialize-InstallAppEntry {

        # Create the CheckBox, vertically centered
        $checkBox = New-Object Windows.Controls.CheckBox
-        $checkBox.Name = $appKey
-        $checkbox.Style = $sync.Form.Resources.AppTileCheckboxStyle
+        $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.Parent
@ -55,7 +64,7 @@ function Initialize-InstallAppEntry {
            $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"
@ -64,15 +73,29 @@ function Initialize-InstallAppEntry {
        # Create the Image and set a placeholder
        $image = New-Object Windows.Controls.Image
        # $image.Name = "wpfapplogo" + $App.Name
-        $image.Style = $sync.Form.Resources.AppTileImageStyle
+        $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.AppTileNameStyle
-        $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 image and name panel to the Checkbox
@ -84,53 +107,91 @@ function Initialize-InstallAppEntry {

        # Create the StackPanel for the buttons and dock it to the right
        $buttonPanel = New-Object Windows.Controls.StackPanel
-        $buttonPanel.Style = $sync.Form.Resources.AppTileButtonPanelStyle
+        $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)

-        # Define the button properties
-        $buttons = @(
-            [PSCustomObject]@{ Name = "Install"; Description = "Install or Upgrade the application"; Tooltip = "Install or Upgrade the application"; Icon = [char]0xE118 },
-            [PSCustomObject]@{ Name = "Uninstall"; Description = "Uninstall the application"; Tooltip = "Uninstall the application"; Icon = [char]0xE74D },
-            [PSCustomObject]@{ Name = "Info"; Description = "Open the application's website in your default browser"; Tooltip = "Open the application's website in your default browser"; Icon = [char]0xE946 }
-        )
+        # 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)

-        # Iterate over each button and create it
-        foreach ($button in $buttons) {
-            $newButton = New-Object Windows.Controls.Button
-            $newButton.Style = $sync.Form.Resources.AppTileButtonStyle
-            $newButton.Content = $button.Icon
-            $newButton.ToolTip = $button.Tooltip
-            $buttonPanel.Children.Add($newButton) | Out-Null
+        $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"

-            switch ($button.Name) {
-                "Install" {
-                    $newButton.Add_Click({
+        $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
        })
-                }
-                "Uninstall" {
-                    $newButton.Add_Click({
+
+        # 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
        })
-                }
-                "Info" {
-                    $newButton.Add_Click({
+
+        # 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

        # Add the border to the corresponding Category
        $TargetElement.Children.Add($border) | Out-Null
-        return $checkbox
    }
--- a/functions/private/Initialize-InstallCategoryAppList.ps1
+++ b/functions/private/Initialize-InstallCategoryAppList.ps1
@ -42,7 +42,7 @@ function Initialize-InstallCategoryAppList {
        $loadingLabel.Content = "Loading, please wait..."
        $loadingLabel.HorizontalAlignment = "Center"
        $loadingLabel.VerticalAlignment = "Center"
-        $loadingLabel.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "HeaderFontSize")
+        $loadingLabel.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "FontSizeHeading")
        $loadingLabel.FontWeight = [Windows.FontWeights]::Bold
        $loadingLabel.Foreground = [Windows.Media.Brushes]::Gray
        $sync.LoadingLabel = $loadingLabel
@ -53,17 +53,8 @@ function Initialize-InstallCategoryAppList {
        $TargetElement.Dispatcher.Invoke([System.Windows.Threading.DispatcherPriority]::Background, [action]{

            $TargetElement.Items.Clear() # Remove the loading message
-
-            # Pre-group apps by category
-            $appsByCategory = @{}
-            foreach ($appKey in $Apps.Keys) {
-                $category = $Apps.$appKey.Category
-                if (-not $appsByCategory.ContainsKey($category)) {
-                    $appsByCategory[$category] = @()
-                }
-                $appsByCategory[$category] += $appKey
-            }
-            foreach ($category in $($appsByCategory.Keys | Sort-Object)) {
+            $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"
@ -73,8 +64,8 @@ function Initialize-InstallCategoryAppList {
                $wrapPanel.Visibility = [Windows.Visibility]::Collapsed
                $wrapPanel.Tag = "CategoryWrapPanel_$category"
                $null = $TargetElement.Items.Add($wrapPanel)
-                $appsByCategory[$category] |Sort-Object | ForEach-Object {
-                    $sync.$_ =  $(Initialize-InstallAppEntry -TargetElement $wrapPanel -AppKey $_)
+                $Apps.Keys | Where-Object { $Apps.$_.Category -eq $category } | Sort-Object | ForEach-Object {
+                    Initialize-InstallAppEntry -TargetElement $wrapPanel -AppKey $_
                }
            }
        })
--- a/functions/private/Initialize-InstallHeader.ps1
+++ b/functions/private/Initialize-InstallHeader.ps1
@ -29,8 +29,7 @@ function Initialize-InstallHeader {
    $buttonConfigs = @(
        @{Name="WPFInstall"; Content="Install/Upgrade Selected"},
        @{Name="WPFInstallUpgrade"; Content="Upgrade All"},
-        @{Name="WPFUninstall"; Content="Uninstall Selected"},
-        @{Name="WPFselectedAppsButton"; Content="Selected Apps: 0"}
+        @{Name="WPFUninstall"; Content="Uninstall Selected"}
    )

    foreach ($config in $buttonConfigs) {
@ -39,9 +38,18 @@ function Initialize-InstallHeader {
        $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 = $sync.WPFselectedAppsButton
+    $selectedAppsPopup.PlacementTarget = $selectedAppsButton
    $selectedAppsPopup.Placement = [System.Windows.Controls.Primitives.PlacementMode]::Bottom
    $selectedAppsPopup.AllowsTransparency = $true

@ -58,21 +66,24 @@ function Initialize-InstallHeader {
    $selectedAppsBorder.Child = $sync.selectedAppsstackPanel

    # Toggle selectedAppsPopup open/close with button
-    $sync.WPFselectedAppsButton.Add_Click({
+    $selectedAppsButton.Add_Click({
        $sync.selectedAppsPopup.IsOpen = -not $sync.selectedAppsPopup.IsOpen
    })
    # Close selectedAppsPopup when mouse leaves both button and selectedAppsPopup
-    $sync.WPFselectedAppsButton.Add_MouseLeave({
+    $selectedAppsButton.Add_MouseLeave({
        if (-not $sync.selectedAppsPopup.IsMouseOver) {
            $sync.selectedAppsPopup.IsOpen = $false
        }
    })
    $selectedAppsPopup.Add_MouseLeave({
-        if (-not $sync.WPFselectedAppsButton.IsMouseOver) {
+        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/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/Test-WinUtilPackageManager.ps1
+++ b/functions/private/Test-WinUtilPackageManager.ps1
@ -56,7 +56,7 @@ function Test-WinUtilPackageManager {
            # Check if Winget's Version is too old.
            $wingetCurrentVersion = [System.Version]::Parse($wingetVersion.Trim('v'))
            # Grabs the latest release of Winget from the Github API for version check process.
-            $response = winget search -e Microsoft.AppInstaller --accept-source-agreements
+            $response = winget search -e Microsoft.AppInstaller
            $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
--- a/functions/public/Invoke-WPFButton.ps1
+++ b/functions/public/Invoke-WPFButton.ps1
@ -44,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}
--- 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-WPFGetInstalled.ps1
+++ b/functions/public/Invoke-WPFGetInstalled.ps1
@ -18,15 +18,15 @@ function Invoke-WPFGetInstalled {
    if (($sync.ChocoRadioButton.IsChecked -eq $false) -and ((Test-WinUtilPackageManager -winget) -eq "not-installed") -and $checkbox -eq "winget") {
        return
    }
-    $managerPreference = $sync["ManagerPreference"]
+    $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 @(("managerPreference", $managerPreference),("checkbox", $checkbox),("ShowOnlyCheckedApps", ${function:Show-OnlyCheckedApps})) -DebugPreference $DebugPreference -ScriptBlock {
+    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
@ -34,10 +34,8 @@ function Invoke-WPFGetInstalled {

        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..."
--- a/functions/public/Invoke-WPFInstall.ps1
+++ b/functions/public/Invoke-WPFInstall.ps1
@ -21,16 +21,40 @@ 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
--- a/functions/public/Invoke-WPFUIElements.ps1
+++ b/functions/public/Invoke-WPFUIElements.ps1
@ -144,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/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')
@ -127,18 +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
-
 # 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

@ -148,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 {
@ -194,6 +184,7 @@ $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
@ -211,6 +202,12 @@ Invoke-WPFRunspace -ScriptBlock {

 # Print the logo
 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
@ -220,24 +217,13 @@ function Update-AppTileProperties {
        $sync.Form.Resources.AppTileBorderThickness = [Windows.Thickness]0
    }
    else {
-        # On first load, set the AppTileWidth to NaN because the Window dosnt exist yet and there is no ActuaWidth
-        if ($sync.ItemsControl.ActualWidth -gt 0) {
-            $sync.Form.Resources.AppTileWidth = $sync.ItemsControl.ActualWidth -20}
-        else {
-            $sync.Form.Resources.AppTileWidth = [double]::NaN
-        }
+        $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
    }
-    if ($sync.SearchBar.Text -eq "") {
-        Set-CategoryVisibility -Category "*"
 }
-}
-# initialize AppTile properties
-Update-AppTileProperties
-
 # 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
@ -317,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
            }
@ -593,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
@ -42,7 +42,6 @@ $sync.ProcessRunning = $false
 $sync.selectedApps = [System.Collections.Generic.List[string]]::new()
 $sync.ShowOnlySeleced = $false
 $sync.currentTab = "Install"
-$sync.CompactView = $true
 $sync.ShowOnlySelected = $false
 $sync.selectedAppsStackPanel
 $sync.selectedAppsPopup
@ -55,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
 }
--- a/xaml/inputXML.xaml
+++ b/xaml/inputXML.xaml
@ -67,82 +67,6 @@
            </Trigger>
        </Style.Triggers>
    </Style>
-    <Style x:Key="AppTileBorderStyle" TargetType="Border">
-        <Setter Property="BorderBrush" Value="Gray"/>
-        <Setter Property="BorderThickness" Value="{DynamicResource AppTileBorderThickness}"/>
-        <Setter Property="CornerRadius" Value="5"/>
-        <Setter Property="Padding" Value="{DynamicResource AppTileMargins}"/>
-        <Setter Property="Width" Value="{DynamicResource AppTileWidth}"/>
-        <Setter Property="VerticalAlignment" Value="Top"/>
-        <Setter Property="Margin" Value="{DynamicResource AppTileMargins}"/>
-        <Setter Property="Cursor" Value="Hand"/>
-        <Setter Property="Background" Value="{DynamicResource AppInstallUnselectedColor}"/>
-    </Style>
-    <Style x:Key="AppTileCheckboxStyle" TargetType="CheckBox">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="HorizontalAlignment" Value="Left"/>
-        <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="Margin" Value="{DynamicResource AppTileMargins}"/>
-        <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="AppTileImageStyle" TargetType="Image">
-        <Setter Property="Width" Value="{DynamicResource AppTileImageSize}"/>
-        <Setter Property="Height" Value="{DynamicResource AppTileImageSize}"/>
-        <Setter Property="Margin">
-            <Setter.Value>
-                <Thickness Left="0" Top="0" Right="10" Bottom="0"/>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Clip">
-            <Setter.Value>
-                <RectangleGeometry Rect="0,0,40,40" RadiusX="5" RadiusY="5"/>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Visibility" Value="{DynamicResource AppTileCompactVisibility}"/>
-    </Style>
-    <Style x:Key="AppTileNameStyle" TargetType="TextBlock">
-        <Setter Property="FontSize" Value="{DynamicResource AppTileFontSize}"/>
-        <Setter Property="FontWeight" Value="Bold"/>
-        <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}"/>
-        <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="Margin" Value="{DynamicResource AppTileMargins}"/>
-        <Setter Property="Background" Value="Transparent"/>
-    </Style>
-    <Style x:Key="AppTileButtonPanelStyle" TargetType="StackPanel">
-        <Setter Property="Orientation" Value="Horizontal"/>
-        <Setter Property="HorizontalAlignment" Value="Right"/>
-        <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="Margin" Value="{DynamicResource AppTileMargins}"/>
-        <Setter Property="Visibility" Value="{DynamicResource AppTileCompactVisibility}"/>
-    </Style>
-    <Style x:Key="AppTileButtonStyle" TargetType="Button">
-        <Setter Property="Width" Value="45"/>
-        <Setter Property="Height" Value="35"/>
-        <Setter Property="Margin" Value="0,0,10,0"/>
-        <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="20"
-                               Foreground="{DynamicResource MainForegroundColor}"
-                               Background="Transparent" HorizontalAlignment="Center"
-                               VerticalAlignment="Center"/>
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>

    <Style TargetType="Button" x:Key="HoverButtonStyle">
        <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}" />
@ -278,7 +202,7 @@
            <Setter Property="Foreground" Value="{DynamicResource LabelboxForegroundColor}"/>
            <Setter Property="Background" Value="{DynamicResource MainBackgroundColor}"/>
            <Setter Property="FontFamily" Value="{DynamicResource HeaderFontFamily}"/>
-            <Setter Property="FontSize" Value="{DynamicResource HeaderFontSize}"/>
+            <Setter Property="FontSize" Value="{DynamicResource FontSizeHeading}"/>
            <Setter Property="HorizontalAlignment" Value="Stretch"/>
            <Setter Property="VerticalAlignment" Value="Center"/>
            <Setter Property="HorizontalContentAlignment" Value="Left"/>
@ -578,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}"/>
@ -914,7 +851,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}"
@ -957,7 +894,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 -->