Add category search chips to Install tab for improved filtering (#4826)

* Add Quick Category Search Chips to Install tab

Add category shortcut chips on the Install tab that insert the category
name into the existing search box. Append each app's category as a
description tag so the existing description search filters by category.
Reuses the standard button style and existing search; no search, install,
or preset logic is changed.

* Fix install category chip filtering

* Fix category filter refresh behavior

---------

Co-authored-by: Chris Titus <contact@christitus.com>

config/appx.json

@@ -4,203 +4,232 @@
     "Content": "Feedback Hub",
     "Description": "Allows users to submit bug reports, feature suggestions, and diagnostic data directly to Microsoft.",
     "Panel": "0",
-    "PackageId": "Microsoft.WindowsFeedbackHub"
+    "PackageId": "Microsoft.WindowsFeedbackHub",
+    "StoreId": "9NBLGGH4R32N"
   },
   "WPFAppxMicrosoft_GetHelp": {
     "Category": "Microsoft Apps",
     "Content": "Get Help",
     "Description": "Provides access to automated troubleshooting guides, support documentation, and direct Microsoft customer assistance.",
     "Panel": "0",
-    "PackageId": "Microsoft.GetHelp"
+    "PackageId": "Microsoft.GetHelp",
+    "StoreId": "9PKDZBMV1H3T"
   },
   "WPFAppxMicrosoft_OutlookForWindows": {
     "Category": "Microsoft Apps",
     "Content": "Outlook for Windows",
     "Description": "Provides modern email management, calendar scheduling, and contact organization features.",
     "Panel": "0",
-    "PackageId": "Microsoft.OutlookForWindows"
+    "PackageId": "Microsoft.OutlookForWindows",
+    "StoreId": "9NRX63209R7B"
   },
   "WPFAppxMSTeams": {
     "Category": "Microsoft Apps",
     "Content": "Microsoft Teams",
     "Description": "Facilitates instant messaging, video conferencing, file sharing, and workspace collaboration.",
     "Panel": "0",
-    "PackageId": "MSTeams"
+    "PackageId": "MSTeams",
+    "StoreId": "XP8BT8DW290MPQ"
   },
   "WPFAppxClipchamp_Clipchamp": {
     "Category": "Utilities & Productivity",
     "Content": "Clipchamp",
     "Description": "Provides a user-friendly video editor with built-in templates, effects, and timeline editing tools.",
     "Panel": "0",
-    "PackageId": "Clipchamp.Clipchamp"
+    "PackageId": "Clipchamp.Clipchamp",
+    "StoreId": "9P1J8S7CCWWT"
   },
   "WPFAppxMicrosoft_MicrosoftOfficeHub": {
     "Category": "Microsoft Apps",
     "Content": "Microsoft 365",
     "Description": "Serves as a centralized launcher and dashboard for accessing cloud-based Microsoft 365 apps and recent documents.",
     "Panel": "0",
-    "PackageId": "Microsoft.MicrosoftOfficeHub"
+    "PackageId": "Microsoft.MicrosoftOfficeHub",
+    "StoreId": "9WZDNCRD29V9"
   },
   "WPFAppxMicrosoft_ZuneMusic": {
     "Category": "Utilities & Productivity",
     "Content": "Media Player",
     "Description": "Plays local audio and video files with modern playlist management and casting capabilities.",
     "Panel": "0",
-    "PackageId": "Microsoft.ZuneMusic"
+    "PackageId": "Microsoft.ZuneMusic",
+    "StoreId": "9WZDNCRFJ3PT"
   },
   "WPFAppxMicrosoft_BingSearch": {
     "Category": "Bing & Web Services",
     "Content": "Bing Search",
     "Description": "Integrates Microsoft Bing search capabilities and web services directly into the operating system.",
     "Panel": "1",
-    "PackageId": "Microsoft.BingSearch"
+    "PackageId": "Microsoft.BingSearch",
+    "StoreId": "9NZBF4GT040C"
   },
   "WPFAppxMicrosoftCorporationII_QuickAssist": {
     "Category": "Utilities & Productivity",
     "Content": "Quick Assist",
     "Description": "Enables secure remote technical support and screen sharing over an internet connection.",
     "Panel": "0",
-    "PackageId": "MicrosoftCorporationII.QuickAssist"
+    "PackageId": "MicrosoftCorporationII.QuickAssist",
+    "StoreId": "9P7BP5VNWKX5"
   },
   "WPFAppxMicrosoft_WindowsDevHome": {
     "Category": "Developer Tools",
     "Content": "Dev Home",
     "Description": "Provides a specialized dashboard for software developer environment setups, repository syncing, and hardware widgets.",
     "Panel": "1",
-    "PackageId": "Microsoft.Windows.DevHome"
+    "PackageId": "Microsoft.Windows.DevHome",
+    "StoreId": "9N8MHTPHNGVV"
   },
   "WPFAppxMicrosoft_WindowsCrossDevice": {
     "Category": "Microsoft Ecosystem",
     "Content": "Mobile Devices",
     "Description": "Manages system-level background connectivity with paired mobile devices. Removing this may disable cross-device features such as phone screen mirroring, file transfer, and mobile hotspot handoff integrated into Windows Settings.",
     "Panel": "0",
-    "PackageId": "MicrosoftWindows.CrossDevice"
+    "PackageId": "MicrosoftWindows.CrossDevice",
+    "StoreId": "9NTXGKQ8P7N0"
   },
   "WPFAppxMicrosoft_Todos": {
     "Category": "Utilities & Productivity",
     "Content": "To Do",
     "Description": "Creates, tracks, and synchronizes personal tasks, smart lists, and daily reminders.",
     "Panel": "0",
-    "PackageId": "Microsoft.Todos"
+    "PackageId": "Microsoft.Todos",
+    "StoreId": "9NBLGGH5R558"
   },
   "WPFAppxMicrosoft_PowerAutomateDesktop": {
     "Category": "Developer Tools",
     "Content": "Power Automate",
     "Description": "Automates repetitive workflows and desktop tasks using low-code visual scripting.",
     "Panel": "1",
-    "PackageId": "Microsoft.PowerAutomateDesktop"
+    "PackageId": "Microsoft.PowerAutomateDesktop",
+    "StoreId": "9NFTCH6J7FHV"
   },
   "WPFAppxMicrosoft_YourPhone": {
     "Category": "Microsoft Ecosystem",
     "Content": "Phone Link",
     "Description": "Synchronizes text messages, phone notifications, photos, and calls from a mobile device to the desktop.",
     "Panel": "0",
-    "PackageId": "Microsoft.YourPhone"
+    "PackageId": "Microsoft.YourPhone",
+    "StoreId": "9NMPJ99VJBWV"
   },
   "WPFAppxMicrosoft_MicrosoftStickyNotes": {
     "Category": "Utilities & Productivity",
     "Content": "Sticky Notes",
     "Description": "Creates quick, floating text notes on the desktop that automatically sync across devices.",
     "Panel": "0",
-    "PackageId": "Microsoft.MicrosoftStickyNotes"
+    "PackageId": "Microsoft.MicrosoftStickyNotes",
+    "StoreId": "9NBLGGH4QGHW"
   },
   "WPFAppxMicrosoft_WindowsSoundRecorder": {
     "Category": "Utilities & Productivity",
     "Content": "Sound Recorder",
     "Description": "Records and trims live audio inputs with simple microphone adjustment controls.",
     "Panel": "0",
-    "PackageId": "Microsoft.WindowsSoundRecorder"
+    "PackageId": "Microsoft.WindowsSoundRecorder",
+    "StoreId": "9WZDNCRFHWKN"
   },
   "WPFAppxMicrosoft_WindowsAlarms": {
     "Category": "Utilities & Productivity",
     "Content": "Clock",
     "Description": "Features world clocks, alarms, countdown timers, stopwatches, and dedicated focus session tracking.",
     "Panel": "0",
-    "PackageId": "Microsoft.WindowsAlarms"
+    "PackageId": "Microsoft.WindowsAlarms",
+    "StoreId": "9WZDNCRFJ3PR"
   },
   "WPFAppxMicrosoft_Paint": {
     "Category": "Utilities & Productivity",
     "Content": "Paint",
     "Description": "Provides built-in digital sketching, basic image editing, and pixel-level graphic manipulation tools.",
     "Panel": "0",
-    "PackageId": "Microsoft.Paint"
+    "PackageId": "Microsoft.Paint",
+    "StoreId": "9PCFS5B6T72H"
   },
   "WPFAppxMicrosoft_WindowsNotepad": {
     "Category": "Utilities & Productivity",
     "Content": "Notepad",
     "Description": "Provides a lightweight text editor with multi-tab support for plain text files and code snippets.",
     "Panel": "0",
-    "PackageId": "Microsoft.WindowsNotepad"
+    "PackageId": "Microsoft.WindowsNotepad",
+    "StoreId": "9MSMLRH6LZF3"
   },
   "WPFAppxMicrosoft_ScreenSketch": {
     "Category": "Utilities & Productivity",
     "Content": "Snipping Tool",
     "Description": "Captures screenshots or screen recordings with built-in markup, image cropping, and optical character recognition (OCR).",
     "Panel": "0",
-    "PackageId": "Microsoft.ScreenSketch"
+    "PackageId": "Microsoft.ScreenSketch",
+    "StoreId": "9MZ95KL8MR0L"
   },
   "WPFAppxMicrosoft_Copilot": {
     "Category": "Bing & Web Services",
     "Content": "Copilot",
     "Description": "Launches the Microsoft AI companion for contextual answers, creative writing assistance, and intelligent web search.",
     "Panel": "1",
-    "PackageId": "Microsoft.Copilot"
+    "PackageId": "Microsoft.Copilot",
+    "StoreId": "9NHT9RB2F4HD"
   },
   "WPFAppxMicrosoft_WindowsCalculator": {
     "Category": "Utilities & Productivity",
     "Content": "Calculator",
     "Description": "Performs standard arithmetic, scientific operations, programming calculations, and unit conversions.",
     "Panel": "0",
-    "PackageId": "Microsoft.WindowsCalculator"
+    "PackageId": "Microsoft.WindowsCalculator",
+    "StoreId": "9WZDNCRFHVN5"
   },
   "WPFAppxMicrosoft_WindowsCamera": {
     "Category": "Utilities & Productivity",
     "Content": "Camera",
     "Description": "Captures photographs and records video files via connected webcams or imaging hardware.",
     "Panel": "0",
-    "PackageId": "Microsoft.WindowsCamera"
+    "PackageId": "Microsoft.WindowsCamera",
+    "StoreId": "9WZDNCRFJBBG"
   },
   "WPFAppxMicrosoft_WindowsPhotos": {
     "Category": "Utilities & Productivity",
     "Content": "Photos",
     "Description": "Organizes, views, and crops local images with basic color adjustment and album creation tools.",
     "Panel": "0",
-    "PackageId": "Microsoft.Windows.Photos"
+    "PackageId": "Microsoft.Windows.Photos",
+    "StoreId": "9WZDNCRFJBH4"
   },
   "WPFAppxMicrosoft_BingNews": {
     "Category": "Bing & Web Services",
     "Content": "News",
     "Description": "Aggregates breaking news headlines, personalized article feeds, and world current events.",
     "Panel": "1",
-    "PackageId": "Microsoft.BingNews"
+    "PackageId": "Microsoft.BingNews",
+    "StoreId": "9WZDNCRFHVFW"
   },
   "WPFAppxMicrosoft_BingWeather": {
     "Category": "Bing & Web Services",
     "Content": "Weather",
     "Description": "Displays local real-time weather tracking, radar maps, and historical meteorological forecasts.",
     "Panel": "1",
-    "PackageId": "Microsoft.BingWeather"
+    "PackageId": "Microsoft.BingWeather",
+    "StoreId": "9WZDNCRFJ3Q2"
   },
   "WPFAppxMicrosoft_GamingApp": {
     "Category": "Xbox & Gaming",
     "Content": "Xbox App",
     "Description": "Serves as the primary gaming library manager, social community interface, and PC Game Pass dashboard.",
     "Panel": "1",
-    "PackageId": "Microsoft.GamingApp"
+    "PackageId": "Microsoft.GamingApp",
+    "StoreId": "9MV0B5HZVK9Z"
   },
   "WPFAppxMicrosoft_XboxGamingOverlay": {
     "Category": "Xbox & Gaming",
     "Content": "Xbox Game Bar",
     "Description": "Provides customizable in-game status widgets, audio balancing sliders, system monitoring tools, and gameplay recording.",
     "Panel": "1",
-    "PackageId": "Microsoft.XboxGamingOverlay"
+    "PackageId": "Microsoft.XboxGamingOverlay",
+    "StoreId": "9NZKPSTSNW4P"
   },
   "WPFAppxMicrosoft_XboxIdentityProvider": {
     "Category": "Xbox & Gaming",
     "Content": "Xbox Identity Provider",
     "Description": "Manages Xbox network user authentication and background account validation for connected titles. Warning: removing this may break Microsoft account sign-in for non-Xbox games and apps that rely on this authentication pipeline.",
     "Panel": "1",
-    "PackageId": "Microsoft.XboxIdentityProvider"
+    "PackageId": "Microsoft.XboxIdentityProvider",
+    "StoreId": "9WZDNCRD1HKW"
   },
   "WPFAppxMicrosoft_XboxSpeechToTextOverlay": {
     "Category": "Xbox & Gaming",
@@ -221,7 +250,8 @@
     "Content": "Start Experiences App",
     "Description": "Powers the Windows Widgets board, delivering a personalized feed of news, weather, sports, and finance content.",
     "Panel": "1",
-    "PackageId": "Microsoft.StartExperiencesApp"
+    "PackageId": "Microsoft.StartExperiencesApp",
+    "StoreId": "9PC1H9VN18CM"
   },
   "WPFAppxMicrosoft_MicrosoftSolitaireCollection": {
     "Category": "Xbox & Gaming",

config/themes.json

@@ -25,7 +25,7 @@
     "IconFontSize": "14",
     "IconButtonSize": "35",
     "SettingsIconFontSize": "18",
-    "CloseIconFontSize": "18",
+    "CloseIconFontSize": "12",
     "GroupBorderBackgroundColor": "#232629",
     "ButtonFontSize": "12",
     "ButtonFontFamily": "Arial",
@@ -100,7 +100,7 @@
     "ScrollBarBackgroundColor": "#2E3135",
     "ScrollBarHoverColor": "#3B4252",
     "ScrollBarDraggingColor": "#5E81AC",
-    "ProgressBarForegroundColor": "#222222",
+    "ProgressBarForegroundColor": "#6EFF72",
     "ProgressBarBackgroundColor": "Transparent",
     "ProgressBarTextColor": "#232629",
     "ButtonInstallBackgroundColor": "#222222",

docs/content/userguide/tweaks/_index.md

@@ -34,6 +34,14 @@ Use the quick-selection buttons at the top of the Tweaks tab to speed up setup:
 * **Select Tweaks to Remove**: Choose the tweaks you want to disable or remove.
 * **Undo Tweaks**: Click **Undo Selected Tweaks** at the bottom of the screen to apply the changes.
 
+### AppX Packages
+
+Open **AppX Removal** from the Tweaks tab to manage the listed Windows apps. Select one or more packages, then choose **Install Selected** or **Remove Selected**.
+
+When installing a selected package, WinUtil first registers an existing local `AppxManifest.xml`. If no usable local manifest remains, WinUtil installs the package from the Microsoft Store through WinGet when a Store product ID is available.
+
+During AppX installation or removal, the window-level progress bar shows the current package, completed package count, and overall progress. The Windows taskbar also reflects progress and the final success or failure state.
+
 ### Essential Tweaks
 Essential Tweaks are the safest starting point for most systems. They focus on lower-risk changes that improve usability, reduce noise, and avoid the more invasive changes found in advanced options.
 

functions/private/Find-AppsByNameOrDescription.ps1

@@ -10,6 +10,9 @@ function Find-AppsByNameOrDescription {
         .PARAMETER SearchString
             The string to be searched for. Wildcards are treated as literal characters.
 
+        .PARAMETER Category
+            When provided, only applications in this exact category are shown.
+
         .NOTES
             - Uses module-scope $sync (no parameter needed; inherits from caller's scope)
             - Performs literal matching (no wildcard expansion)
@@ -18,7 +21,10 @@ function Find-AppsByNameOrDescription {
     #>
     param(
         [Parameter(Mandatory = $false)]
-        [string]$SearchString = ""
+        [string]$SearchString = "",
+
+        [Parameter(Mandatory = $false)]
+        [string]$Category = ""
     )
 
     # Validate that $sync exists and has required structure
@@ -39,7 +45,7 @@ function Find-AppsByNameOrDescription {
 
     try {
         # Reset the visibility if the search string is empty or the search is cleared
-        if ([string]::IsNullOrWhiteSpace($SearchString)) {
+        if ([string]::IsNullOrWhiteSpace($SearchString) -and [string]::IsNullOrWhiteSpace($Category)) {
             $sync.ItemsControl.Items | ForEach-Object {
                 # Each item is a StackPanel container
                 $_.Visibility = [Windows.Visibility]::Visible
@@ -94,10 +100,11 @@ function Find-AppsByNameOrDescription {
 
                     # Check if app matches search criteria
                     if ($null -ne $appEntry) {
-                        $contentMatch = $appEntry.Content -like "*$escapedSearchString*"
+                        $categoryMatch = -not [string]::IsNullOrWhiteSpace($Category) -and $appEntry.Category -eq $Category
-                        $descriptionMatch = $appEntry.Description -like "*$escapedSearchString*"
+                        $contentMatch = [string]::IsNullOrWhiteSpace($Category) -and $appEntry.Content -like "*$escapedSearchString*"
+                        $descriptionMatch = [string]::IsNullOrWhiteSpace($Category) -and $appEntry.Description -like "*$escapedSearchString*"
 
-                        if ($contentMatch -or $descriptionMatch) {
+                        if ($categoryMatch -or $contentMatch -or $descriptionMatch) {
                             # Show the App and mark that this category has a match
                             $appControl.Visibility = [Windows.Visibility]::Visible
                             $categoryHasMatch = $true

functions/private/Get-WinUtilInstalledAPPX.ps1

@@ -0,0 +1,24 @@
+function Get-WinUtilInstalledAPPX {
+    <#
+
+    .SYNOPSIS
+        Gets the names of AppX packages installed for all users
+
+    #>
+
+    # AppX module auto-loading can leave PowerShell 7 dependent on a temporary Windows PowerShell
+    # compatibility proxy. Run the query in Windows PowerShell 5.1 so it remains available after
+    # those temporary proxy files are removed.
+    $ps5Command = {
+        Get-AppxPackage -AllUsers -ErrorAction Stop | Select-Object -ExpandProperty Name
+    }
+
+    $packageOutput = powershell.exe -NoProfile -NonInteractive -Command $ps5Command 2>&1
+    if ($LASTEXITCODE -ne 0) {
+        $failureDetails = ($packageOutput | Out-String).Trim()
+        Write-WinUtilLog -Level "ERROR" -Component "AppX" -Message "Failed to get installed AppX packages: $failureDetails"
+        return @()
+    }
+
+    return @($packageOutput)
+}

functions/private/Install-WinUtilAPPX.ps1

@@ -0,0 +1,79 @@
+function Install-WinUtilAPPX {
+    <#
+
+    .SYNOPSIS
+        Registers a local AppX package or installs it from the Microsoft Store
+
+    .PARAMETER Name
+        The AppX package name to install
+
+    .PARAMETER StoreId
+        The optional Microsoft Store product ID used when no local manifest is available
+
+    #>
+    param (
+        [Parameter(Mandatory = $true)]
+        [string]$Name,
+
+        [string]$StoreId
+    )
+
+    Write-WinUtilLog -Component "AppX" -Message "Installing AppX package: $Name"
+
+    # AppX and DISM cmdlets are more reliable in Windows PowerShell 5.1. Query both installed and
+    # provisioned package metadata because either can expose a local manifest that can be registered.
+    $ps5Command = {
+        $packageName = $args[0]
+        $manifestPaths = [System.Collections.Generic.List[string]]::new()
+
+        Get-AppxPackage -AllUsers -Name $packageName -ErrorAction SilentlyContinue |
+            Sort-Object -Property Version -Descending |
+            ForEach-Object {
+                if (-not [string]::IsNullOrWhiteSpace($_.InstallLocation)) {
+                    $manifestPaths.Add((Join-Path $_.InstallLocation "AppxManifest.xml"))
+                }
+            }
+
+        Get-AppxProvisionedPackage -Online -ErrorAction SilentlyContinue |
+            Where-Object DisplayName -EQ $packageName |
+            ForEach-Object {
+                if (-not [string]::IsNullOrWhiteSpace($_.InstallLocation)) {
+                    $manifestPaths.Add((Join-Path $_.InstallLocation "AppxManifest.xml"))
+                }
+            }
+
+        $manifestPath = $manifestPaths |
+            Select-Object -Unique |
+            Where-Object { Test-Path -LiteralPath $_ } |
+            Select-Object -First 1
+
+        if ($null -ne $manifestPath) {
+            Add-AppxPackage -Register $manifestPath -DisableDevelopmentMode -ErrorAction Stop
+            Write-Output $manifestPath
+        }
+    }
+
+    $manifestOutput = powershell.exe -NoProfile -NonInteractive -Command $ps5Command -args $Name 2>&1
+    if ($LASTEXITCODE -eq 0 -and $null -ne $manifestOutput) {
+        $manifestPath = ($manifestOutput | Select-Object -Last 1).ToString().Trim()
+        if (-not [string]::IsNullOrWhiteSpace($manifestPath)) {
+            Write-WinUtilLog -Component "AppX" -Message "Registered local AppX manifest for $Name`: $manifestPath"
+            return
+        }
+    }
+
+    if ($LASTEXITCODE -ne 0) {
+        $failureDetails = ($manifestOutput | Out-String).Trim()
+        Write-WinUtilLog -Level "WARN" -Component "AppX" -Message "Local AppX registration failed for $Name`: $failureDetails"
+    }
+
+    if ([string]::IsNullOrWhiteSpace($StoreId)) {
+        $errorMessage = "Unable to install $Name because no local manifest or Microsoft Store ID is available."
+        Write-WinUtilLog -Level "ERROR" -Component "AppX" -Message $errorMessage
+        throw $errorMessage
+    }
+
+    Write-WinUtilLog -Component "AppX" -Message "No usable local manifest found for $Name. Installing Microsoft Store product $StoreId."
+    Install-WinUtilWinget
+    Install-WinUtilProgramWinget -Action Install -Programs @("msstore:$StoreId")
+}

functions/private/Remove-WinUtilProvisionedAPPX.ps1

@@ -53,8 +53,9 @@ function Remove-WinUtilProvisionedAPPX {
     $removalOutput = powershell.exe -NoProfile -NonInteractive -Command $ps5Command -args $PackageList 2>&1
     if ($LASTEXITCODE -ne 0 -or $null -ne $removalOutput) {
         $failureDetails = ($removalOutput | Out-String).Trim()
-        Write-WinUtilLog -Level "ERROR" -Component "AppX" -Message "AppX provisioned package removal failed: $failureDetails"
+        $errorMessage = "AppX provisioned package removal failed: $failureDetails"
-        return
+        Write-WinUtilLog -Level "ERROR" -Component "AppX" -Message $errorMessage
+        throw $errorMessage
     }
 
     Write-WinUtilLog -Component "AppX" -Message "AppX provisioned package removal completed."

functions/private/Set-WinUtilAppCategoryFilter.ps1

@@ -0,0 +1,17 @@
+function Set-WinUtilAppCategoryFilter {
+    <#
+        .SYNOPSIS
+            Applies an exact application category filter from an Install tab search chip.
+
+        .PARAMETER Category
+            The application category to show. An empty value clears the filter.
+    #>
+    param(
+        [Parameter(Mandatory = $false)]
+        [string]$Category = ""
+    )
+
+    $sync.SearchBar.Tag = $Category
+    $sync.SearchBar.Text = $Category
+    Find-AppsByNameOrDescription -SearchString $Category -Category $Category
+}

functions/private/Set-WinUtilTweaksProgressIndicator.ps1

@@ -0,0 +1,35 @@
+function Set-WinUtilTweaksProgressIndicator {
+    <#
+    .SYNOPSIS
+        Shows, updates, or hides the window-level progress indicator used by long-running
+        workflows such as Tweaks, Undo, and AppX management. It lives outside the TabControl,
+        so unlike the Install tab's progress bar it stays visible no matter which tab is active.
+    .PARAMETER Visible
+        Whether the indicator should be shown or hidden.
+    .PARAMETER Label
+        The text to display above the progress bar.
+    .PARAMETER Percent
+        The percentage of the progress bar that should be filled (0-100).
+    #>
+    param(
+        [bool]$Visible,
+        [string]$Label,
+        [ValidateRange(0,100)]
+        [int]$Percent
+    )
+
+    $indicatorVisible = if ($Visible) { [Windows.Visibility]::Visible } else { [Windows.Visibility]::Collapsed }
+    $indicatorLabel = $Label
+    $hasLabel = $PSBoundParameters.ContainsKey('Label')
+    $hasPercent = $PSBoundParameters.ContainsKey('Percent')
+
+    Invoke-WPFUIThread -ScriptBlock {
+        $sync.WPFTweaksProgressBar.Visibility = $indicatorVisible
+        if ($hasLabel) {
+            $sync.WPFTweaksProgressLabel.Text = $indicatorLabel
+        }
+        if ($hasPercent) {
+            $sync.WPFTweaksProgressValue.Value = $Percent
+        }
+    }
+}

functions/private/Start-WinUtilInstallAppRendering.ps1

@@ -9,7 +9,7 @@ function Invoke-WinUtilInstallAppRenderBatch {
     }
 
     if ($sync.currentTab -eq "Install" -and $sync.SearchBar -and -not [string]::IsNullOrWhiteSpace($sync.SearchBar.Text)) {
-        Find-AppsByNameOrDescription -SearchString $sync.SearchBar.Text
+        Find-AppsByNameOrDescription -SearchString $sync.SearchBar.Text -Category $sync.SearchBar.Tag
     }
 }
 

functions/public/Invoke-WPFAppxInstall.ps1

@@ -0,0 +1,68 @@
+function Invoke-WPFAppxInstall {
+    if ($sync.ProcessRunning) {
+        Show-WinUtilMessage -Message "An AppX process is currently running." -Title "WinUtil" -Button "OK" -Icon "Warning"
+        return
+    }
+
+    if ($null -eq $sync.selectedAppx -or $sync.selectedAppx.Count -eq 0) {
+        Show-WinUtilMessage -Message "No AppX Package selected" -Title "Error" -Button "OK" -Icon "Error"
+        return
+    }
+
+    $selected = @($sync.selectedAppx)
+    $apps = $sync.configs.appxHashtable
+
+    $sync.ProcessRunning = $true
+    Invoke-WPFRunspace -ParameterList @(("selected", $selected), ("apps", $apps)) -ScriptBlock {
+        param($selected, $apps)
+
+        $totalPackages = @($selected).Count
+        $hasUI = $null -ne $sync.Form -and $null -ne $sync.Form.Dispatcher
+
+        try {
+            Write-WinUtilLog -Component "AppX" -Message "Starting AppX install for $totalPackages selected package(s)."
+            if ($hasUI) {
+                Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Preparing AppX install (0/$totalPackages)" -Percent 0
+                Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" }
+            }
+
+            for ($index = 0; $index -lt $totalPackages; $index++) {
+                $key = $selected[$index]
+                $app = $apps[$key]
+                $position = $index + 1
+                $startPercent = [int](($index / $totalPackages) * 100)
+
+                if ($hasUI) {
+                    Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Installing $($app.Content) ($position/$totalPackages)" -Percent $startPercent
+                }
+                Write-Host "Installing $($app.Content)"
+                Install-WinUtilAPPX -Name $app.PackageId -StoreId $app.StoreId
+
+                $completedPercent = [int](($position / $totalPackages) * 100)
+                if ($hasUI) {
+                    Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Installed $($app.Content) ($position/$totalPackages)" -Percent $completedPercent
+                    Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -value ($completedPercent / 100) }
+                }
+            }
+
+            Write-Host "================================="
+            Write-Host "--   AppX Install Finished   ---"
+            Write-Host "================================="
+            Write-WinUtilLog -Component "AppX" -Message "AppX install finished."
+            if ($hasUI) {
+                Set-WinUtilTweaksProgressIndicator -Visible $true -Label "AppX install finished" -Percent 100
+                Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" }
+            }
+        }
+        catch {
+            Write-WinUtilLog -Level "ERROR" -Component "AppX" -Message "AppX install failed: $($_.Exception.Message)"
+            if ($hasUI) {
+                Set-WinUtilTweaksProgressIndicator -Visible $true -Label "AppX install failed" -Percent 100
+                Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" -overlay "warning" }
+            }
+        }
+        finally {
+            $sync.ProcessRunning = $false
+        }
+    }
+}

functions/public/Invoke-WPFAppxRemoval.ps1

@@ -1,57 +1,100 @@
 function Invoke-WPFAppxRemoval {
+    if ($sync.ProcessRunning) {
+        Show-WinUtilMessage -Message "An AppX process is currently running." -Title "WinUtil" -Button "OK" -Icon "Warning"
+        return
+    }
+
     if ($null -eq $sync.selectedAppx -or $sync.selectedAppx.Count -eq 0) {
         Show-WinUtilMessage -Message "No AppX Package selected" -Title "Error" -Button "OK" -Icon "Error"
         return
     }
 
-    $selected = $sync.selectedAppx
+    $selected = @($sync.selectedAppx)
     $apps = $sync.configs.appxHashtable
 
+    $sync.ProcessRunning = $true
     Invoke-WPFRunspace -ParameterList @(("selected", $selected), ("apps", $apps)) -ScriptBlock {
         param($selected, $apps)
 
-        $sync.ProcessRunning = $true
+        $totalPackages = @($selected).Count
-        Write-WinUtilLog -Component "AppX" -Message "Starting AppX removal for $(@($selected).Count) selected package(s)."
+        $hasUI = $null -ne $sync.Form -and $null -ne $sync.Form.Dispatcher
-
         $packageList = [System.Collections.Generic.List[string]]::new()
 
-        foreach ($key in $selected) {
+        try {
-            if ($key -eq "WPFAppxMicrosoft_XboxGamingOverlay") {
+            Write-WinUtilLog -Component "AppX" -Message "Starting AppX removal for $totalPackages selected package(s)."
-                # Making sure Game Bar isn't running
+            if ($hasUI) {
-                Write-WinUtilLog -Component "AppX" -Message "Stopping GameBarFTServer before removing Xbox Gaming Overlay."
+                Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Preparing AppX removal (0/$totalPackages)" -Percent 0
-                Stop-Process -Name GameBarFTServer -Force -Confirm:$false -ErrorAction SilentlyContinue
+                Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Normal" -value 0.01 -overlay "logo" }
-
-                # This stops annoying ms-gamebar popup when launching games.
-                Write-WinUtilLog -Component "AppX" -Message "Disabling Game DVR capture before removing Xbox Gaming Overlay."
-                Set-ItemProperty -Path HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\GameDVR -Name AppCaptureEnabled -Value 0
             }
 
-            if ($key -eq "WPFAppxMicrosoft_WindowsNotepad") {
+            for ($index = 0; $index -lt $totalPackages; $index++) {
-                Write-WinUtilLog -Component "AppX" -Message "Stopping dllhost before removing Notepad."
+                $key = $selected[$index]
-                Stop-Process -Name dllhost -Force -Confirm:$false -ErrorAction SilentlyContinue
+                $app = $apps[$key]
+                $position = $index + 1
+                $startPercent = [int](($index / $totalPackages) * 90)
+                if ($hasUI) {
+                    Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Removing $($app.Content) ($position/$totalPackages)" -Percent $startPercent
+                }
+
+                if ($key -eq "WPFAppxMicrosoft_XboxGamingOverlay") {
+                    # Making sure Game Bar isn't running
+                    Write-WinUtilLog -Component "AppX" -Message "Stopping GameBarFTServer before removing Xbox Gaming Overlay."
+                    Stop-Process -Name GameBarFTServer -Force -Confirm:$false -ErrorAction SilentlyContinue
+
+                    # This stops annoying ms-gamebar popup when launching games.
+                    Write-WinUtilLog -Component "AppX" -Message "Disabling Game DVR capture before removing Xbox Gaming Overlay."
+                    Set-ItemProperty -Path HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\GameDVR -Name AppCaptureEnabled -Value 0
+                }
+
+                if ($key -eq "WPFAppxMicrosoft_WindowsNotepad") {
+                    Write-WinUtilLog -Component "AppX" -Message "Stopping dllhost before removing Notepad."
+                    Stop-Process -Name dllhost -Force -Confirm:$false -ErrorAction SilentlyContinue
+                }
+
+                Write-Host "Removing $($app.Content)"
+                Write-WinUtilLog -Component "AppX" -Message "Removing $($app.Content) ($($app.PackageId))."
+                Remove-WinUtilAPPX -Name $app.PackageId
+                $packageList.Add($app.PackageId)
+
+                if ($key -eq "WPFAppxMSTeams") {
+                    # Uninstalls Microsoft Teams Meeting Add-in for Microsoft Office
+                    Write-WinUtilLog -Component "AppX" -Message "Uninstalling Microsoft Teams meeting add-in package."
+                    Get-Package -Name "Microsoft Teams*" -ErrorAction SilentlyContinue | Uninstall-Package -Force
+                }
+
+                $completedPercent = [int](($position / $totalPackages) * 90)
+                if ($hasUI) {
+                    Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Removed $($app.Content) ($position/$totalPackages)" -Percent $completedPercent
+                    Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -value ($completedPercent / 100) }
+                }
             }
 
-            Write-Host "Removing $($apps[$key].Content)"
+            if ($packageList.Count -gt 0) {
-            Write-WinUtilLog -Component "AppX" -Message "Removing $($apps[$key].Content) ($($apps[$key].PackageId))."
+                if ($hasUI) {
-            Remove-WinUtilAPPX -Name $apps[$key].PackageId
+                    Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Removing provisioned AppX packages" -Percent 90
-            $packageList.Add($apps[$key].PackageId)
+                }
+                Remove-WinUtilProvisionedAPPX -PackageList $packageList.ToArray()
+            }
 
-            if ($key -eq "WPFAppxMSTeams") {
+            Write-Host "================================="
-                # Uninstalls Microsoft Teams Meeting Add-in for Microsoft Office
+            Write-Host "--   AppX Removal Finished   ---"
-                Write-WinUtilLog -Component "AppX" -Message "Uninstalling Microsoft Teams meeting add-in package."
+            Write-Host "================================="
-                Get-Package -Name "Microsoft Teams*" -ErrorAction SilentlyContinue | Uninstall-Package -Force
+            Write-WinUtilLog -Component "AppX" -Message "AppX removal finished."
+            if ($hasUI) {
+                Set-WinUtilTweaksProgressIndicator -Visible $true -Label "AppX removal finished" -Percent 100
+                Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" }
             }
         }
-
+        catch {
-        if ($packageList.Count -gt 0) {
+            Write-WinUtilLog -Level "ERROR" -Component "AppX" -Message "AppX removal failed: $($_.Exception.Message)"
-            Remove-WinUtilProvisionedAPPX -PackageList $packageList.ToArray()
+            if ($hasUI) {
+                Set-WinUtilTweaksProgressIndicator -Visible $true -Label "AppX removal failed" -Percent 100
+                Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" -overlay "warning" }
+            }
+        }
+        finally {
+            $sync.ProcessRunning = $false
         }
 
-        Write-Host "================================="
-        Write-Host "--   AppX Removal Finished   ---"
-        Write-Host "================================="
-        Write-WinUtilLog -Component "AppX" -Message "AppX removal finished."
-
-        $sync.ProcessRunning = $false
     }
 }

functions/public/Invoke-WPFButton.ps1

@@ -16,6 +16,7 @@ function Invoke-WPFButton {
     #[System.Windows.MessageBox]::Show("$Button","Chris Titus Tech's Windows Utility","OK","Info")
     if (-not $sync.ProcessRunning) {
         Set-WinUtilProgressBar  -label "" -percent 0
+        Set-WinUtilTweaksProgressIndicator -Visible $false
     }
 
     # Check if button is defined in feature config with function or InvokeScript
@@ -67,6 +68,7 @@ function Invoke-WPFButton {
         "WPFGetInstalledTweaks" {Invoke-WPFGetInstalled -CheckBox "tweaks"}
         "WPFAppxRemoval" {Invoke-WPFTab "WPFTab6BT"}
         "WPFBackToTweaks" {Invoke-WPFTab "WPFTab2BT"}
+        "WPFInstallSelectedAppx" {Invoke-WPFAppxInstall}
         "WPFRemoveSelectedAppx" {Invoke-WPFAppxRemoval}
         "WPFDefaultAppxSelection" {Invoke-WPFPresets "AppxDefault" -checkboxfilterpattern "WPFAppx*"}
         "WPFSelectAllAppx" {
@@ -76,7 +78,7 @@ function Invoke-WPFButton {
             $sync.configs.appxHashtable.Keys | ForEach-Object {$sync.$_.IsChecked = $false}
         }
         "WPFGetInstalledAppx" {
-            $installedAppxPackages = Get-AppxPackage -AllUsers | Select-Object -ExpandProperty Name
+            $installedAppxPackages = Get-WinUtilInstalledAPPX
             foreach ($appx in $sync.configs.appxHashtable.GetEnumerator()) {
                 if ($appx.Value.PackageId -in $installedAppxPackages) {
                     $sync.$($appx.Key).IsChecked = $true
@@ -85,6 +87,13 @@ function Invoke-WPFButton {
         }
         "WPFCloseButton" {$sync.Form.Close(); Write-Host "Bye bye!"}
         "WPFMinimizeButton" {$sync.Form.WindowState = [Windows.WindowState]::Minimized}
+        "WPFMaximizeButton" {
+            if ($sync.Form.WindowState -eq [Windows.WindowState]::Normal) {
+                $sync.Form.WindowState = [Windows.WindowState]::Maximized
+            } else {
+                $sync.Form.WindowState = [Windows.WindowState]::Normal
+            }
+        }
         "WPFselectedAppsButton" {$sync.selectedAppsPopup.IsOpen = -not $sync.selectedAppsPopup.IsOpen}
     }
 }

functions/public/Invoke-WPFtweaksbutton.ps1

@@ -40,12 +40,14 @@ function Invoke-WPFtweaksbutton {
     }
 
     Set-WinUtilProgressBar -Label "Creating restore point" -Percent 0
+    Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Creating restore point" -Percent 0
     Write-WinUtilLog -Component "Tweaks" -Message "Creating restore point before applying selected tweaks."
     Invoke-WinUtilTweaks $restorePointTweak
     $completedSteps = 1
 
     if ($tweaksToRun.Count -eq 0 -and $dnsProvider -eq "Default") {
       Set-WinUtilProgressBar -Label "Tweaks finished" -Percent 100
+      Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Tweaks finished" -Percent 100
       $sync.ProcessRunning = $false
       Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" }
       Write-Host "================================="
@@ -76,12 +78,14 @@ function Invoke-WPFtweaksbutton {
 
     for ($i = 0; $i -lt $tweaks.Count; $i++) {
       Set-WinUtilProgressBar -Label "Applying $($tweaks[$i])" -Percent ($completedSteps / $totalSteps * 100)
+      Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Applying $($tweaks[$i]) ($($completedSteps + 1)/$totalSteps)" -Percent ($completedSteps / $totalSteps * 100)
       Invoke-WinUtilTweaks $tweaks[$i]
       $completedSteps++
       $progress = $completedSteps / $totalSteps
       Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -value $progress }
     }
     Set-WinUtilProgressBar -Label "Tweaks finished" -Percent 100
+    Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Tweaks finished" -Percent 100
     $sync.ProcessRunning = $false
     Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" }
     Write-Host "================================="

functions/public/Invoke-WPFundoall.ps1

@@ -34,11 +34,13 @@ function Invoke-WPFundoall {
 
         for ($i = 0; $i -lt $tweaks.Count; $i++) {
             Set-WinUtilProgressBar -Label "Undoing $($tweaks[$i])" -Percent ($i / $tweaks.Count * 100)
+            Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Undoing $($tweaks[$i]) ($($i + 1)/$($tweaks.Count))" -Percent ($i / $tweaks.Count * 100)
             Invoke-WinUtiltweaks $tweaks[$i] -undo $true
             Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -value ($i/$tweaks.Count) }
         }
 
         Set-WinUtilProgressBar -Label "Undo Tweaks Finished" -Percent 100
+        Set-WinUtilTweaksProgressIndicator -Visible $true -Label "Undo Tweaks Finished" -Percent 100
         $sync.ProcessRunning = $false
         Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "None" -overlay "checkmark" }
         Write-Host "=================================="

pester/appx.Tests.ps1

@@ -1,12 +1,16 @@
 #===========================================================================
-# Tests - AppX Removal
+# Tests - AppX Management
 #===========================================================================
 
 BeforeAll {
     $script:repoRoot = (Resolve-Path (Join-Path $PSScriptRoot "..")).Path
+    . (Join-Path $script:repoRoot "functions\private\Get-WinUtilInstalledAPPX.ps1")
+    . (Join-Path $script:repoRoot "functions\private\Install-WinUtilAPPX.ps1")
     . (Join-Path $script:repoRoot "functions\private\Remove-WinUtilAPPX.ps1")
     . (Join-Path $script:repoRoot "functions\private\Remove-WinUtilProvisionedAPPX.ps1")
+    . (Join-Path $script:repoRoot "functions\public\Invoke-WPFAppxInstall.ps1")
     . (Join-Path $script:repoRoot "functions\public\Invoke-WPFAppxRemoval.ps1")
+    . (Join-Path $script:repoRoot "functions\public\Invoke-WPFButton.ps1")
 
     $tokens = $null
     $parseErrors = $null
@@ -20,6 +24,16 @@ BeforeAll {
     }, $true)
     $script:provisionedRemovalScriptBlock = $ps5CommandAssignment.Right.Expression.ScriptBlock.GetScriptBlock()
 
+    $installSourcePath = Join-Path $script:repoRoot "functions\private\Install-WinUtilAPPX.ps1"
+    $installSourceAst = [System.Management.Automation.Language.Parser]::ParseFile($installSourcePath, [ref]$tokens, [ref]$parseErrors)
+    $installCommandAssignment = $installSourceAst.Find({
+        param($node)
+        $node -is [System.Management.Automation.Language.AssignmentStatementAst] -and
+            $node.Left -is [System.Management.Automation.Language.VariableExpressionAst] -and
+            $node.Left.VariablePath.UserPath -eq "ps5Command"
+    }, $true)
+    $script:appxInstallScriptBlock = $installCommandAssignment.Right.Expression.ScriptBlock.GetScriptBlock()
+
     function Write-WinUtilLog {
         param($Message, $Level, $Component)
     }
@@ -29,8 +43,25 @@ BeforeAll {
     function Invoke-WPFRunspace {
         param($ArgumentList, $ParameterList, [scriptblock]$ScriptBlock)
     }
+    function Invoke-WPFUIThread {
+        param([scriptblock]$ScriptBlock)
+    }
+    function Set-WinUtilProgressBar {
+        param($Label, $Percent)
+    }
+    function Set-WinUtilTweaksProgressIndicator {
+        param($Visible, $Label, $Percent)
+    }
+    function powershell.exe { }
     function Get-AppxPackage {
-        param($Name, [switch]$AllUsers)
+        param($Name, [switch]$AllUsers, $ErrorAction)
+    }
+    function Add-AppxPackage {
+        param($Register, [switch]$DisableDevelopmentMode, $ErrorAction)
+    }
+    function Install-WinUtilWinget { }
+    function Install-WinUtilProgramWinget {
+        param($Action, $Programs)
     }
     function Remove-AppxPackage {
         param(
@@ -73,6 +104,162 @@ BeforeAll {
     }
 }
 
+Describe "Get-WinUtilInstalledAPPX" {
+    BeforeEach {
+        Mock Write-WinUtilLog { }
+        Mock powershell.exe {
+            $global:LASTEXITCODE = 0
+            @("Example.One", "Example.Two")
+        }
+    }
+
+    It "queries installed package names through Windows PowerShell" {
+        $result = Get-WinUtilInstalledAPPX
+
+        $result | Should -Be @("Example.One", "Example.Two")
+        Should -Invoke -CommandName powershell.exe -Times 1 -Exactly
+        Should -Invoke -CommandName Write-WinUtilLog -Times 0 -Exactly
+    }
+
+    It "logs query failures and returns no package names" {
+        Mock powershell.exe {
+            $global:LASTEXITCODE = 1
+            "AppX query failed"
+        }
+
+        $result = @(Get-WinUtilInstalledAPPX)
+
+        $result | Should -HaveCount 0
+        Should -Invoke -CommandName Write-WinUtilLog -Times 1 -Exactly -ParameterFilter {
+            $Level -eq "ERROR" -and
+                $Component -eq "AppX" -and
+                $Message -eq "Failed to get installed AppX packages: AppX query failed"
+        }
+    }
+}
+
+Describe "Install-WinUtilAPPX" {
+    BeforeEach {
+        Mock Write-WinUtilLog { }
+        Mock Install-WinUtilWinget { }
+        Mock Install-WinUtilProgramWinget { }
+        Mock powershell.exe {
+            $global:LASTEXITCODE = 0
+            "C:\Program Files\WindowsApps\Example.Package\AppxManifest.xml"
+        }
+    }
+
+    It "uses a local manifest without contacting the Microsoft Store" {
+        Install-WinUtilAPPX -Name "Example.Package" -StoreId "9EXAMPLE1234"
+
+        Should -Invoke -CommandName Install-WinUtilWinget -Times 0 -Exactly
+        Should -Invoke -CommandName Install-WinUtilProgramWinget -Times 0 -Exactly
+        Should -Invoke -CommandName Write-WinUtilLog -Times 1 -Exactly -ParameterFilter {
+            $Component -eq "AppX" -and
+                $Message -like "Registered local AppX manifest for Example.Package*"
+        }
+    }
+
+    It "falls back to the Microsoft Store when no local manifest is available" {
+        Mock powershell.exe { $global:LASTEXITCODE = 0 }
+
+        Install-WinUtilAPPX -Name "Example.Package" -StoreId "9EXAMPLE1234"
+
+        Should -Invoke -CommandName Install-WinUtilWinget -Times 1 -Exactly
+        Should -Invoke -CommandName Install-WinUtilProgramWinget -Times 1 -Exactly -ParameterFilter {
+            $Action -eq "Install" -and $Programs.Count -eq 1 -and $Programs[0] -eq "msstore:9EXAMPLE1234"
+        }
+    }
+
+    It "logs local registration failures before using the Microsoft Store" {
+        Mock powershell.exe {
+            $global:LASTEXITCODE = 1
+            "Registration failed"
+        }
+
+        Install-WinUtilAPPX -Name "Example.Package" -StoreId "9EXAMPLE1234"
+
+        Should -Invoke -CommandName Write-WinUtilLog -Times 1 -Exactly -ParameterFilter {
+            $Level -eq "WARN" -and
+                $Component -eq "AppX" -and
+                $Message -eq "Local AppX registration failed for Example.Package: Registration failed"
+        }
+        Should -Invoke -CommandName Install-WinUtilProgramWinget -Times 1 -Exactly
+    }
+
+    It "throws after logging an error when neither install method is available" {
+        Mock powershell.exe { $global:LASTEXITCODE = 0 }
+
+        { Install-WinUtilAPPX -Name "Example.Package" } |
+            Should -Throw "Unable to install Example.Package because no local manifest or Microsoft Store ID is available."
+
+        Should -Invoke -CommandName Install-WinUtilProgramWinget -Times 0 -Exactly
+        Should -Invoke -CommandName Write-WinUtilLog -Times 1 -Exactly -ParameterFilter {
+            $Level -eq "ERROR" -and
+                $Component -eq "AppX" -and
+                $Message -eq "Unable to install Example.Package because no local manifest or Microsoft Store ID is available."
+        }
+    }
+
+    It "registers an installed package manifest through Windows PowerShell" {
+        Mock Get-AppxPackage {
+            [pscustomobject]@{
+                InstallLocation = "C:\Program Files\WindowsApps\Example.Package"
+                Version = [version]"2.0.0.0"
+            }
+        }
+        Mock Get-AppxProvisionedPackage { }
+        Mock Test-Path { $LiteralPath -eq "C:\Program Files\WindowsApps\Example.Package\AppxManifest.xml" }
+        Mock Add-AppxPackage { }
+
+        $result = & $script:appxInstallScriptBlock "Example.Package"
+
+        $result | Should -Be "C:\Program Files\WindowsApps\Example.Package\AppxManifest.xml"
+        Should -Invoke -CommandName Get-AppxPackage -Times 1 -Exactly
+        Should -Invoke -CommandName Add-AppxPackage -Times 1 -Exactly
+    }
+}
+
+Describe "Get installed AppX selection" {
+    BeforeEach {
+        $script:sync = [Hashtable]::Synchronized(@{
+            ProcessRunning = $false
+            configs = @{
+                feature = @{}
+                appxHashtable = @{
+                    WPFAppxExample = [pscustomobject]@{ PackageId = "Example.Package" }
+                    WPFAppxMissing = [pscustomobject]@{ PackageId = "Missing.Package" }
+                }
+            }
+            WPFAppxExample = [pscustomobject]@{ IsChecked = $false }
+            WPFAppxMissing = [pscustomobject]@{ IsChecked = $false }
+        })
+
+        Mock Set-WinUtilProgressBar { }
+        Mock Set-WinUtilTweaksProgressIndicator { }
+        Mock Get-WinUtilInstalledAPPX { @("Example.Package") }
+        Mock Invoke-WPFAppxInstall { }
+    }
+
+    AfterEach {
+        Remove-Variable -Name sync -Scope Script -ErrorAction SilentlyContinue
+    }
+
+    It "selects configured packages returned by the compatibility-safe query" {
+        Invoke-WPFButton -Button "WPFGetInstalledAppx"
+
+        Should -Invoke -CommandName Get-WinUtilInstalledAPPX -Times 1 -Exactly
+        $script:sync.WPFAppxExample.IsChecked | Should -BeTrue
+        $script:sync.WPFAppxMissing.IsChecked | Should -BeFalse
+    }
+
+    It "routes the install button to the AppX install workflow" {
+        Invoke-WPFButton -Button "WPFInstallSelectedAppx"
+
+        Should -Invoke -CommandName Invoke-WPFAppxInstall -Times 1 -Exactly
+    }
+}
+
 Describe "Remove-WinUtilAPPX" {
     BeforeEach {
         Mock Write-Host { }
@@ -155,13 +342,123 @@ Describe "Remove-WinUtilProvisionedAPPX" {
         }
     }
 
-    It "handles child process failures before logging completion" {
+    It "throws after logging child process failures" {
         $source = Get-Content -Path $provisionedSourcePath -Raw
 
         $source | Should -Match '\$removalOutput = powershell\.exe .* 2>&1'
-        $source | Should -Match 'if \(\$LASTEXITCODE -ne 0 -or \$null -ne \$removalOutput\)'
+        $source | Should -Match 'Write-WinUtilLog -Level "ERROR" -Component "AppX" -Message \$errorMessage'
-        $source | Should -Match 'Write-WinUtilLog -Level "ERROR" -Component "AppX" -Message "AppX provisioned package removal failed:'
+        $source | Should -Match '(?s)AppX provisioned package removal failed:.*throw \$errorMessage.*AppX provisioned package removal completed\.'
-        $source | Should -Match '(?s)AppX provisioned package removal failed:.*return.*AppX provisioned package removal completed\.'
+    }
+}
+
+Describe "Invoke-WPFAppxInstall" {
+    BeforeEach {
+        $script:sync = [Hashtable]::Synchronized(@{
+            ProcessRunning = $false
+            Form = [pscustomobject]@{ Dispatcher = [pscustomobject]@{} }
+            selectedAppx = [System.Collections.Generic.List[string]]::new()
+            configs = @{
+                appxHashtable = @{
+                    WPFAppxExample = [pscustomobject]@{
+                        Content = "Example App"
+                        PackageId = "Example.Package"
+                        StoreId = "9EXAMPLE1234"
+                    }
+                }
+            }
+        })
+        $script:capturedAppxInstallScriptBlock = $null
+        $script:capturedAppxInstallParameterList = $null
+        $script:appxInstallProcessRunningAtLaunch = $null
+
+        Mock Show-WinUtilMessage { "OK" }
+        Mock Write-Host { }
+        Mock Write-WinUtilLog { }
+        Mock Set-WinUtilTweaksProgressIndicator { }
+        Mock Invoke-WPFUIThread { }
+        Mock Install-WinUtilAPPX { }
+        Mock Invoke-WPFRunspace {
+            $script:appxInstallProcessRunningAtLaunch = $script:sync.ProcessRunning
+            $script:capturedAppxInstallScriptBlock = $ScriptBlock
+            $script:capturedAppxInstallParameterList = $ParameterList
+            [pscustomobject]@{ MockHandle = $true }
+        }
+    }
+
+    AfterEach {
+        Remove-Variable -Name sync -Scope Script -ErrorAction SilentlyContinue
+        Remove-Variable -Name capturedAppxInstallScriptBlock -Scope Script -ErrorAction SilentlyContinue
+        Remove-Variable -Name capturedAppxInstallParameterList -Scope Script -ErrorAction SilentlyContinue
+        Remove-Variable -Name appxInstallProcessRunningAtLaunch -Scope Script -ErrorAction SilentlyContinue
+    }
+
+    It "prompts and exits when no AppX packages are selected for install" {
+        Invoke-WPFAppxInstall
+
+        Should -Invoke -CommandName Show-WinUtilMessage -Times 1 -Exactly -ParameterFilter {
+            $Message -eq "No AppX Package selected" -and
+                $Title -eq "Error" -and
+                $Button -eq "OK" -and
+                $Icon -eq "Error"
+        }
+        Should -Invoke -CommandName Invoke-WPFRunspace -Times 0 -Exactly
+    }
+
+    It "prevents overlapping AppX install operations" {
+        $script:sync.ProcessRunning = $true
+        $script:sync.selectedAppx.Add("WPFAppxExample")
+
+        Invoke-WPFAppxInstall
+
+        Should -Invoke -CommandName Show-WinUtilMessage -Times 1 -Exactly -ParameterFilter {
+            $Message -eq "An AppX process is currently running." -and
+                $Title -eq "WinUtil" -and
+                $Button -eq "OK" -and
+                $Icon -eq "Warning"
+        }
+        Should -Invoke -CommandName Invoke-WPFRunspace -Times 0 -Exactly
+    }
+
+    It "installs selected AppX packages with their Store IDs" {
+        $script:sync.selectedAppx.Add("WPFAppxExample")
+
+        Invoke-WPFAppxInstall
+        $script:appxInstallProcessRunningAtLaunch | Should -BeTrue
+        & $script:capturedAppxInstallScriptBlock -selected @("WPFAppxExample") -apps $script:sync.configs.appxHashtable
+
+        $script:capturedAppxInstallParameterList[0][1][0] | Should -Be "WPFAppxExample"
+        Should -Invoke -CommandName Install-WinUtilAPPX -Times 1 -Exactly -ParameterFilter {
+            $Name -eq "Example.Package" -and $StoreId -eq "9EXAMPLE1234"
+        }
+        Should -Invoke -CommandName Set-WinUtilTweaksProgressIndicator -Times 1 -Exactly -ParameterFilter {
+            $Visible -eq $true -and $Label -eq "Installing Example App (1/1)" -and $Percent -eq 0
+        }
+        Should -Invoke -CommandName Set-WinUtilTweaksProgressIndicator -Times 1 -Exactly -ParameterFilter {
+            $Visible -eq $true -and $Label -eq "Installed Example App (1/1)" -and $Percent -eq 100
+        }
+        Should -Invoke -CommandName Set-WinUtilTweaksProgressIndicator -Times 1 -Exactly -ParameterFilter {
+            $Visible -eq $true -and $Label -eq "AppX install finished" -and $Percent -eq 100
+        }
+        Should -Invoke -CommandName Invoke-WPFUIThread -Times 1 -Exactly -ParameterFilter {
+            $ScriptBlock.ToString() -like '*Set-WinUtilTaskbaritem -state "None" -overlay "checkmark"*'
+        }
+        $script:sync.ProcessRunning | Should -BeFalse
+    }
+
+    It "shows failure feedback and clears ProcessRunning when install fails" {
+        $script:sync.selectedAppx.Add("WPFAppxExample")
+        Mock Install-WinUtilAPPX { throw "Install failed" }
+
+        Invoke-WPFAppxInstall
+        & $script:capturedAppxInstallScriptBlock -selected @("WPFAppxExample") -apps $script:sync.configs.appxHashtable
+
+        Should -Invoke -CommandName Set-WinUtilTweaksProgressIndicator -Times 1 -Exactly -ParameterFilter {
+            $Visible -eq $true -and $Label -eq "AppX install failed" -and $Percent -eq 100
+        }
+        Should -Invoke -CommandName Invoke-WPFUIThread -Times 1 -Exactly -ParameterFilter {
+            $ScriptBlock.ToString() -like '*Set-WinUtilTaskbaritem -state "Error" -overlay "warning"*'
+        }
+        $script:sync.ProcessRunning | Should -BeFalse
     }
 }
 
@@ -176,9 +473,11 @@ Describe "Invoke-WPFAppxRemoval entrypoint" {
         })
         $script:capturedAppxScriptBlock = $null
         $script:capturedAppxParameterList = $null
+        $script:appxRemovalProcessRunningAtLaunch = $null
 
         Mock Show-WinUtilMessage { "OK" }
         Mock Invoke-WPFRunspace {
+            $script:appxRemovalProcessRunningAtLaunch = $script:sync.ProcessRunning
             $script:capturedAppxScriptBlock = $ScriptBlock
             $script:capturedAppxParameterList = $ParameterList
             [pscustomobject]@{ MockHandle = $true }
@@ -189,6 +488,7 @@ Describe "Invoke-WPFAppxRemoval entrypoint" {
         Remove-Variable -Name sync -Scope Script -ErrorAction SilentlyContinue
         Remove-Variable -Name capturedAppxScriptBlock -Scope Script -ErrorAction SilentlyContinue
         Remove-Variable -Name capturedAppxParameterList -Scope Script -ErrorAction SilentlyContinue
+        Remove-Variable -Name appxRemovalProcessRunningAtLaunch -Scope Script -ErrorAction SilentlyContinue
     }
 
     It "prompts and exits when no AppX packages are selected" {
@@ -203,6 +503,21 @@ Describe "Invoke-WPFAppxRemoval entrypoint" {
         Should -Invoke -CommandName Invoke-WPFRunspace -Times 0 -Exactly
     }
 
+    It "prevents overlapping AppX removal operations" {
+        $script:sync.ProcessRunning = $true
+        $script:sync.selectedAppx.Add("WPFAppxExample")
+
+        Invoke-WPFAppxRemoval
+
+        Should -Invoke -CommandName Show-WinUtilMessage -Times 1 -Exactly -ParameterFilter {
+            $Message -eq "An AppX process is currently running." -and
+                $Title -eq "WinUtil" -and
+                $Button -eq "OK" -and
+                $Icon -eq "Warning"
+        }
+        Should -Invoke -CommandName Invoke-WPFRunspace -Times 0 -Exactly
+    }
+
     It "passes selected AppX keys and app metadata to the removal runspace" {
         $script:sync.selectedAppx.Add("WPFAppxExample")
         $script:sync.configs.appxHashtable["WPFAppxExample"] = [pscustomobject]@{
@@ -211,7 +526,10 @@ Describe "Invoke-WPFAppxRemoval entrypoint" {
         }
 
         Invoke-WPFAppxRemoval
+        $script:sync.selectedAppx.Add("WPFAppxChangedAfterLaunch")
 
+        $script:appxRemovalProcessRunningAtLaunch | Should -BeTrue
+        $script:capturedAppxParameterList[0][1] | Should -HaveCount 1
         Should -Invoke -CommandName Show-WinUtilMessage -Times 0 -Exactly
         Should -Invoke -CommandName Invoke-WPFRunspace -Times 1 -Exactly -ParameterFilter {
             $ScriptBlock -is [scriptblock] -and
@@ -228,6 +546,7 @@ Describe "Invoke-WPFAppxRemoval runspace body" {
     BeforeEach {
         $script:sync = [Hashtable]::Synchronized(@{
             ProcessRunning = $false
+            Form = [pscustomobject]@{ Dispatcher = [pscustomobject]@{} }
             selectedAppx = [System.Collections.Generic.List[string]]::new()
             configs = @{
                 appxHashtable = @{}
@@ -260,6 +579,8 @@ Describe "Invoke-WPFAppxRemoval runspace body" {
         Mock Show-WinUtilMessage { "OK" }
         Mock Write-Host { }
         Mock Write-WinUtilLog { }
+        Mock Set-WinUtilTweaksProgressIndicator { }
+        Mock Invoke-WPFUIThread { }
         Mock Stop-Process { }
         Mock Set-ItemProperty { }
         Mock Get-AppxPackage {
@@ -301,6 +622,77 @@ Describe "Invoke-WPFAppxRemoval runspace body" {
         Should -Invoke -CommandName Remove-WinUtilProvisionedAPPX -Times 1 -Exactly -ParameterFilter {
             $PackageList.Count -eq 1 -and $PackageList[0] -eq "Example.Package"
         }
+        Should -Invoke -CommandName Set-WinUtilTweaksProgressIndicator -Times 1 -Exactly -ParameterFilter {
+            $Visible -eq $true -and $Label -eq "Removing Example App (1/1)" -and $Percent -eq 0
+        }
+        Should -Invoke -CommandName Set-WinUtilTweaksProgressIndicator -Times 1 -Exactly -ParameterFilter {
+            $Visible -eq $true -and $Label -eq "Removed Example App (1/1)" -and $Percent -eq 90
+        }
+        Should -Invoke -CommandName Set-WinUtilTweaksProgressIndicator -Times 1 -Exactly -ParameterFilter {
+            $Visible -eq $true -and $Label -eq "AppX removal finished" -and $Percent -eq 100
+        }
+        Should -Invoke -CommandName Invoke-WPFUIThread -Times 1 -Exactly -ParameterFilter {
+            $ScriptBlock.ToString() -like '*Set-WinUtilTaskbaritem -state "None" -overlay "checkmark"*'
+        }
+        $script:sync.ProcessRunning | Should -BeFalse
+    }
+
+    It "shows failure feedback and clears ProcessRunning when removal fails" {
+        $selected = @("WPFAppxExample")
+        $script:sync.selectedAppx.Add("WPFAppxExample")
+        $script:sync.configs.appxHashtable = $script:apps
+        Mock Remove-WinUtilAPPX { throw "Removal failed" }
+
+        Invoke-WPFAppxRemoval
+        & $script:capturedAppxScriptBlock -selected $selected -apps $script:apps
+
+        Should -Invoke -CommandName Set-WinUtilTweaksProgressIndicator -Times 1 -Exactly -ParameterFilter {
+            $Visible -eq $true -and $Label -eq "AppX removal failed" -and $Percent -eq 100
+        }
+        Should -Invoke -CommandName Invoke-WPFUIThread -Times 1 -Exactly -ParameterFilter {
+            $ScriptBlock.ToString() -like '*Set-WinUtilTaskbaritem -state "Error" -overlay "warning"*'
+        }
+        Should -Invoke -CommandName Remove-WinUtilProvisionedAPPX -Times 0 -Exactly
+        $script:sync.ProcessRunning | Should -BeFalse
+    }
+
+    It "removes packages without UI progress during headless autorun" {
+        $selected = @("WPFAppxExample")
+        $script:sync.Remove("Form")
+        $script:sync.selectedAppx.Add("WPFAppxExample")
+        $script:sync.configs.appxHashtable = $script:apps
+
+        Invoke-WPFAppxRemoval
+        & $script:capturedAppxScriptBlock -selected $selected -apps $script:apps
+
+        Should -Invoke -CommandName Remove-AppxPackage -Times 1 -Exactly
+        Should -Invoke -CommandName Remove-WinUtilProvisionedAPPX -Times 1 -Exactly
+        Should -Invoke -CommandName Set-WinUtilTweaksProgressIndicator -Times 0 -Exactly
+        Should -Invoke -CommandName Invoke-WPFUIThread -Times 0 -Exactly
+        $script:sync.ProcessRunning | Should -BeFalse
+    }
+
+    It "shows failure feedback when provisioned package removal fails" {
+        $selected = @("WPFAppxExample")
+        $script:sync.selectedAppx.Add("WPFAppxExample")
+        $script:sync.configs.appxHashtable = $script:apps
+        Mock Remove-WinUtilProvisionedAPPX { throw "Provisioned removal failed" }
+
+        Invoke-WPFAppxRemoval
+        & $script:capturedAppxScriptBlock -selected $selected -apps $script:apps
+
+        Should -Invoke -CommandName Set-WinUtilTweaksProgressIndicator -Times 1 -Exactly -ParameterFilter {
+            $Visible -eq $true -and $Label -eq "AppX removal failed" -and $Percent -eq 100
+        }
+        Should -Invoke -CommandName Set-WinUtilTweaksProgressIndicator -Times 0 -Exactly -ParameterFilter {
+            $Label -eq "AppX removal finished"
+        }
+        Should -Invoke -CommandName Invoke-WPFUIThread -Times 1 -Exactly -ParameterFilter {
+            $ScriptBlock.ToString() -like '*Set-WinUtilTaskbaritem -state "Error" -overlay "warning"*'
+        }
+        Should -Invoke -CommandName Invoke-WPFUIThread -Times 0 -Exactly -ParameterFilter {
+            $ScriptBlock.ToString() -like '*Set-WinUtilTaskbaritem -state "None" -overlay "checkmark"*'
+        }
         $script:sync.ProcessRunning | Should -BeFalse
     }
 

pester/configs.Tests.ps1

@@ -326,6 +326,11 @@ Describe "UI-rendered config entries" {
             foreach ($missingField in (Get-WinUtilMissingRequiredFields -EntryName $entry.Name -Entry $entry.Value -RequiredFields $requiredFields)) {
                 $invalidEntries.Add($missingField)
             }
+
+            if ((Test-WinUtilHasProperty -Object $entry.Value -Name "StoreId") -and
+                $entry.Value.StoreId -notmatch '^(?:[A-Z0-9]{12}|XP[A-Z0-9]{12})$') {
+                $invalidEntries.Add("$($entry.Name) has invalid Microsoft Store ID '$($entry.Value.StoreId)'")
+            }
         }
 
         if ($invalidEntries.Count -gt 0) {

pester/install-rendering.Tests.ps1

@@ -21,6 +21,7 @@ Describe "Install app rendering startup contract" {
         $renderScript | Should -Match 'Dispatcher\.BeginInvoke'
         $renderScript | Should -Match 'Invoke-WinUtilInstallAppRenderNextBatch'
         $renderScript | Should -Match 'Initialize-InstallAppEntry'
+        $renderScript | Should -Match 'Find-AppsByNameOrDescription -SearchString \$sync\.SearchBar\.Text -Category \$sync\.SearchBar\.Tag'
         $renderScript | Should -Match '\$sync\.InstallAppEntriesRendered = \$true'
     }
 
@@ -59,7 +60,7 @@ Describe "Install app rendering startup contract" {
             }
 
             function global:Find-AppsByNameOrDescription {
-                param($SearchString)
+                param($SearchString, $Category)
                 throw "Search should not run for an empty search box in this test."
             }
 

pester/search-filter.Tests.ps1

@@ -172,18 +172,27 @@ namespace Windows.Controls
                     WPFInstallBrowser = [pscustomobject]@{
                         Content = "Firefox"
                         Description = "Fast private browser"
+                        Category = "Browsers"
                     }
                     WPFInstallMedia = [pscustomobject]@{
                         Content = "VLC"
                         Description = "Media player"
+                        Category = "Multimedia Tools"
                     }
                     WPFInstallLiteral = [pscustomobject]@{
                         Content = "Tool [abc]"
                         Description = "Literal wildcard sample"
+                        Category = "Utilities"
                     }
                     WPFInstallEditor = [pscustomobject]@{
                         Content = "Code Editor"
                         Description = "Text editing"
+                        Category = "Development"
+                    }
+                    WPFInstallPowerToys = [pscustomobject]@{
+                        Content = "PowerToys"
+                        Description = "A collection of system utilities"
+                        Category = "Microsoft Tools"
                     }
                 }
             }
@@ -363,6 +372,19 @@ Describe "Find-AppsByNameOrDescription" {
         $mediaItem.Visibility | Should -Be ([Windows.Visibility]::Collapsed)
         $category.Visibility | Should -Be ([Windows.Visibility]::Visible)
     }
+
+    It "filters category chips by exact application category" {
+        $utilityItem = New-WinUtilAppSearchItem -Tag "WPFInstallLiteral"
+        $powerToysItem = New-WinUtilAppSearchItem -Tag "WPFInstallPowerToys"
+        $category = New-WinUtilAppCategory -Label "- Tools" -Items @($utilityItem, $powerToysItem)
+        New-WinUtilAppSearchContext -Categories @($category)
+
+        Find-AppsByNameOrDescription -SearchString "Utilities" -Category "Utilities"
+
+        $utilityItem.Visibility | Should -Be ([Windows.Visibility]::Visible)
+        $powerToysItem.Visibility | Should -Be ([Windows.Visibility]::Collapsed)
+        $category.Visibility | Should -Be ([Windows.Visibility]::Visible)
+    }
 }
 
 Describe "Find-TweaksByNameOrDescription" {

pester/tweaks.Tests.ps1

@@ -34,6 +34,9 @@ BeforeAll {
     function Set-WinUtilProgressBar {
         param($Label, $Percent)
     }
+    function Set-WinUtilTweaksProgressIndicator {
+        param($Visible, $Label, $Percent)
+    }
     function Write-WinUtilLog {
         param($Message, $Level, $Component)
     }

pester/ui-state.Tests.ps1

@@ -5,7 +5,7 @@
 BeforeAll {
     $script:repoRoot = (Resolve-Path (Join-Path $PSScriptRoot "..")).Path
 
-    if (-not ("System.Windows.Controls.CheckBox" -as [type])) {
+    if (-not ("Windows.Visibility" -as [type])) {
         Add-Type @"
 namespace Windows
 {
@@ -15,7 +15,25 @@ namespace Windows
         Collapsed
     }
 }
+"@
+    }
 
+    if (-not ("Windows.WindowState" -as [type])) {
+        Add-Type @"
+namespace Windows
+{
+    public enum WindowState
+    {
+        Normal,
+        Minimized,
+        Maximized
+    }
+}
+"@
+    }
+
+    if (-not ("System.Windows.Controls.CheckBox" -as [type])) {
+        Add-Type @"
 namespace System.Windows.Controls
 {
     public class CheckBox
@@ -44,8 +62,17 @@ namespace System.Windows.Controls
     . (Join-Path $script:repoRoot "functions\private\Update-WinUtilSelections.ps1")
     . (Join-Path $script:repoRoot "functions\private\Reset-WPFCheckBoxes.ps1")
     . (Join-Path $script:repoRoot "functions\public\Invoke-WPFSelectedCheckboxesUpdate.ps1")
+    . (Join-Path $script:repoRoot "functions\public\Invoke-WPFButton.ps1")
     . (Join-Path $script:repoRoot "functions\public\Invoke-WPFToggleAllCategories.ps1")
 
+    function Set-WinUtilProgressBar {
+        param($Label, $Percent)
+    }
+
+    function Set-WinUtilTweaksProgressIndicator {
+        param($Visible, $Label, $Percent)
+    }
+
     function script:New-WinUtilFakeCheckBox {
         param([bool]$IsChecked = $false)
 
@@ -272,3 +299,67 @@ Describe "Invoke-WPFToggleAllCategories" {
         }
     }
 }
+
+Describe "Invoke-WPFButton progress cleanup" {
+    BeforeEach {
+        New-WinUtilUiStateTestContext
+        Mock Set-WinUtilProgressBar { }
+        Mock Set-WinUtilTweaksProgressIndicator { }
+    }
+
+    AfterEach {
+        Remove-Variable -Name sync -Scope Script -ErrorAction SilentlyContinue
+        Remove-Variable -Name sync -Scope Global -ErrorAction SilentlyContinue
+    }
+
+    It "clears completed progress on the next idle button click" {
+        $script:sync.ProcessRunning = $false
+
+        Invoke-WPFButton -Button "WPFNoOp"
+
+        Should -Invoke Set-WinUtilProgressBar -Times 1 -Exactly -ParameterFilter {
+            $Label -eq "" -and $Percent -eq 0
+        }
+        Should -Invoke Set-WinUtilTweaksProgressIndicator -Times 1 -Exactly -ParameterFilter {
+            $Visible -eq $false
+        }
+    }
+
+    It "leaves progress visible while a process is running" {
+        $script:sync.ProcessRunning = $true
+
+        Invoke-WPFButton -Button "WPFNoOp"
+
+        Should -Not -Invoke Set-WinUtilProgressBar
+        Should -Not -Invoke Set-WinUtilTweaksProgressIndicator
+    }
+}
+
+Describe "Invoke-WPFButton window state" {
+    BeforeEach {
+        New-WinUtilUiStateTestContext
+        $script:sync.ProcessRunning = $true
+        $script:sync.Form = [pscustomobject]@{
+            WindowState = [Windows.WindowState]::Normal
+        }
+    }
+
+    AfterEach {
+        Remove-Variable -Name sync -Scope Script -ErrorAction SilentlyContinue
+        Remove-Variable -Name sync -Scope Global -ErrorAction SilentlyContinue
+    }
+
+    It "maximizes a normal window" {
+        Invoke-WPFButton -Button "WPFMaximizeButton"
+
+        $script:sync.Form.WindowState | Should -Be ([Windows.WindowState]::Maximized)
+    }
+
+    It "restores a maximized window" {
+        $script:sync.Form.WindowState = [Windows.WindowState]::Maximized
+
+        Invoke-WPFButton -Button "WPFMaximizeButton"
+
+        $script:sync.Form.WindowState | Should -Be ([Windows.WindowState]::Normal)
+    }
+}

pester/xaml.Tests.ps1

@@ -135,7 +135,19 @@ Describe "XAML document" {
             "WPFTab4BT",
             "WPFTab5BT",
             "SearchBar",
+            "SearchBarIcon",
             "SearchBarClearButton",
+            "WPFSearchChips",
+            "WPFSearchChipAll",
+            "WPFSearchChipBrowsers",
+            "WPFSearchChipCommunications",
+            "WPFSearchChipDevelopment",
+            "WPFSearchChipGames",
+            "WPFSearchChipMicrosoftTools",
+            "WPFSearchChipMultimediaTools",
+            "WPFSearchChipProTools",
+            "WPFSearchChipSelfhostedTools",
+            "WPFSearchChipUtilities",
             "appscategory",
             "appspanel",
             "tweakspanel",
@@ -158,6 +170,7 @@ Describe "XAML document" {
             "WPFSelectAllAppx",
             "WPFClearAppxSelection",
             "WPFBackToTweaks",
+            "WPFInstallSelectedAppx",
             "WPFRemoveSelectedAppx"
         )
 
@@ -240,11 +253,106 @@ Describe "XAML document" {
         $openButton.GetAttribute("Content").Trim() | Should -Be "AppX Removal"
         $openAppxIndex | Should -Be ($getInstalledIndex + 1)
         $appxTab.SelectSingleNode('.//*[local-name()="Button"][@Name="WPFBackToTweaks"]') | Should -Not -BeNullOrEmpty
+        $appxTab.SelectSingleNode('.//*[local-name()="Button"][@Name="WPFInstallSelectedAppx"]') | Should -Not -BeNullOrEmpty
         $appxTab.SelectSingleNode('.//*[local-name()="Button"][@Name="WPFRemoveSelectedAppx"]') | Should -Not -BeNullOrEmpty
         $buttonSource | Should -Match '"WPFAppxRemoval"\s*\{Invoke-WPFTab "WPFTab6BT"\}'
         $buttonSource | Should -Match '"WPFBackToTweaks"\s*\{Invoke-WPFTab "WPFTab2BT"\}'
+        $buttonSource | Should -Match '"WPFInstallSelectedAppx"\s*\{Invoke-WPFAppxInstall\}'
         $tabSource | Should -Match '\$sync\.\$tabNav\.Items\[\$tabNumber\]\.IsSelected = \$true'
     }
+
+    It "centers top bar controls vertically" {
+        $navPanel = $script:xaml.SelectSingleNode('//*[local-name()="StackPanel"][@Name="NavDockPanel"]')
+        $minimizeButton = $script:xaml.SelectSingleNode('//*[local-name()="Button"][@Name="WPFMinimizeButton"]')
+        $actionPanel = $minimizeButton.ParentNode
+        $topBarButtonNames = @(
+            "ThemeButton",
+            "FontScalingButton",
+            "SettingsButton",
+            "WPFMinimizeButton",
+            "WPFMaximizeButton",
+            "WPFCloseButton"
+        )
+
+        $navPanel.GetAttribute("VerticalAlignment") | Should -Be "Center"
+        $actionPanel.GetAttribute("VerticalAlignment") | Should -Be "Center"
+
+        foreach ($buttonName in $topBarButtonNames) {
+            $button = $script:xaml.SelectSingleNode("//*[local-name()='Button'][@Name='$buttonName']")
+            $button.GetAttribute("VerticalAlignment") | Should -Be "Center"
+        }
+    }
+
+    It "keeps the responsive search controls within the available screen width" {
+        $window = $script:xaml.DocumentElement
+        $searchBar = $script:xaml.SelectSingleNode('//*[local-name()="TextBox"][@Name="SearchBar"]')
+        $searchBorder = $searchBar.ParentNode.ParentNode
+        $mainScript = Get-Content -Path $script:mainScriptPath -Raw
+
+        $window.GetAttribute("MinWidth") | Should -Be "800"
+        $searchBorder.GetAttribute("Width") | Should -BeNullOrEmpty
+        $searchBorder.GetAttribute("HorizontalAlignment") | Should -Be "Stretch"
+        $searchBar.GetAttribute("Width") | Should -BeNullOrEmpty
+        $searchBar.GetAttribute("HorizontalAlignment") | Should -Be "Stretch"
+        $mainScript | Should -Match '\$sync\.Form\.MinWidth = "1150"'
+        $mainScript | Should -Match '\$sync\.Form\.MinWidth = \[Math\]::Min\(\[double\]\$sync\.Form\.MinWidth, \[double\]\$screenWidth\)'
+    }
+
+    It "shows only one search action glyph at a time" {
+        $searchIcon = $script:xaml.SelectSingleNode('//*[local-name()="TextBlock"][@Name="SearchBarIcon"]')
+        $clearButton = $script:xaml.SelectSingleNode('//*[local-name()="Button"][@Name="SearchBarClearButton"]')
+        $mainScript = Get-Content -Path $script:mainScriptPath -Raw
+
+        $searchIcon | Should -Not -BeNullOrEmpty
+        $clearButton | Should -Not -BeNullOrEmpty
+        $mainScript | Should -Match '\$sync\.SearchBarClearButton\.Visibility = "Visible"\s+\$sync\.SearchBarIcon\.Visibility = "Collapsed"'
+        $mainScript | Should -Match '\$sync\.SearchBarClearButton\.Visibility = "Collapsed"\s+\$sync\.SearchBarIcon\.Visibility = "Visible"'
+    }
+
+    It "scopes toggle button styles without leaking into combo boxes" {
+        $resources = $script:xaml.SelectSingleNode('//*[local-name()="Window.Resources"]')
+        $implicitToggleStyles = @($resources.SelectNodes('./*[local-name()="Style"][@TargetType="ToggleButton" or @TargetType="{x:Type ToggleButton}"][not(@x:Key)]', $script:xamlNamespace))
+        $tabStyle = $resources.SelectSingleNode('./*[local-name()="Style"][@x:Key="TabToggleButton"]', $script:xamlNamespace)
+        $comboToggleStyle = $resources.SelectSingleNode('./*[local-name()="Style"][@x:Key="ComboBoxToggleButtonStyle"]', $script:xamlNamespace)
+        $comboStyle = $resources.SelectSingleNode('./*[local-name()="Style"][@TargetType="ComboBox"]')
+        $comboToggle = $comboStyle.SelectSingleNode('.//*[local-name()="ToggleButton"][@Name="ToggleButton"]')
+        $comboItemStyle = $resources.SelectSingleNode('./*[local-name()="Style"][@TargetType="ComboBoxItem"]')
+        $navButtons = @($script:xaml.SelectNodes('//*[local-name()="StackPanel"][@Name="NavDockPanel"]/*[local-name()="ToggleButton"]'))
+
+        $implicitToggleStyles | Should -BeNullOrEmpty
+        $tabStyle | Should -Not -BeNullOrEmpty
+        $comboToggleStyle | Should -Not -BeNullOrEmpty
+        $comboToggle.GetAttribute("Style") | Should -Be "{StaticResource ComboBoxToggleButtonStyle}"
+        $comboItemStyle | Should -Not -BeNullOrEmpty
+        $navButtons.Count | Should -Be 5
+        foreach ($navButton in $navButtons) {
+            $navButton.GetAttribute("Style") | Should -Be "{StaticResource TabToggleButton}"
+        }
+    }
+
+    It "uses state-aware maximize and restore icons" {
+        $themes = Get-WinUtilConfigObject -Name "themes"
+        $minimizeButton = $script:xaml.SelectSingleNode('//*[local-name()="Button"][@Name="WPFMinimizeButton"]')
+        $maximizeButton = $script:xaml.SelectSingleNode('//*[local-name()="Button"][@Name="WPFMaximizeButton"]')
+        $closeButton = $script:xaml.SelectSingleNode('//*[local-name()="Button"][@Name="WPFCloseButton"]')
+        $maximizeStyle = $maximizeButton.SelectSingleNode('./*[local-name()="Button.Style"]/*[local-name()="Style"]')
+        $maximizeIcon = $maximizeStyle.SelectSingleNode('./*[local-name()="Setter"][@Property="Content"]')
+        $maximizedTrigger = $maximizeStyle.SelectSingleNode('./*[local-name()="Style.Triggers"]/*[local-name()="DataTrigger"][@Value="Maximized"]')
+        $restoreIcon = $maximizedTrigger.SelectSingleNode('./*[local-name()="Setter"][@Property="Content"]')
+
+        foreach ($button in @($minimizeButton, $maximizeButton, $closeButton)) {
+            $button.GetAttribute("FontFamily") | Should -Be "Segoe MDL2 Assets"
+            $button.GetAttribute("FontSize") | Should -Be "{DynamicResource CloseIconFontSize}"
+            $button.GetAttribute("Margin") | Should -BeIn @("0", "0,0,0,0")
+        }
+
+        $minimizeButton.GetAttribute("Content") | Should -Be ([string][char]0xE921)
+        $maximizeIcon.GetAttribute("Value") | Should -Be ([string][char]0xE922)
+        $restoreIcon.GetAttribute("Value") | Should -Be ([string][char]0xE923)
+        $closeButton.GetAttribute("Content") | Should -Be ([string][char]0xE8BB)
+        $maximizeStyle.GetAttribute("BasedOn") | Should -Be "{StaticResource HoverButtonStyle}"
+        [int]$themes.shared.CloseIconFontSize | Should -BeLessThan ([int]$themes.shared.SettingsIconFontSize)
+    }
 }
 
 Describe "XAML and sync wiring" {

scripts/main.ps1

@@ -285,6 +285,7 @@ $sync["Form"].Add_ContentRendered({
         # Extract screen width and height for the primary monitor
         $screenWidth = $primaryScreen.Bounds.Width
         $screenHeight = $primaryScreen.Bounds.Height
+        $sync.Form.MinWidth = [Math]::Min([double]$sync.Form.MinWidth, [double]$screenWidth)
 
         # Compare with the primary monitor size
         if ($sync.Form.ActualWidth -gt $screenWidth -or $sync.Form.ActualHeight -gt $screenHeight) {
@@ -340,7 +341,7 @@ $searchBarTimer.add_Tick({
     $searchBarTimer.Stop()
     switch ($sync.currentTab) {
         "Install" {
-            Find-AppsByNameOrDescription -SearchString $sync.SearchBar.Text
+            Find-AppsByNameOrDescription -SearchString $sync.SearchBar.Text -Category $sync.SearchBar.Tag
         }
         "Tweaks" {
             Find-TweaksByNameOrDescription -SearchString $sync.SearchBar.Text
@@ -351,21 +352,45 @@ $searchBarTimer.add_Tick({
     }
 })
 $sync["SearchBar"].Add_TextChanged({
+    if ($sync.SearchBar.Tag -ne $sync.SearchBar.Text) {
+        $sync.SearchBar.Tag = $null
+    }
+
     if ($sync.SearchBar.Text -ne "") {
         $sync.SearchBarClearButton.Visibility = "Visible"
+        $sync.SearchBarIcon.Visibility = "Collapsed"
     } else {
         $sync.SearchBarClearButton.Visibility = "Collapsed"
+        $sync.SearchBarIcon.Visibility = "Visible"
     }
+
+    # Category chip handlers apply their filter immediately.
+    if ($sync.SearchBar.Tag -eq $sync.SearchBar.Text) {
+        return
+    }
+
     if ($searchBarTimer.IsEnabled) {
         $searchBarTimer.Stop()
     }
     $searchBarTimer.Start()
 })
 
+# Quick Category Search Chips
+$sync["WPFSearchChipAll"].Add_Click({ Set-WinUtilAppCategoryFilter })
+$sync["WPFSearchChipBrowsers"].Add_Click({ Set-WinUtilAppCategoryFilter -Category "Browsers" })
+$sync["WPFSearchChipCommunications"].Add_Click({ Set-WinUtilAppCategoryFilter -Category "Communications" })
+$sync["WPFSearchChipDevelopment"].Add_Click({ Set-WinUtilAppCategoryFilter -Category "Development" })
+$sync["WPFSearchChipGames"].Add_Click({ Set-WinUtilAppCategoryFilter -Category "Games" })
+$sync["WPFSearchChipMicrosoftTools"].Add_Click({ Set-WinUtilAppCategoryFilter -Category "Microsoft Tools" })
+$sync["WPFSearchChipMultimediaTools"].Add_Click({ Set-WinUtilAppCategoryFilter -Category "Multimedia Tools" })
+$sync["WPFSearchChipProTools"].Add_Click({ Set-WinUtilAppCategoryFilter -Category "Pro Tools" })
+$sync["WPFSearchChipSelfhostedTools"].Add_Click({ Set-WinUtilAppCategoryFilter -Category "Selfhosted Tools" })
+$sync["WPFSearchChipUtilities"].Add_Click({ Set-WinUtilAppCategoryFilter -Category "Utilities" })
+
 $sync["Form"].Add_Loaded({
     param($e)
     $null = $e
-    $sync.Form.MinWidth = "1000"
+    $sync.Form.MinWidth = "1150"
     $sync["Form"].MaxWidth = [Double]::PositiveInfinity
     $sync["Form"].MaxHeight = [Double]::PositiveInfinity
 })

xaml/inputXML.xaml

@@ -248,6 +248,17 @@
             </Setter.Value>
         </Setter>
         </Style>
+        <Style x:Key="ComboBoxToggleButtonStyle" TargetType="ToggleButton">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ToggleButton">
+                        <Border Background="{TemplateBinding Background}" BorderThickness="0">
+                            <ContentPresenter/>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
         <Style TargetType="ComboBox">
             <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundColor}" />
             <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundColor}" />
@@ -262,6 +273,7 @@
                                     CornerRadius="{DynamicResource ButtonCornerRadius}"
                                     Background="{TemplateBinding Background}">
                                 <ToggleButton Name="ToggleButton"
+                                              Style="{StaticResource ComboBoxToggleButtonStyle}"
                                               Background="Transparent"
                                               BorderThickness="0"
                                               IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
@@ -309,6 +321,27 @@
                 </Setter.Value>
             </Setter>
         </Style>
+        <Style TargetType="ComboBoxItem">
+            <Setter Property="Background" Value="{DynamicResource ComboBoxBackgroundColor}"/>
+            <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundColor}"/>
+            <Setter Property="Padding" Value="6,3"/>
+            <Setter Property="ContentTemplate">
+                <Setter.Value>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding}" Background="Transparent"
+                                   Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=ComboBoxItem}}"/>
+                    </DataTemplate>
+                </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+                <Trigger Property="IsHighlighted" Value="True">
+                    <Setter Property="Background" Value="{DynamicResource ButtonBackgroundMouseoverColor}"/>
+                </Trigger>
+                <Trigger Property="IsSelected" Value="True">
+                    <Setter Property="Background" Value="{DynamicResource ButtonBackgroundSelectedColor}"/>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
         <Style TargetType="Label">
             <Setter Property="Foreground" Value="{DynamicResource LabelboxForegroundColor}"/>
             <Setter Property="Background" Value="{DynamicResource LabelBackgroundColor}"/>
@@ -321,8 +354,7 @@
             <Setter Property="Foreground" Value="{DynamicResource LabelboxForegroundColor}"/>
             <Setter Property="Background" Value="{DynamicResource LabelBackgroundColor}"/>
         </Style>
-        <!-- Toggle button template x:Key="TabToggleButton" -->
+        <Style x:Key="TabToggleButton" TargetType="{x:Type ToggleButton}">
-        <Style TargetType="{x:Type ToggleButton}">
             <Setter Property="Margin" Value="{DynamicResource ButtonMargin}"/>
             <Setter Property="Content" Value=""/>
             <Setter Property="FontFamily" Value="{DynamicResource FontFamily}"/>
@@ -918,12 +950,27 @@
                 </MultiDataTrigger>
             </Style.Triggers>
         </Style>
+        <Style x:Key="RoundedProgressBarStyle" TargetType="ProgressBar">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ProgressBar">
+                        <Border CornerRadius="4" Background="{DynamicResource MainBackgroundColor}" BorderBrush="{DynamicResource MainForegroundColor}" BorderThickness="1">
+                            <Grid ClipToBounds="True">
+                                <Border Name="PART_Track" CornerRadius="4" Background="Transparent"/>
+                                <Border Name="PART_Indicator" CornerRadius="4" Background="{DynamicResource ProgressBarForegroundColor}" HorizontalAlignment="Left"/>
+                            </Grid>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
     </Window.Resources>
     <Grid Background="{DynamicResource MainBackgroundColor}" ShowGridLines="False" Name="WPFMainGrid" Width="Auto" Height="Auto" HorizontalAlignment="Stretch">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*"/>
@@ -940,10 +987,10 @@
             </Grid.ColumnDefinitions>
 
             <!-- Navigation Buttons Panel -->
-            <StackPanel Name="NavDockPanel" Orientation="Horizontal" Grid.Column="0" Margin="5,5,10,5">
+            <StackPanel Name="NavDockPanel" Orientation="Horizontal" Grid.Column="0" VerticalAlignment="Center" Margin="5,5,10,5">
                 <StackPanel Name="NavLogoPanel" Orientation="Horizontal" HorizontalAlignment="Left" Background="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True" Margin="10,0,20,0">
                 </StackPanel>
-                <ToggleButton Margin="0,0,5,0" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
+                <ToggleButton Style="{StaticResource TabToggleButton}" Margin="0,0,5,0" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
                     Background="{DynamicResource ButtonInstallBackgroundColor}" Foreground="white" FontWeight="Bold" Name="WPFTab1BT">
                     <ToggleButton.Content>
                         <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonInstallForegroundColor}" >
@@ -951,7 +998,7 @@
                         </TextBlock>
                     </ToggleButton.Content>
                 </ToggleButton>
-                <ToggleButton Margin="0,0,5,0" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
+                <ToggleButton Style="{StaticResource TabToggleButton}" Margin="0,0,5,0" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
                     Background="{DynamicResource ButtonTweaksBackgroundColor}" Foreground="{DynamicResource ButtonTweaksForegroundColor}" FontWeight="Bold" Name="WPFTab2BT">
                     <ToggleButton.Content>
                         <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonTweaksForegroundColor}">
@@ -959,7 +1006,7 @@
                         </TextBlock>
                     </ToggleButton.Content>
                 </ToggleButton>
-                <ToggleButton Margin="0,0,5,0" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
+                <ToggleButton Style="{StaticResource TabToggleButton}" Margin="0,0,5,0" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
                     Background="{DynamicResource ButtonConfigBackgroundColor}" Foreground="{DynamicResource ButtonConfigForegroundColor}" FontWeight="Bold" Name="WPFTab3BT">
                     <ToggleButton.Content>
                         <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonConfigForegroundColor}">
@@ -967,7 +1014,7 @@
                         </TextBlock>
                     </ToggleButton.Content>
                 </ToggleButton>
-                <ToggleButton Margin="0,0,5,0" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
+                <ToggleButton Style="{StaticResource TabToggleButton}" Margin="0,0,5,0" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
                     Background="{DynamicResource ButtonUpdatesBackgroundColor}" Foreground="{DynamicResource ButtonUpdatesForegroundColor}" FontWeight="Bold" Name="WPFTab4BT">
                     <ToggleButton.Content>
                         <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonUpdatesForegroundColor}">
@@ -975,7 +1022,7 @@
                         </TextBlock>
                     </ToggleButton.Content>
                 </ToggleButton>
-                <ToggleButton Margin="0,0,5,0" Height="{DynamicResource TabButtonHeight}" Width="Auto" MinWidth="{DynamicResource TabButtonWidth}"
+                <ToggleButton Style="{StaticResource TabToggleButton}" Margin="0,0,5,0" Height="{DynamicResource TabButtonHeight}" Width="Auto" MinWidth="{DynamicResource TabButtonWidth}"
                     Background="{DynamicResource ButtonWin11ISOBackgroundColor}" Foreground="{DynamicResource ButtonWin11ISOForegroundColor}" FontWeight="Bold" Name="WPFTab5BT">
                     <ToggleButton.Content>
                         <TextBlock FontSize="{DynamicResource TabButtonFontSize}" Background="Transparent" Foreground="{DynamicResource ButtonWin11ISOForegroundColor}">
@@ -992,13 +1039,12 @@
                     <ColumnDefinition Width="Auto"/><!-- Buttons area -->
                 </Grid.ColumnDefinitions>
 
-                <Border Grid.Column="0" Margin="5,0,0,0" Width="{DynamicResource SearchBarWidth}" Height="{DynamicResource SearchBarHeight}" VerticalAlignment="Center" HorizontalAlignment="Left">
+                <Border Grid.Column="0" Margin="5,0,10,0" MinWidth="120" Height="{DynamicResource SearchBarHeight}" VerticalAlignment="Center" HorizontalAlignment="Stretch">
                     <Grid>
                         <TextBox
-                            Width="{DynamicResource SearchBarWidth}"
                             Height="{DynamicResource SearchBarHeight}"
                             FontSize="{DynamicResource SearchBarTextBoxFontSize}"
-                            VerticalAlignment="Center" HorizontalAlignment="Left"
+                            VerticalAlignment="Center" HorizontalAlignment="Stretch"
                             BorderThickness="1"
                             Name="SearchBar"
                             Foreground="{DynamicResource MainForegroundColor}" Background="{DynamicResource MainBackgroundColor}"
@@ -1006,6 +1052,7 @@
                             ToolTip="Press Ctrl-F and type app name to filter application list below. Press Esc to reset the filter">
                         </TextBox>
                         <TextBlock
+                            Name="SearchBarIcon"
                             VerticalAlignment="Center" HorizontalAlignment="Right"
                             FontFamily="Segoe MDL2 Assets"
                             Foreground="{DynamicResource ButtonBackgroundSelectedColor}"
@@ -1015,14 +1062,14 @@
                     </Grid>
                 </Border>
                 <Button Grid.Column="0"
-                    VerticalAlignment="Center" HorizontalAlignment="Left"
+                    VerticalAlignment="Center" HorizontalAlignment="Right"
                     Name="SearchBarClearButton"
                     Style="{StaticResource SearchBarClearButtonStyle}"
-                    Margin="213,0,0,0" Visibility="Collapsed">
+                    Margin="0,0,20,0" Visibility="Collapsed">
                 </Button>
 
                 <!-- Buttons Container -->
-                <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="5,5,5,5">
+                <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="5,5,5,5">
                     <Button Name="ThemeButton"
                         Style="{StaticResource HoverButtonStyle}"
                         BorderBrush="Transparent"
@@ -1030,7 +1077,7 @@
                     Foreground="{DynamicResource MainForegroundColor}"
                     FontSize="{DynamicResource SettingsIconFontSize}"
                     Width="{DynamicResource IconButtonSize}" Height="{DynamicResource IconButtonSize}"
-                    HorizontalAlignment="Right" VerticalAlignment="Top"
+                    HorizontalAlignment="Right" VerticalAlignment="Center"
                     Margin="0,0,2,0"
                     FontFamily="Segoe MDL2 Assets"
                     Content="N/A"
@@ -1068,7 +1115,7 @@
                     Foreground="{DynamicResource MainForegroundColor}"
                     FontSize="{DynamicResource SettingsIconFontSize}"
                     Width="{DynamicResource IconButtonSize}" Height="{DynamicResource IconButtonSize}"
-                    HorizontalAlignment="Right" VerticalAlignment="Top"
+                    HorizontalAlignment="Right" VerticalAlignment="Center"
                     Margin="0,0,2,0"
                     FontFamily="Segoe MDL2 Assets"
                     Content="&#xE8D3;"
@@ -1136,7 +1183,7 @@
                     Foreground="{DynamicResource MainForegroundColor}"
                     FontSize="{DynamicResource SettingsIconFontSize}"
                     Width="{DynamicResource IconButtonSize}" Height="{DynamicResource IconButtonSize}"
-                    HorizontalAlignment="Right" VerticalAlignment="Top"
+                    HorizontalAlignment="Right" VerticalAlignment="Center"
                     Margin="0,0,2,0"
                     FontFamily="Segoe MDL2 Assets"
                     Content="&#xE713;"/>
@@ -1165,24 +1212,62 @@
                 </Popup>
 
                     <Button
-                    Content="&#x2212;" BorderThickness="0"
+                        Content="&#xE921;"
-                    BorderBrush="Transparent"
+                        Style="{StaticResource HoverButtonStyle}"
-                    Background="{DynamicResource MainBackgroundColor}"
+                        BorderThickness="0"
-                    Width="{DynamicResource IconButtonSize}" Height="{DynamicResource IconButtonSize}"
+                        BorderBrush="Transparent"
-                    HorizontalAlignment="Right" VerticalAlignment="Top"
+                        Background="{DynamicResource MainBackgroundColor}"
-                    Margin="0,0,0,0"
+                        Width="{DynamicResource IconButtonSize}" Height="{DynamicResource IconButtonSize}"
-                    FontFamily="{DynamicResource FontFamily}"
+                        HorizontalAlignment="Right" VerticalAlignment="Center"
-                    Foreground="{DynamicResource MainForegroundColor}" FontSize="{DynamicResource CloseIconFontSize}" Name="WPFMinimizeButton" />
+                        Margin="0"
+                        FontFamily="Segoe MDL2 Assets"
+                        Foreground="{DynamicResource MainForegroundColor}"
+                        FontSize="{DynamicResource CloseIconFontSize}"
+                        ToolTip="Minimize"
+                        AutomationProperties.Name="Minimize"
+                        Name="WPFMinimizeButton" />
+                    <Button
+                        BorderThickness="0"
+                        BorderBrush="Transparent"
+                        Background="{DynamicResource MainBackgroundColor}"
+                        Width="{DynamicResource IconButtonSize}" Height="{DynamicResource IconButtonSize}"
+                        HorizontalAlignment="Right" VerticalAlignment="Center"
+                        Margin="0,0,0,0"
+                        FontFamily="Segoe MDL2 Assets"
+                        Foreground="{DynamicResource MainForegroundColor}"
+                        FontSize="{DynamicResource CloseIconFontSize}"
+                        Name="WPFMaximizeButton">
+                        <Button.Style>
+                            <Style TargetType="Button" BasedOn="{StaticResource HoverButtonStyle}">
+                                <Setter Property="Content" Value="&#xE922;"/>
+                                <Setter Property="ToolTip" Value="Maximize"/>
+                                <Setter Property="AutomationProperties.Name" Value="Maximize"/>
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding WindowState, RelativeSource={RelativeSource AncestorType={x:Type Window}}}" Value="Maximized">
+                                        <Setter Property="Content" Value="&#xE923;"/>
+                                        <Setter Property="ToolTip" Value="Restore"/>
+                                        <Setter Property="AutomationProperties.Name" Value="Restore"/>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </Button.Style>
+                    </Button>
 
                     <Button
-                    Content="&#xD7;" BorderThickness="0"
+                        Content="&#xE8BB;"
-                BorderBrush="Transparent"
+                        Style="{StaticResource HoverButtonStyle}"
-                Background="{DynamicResource MainBackgroundColor}"
+                        BorderThickness="0"
-                Width="{DynamicResource IconButtonSize}" Height="{DynamicResource IconButtonSize}"
+                        BorderBrush="Transparent"
-                HorizontalAlignment="Right" VerticalAlignment="Top"
+                        Background="{DynamicResource MainBackgroundColor}"
-                Margin="0,0,0,0"
+                        Width="{DynamicResource IconButtonSize}" Height="{DynamicResource IconButtonSize}"
-                FontFamily="{DynamicResource FontFamily}"
+                        HorizontalAlignment="Right" VerticalAlignment="Center"
-                Foreground="{DynamicResource MainForegroundColor}" FontSize="{DynamicResource CloseIconFontSize}" Name="WPFCloseButton" />
+                        Margin="0"
+                        FontFamily="Segoe MDL2 Assets"
+                        Foreground="{DynamicResource MainForegroundColor}"
+                        FontSize="{DynamicResource CloseIconFontSize}"
+                        ToolTip="Close"
+                        AutomationProperties.Name="Close"
+                        Name="WPFCloseButton" />
                 </StackPanel>
             </Grid>
         </Grid>
@@ -1190,8 +1275,26 @@
         <TabControl Name="WPFTabNav" Background="Transparent" Width="Auto" Height="Auto" BorderBrush="Transparent" BorderThickness="0" Grid.Row="2" Grid.Column="0" Padding="-1">
             <TabItem Header="Install" Visibility="Collapsed" Name="WPFTab1">
                 <Grid Background="Transparent" >
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
 
-                    <Grid Grid.Row="0" Grid.Column="0" Margin="{DynamicResource TabContentMargin}">
+                    <!-- Quick Category Search Chips -->
+                    <WrapPanel Grid.Row="0" Orientation="Horizontal" Margin="5,5,5,5" Name="WPFSearchChips">
+                        <Button Name="WPFSearchChipAll"             Content="All"               Width="Auto" Height="Auto" Margin="2"/>
+                        <Button Name="WPFSearchChipBrowsers"        Content="Browsers"          Width="Auto" Height="Auto" Margin="2"/>
+                        <Button Name="WPFSearchChipCommunications"  Content="Communications"    Width="Auto" Height="Auto" Margin="2"/>
+                        <Button Name="WPFSearchChipDevelopment"     Content="Development"       Width="Auto" Height="Auto" Margin="2"/>
+                        <Button Name="WPFSearchChipGames"           Content="Games"             Width="Auto" Height="Auto" Margin="2"/>
+                        <Button Name="WPFSearchChipMicrosoftTools"  Content="Microsoft Tools"   Width="Auto" Height="Auto" Margin="2"/>
+                        <Button Name="WPFSearchChipMultimediaTools" Content="Multimedia Tools"  Width="Auto" Height="Auto" Margin="2"/>
+                        <Button Name="WPFSearchChipProTools"        Content="Pro Tools"         Width="Auto" Height="Auto" Margin="2"/>
+                        <Button Name="WPFSearchChipSelfhostedTools" Content="Selfhosted Tools"  Width="Auto" Height="Auto" Margin="2"/>
+                        <Button Name="WPFSearchChipUtilities"       Content="Utilities"         Width="Auto" Height="Auto" Margin="2"/>
+                    </WrapPanel>
+
+                    <Grid Grid.Row="1" Margin="{DynamicResource TabContentMargin}">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="*" />
@@ -1700,8 +1803,9 @@
                             <Border Grid.Row="2" Style="{StaticResource BorderStyle}" Margin="5,15,5,5">
                                 <StackPanel Background="{DynamicResource MainBackgroundColor}" Orientation="Horizontal" HorizontalAlignment="Left">
                                     <TextBlock Padding="10" TextWrapping="Wrap" Foreground="{DynamicResource MainForegroundColor}">
-                                        Note: Select the pre-installed Windows AppX packages you wish to remove and click 'Remove Selected'.
+                                        Note: Select the Windows AppX packages you wish to install or remove.
-                                        <LineBreak/>These packages are removed for the current user and all new user profiles.
+                                        <LineBreak/>Install Selected registers a local manifest when available, then falls back to the Microsoft Store.
+                                        <LineBreak/>Remove Selected removes packages for the current user and all new user profiles.
                                     </TextBlock>
                                 </StackPanel>
                             </Border>
@@ -1711,11 +1815,20 @@
                     <Border Grid.Row="1" Background="{DynamicResource MainBackgroundColor}" BorderBrush="{DynamicResource BorderColor}" BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch" Padding="10">
                         <WrapPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
                             <Button Name="WPFBackToTweaks" Content="Back to Tweaks" Margin="5" Width="{DynamicResource ButtonWidth}" Height="{DynamicResource ButtonHeight}"/>
+                            <Button Name="WPFInstallSelectedAppx" Content="Install Selected" Margin="5" Width="{DynamicResource ButtonWidth}" Height="{DynamicResource ButtonHeight}"/>
                             <Button Name="WPFRemoveSelectedAppx" Content="Remove Selected" Margin="5" Width="{DynamicResource ButtonWidth}" Height="{DynamicResource ButtonHeight}"/>
                         </WrapPanel>
                     </Border>
                 </Grid>
             </TabItem>
         </TabControl>
+
+        <!-- Tweaks/Undo progress indicator - visible regardless of active tab -->
+        <Border Name="WPFTweaksProgressBar" Grid.Row="3" Background="{DynamicResource MainBackgroundColor}" Visibility="Collapsed" Padding="10,6">
+            <StackPanel Orientation="Vertical">
+                <TextBlock Name="WPFTweaksProgressLabel" Text="" Foreground="{DynamicResource MainForegroundColor}" FontSize="13" Background="Transparent" Margin="0,0,0,4"/>
+                <ProgressBar Name="WPFTweaksProgressValue" Height="6" Minimum="0" Maximum="100" Value="0" Style="{StaticResource RoundedProgressBarStyle}"/>
+            </StackPanel>
+        </Border>
     </Grid>
 </Window>