Fix context menu registry cleanup when modules disabled via GPO

Co-authored-by: yeelam-gordon <73506701+yeelam-gordon@users.noreply.github.com>

.github/actions/spell-check/expect.txt

@@ -70,7 +70,6 @@ APPMODEL
 APPNAME
 appref
 appsettings
-appsfeatures
 appwindow
 appwiz
 appxpackage
@@ -1316,7 +1315,6 @@ PRODUCTVERSION
 Progman
 programdata
 projectname
-projitems
 PROPERTYKEY
 Propset
 PROPVARIANT
@@ -1396,7 +1394,6 @@ regkey
 regroot
 regsvr
 REINSTALLMODE
-releaseblog
 reloadable
 Relogger
 remappings

.github/workflows/manual-batch-issue-deduplication.yml

@@ -1,20 +0,0 @@
-name: Manual Batch Issue Deduplication
-
-on:
-  workflow_dispatch: # Only runs when manually triggered
-
-jobs:
-  batch-deduplicate:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Batch Deduplicate Issues
-        uses: pelikhan/action-genai-issue-dedup@v0
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          label-duplicate: "potential duplicate"
-          comment-duplicate: true
-          close-duplicate: false
-          batch-size: 100 
-          since: '2019-05-05T00:00:00Z' # Process issues dating back to 2019
-          duplicate-comment-template: "This issue appears to be a duplicate of #{duplicate_issue_number}."
-          # Add other action-specific inputs if needed

README.md

@@ -35,19 +35,19 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 Go to the [Microsoft PowerToys GitHub releases page][github-release-link] and click on `Assets` at the bottom to show the files available in the release. Please use the appropriate PowerToys installer that matches your machine's architecture and install scope. For most, it is `x64` and per-user.
 
 <!-- items that need to be updated release to release -->
-[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.95%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.94%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.94.0/PowerToysUserSetup-0.94.0-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.94.0/PowerToysUserSetup-0.94.0-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.94.0/PowerToysSetup-0.94.0-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.94.0/PowerToysSetup-0.94.0-arm64.exe
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.94%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.93%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysUserSetup-0.93.0-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysUserSetup-0.93.0-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysSetup-0.93.0-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysSetup-0.93.0-arm64.exe
  
 |  Description   | Filename |
 |----------------|----------|
-| Per user - x64       | [PowerToysUserSetup-0.94.0-x64.exe][ptUserX64] |
-| Per user - ARM64     | [PowerToysUserSetup-0.94.0-arm64.exe][ptUserArm64] |
-| Machine wide - x64   | [PowerToysSetup-0.94.0-x64.exe][ptMachineX64] |
-| Machine wide - ARM64 | [PowerToysSetup-0.94.0-arm64.exe][ptMachineArm64] |
+| Per user - x64       | [PowerToysUserSetup-0.93.0-x64.exe][ptUserX64] |
+| Per user - ARM64     | [PowerToysUserSetup-0.93.0-arm64.exe][ptUserArm64] |
+| Machine wide - x64   | [PowerToysSetup-0.93.0-x64.exe][ptMachineX64] |
+| Machine wide - ARM64 | [PowerToysSetup-0.93.0-arm64.exe][ptMachineArm64] |
 
 This is our preferred method.
 
@@ -93,145 +93,118 @@ For guidance on developing for PowerToys, please read the [developer docs](./doc
 
 Our [prioritized roadmap][roadmap] of features and utilities that the core team is focusing on.
 
-### 0.94 - Sep 2025 Update
+### 0.93 - Aug 2025 Update
 
 In this release, we focused on new features, stability, optimization improvements, and automation.
 
-For an in-depth look at the latest changes, visit the [release blog](https://aka.ms/powertoys-releaseblog).
-
 **✨Highlights**
 
- - PowerToys Settings added a Settings search with fuzzy matching, suggestions, a results page, and UX polish to make finding options faster.
- - A comprehensive hotkey conflict detection system was introduced in Settings to surface and help resolve conflicting shortcuts. Note that the default hotkey settings (Win+Ctrl+Shift+T, Win+Ctrl+V, Win+Ctrl+T, Win+Shift+T) may overlap with existing Windows system shortcuts. This is expected. You can resolve the conflict by assigning different hotkeys.
- - Mouse Utilities added a “Gliding cursor” accessibility feature to Mouse Pointer Crosshairs for single‑button cursor movement and clicking. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
- - The installer was upgraded to WiX 5 after WiX 3 reached end-of-life; this move improved installer security, reliability, and community support.
- - Tons of bug fixes and improvements for Command Palette, including visual updates and new support for filters on ListPages (handy for extension developers).
- - Hosts Editor now has a “No leading spaces” option so active host entries can start at column 0 even if others are disabled. Thanks [@mohammed-saalim](https://github.com/mohammed-saalim)!
- - Context menu registration was moved from the installer to runtime to avoid loading disabled modules (runtime registrations).
- - Quick Accent now supports Maltese, and frequently used accents appear first (and are remembered across sessions). Thanks [@rovercoder](https://github.com/rovercoder)! [@davidegiacometti](https://github.com/davidegiacometti)!
-
-### Always On Top
-
- - Fixed the border hover cursor so it shows the arrow instead of the wait cursor. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - PowerToys settings debuts a modern, card-based dashboard with clearer descriptions and faster navigation for a streamlined user experience.
+ - Command Palette had over 99 issues resolved, including bringing back Clipboard History, adding context menu shortcuts, pinning favorite apps, and supporting history in Run.
+ - Command Palette reduced its startup memory usage by ~15%, load time by ~40%, built-in extensions loading time by ~70%, and installation size by ~55%—all due to using the full Ahead-of-Time (AOT) compilation mode in Windows App SDK.
+ - Peek now supports instant previews and embedded thumbnails for Binary G-code (.bgcode) 3D printing files, making it easy to inspect models at a glance. Thanks [@pedrolamas](https://github.com/pedrolamas)!
+ - Mouse Utilities introduces a new spotlight highlighting mode that dims the screen and draws attention to your cursor, perfect for presentations.
+ - Test coverage improvements for multiple PowerToys modules including Command Palette, Advanced Paste, Peek, Text Extractor, and PowerRename — ensuring better reliability and quality, with over 600 new unit tests (mostly for Command Palette) and doubled UI automation coverage.
 
 ### Command Palette
 
- - Applied single-click activation only to pointer input; keyboard always activates immediately. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Let context menus open at the cursor by removing window-bound constraints. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Made error messages clearer with timestamps, HRESULTs, and full details for easier diagnosis. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Prevented crashes and improved robustness when updating providers without commands. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Ensured the Settings window reliably comes to the front when opened. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Replaced the Clipboard History icon with a colorful Fluent icon. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Hardened ContentIcon to avoid duplicate parenting and improve diagnostics. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Standardized null checks using C# pattern matching for safer behavior.
- - Improved accessibility by focusing the activation shortcut dialog and making text reachable. Thanks [@chatasweetie](https://github.com/chatasweetie)!
- - Moved the extension SDK to a stable Windows SDK and cleaned up message namespaces.
- - Added path shortcuts: ~ to home, and / or \\ to system root, plus UNC support. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Fixed a race in cancellation handling to avoid InvalidOperationException. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Aligned separator styling with WinUI 3 for consistent visuals. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added ARM64 PDBs to the Extensions SDK NuGet for better debugging.
- - Added single-select filters to DynamicListPage and updated Windows Services sample.
- - Updated main page placeholder text to better describe what can be searched. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Removed explicit WinAppSDK/WebView2 dependencies from toolkit and API. Thanks [@rluengen](https://github.com/rluengen)!
- - Added a local keyboard hook to handle the GoBack key reliably. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Propagated alias changes safely and resolved conflicts across view models.
- - Allowed providers to override Dispose with a virtual method.
- - Fixed memory leaks by cleaning up removed or cancelled list items.
- - Sorted DateTime extension results by relevance for better usability.
- - Reduced search text “jiggling” by avoiding redundant change notifications.
- - Centralized automation notifications in a UIHelper for better accessibility. Thanks [@chatasweetie](https://github.com/chatasweetie)!
- - Preserved Adaptive Card action types during trimming via DynamicDependency.
- - Added an acrylic backdrop and refined styling to the context menu. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Prevented disposed pages and Settings windows from handling stale messages. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Made the extension API easier to evolve without breaking clients.
- - Added “evil” sample pages to help reproduce tricky bugs.
- - Fixed WinGet trim-safety issues by replacing LINQ with manual iteration.
- - Cancelled stale list fetches to avoid older results overwriting newer ones in CmdPal.
+ - Ensured screen readers are notified when the selected item in the list changes for better accessibility.
+ - Fixed command title changes not being properly notified to screen readers. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Made icon controls excluded from keyboard navigation by default for better accessibility. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Improved UI design with better text sizing and alignment.
+ - Fixed keyboard shortcuts to work better in text boxes and context menus.
+ - Added right-click context menus with critical command styling and separators.
+ - Improved various context menu issues, improving item selection, handling of long titles, search bar text scaling, initial item behavior, and primary button functionality.
+ - Fixed context menu crashes with better type handling.
+ - Fixed "Reload" command to work with both uppercase and lowercase letters.
+ - Added mouse back button support for easier navigation. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed Alt+Left Arrow navigation not working when search box contains text. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Updated back button tooltip to show keyboard shortcut information. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed Command Palette window not appearing properly when activated. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed Command Palette window staying hidden from taskbar after File Explorer restarts. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed window focus not returning to previous app properly.
+ - Fixed Command Palette window to always appear on top when shown and move to bottom when hidden. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed window hiding to properly work on UI thread. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed crashes and improved stability with better synchronization of Command list updates. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Improved extension disposal with better error handling to prevent crashes. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Improved stability by fixing a UI threading issue when loading more results, preventing possible crashes and ensuring the loading state resets if loading fails. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Enhanced icon loading stability with better exception handling. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added thread safety to recent commands to prevent crashes. Thanks [@MaoShengelia](https://github.com/MaoShengelia)!
+ - Fixed acrylic (frosted glass) system backdrop display issues by ensuring proper UI thread handling. Thanks [@jiripolasek](https://github.com/jiripolasek)!
 
 ### Command Palette extensions
 
- - Improved empty states and ranking logic for multiple extensions. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Added app icons to the All Apps "Run" context command when available.
- - Restored missing builtin icons by standardizing extension dependencies.
- - Unblocked local deployment by adding WinAppSDK to two sample extensions.
-
-### Hosts File Editor
-
- - Added a "No leading spaces" option so active hosts entries can start at column 0 even when others are disabled. Thanks [@mohammed-saalim](https://github.com/mohammed-saalim)!
-
-### Image Resizer
-
- - Fixed Image Resizer localization by installing satellite resources under the WinUI 3 apps culture path.
+ - Added settings to each provider to control which fallback commands are enabled. Thanks [@jiripolasek](https://github.com/jiripolasek)! for fixing a regression in this feature.
+ - Added sample code showing how Command Palette extensions can track when their pages are loaded or unloaded. [Check it out here](./src/modules/cmdpal/ext/SamplePagesExtension/OnLoadPage.cs).
+ - Fixed *Calculator* to accept regular spaces in numbers that use space separators. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Added a new setting to *Calculator* to make "Copy" the primary button (replacing “Save”) and enable "Close on Enter", streamlining the workflow. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Improved *Apps* indexing error handling and removed obsolete code. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Prevented apps from showing in search when the *Apps* extension is disabled. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added ability to pin/unpin *Apps* using Ctrl+P shortcut.
+ - Added keyboard shortcuts to the *Apps* context menu items for faster access. 
+ - Added all file context menu options to the *Apps* items context menu, making all file actions available there for better functionality.
+ - Streamlined All *Apps* extension settings by removing redundant descriptions, making the UI clearer.
+ - Added command history to the *Run* page for easier access to previous commands.
+ - Fixed directory path handling in *Run* fallback for better file navigation.
+ - Fixed URL fallback item hiding properly in *Web Search* extension when search query becomes invalid. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added proper empty state message for *Web Search* extension when no results found. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added fallback command to *Windows Settings* extension for better search results.
+ - Re-enabled *Clipboard History* feature with proper window handling.
+ - Improved *Add Bookmark* extension to automatically detect file, folder, or URL types without manual input.
+ - Updated terminology from "Kill process" to "End task" in *Window Walker* for consistency with Windows.
+ - Fixed minor grammar error in SamplePagesExtension code comments. Thanks [@purofle](https://github.com/purofle)!
 
 ### Mouse Utilities
 
- - Introduced "Gliding cursor" to control the pointer and click with a single hotkey for better accessibility. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
-
-### Mouse Without Borders
-
- - Blocked Easy Mouse from switching machines during fullscreen apps, with an allow-list for exceptions. Thanks [@dot-tb](https://github.com/dot-tb)!
+ - Added a new spotlight highlighting mode that creates a large transparent circle around your cursor with a backdrop effect, providing an alternative to the traditional circle highlight. Perfect for presentations where you want to focus attention on a specific area while dimming the rest of the screen.
 
 ### Peek
 
- - Added Visual Studio shared project file types to XML preview and fixed bgcode handler registration. Thanks [@rezanid](https://github.com/rezanid)!
- - Fixes bgcode preview handler registration and events for reliable previews. Thanks [@pedrolamas](https://github.com/pedrolamas)!
-
-### PowerRename
-
- - Changed the Explorer accelerator key to PowErRename to avoid clashing with the New menu. Thanks [@aaron-ni](https://github.com/aaron-ni)!
+ - Added preview and thumbnail support for Binary G-code (.bgcode) files used in 3D printing. You can now see embedded thumbnails and preview these compressed 3D printing files directly in Peek and File Explorer. Thanks [@pedrolamas](https://github.com/pedrolamas)!
 
 ### Quick Accent
 
- - Remembered character usage across sessions so frequently used accents appear first. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Added Maltese language support with specific characters and the Euro symbol. Thanks [@rovercoder](https://github.com/rovercoder)!
- - Reduced GPU usage issues by making the window Topmost only when the picker is visible. Thanks [@daverayment](https://github.com/daverayment)!
+ - Added Vietnamese language support to Quick Accent, mappings for Vietnamese vowels (a, e, i, o, u, y) and the letter d. Thanks [@octastylos-pseudodipteros](https://github.com/octastylos-pseudodipteros)!
 
 ### Settings
 
- - Added telemetry to track usage of the new shortcut conflict detection workflow.
- - Moved the shutdown action from the title bar to a footer menu item with confirmation. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Implemented comprehensive hotkey conflict detection with a dedicated resolution dialog.
- - Added branded visuals for Office and Copilot keys in the KeyVisual control.
- - Introduced Settings search with fuzzy matching and navigation to specific controls.
- - Corrected Spanish localization so product names like Awake remain in English across Settings and OOBE.
- - Simplified the Advanced Paste description in Settings for quicker reading and consistent capitalization. Thanks [@OldUser101](https://github.com/OldUser101)!
- - Localized conflict messages in the conflict window and dialog.
-
-### Installer
-
- - Upgraded the installer to WiX 5 with silent "Files in Use" handling for smoother winget installs.
- - Switched Win10 context menu modules to runtime registration and added cleanup on uninstall to avoid stale entries.
+ - Completely redesigned the Settings dashboard with a modern card-based layout featuring organized sections for quick actions and shortcuts overview, replacing the old module list.
+ - Rewrote setting descriptions to be more concise and follow Windows writing style guidelines, making them easier to understand.
+ - Improved formatting and readability of release notes in the "What's New" section with better typography and spacing.
+ - Added missing deep link support for various settings pages (Peek, Quick Accent, PowerToys Run, etc.) so you can jump directly to specific settings.
+ - Resolved an issue where the settings page header would drift away from its position when resizing the settings window.
+ - Resolved a settings crash related to incompatible property names in ZoomIt configuration.
 
 ### Documentation
 
- - Adds docs for building the installer locally and testing winget installs.
- - Fixed a broken style guide link in developer documentation. Thanks [@denizmaral](https://github.com/denizmaral)!
+ - Added detailed step-by-step instructions for first-time developers building the Command Palette module, including prerequisites and Visual Studio setup guidance. Thanks [@chatasweetie](https://github.com/chatasweetie)!
+ - **Fixed Broken SDK Link**: Corrected a broken markdown link in the Command Palette SDK README that was pointing to an incorrect directory path. Thanks [@ChrisGuzak](https://github.com/ChrisGuzak)!
+ - Added documentation for the "Open With Cursor" plugin that enables opening Visual Studio and VS Code recent files using Cursor AI. Thanks [@VictorNoxx](https://github.com/VictorNoxx)!
+ - Added documentation for two new community plugins - Hotkeys plugin for creating custom keyboard shortcuts, and RandomGen plugin for generating random data like passwords, colors, and placeholder text. Thanks [@ruslanlap](https://github.com/ruslanlap)!
 
 ### Development
 
- - Excluded test and coverage DLLs from BinSkim scans to cut false positives and speed up security analysis.
- - Simplified NOTICE maintenance by removing version numbers and filtering out Microsoft/System packages.
- - Improved NuGet dependency validation to prevent package downgrades and catch issues during restore.
- - Updated UTF.Unknown to a modern version to improve compatibility without breaking changes. Thanks [@304NotModified](https://github.com/304NotModified)!
- - Refreshed package catalog in CI before installing dependencies to prevent Linux workflow failures.
- - Refactored CmdPal tests with dependency injection and added coverage for queries and settings.
- - Added unit tests to verify Close on Enter swaps Copy/Save as expected. Thanks [@mohammed-saalim](https://github.com/mohammed-saalim)!
- - Added accessibility IDs to CmdPal UI for stable UI tests.
- - Rewrote system command tests with a new test base and cleaner patterns.
- - Added unit tests for WebSearch and Shell extensions with mockable settings.
- - Added unit tests and abstractions for Apps and Bookmarks extensions.
- - Cleans up AI‑generated tests; adds meaningful query tests across extensions.
- - Removed the obsolete debug dialog from Settings for a smoother developer loop.
+ - Updated .NET libraries to 9.0.8 for performance and security. Thanks [@snickler](https://github.com/snickler)!
+ - Updated the spell check system to version 0.0.25 with better GitHub integration and SARIF reporting, plus fixed numerous spelling errors throughout the codebase including property names and documentation. Thanks [@jsoref](https://github.com/jsoref)!
+ - Cleaned up spelling check configuration to eliminate false positives and excessive noise that was appearing in every pull request, making the development process smoother.
+ - Replaced NuGet feed with Azure Artifacts for better package management.
+ - Implemented configurable UI test pipeline that can use pre-built official releases instead of building everything from scratch, reducing test execution time from 2+ hours.
+ - Replaced brittle pixel-by-pixel image comparison with perceptual hash (pHash) technology that's more robust to minor rendering differences - no more test failures due to anti-aliasing or compression artifacts.
+ - Reduced CI/fuzzing/UI test timeouts from 4 hours to 90 minutes, dramatically improving developer feedback loops and preventing long waits when builds get stuck.
+ - Standardized test project naming across the entire codebase and improved pipeline result identification by adding platform/install mode context to test run titles. Thanks [@khmyznikov](https://github.com/khmyznikov)!
+ - Added comprehensive UI test suites for multiple PowerToys modules including Command Palette, Advanced Paste, Peek, Text Extractor, and PowerRename - ensuring better reliability and quality.
+ - Enhanced UI test automation with command-line argument support, better session management, and improved element location methods using pattern matching to avoid failures from minor differences in exact matches.
 
 ### What is being planned over the next few releases
 
-For [v0.95][github-next-release-work], we'll work on the items below:
+For [v0.94][github-next-release-work], we'll work on the items below:
 
  - Continued Command Palette polish
  - Working on Shortcut Guide v2 (Thanks [@noraa-junker](https://github.com/noraa-junker)!)
+ - Working on upgrading the installer to WiX 5
+ - Working on shortcut conflict detection
+ - Working on setting search
  - Upgrading Keyboard Manager's editor UI
- - UI tweaking utility with day/night theme switcher
- - DSC v3 support for top utilities
  - New UI automation tests
  - Stability, bug fixes
 

src/common/ManagedCommon/Logger.cs

@@ -122,13 +122,13 @@ namespace ManagedCommon
             {
                 var exMessage =
                     message + Environment.NewLine +
-                    ex.GetType() + " (" + ex.HResult + "): " + ex.Message + Environment.NewLine;
+                    ex.GetType() + ": " + ex.Message + Environment.NewLine;
 
                 if (ex.InnerException != null)
                 {
                     exMessage +=
                         "Inner exception: " + Environment.NewLine +
-                        ex.InnerException.GetType() + " (" + ex.HResult + "): " + ex.InnerException.Message + Environment.NewLine;
+                        ex.InnerException.GetType() + ": " + ex.InnerException.Message + Environment.NewLine;
                 }
 
                 exMessage +=

src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml

@@ -20,14 +20,27 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <TitleBar x:Name="titleBar">
-            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
-            <TitleBar.LeftHeader>
-                <ImageIcon
-                    Height="16"
-                    Margin="16,0,0,0"
-                    Source="/Assets/EnvironmentVariables/EnvironmentVariables.ico" />
-            </TitleBar.LeftHeader>
-        </TitleBar>
+        <Grid
+            x:Name="titleBar"
+            Height="32"
+            ColumnSpacing="16">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition x:Name="LeftPaddingColumn" Width="0" />
+                <ColumnDefinition x:Name="IconColumn" Width="Auto" />
+                <ColumnDefinition x:Name="TitleColumn" Width="Auto" />
+                <ColumnDefinition x:Name="RightPaddingColumn" Width="0" />
+            </Grid.ColumnDefinitions>
+            <Image
+                Grid.Column="1"
+                Width="16"
+                Height="16"
+                VerticalAlignment="Center"
+                Source="../Assets/EnvironmentVariables/EnvironmentVariables.ico" />
+            <TextBlock
+                x:Name="AppTitleTextBlock"
+                Grid.Column="2"
+                VerticalAlignment="Center"
+                Style="{StaticResource CaptionTextBlockStyle}" />
+        </Grid>
     </Grid>
 </winuiex:WindowEx>

src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml.cs

@@ -4,19 +4,22 @@
 
 using System;
 using System.Runtime.InteropServices;
+
 using EnvironmentVariables.Win32;
 using EnvironmentVariablesUILib;
 using EnvironmentVariablesUILib.Helpers;
 using EnvironmentVariablesUILib.ViewModels;
 using ManagedCommon;
 using Microsoft.UI.Dispatching;
-using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using WinUIEx;
 
 namespace EnvironmentVariables
 {
+    /// <summary>
+    /// An empty window that can be used on its own or navigated to within a Frame.
+    /// </summary>
     public sealed partial class MainWindow : WindowEx
     {
         private EnvironmentVariablesMainPage MainPage { get; }
@@ -31,9 +34,8 @@ namespace EnvironmentVariables
             AppWindow.SetIcon("Assets/EnvironmentVariables/EnvironmentVariables.ico");
             var loader = ResourceLoaderInstance.ResourceLoader;
             var title = App.GetService<IElevationHelper>().IsElevated ? loader.GetString("WindowAdminTitle") : loader.GetString("WindowTitle");
-
             Title = title;
-            titleBar.Title = title;
+            AppTitleTextBlock.Text = title;
 
             var handle = this.GetWindowHandle();
             RegisterWindow(handle);

src/modules/FileLocksmith/FileLocksmithExt/PowerToysModule.cpp

@@ -19,26 +19,6 @@
 
 class FileLocksmithModule : public PowertoyModuleIface
 {
-private:
-    // Update registration based on enabled state
-    void UpdateRegistration(bool enabled)
-    {
-        if (enabled)
-        {
-#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
-            FileLocksmithRuntimeRegistration::EnsureRegistered();
-            Logger::info(L"File Locksmith context menu registered");
-#endif
-        }
-        else
-        {
-#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
-            FileLocksmithRuntimeRegistration::Unregister();
-            Logger::info(L"File Locksmith context menu unregistered");
-#endif
-        }
-    }
-
 public:
     FileLocksmithModule()
     {
@@ -108,16 +88,21 @@ public:
                 package::RegisterSparsePackage(path, packageUri);
             }
         }
+#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
+        FileLocksmithRuntimeRegistration::EnsureRegistered();
+#endif
 
         m_enabled = true;
-        UpdateRegistration(m_enabled);
     }
 
     virtual void disable() override
     {
         Logger::info(L"File Locksmith disabled");
+#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
+        FileLocksmithRuntimeRegistration::Unregister();
+        Logger::info(L"File Locksmith context menu unregistered (Win10)");
+#endif
         m_enabled = false;
-        UpdateRegistration(m_enabled);
     }
 
     virtual bool is_enabled() override
@@ -150,7 +135,6 @@ private:
     {
         m_enabled = FileLocksmithSettingsInstance().GetEnabled();
         m_extended_only = FileLocksmithSettingsInstance().GetShowInExtendedContextMenu();
-        UpdateRegistration(m_enabled);
         Trace::EnableFileLocksmith(m_enabled);
     }
 

src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml

@@ -20,15 +20,30 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <TitleBar x:Name="titleBar">
-            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
-            <TitleBar.LeftHeader>
-                <ImageIcon
-                    Height="16"
-                    Margin="16,0,0,0"
-                    Source="/Assets/FileLocksmith/Icon.ico" />
-            </TitleBar.LeftHeader>
-        </TitleBar>
+        <Grid
+            x:Name="AppTitleBar"
+            Height="32"
+            ColumnSpacing="16">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition x:Name="LeftPaddingColumn" Width="0" />
+                <ColumnDefinition x:Name="IconColumn" Width="Auto" />
+                <ColumnDefinition x:Name="TitleColumn" Width="Auto" />
+                <ColumnDefinition x:Name="RightDragColumn" Width="*" />
+                <ColumnDefinition x:Name="RightPaddingColumn" Width="0" />
+            </Grid.ColumnDefinitions>
+            <Image
+                Grid.Column="1"
+                Width="16"
+                Height="16"
+                VerticalAlignment="Center"
+                Source="../Assets/FileLocksmith/Icon.ico" />
+            <TextBlock
+                x:Name="AppTitleTextBlock"
+                Grid.Column="2"
+                VerticalAlignment="Center"
+                Style="{StaticResource CaptionTextBlockStyle}" />
+        </Grid>
+
         <views:MainPage x:Name="mainPage" Grid.Row="1" />
     </Grid>
-</winuiex:WindowEx>
+</winuiex:WindowEx>

src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml.cs

@@ -18,16 +18,30 @@ namespace FileLocksmithUI
         {
             InitializeComponent();
             mainPage.ViewModel.IsElevated = isElevated;
-            SetTitleBar(titleBar);
             ExtendsContentIntoTitleBar = true;
-            AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Tall;
+            SetTitleBar(AppTitleBar);
+            Activated += MainWindow_Activated;
             AppWindow.SetIcon("Assets/FileLocksmith/Icon.ico");
             WindowHelpers.ForceTopBorder1PixelInsetOnWindows10(this.GetWindowHandle());
 
             var loader = ResourceLoaderInstance.ResourceLoader;
             var title = isElevated ? loader.GetString("AppAdminTitle") : loader.GetString("AppTitle");
             Title = title;
-            titleBar.Title = title;
+            AppTitleTextBlock.Text = title;
+        }
+
+        private void MainWindow_Activated(object sender, WindowActivatedEventArgs args)
+        {
+            if (args.WindowActivationState == WindowActivationState.Deactivated)
+            {
+                AppTitleTextBlock.Foreground =
+                    (SolidColorBrush)App.Current.Resources["WindowCaptionForegroundDisabled"];
+            }
+            else
+            {
+                AppTitleTextBlock.Foreground =
+                    (SolidColorBrush)App.Current.Resources["WindowCaptionForeground"];
+            }
         }
 
         public void Dispose()

src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml

@@ -190,7 +190,7 @@
                 TextWrapping="Wrap" />
         </ContentDialog>
         <ContentDialog x:Name="ProcessFilesListDialog" x:Uid="ProcessFilesListDialog">
-            <ScrollViewer Padding="16" HorizontalScrollBarVisibility="Auto">
+            <ScrollViewer Padding="15" HorizontalScrollBarVisibility="Auto">
                 <TextBlock
                     x:Name="ProcessFilesListDialogTextBlock"
                     x:Uid="ProcessFilesListDialogTextBlock"

src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml

@@ -20,14 +20,27 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <TitleBar x:Name="titleBar">
-            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
-            <TitleBar.LeftHeader>
-                <ImageIcon
-                    Height="16"
-                    Margin="16,0,0,0"
-                    Source="/Assets/Hosts/Hosts.ico" />
-            </TitleBar.LeftHeader>
-        </TitleBar>
+        <Grid
+            x:Name="titleBar"
+            Height="32"
+            ColumnSpacing="16">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition x:Name="LeftPaddingColumn" Width="0" />
+                <ColumnDefinition x:Name="IconColumn" Width="Auto" />
+                <ColumnDefinition x:Name="TitleColumn" Width="Auto" />
+                <ColumnDefinition x:Name="RightPaddingColumn" Width="0" />
+            </Grid.ColumnDefinitions>
+            <Image
+                Grid.Column="1"
+                Width="16"
+                Height="16"
+                VerticalAlignment="Center"
+                Source="../Assets/Hosts/Hosts.ico" />
+            <TextBlock
+                x:Name="AppTitleTextBlock"
+                Grid.Column="2"
+                VerticalAlignment="Center"
+                Style="{StaticResource CaptionTextBlockStyle}" />
+        </Grid>
     </Grid>
 </winuiex:WindowEx>

src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml.cs

@@ -9,15 +9,19 @@ using HostsUILib.Helpers;
 using HostsUILib.Views;
 using ManagedCommon;
 using Microsoft.PowerToys.Telemetry;
-using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.Windows.ApplicationModel.Resources;
 using WinUIEx;
 
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
 namespace Hosts
 {
+    /// <summary>
+    /// An empty window that can be used on its own or navigated to within a Frame.
+    /// </summary>
     public sealed partial class MainWindow : WindowEx
     {
         private HostsMainPage MainPage { get; }
@@ -34,18 +38,31 @@ namespace Hosts
 
             var title = Host.GetService<IElevationHelper>().IsElevated ? loader.GetString("WindowAdminTitle") : loader.GetString("WindowTitle");
             Title = title;
-            titleBar.Title = title;
+            AppTitleTextBlock.Text = title;
 
             var handle = this.GetWindowHandle();
 
             WindowHelpers.ForceTopBorder1PixelInsetOnWindows10(handle);
             WindowHelpers.BringToForeground(handle);
+            Activated += MainWindow_Activated;
 
             MainPage = Host.GetService<HostsMainPage>();
 
             PowerToysTelemetry.Log.WriteEvent(new HostEditorStartFinishEvent() { TimeStamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() });
         }
 
+        private void MainWindow_Activated(object sender, WindowActivatedEventArgs args)
+        {
+            if (args.WindowActivationState == WindowActivationState.Deactivated)
+            {
+                AppTitleTextBlock.Foreground = (SolidColorBrush)App.Current.Resources["WindowCaptionForegroundDisabled"];
+            }
+            else
+            {
+                AppTitleTextBlock.Foreground = (SolidColorBrush)App.Current.Resources["WindowCaptionForeground"];
+            }
+        }
+
         private void Grid_Loaded(object sender, RoutedEventArgs e)
         {
             MainGrid.Children.Add(MainPage);

src/modules/NewPlus/NewShellExtensionContextMenu/powertoys_module.cpp

@@ -21,26 +21,6 @@
 // Note: Settings are managed via Settings and UI Settings
 class NewModule : public PowertoyModuleIface
 {
-private:
-    // Update registration based on enabled state
-    void UpdateRegistration(bool enabled)
-    {
-        if (enabled)
-        {
-#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
-            NewPlusRuntimeRegistration::EnsureRegisteredWin10();
-            Logger::info(L"New+ context menu registered");
-#endif
-        }
-        else
-        {
-#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
-            NewPlusRuntimeRegistration::Unregister();
-            Logger::info(L"New+ context menu unregistered");
-#endif
-        }
-    }
-
 public:
     NewModule()
     {
@@ -118,9 +98,14 @@ public:
         {
             newplus::utilities::register_msix_package();
         }
+        else
+        {
+#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
+            NewPlusRuntimeRegistration::EnsureRegisteredWin10();
+#endif
+        }
 
         powertoy_new_enabled = true;
-        UpdateRegistration(powertoy_new_enabled);
     }
 
     virtual void disable() override
@@ -165,14 +150,19 @@ private:
         {
             Trace::EventToggleOnOff(false);
         }
+        if (!package::IsWin11OrGreater())
+        {
+#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
+            NewPlusRuntimeRegistration::Unregister();
+            Logger::info(L"New+ context menu unregistered (Win10)");
+#endif
+        }
         powertoy_new_enabled = false;
-        UpdateRegistration(powertoy_new_enabled);
     }
 
     void init_settings()
     {
         powertoy_new_enabled = NewSettingsInstance().GetEnabled();
-        UpdateRegistration(powertoy_new_enabled);
     }
 };
 

src/modules/awake/Awake/Core/Manager.cs

@@ -49,9 +49,7 @@ namespace Awake.Core
 
         private static DateTimeOffset ExpireAt { get; set; }
 
-        private static readonly CompositeFormat AwakeMinute = CompositeFormat.Parse(Resources.AWAKE_MINUTE);
         private static readonly CompositeFormat AwakeMinutes = CompositeFormat.Parse(Resources.AWAKE_MINUTES);
-        private static readonly CompositeFormat AwakeHour = CompositeFormat.Parse(Resources.AWAKE_HOUR);
         private static readonly CompositeFormat AwakeHours = CompositeFormat.Parse(Resources.AWAKE_HOURS);
         private static readonly BlockingCollection<ExecutionState> _stateQueue;
         private static CancellationTokenSource _tokenSource;
@@ -453,7 +451,7 @@ namespace Awake.Core
             Dictionary<string, uint> optionsList = new()
             {
                 { string.Format(CultureInfo.InvariantCulture, AwakeMinutes, 30), 1800 },
-                { string.Format(CultureInfo.InvariantCulture, AwakeHour, 1), 3600 },
+                { string.Format(CultureInfo.InvariantCulture, AwakeHours, 1), 3600 },
                 { string.Format(CultureInfo.InvariantCulture, AwakeHours, 2), 7200 },
             };
             return optionsList;

src/modules/awake/Awake/Properties/Resources.Designer.cs

@@ -159,15 +159,6 @@ namespace Awake.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to {0} hour.
-        /// </summary>
-        internal static string AWAKE_HOUR {
-            get {
-                return ResourceManager.GetString("AWAKE_HOUR", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to {0} hours.
         /// </summary>
@@ -249,15 +240,6 @@ namespace Awake.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to {0} minute.
-        /// </summary>
-        internal static string AWAKE_MINUTE {
-            get {
-                return ResourceManager.GetString("AWAKE_MINUTE", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to {0} minutes.
         /// </summary>

src/modules/awake/Awake/Properties/Resources.resx

@@ -123,10 +123,6 @@
   <data name="AWAKE_EXIT" xml:space="preserve">
     <value>Exit</value>
   </data>
-  <data name="AWAKE_HOUR" xml:space="preserve">
-    <value>{0} hour</value>
-    <comment>{0} shouldn't be removed. It will be replaced by the number 1 at runtime by the application. Used for defining a period to keep the PC awake.</comment>
-  </data>
   <data name="AWAKE_HOURS" xml:space="preserve">
     <value>{0} hours</value>
     <comment>{0} shouldn't be removed. It will be replaced by a number greater than 1 at runtime by the application. Used for defining a period to keep the PC awake.</comment>
@@ -146,10 +142,6 @@
     <value>Keep awake until expiration date and time</value>
     <comment>Keep the system awake until expiration date and time</comment>
   </data>
-  <data name="AWAKE_MINUTE" xml:space="preserve">
-    <value>{0} minute</value>
-    <comment>{0} shouldn't be removed. It will be replaced by the number 1 at runtime by the application. Used for defining a period to keep the PC awake.</comment>
-  </data>
   <data name="AWAKE_MINUTES" xml:space="preserve">
     <value>{0} minutes</value>
     <comment>{0} shouldn't be removed. It will be replaced by a number greater than 1 at runtime by the application. Used for defining a period to keep the PC awake.</comment>

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandItemViewModel.cs

@@ -160,7 +160,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         Initialized |= InitializedState.Initialized;
     }
 
-    public virtual void SlowInitializeProperties()
+    public void SlowInitializeProperties()
     {
         if (IsSelectedInitialized)
         {

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ListItemViewModel.cs

@@ -47,21 +47,9 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
 
         UpdateTags(li.Tags);
 
+        TextToSuggest = li.TextToSuggest;
         Section = li.Section ?? string.Empty;
-
-        UpdateProperty(nameof(Section));
-    }
-
-    public override void SlowInitializeProperties()
-    {
-        base.SlowInitializeProperties();
-        var model = Model.Unsafe;
-        if (model is null)
-        {
-            return;
-        }
-
-        var extensionDetails = model.Details;
+        var extensionDetails = li.Details;
         if (extensionDetails is not null)
         {
             Details = new(extensionDetails, PageContext);
@@ -70,8 +58,8 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
             UpdateProperty(nameof(HasDetails));
         }
 
-        TextToSuggest = model.TextToSuggest;
         UpdateProperty(nameof(TextToSuggest));
+        UpdateProperty(nameof(Section));
     }
 
     protected override void FetchProperty(string propertyName)

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/AppStateModel.cs

@@ -3,12 +3,10 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using CommunityToolkit.Mvvm.ComponentModel;
-using ManagedCommon;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.Foundation;
 
@@ -41,7 +39,7 @@ public partial class AppStateModel : ObservableObject
     {
         if (string.IsNullOrEmpty(FilePath))
         {
-            throw new InvalidOperationException($"You must set a valid {nameof(FilePath)} before calling {nameof(LoadState)}");
+            throw new InvalidOperationException($"You must set a valid {nameof(SettingsModel.FilePath)} before calling {nameof(LoadState)}");
         }
 
         if (!File.Exists(FilePath))
@@ -79,84 +77,43 @@ public partial class AppStateModel : ObservableObject
         try
         {
             // Serialize the main dictionary to JSON and save it to the file
-            var settingsJson = JsonSerializer.Serialize(model, JsonSerializationContext.Default.AppStateModel!);
+            var settingsJson = JsonSerializer.Serialize(model, JsonSerializationContext.Default.AppStateModel);
 
-            // validate JSON
-            if (JsonNode.Parse(settingsJson) is not JsonObject newSettings)
+            // Is it valid JSON?
+            if (JsonNode.Parse(settingsJson) is JsonObject newSettings)
             {
-                Logger.LogError("Failed to parse app state as a JsonObject.");
-                return;
-            }
+                // Now, read the existing content from the file
+                var oldContent = File.Exists(FilePath) ? File.ReadAllText(FilePath) : "{}";
 
-            // read previous settings
-            if (!TryReadSavedState(out var savedSettings))
-            {
-                savedSettings = new JsonObject();
-            }
+                // Is it valid JSON?
+                if (JsonNode.Parse(oldContent) is JsonObject savedSettings)
+                {
+                    foreach (var item in newSettings)
+                    {
+                        savedSettings[item.Key] = item.Value?.DeepClone();
+                    }
 
-            // merge new settings into old ones
-            foreach (var item in newSettings)
-            {
-                savedSettings[item.Key] = item.Value?.DeepClone();
-            }
+                    var serialized = savedSettings.ToJsonString(JsonSerializationContext.Default.AppStateModel.Options);
+                    File.WriteAllText(FilePath, serialized);
 
-            var serialized = savedSettings.ToJsonString(JsonSerializationContext.Default.AppStateModel!.Options);
-            File.WriteAllText(FilePath, serialized);
-
-            // TODO: Instead of just raising the event here, we should
-            // have a file change watcher on the settings file, and
-            // reload the settings then
-            model.StateChanged?.Invoke(model, null);
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"Failed to save application state to {FilePath}:", ex);
-        }
-    }
-
-    private static bool TryReadSavedState([NotNullWhen(true)] out JsonObject? savedSettings)
-    {
-        savedSettings = null;
-
-        // read existing content from the file
-        string oldContent;
-        try
-        {
-            if (File.Exists(FilePath))
-            {
-                oldContent = File.ReadAllText(FilePath);
+                    // TODO: Instead of just raising the event here, we should
+                    // have a file change watcher on the settings file, and
+                    // reload the settings then
+                    model.StateChanged?.Invoke(model, null);
+                }
+                else
+                {
+                    Debug.WriteLine("Failed to parse settings file as JsonObject.");
+                }
             }
             else
             {
-                // file doesn't exist (might not have been created yet), so consider this a success
-                // and return empty settings
-                savedSettings = new JsonObject();
-                return true;
+                Debug.WriteLine("Failed to parse settings file as JsonObject.");
             }
         }
         catch (Exception ex)
         {
-            Logger.LogWarning($"Failed to read app state file {FilePath}:\n{ex}");
-            return false;
-        }
-
-        // detect empty file, just for sake of logging
-        if (string.IsNullOrWhiteSpace(oldContent))
-        {
-            Logger.LogInfo($"App state file is empty: {FilePath}");
-            return false;
-        }
-
-        // is it valid JSON?
-        try
-        {
-            savedSettings = JsonNode.Parse(oldContent) as JsonObject;
-            return savedSettings != null;
-        }
-        catch (Exception ex)
-        {
-            Logger.LogWarning($"Failed to parse app state from {FilePath}:\n{ex}");
-            return false;
+            Debug.WriteLine(ex.ToString());
         }
     }
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs

@@ -27,9 +27,7 @@ public partial class MainListPage : DynamicListPage,
     private readonly IServiceProvider _serviceProvider;
 
     private readonly TopLevelCommandManager _tlcManager;
-    private IEnumerable<Scored<IListItem>>? _filteredItems;
-    private IEnumerable<Scored<IListItem>>? _filteredApps;
-    private IEnumerable<IListItem>? _allApps;
+    private IEnumerable<IListItem>? _filteredItems;
     private bool _includeApps;
     private bool _filteredItemsIncludesApps;
 
@@ -85,7 +83,7 @@ public partial class MainListPage : DynamicListPage,
         }
         else
         {
-            RaiseItemsChanged();
+            RaiseItemsChanged(_tlcManager.TopLevelCommands.Count);
         }
     }
 
@@ -150,13 +148,7 @@ public partial class MainListPage : DynamicListPage,
         {
             lock (_tlcManager.TopLevelCommands)
             {
-                var items = Enumerable.Empty<Scored<IListItem>>()
-                                .Concat(_filteredItems is not null ? _filteredItems : [])
-                                .Concat(_filteredApps is not null ? _filteredApps : [])
-                                .OrderByDescending(o => o.Score)
-                                .Select(s => s.Item)
-                                .ToArray();
-                return items;
+                return _filteredItems?.ToArray() ?? [];
             }
         }
     }
@@ -175,8 +167,6 @@ public partial class MainListPage : DynamicListPage,
                     {
                         _filteredItemsIncludesApps = _includeApps;
                         _filteredItems = null;
-                        _filteredApps = null;
-                        _allApps = null;
                     }
                 }
 
@@ -194,8 +184,6 @@ public partial class MainListPage : DynamicListPage,
             {
                 _filteredItemsIncludesApps = _includeApps;
                 _filteredItems = null;
-                _filteredApps = null;
-                _allApps = null;
                 RaiseItemsChanged(commands.Count);
                 return;
             }
@@ -205,49 +193,35 @@ public partial class MainListPage : DynamicListPage,
             if (!newSearch.StartsWith(oldSearch, StringComparison.CurrentCultureIgnoreCase))
             {
                 _filteredItems = null;
-                _filteredApps = null;
-                _allApps = null;
             }
 
             // If the internal state has changed, reset _filteredItems to reset the list.
             if (_filteredItemsIncludesApps != _includeApps)
             {
                 _filteredItems = null;
-                _filteredApps = null;
-                _allApps = null;
             }
 
-            var newFilteredItems = _filteredItems?.Select(s => s.Item);
-
             // If we don't have any previous filter results to work with, start
             // with a list of all our commands & apps.
-            if (newFilteredItems is null && _filteredApps is null)
+            if (_filteredItems is null)
             {
-                newFilteredItems = commands;
+                _filteredItems = commands;
                 _filteredItemsIncludesApps = _includeApps;
-
                 if (_includeApps)
                 {
-                    _allApps = AllAppsCommandProvider.Page.GetItems();
+                    IEnumerable<IListItem> apps = AllAppsCommandProvider.Page.GetItems();
+                    var appIds = apps.Select(app => app.Command.Id).ToArray();
+
+                    // Remove any top level pinned apps and use the apps from AllAppsCommandProvider.Page.GetItems()
+                    // since they contain details.
+                    _filteredItems = _filteredItems.Where(item => item.Command is not AppCommand);
+                    _filteredItems = _filteredItems.Concat(apps);
                 }
             }
 
             // Produce a list of everything that matches the current filter.
-            _filteredItems = ListHelpers.FilterListWithScores<IListItem>(newFilteredItems ?? [], SearchText, ScoreTopLevelItem);
-
-            // Produce a list of filtered apps with the appropriate limit
-            if (_allApps is not null)
-            {
-                _filteredApps = ListHelpers.FilterListWithScores<IListItem>(_allApps, SearchText, ScoreTopLevelItem);
-
-                var appResultLimit = AllAppsCommandProvider.TopLevelResultLimit;
-                if (appResultLimit >= 0)
-                {
-                    _filteredApps = _filteredApps.Take(appResultLimit);
-                }
-            }
-
-            RaiseItemsChanged();
+            _filteredItems = ListHelpers.FilterList<IListItem>(_filteredItems, SearchText, ScoreTopLevelItem);
+            RaiseItemsChanged(_filteredItems.Count());
         }
     }
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelViewModel.cs

@@ -32,7 +32,6 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
     private string _generatedId = string.Empty;
 
     private HotkeySettings? _hotkey;
-    private IIconInfo? _initialIcon;
 
     private CommandAlias? Alias { get; set; }
 
@@ -58,8 +57,6 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
 
     public IIconInfo Icon => _commandItemViewModel.Icon;
 
-    public IIconInfo InitialIcon => _initialIcon ?? _commandItemViewModel.Icon;
-
     ICommand? ICommandItem.Command => _commandItemViewModel.Command.Model.Unsafe;
 
     IContextItem?[] ICommandItem.MoreCommands => _commandItemViewModel.MoreCommands
@@ -208,8 +205,6 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
             {
                 DisplayTitle = fallback.DisplayTitle;
             }
-
-            UpdateInitialIcon(false);
         }
     }
 
@@ -226,31 +221,7 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
                 FetchAliasFromAliasManager();
                 UpdateHotkey();
                 UpdateTags();
-                UpdateInitialIcon();
             }
-            else if (e.PropertyName == nameof(CommandItem.Icon))
-            {
-                UpdateInitialIcon();
-            }
-        }
-    }
-
-    private void UpdateInitialIcon(bool raiseNotification = true)
-    {
-        if (_initialIcon != null || !_commandItemViewModel.Icon.IsSet)
-        {
-            return;
-        }
-
-        _initialIcon = _commandItemViewModel.Icon;
-
-        if (raiseNotification)
-        {
-            DoOnUiThread(
-                () =>
-                {
-                    PropChanged?.Invoke(this, new PropChangedEventArgs(nameof(InitialIcon)));
-                });
         }
     }
 

src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionPage.xaml

@@ -125,7 +125,7 @@
                                                                 Width="20"
                                                                 Height="20"
                                                                 AutomationProperties.AccessibilityView="Raw"
-                                                                SourceKey="{x:Bind InitialIcon, Mode=OneWay}"
+                                                                SourceKey="{x:Bind Icon, Mode=OneWay}"
                                                                 SourceRequested="{x:Bind helpers:IconCacheProvider.SourceRequested}" />
                                                         </cpcontrols:ContentIcon.Content>
                                                     </cpcontrols:ContentIcon>

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WebSearch.UnitTests/MockSettingsInterface.cs

@@ -15,13 +15,13 @@ public class MockSettingsInterface : ISettingsInterface
 
     public bool GlobalIfURI { get; set; }
 
-    public uint HistoryItemCount { get; set; }
+    public string ShowHistory { get; set; }
 
-    public MockSettingsInterface(uint historyItemCount = 0, bool globalIfUri = true, List<HistoryItem> mockHistory = null)
+    public MockSettingsInterface(string showHistory = "none", bool globalIfUri = true, List<HistoryItem> mockHistory = null)
     {
         _historyItems = mockHistory ?? new List<HistoryItem>();
         GlobalIfURI = globalIfUri;
-        HistoryItemCount = historyItemCount;
+        ShowHistory = showHistory;
     }
 
     public List<ListItem> LoadHistory()
@@ -50,9 +50,9 @@ public class MockSettingsInterface : ISettingsInterface
         _historyItems.Add(historyItem);
 
         // Simulate the same logic as SettingsManager
-        if (HistoryItemCount > 0)
+        if (int.TryParse(ShowHistory, out var maxHistoryItems) && maxHistoryItems > 0)
         {
-            while (_historyItems.Count > HistoryItemCount)
+            while (_historyItems.Count > maxHistoryItems)
             {
                 _historyItems.RemoveAt(0); // Remove the oldest item
             }

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WebSearch.UnitTests/QueryTests.cs

@@ -54,7 +54,7 @@ public class QueryTests : CommandPaletteUnitTestBase
             new HistoryItem("another search", DateTime.Parse("2024-01-02 13:00:00", CultureInfo.CurrentCulture)),
         };
 
-        var settings = new MockSettingsInterface(mockHistory: mockHistoryItems, historyItemCount: 5);
+        var settings = new MockSettingsInterface(mockHistory: mockHistoryItems, showHistory: "5");
 
         var page = new WebSearchListPage(settings);
 
@@ -89,7 +89,7 @@ public class QueryTests : CommandPaletteUnitTestBase
             new HistoryItem("another search4", DateTime.Parse("2024-01-05 13:00:00", CultureInfo.CurrentCulture)),
         };
 
-        var settings = new MockSettingsInterface(mockHistory: mockHistoryItems, historyItemCount: 5);
+        var settings = new MockSettingsInterface(mockHistory: mockHistoryItems, showHistory: "5");
 
         var page = new WebSearchListPage(settings);
 
@@ -122,7 +122,7 @@ public class QueryTests : CommandPaletteUnitTestBase
             new HistoryItem("another search5", DateTime.Parse("2024-01-06 13:00:00", CultureInfo.CurrentCulture)),
         };
 
-        var settings = new MockSettingsInterface(mockHistory: mockHistoryItems, historyItemCount: 0);
+        var settings = new MockSettingsInterface(mockHistory: mockHistoryItems, showHistory: "None");
 
         var page = new WebSearchListPage(settings);
 

src/modules/cmdpal/custom.props

@@ -5,7 +5,7 @@
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
     <XesBaseYearForStoreVersion>2025</XesBaseYearForStoreVersion>
     <VersionMajor>0</VersionMajor>
-    <VersionMinor>5</VersionMinor>
+    <VersionMinor>4</VersionMinor>
     <VersionInfoProductName>Microsoft Command Palette</VersionInfoProductName>
   </PropertyGroup>
 </Project>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsCommandProvider.cs

@@ -3,7 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using Microsoft.CmdPal.Ext.Apps.Programs;
 using Microsoft.CmdPal.Ext.Apps.Properties;
 using Microsoft.CmdPal.Ext.Apps.State;
 using Microsoft.CommandPalette.Extensions;
@@ -43,28 +45,6 @@ public partial class AllAppsCommandProvider : CommandProvider
         PinnedAppsManager.Instance.PinStateChanged += OnPinStateChanged;
     }
 
-    public static int TopLevelResultLimit
-    {
-        get
-        {
-            var limitSetting = AllAppsSettings.Instance.SearchResultLimit;
-
-            if (limitSetting is null)
-            {
-                return -1;
-            }
-
-            var quantity = -1;
-
-            if (int.TryParse(limitSetting, out var result))
-            {
-                quantity = result;
-            }
-
-            return quantity;
-        }
-    }
-
     public override ICommandItem[] TopLevelCommands() => [_listItem, .._page.GetPinnedApps()];
 
     public ICommandItem? LookupApp(string displayName)

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsSettings.cs

@@ -20,16 +20,6 @@ public class AllAppsSettings : JsonSettingsManager, ISettingsInterface
 
     private static string Experimental(string propertyName) => $"{_namespace}.experimental.{propertyName}";
 
-    private static readonly List<ChoiceSetSetting.Choice> _searchResultLimitChoices =
-    [
-        new ChoiceSetSetting.Choice(Resources.limit_none, "-1"),
-        new ChoiceSetSetting.Choice(Resources.limit_0, "0"),
-        new ChoiceSetSetting.Choice(Resources.limit_1, "1"),
-        new ChoiceSetSetting.Choice(Resources.limit_5, "5"),
-        new ChoiceSetSetting.Choice(Resources.limit_10, "10"),
-        new ChoiceSetSetting.Choice(Resources.limit_20, "20"),
-    ];
-
 #pragma warning disable SA1401 // Fields should be private
     internal static AllAppsSettings Instance = new();
 #pragma warning restore SA1401 // Fields should be private
@@ -52,14 +42,6 @@ public class AllAppsSettings : JsonSettingsManager, ISettingsInterface
 
     public bool EnablePathEnvironmentVariableSource => _enablePathEnvironmentVariableSource.Value;
 
-    private readonly ChoiceSetSetting _searchResultLimitSource = new(
-        Namespaced(nameof(SearchResultLimit)),
-        Resources.limit_fallback_results_source,
-        Resources.limit_fallback_results_source_description,
-        _searchResultLimitChoices);
-
-    public string SearchResultLimit => _searchResultLimitSource.Value ?? string.Empty;
-
     private readonly ToggleSetting _enableStartMenuSource = new(
         Namespaced(nameof(EnableStartMenuSource)),
         Resources.enable_start_menu_source,
@@ -105,7 +87,6 @@ public class AllAppsSettings : JsonSettingsManager, ISettingsInterface
         Settings.Add(_enableDesktopSource);
         Settings.Add(_enableRegistrySource);
         Settings.Add(_enablePathEnvironmentVariableSource);
-        Settings.Add(_searchResultLimitSource);
 
         // Load settings from file upon initialization
         LoadSettings();

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Commands/UninstallApplicationCommand.cs

@@ -1,130 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using ManagedCommon;
-using Microsoft.CmdPal.Ext.Apps.Programs;
-using Microsoft.CmdPal.Ext.Apps.Properties;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-using Windows.Management.Deployment;
-
-namespace Microsoft.CmdPal.Ext.Apps.Commands;
-
-internal sealed partial class UninstallApplicationCommand : InvokableCommand
-{
-    // This is a ms-settings URI that opens the Apps & Features page in Windows Settings.
-    // It's correct and follows the Microsoft documentation:
-    // https://learn.microsoft.com/en-us/windows/apps/develop/launch/launch-settings-app#apps
-    private const string AppsFeaturesUri = "ms-settings:appsfeatures";
-
-    private readonly UWPApplication? _uwpTarget;
-    private readonly Win32Program? _win32Target;
-
-    public UninstallApplicationCommand(UWPApplication target)
-    {
-        Name = Resources.uninstall_application;
-        Icon = Icons.UninstallApplicationIcon;
-        _uwpTarget = target ?? throw new ArgumentNullException(nameof(target));
-    }
-
-    public UninstallApplicationCommand(Win32Program target)
-    {
-        Name = Resources.uninstall_application;
-        Icon = Icons.UninstallApplicationIcon;
-        _win32Target = target ?? throw new ArgumentNullException(nameof(target));
-    }
-
-    private async Task<CommandResult> UninstallUwpAppAsync(UWPApplication app)
-    {
-        if (string.IsNullOrWhiteSpace(app.Package.FullName))
-        {
-            Logger.LogError($"Critical error while uninstalling: packageFullName cannot be null or empty.");
-            return CommandResult.ShowToast(new ToastArgs()
-            {
-                Message = string.Format(CultureInfo.CurrentCulture, CompositeFormat.Parse(Resources.uninstall_application_failed), app.DisplayName),
-                Result = CommandResult.KeepOpen(),
-            });
-        }
-
-        try
-        {
-            // Which timeout to use for the uninstallation operation?
-            using (var cts = new CancellationTokenSource(TimeSpan.FromSeconds(60)))
-            {
-                var packageManager = new PackageManager();
-                var result = await packageManager.RemovePackageAsync(app.Package.FullName).AsTask(cts.Token);
-
-                if (result.ErrorText is not null && result.ErrorText.Length > 0)
-                {
-                    Logger.LogError($"Failed to uninstall {app.Package.FullName}: {result.ErrorText}");
-                    return CommandResult.ShowToast(new ToastArgs()
-                    {
-                        Message = string.Format(CultureInfo.CurrentCulture, CompositeFormat.Parse(Resources.uninstall_application_failed), app.DisplayName),
-                        Result = CommandResult.KeepOpen(),
-                    });
-                }
-            }
-
-            // TODO: Update the Search results after uninstalling the app - unsure how to do this yet.
-            return CommandResult.ShowToast(new ToastArgs()
-            {
-                Message = string.Format(CultureInfo.CurrentCulture, CompositeFormat.Parse(Resources.uninstall_application_successful), app.DisplayName),
-                Result = CommandResult.GoHome(),
-            });
-        }
-        catch (OperationCanceledException)
-        {
-            Logger.LogError($"Timeout exceeded while uninstalling {app.Package.FullName}");
-            return CommandResult.ShowToast(new ToastArgs()
-            {
-                Message = string.Format(CultureInfo.CurrentCulture, CompositeFormat.Parse(Resources.uninstall_application_failed), app.DisplayName),
-                Result = CommandResult.KeepOpen(),
-            });
-        }
-        catch (UnauthorizedAccessException ex)
-        {
-            Logger.LogError($"Permission denied to uninstall {app.Package.FullName}. Elevated privileges may be required. Error: {ex.Message}");
-            return CommandResult.ShowToast(new ToastArgs()
-            {
-                Message = string.Format(CultureInfo.CurrentCulture, CompositeFormat.Parse(Resources.uninstall_application_failed), app.DisplayName),
-                Result = CommandResult.KeepOpen(),
-            });
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"An unexpected error occurred during uninstallation of {app.Package.FullName}: {ex.Message}");
-            return CommandResult.ShowToast(new ToastArgs()
-            {
-                Message = string.Format(CultureInfo.CurrentCulture, CompositeFormat.Parse(Resources.uninstall_application_failed), app.DisplayName),
-                Result = CommandResult.KeepOpen(),
-            });
-        }
-    }
-
-    public override CommandResult Invoke()
-    {
-        if (_uwpTarget is not null)
-        {
-            return UninstallUwpAppAsync(_uwpTarget).ConfigureAwait(false).GetAwaiter().GetResult();
-        }
-
-        if (_win32Target is not null)
-        {
-            Process.Start(new ProcessStartInfo
-            {
-                FileName = AppsFeaturesUri,
-                UseShellExecute = true,
-            });
-            return CommandResult.Dismiss();
-        }
-
-        Logger.LogError("UninstallApplicationCommand invoked with no target.");
-        return CommandResult.Dismiss();
-    }
-}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Commands/UninstallApplicationConfirmation.cs

@@ -1,66 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Globalization;
-using System.Text;
-using ManagedCommon;
-using Microsoft.CmdPal.Ext.Apps.Programs;
-using Microsoft.CmdPal.Ext.Apps.Properties;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.Apps.Commands;
-
-internal sealed partial class UninstallApplicationConfirmation : InvokableCommand
-{
-    private readonly UWPApplication? _uwpTarget;
-    private readonly Win32Program? _win32Target;
-
-    public UninstallApplicationConfirmation(UWPApplication target)
-    {
-        Name = Resources.uninstall_application;
-        Icon = Icons.UninstallApplicationIcon;
-        _uwpTarget = target ?? throw new ArgumentNullException(nameof(target));
-    }
-
-    public UninstallApplicationConfirmation(Win32Program target)
-    {
-        Name = Resources.uninstall_application;
-        Icon = Icons.UninstallApplicationIcon;
-        _win32Target = target ?? throw new ArgumentNullException(nameof(target));
-    }
-
-    public override CommandResult Invoke()
-    {
-        UninstallApplicationCommand uninstallCommand;
-
-        var applicationTitle = Resources.uninstall_application;
-
-        if (_uwpTarget is not null)
-        {
-            uninstallCommand = new UninstallApplicationCommand(_uwpTarget);
-            applicationTitle = _uwpTarget.DisplayName;
-        }
-        else if (_win32Target is not null)
-        {
-            uninstallCommand = new UninstallApplicationCommand(_win32Target);
-            applicationTitle = _win32Target.Name;
-        }
-        else
-        {
-            Logger.LogError("UninstallApplicationCommand invoked with no target.");
-            return CommandResult.Dismiss();
-        }
-
-        var confirmArgs = new ConfirmationArgs()
-        {
-            Title = string.Format(CultureInfo.CurrentCulture, CompositeFormat.Parse(Resources.uninstall_application_confirm_title), applicationTitle),
-            Description = Resources.uninstall_application_confirm_description,
-            PrimaryCommand = uninstallCommand,
-            IsPrimaryCommandCritical = true,
-        };
-
-        return CommandResult.Confirm(confirmArgs);
-    }
-}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Icons.cs

@@ -21,6 +21,4 @@ internal sealed class Icons
     public static IconInfo UnpinIcon { get; } = new("\uE77A"); // Unpin icon
 
     public static IconInfo PinIcon { get; } = new("\uE840"); // Pin icon
-
-    public static IconInfo UninstallApplicationIcon { get; } = new("\uE74D"); // Uninstall icon
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/UWPApplication.cs

@@ -117,14 +117,6 @@ public class UWPApplication : IUWPApplication
             RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.R),
         });
 
-        commands.Add(
-            new CommandContextItem(
-                new UninstallApplicationConfirmation(this))
-            {
-                RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.Delete),
-                IsCritical = true,
-            });
-
         return commands;
     }
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/Win32Program.cs

@@ -219,16 +219,6 @@ public class Win32Program : IProgram
             RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.R),
         });
 
-        if (AppType == ApplicationType.ShortcutApplication || AppType == ApplicationType.ApprefApplication || AppType == ApplicationType.Win32Application)
-        {
-            commands.Add(new CommandContextItem(
-                new UninstallApplicationConfirmation(this))
-            {
-                RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.Delete),
-                IsCritical = true,
-            });
-        }
-
         return commands;
     }
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Properties/Resources.Designer.cs

@@ -159,78 +159,6 @@ namespace Microsoft.CmdPal.Ext.Apps.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to 0.
-        /// </summary>
-        internal static string limit_0 {
-            get {
-                return ResourceManager.GetString("limit_0", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 1.
-        /// </summary>
-        internal static string limit_1 {
-            get {
-                return ResourceManager.GetString("limit_1", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 10.
-        /// </summary>
-        internal static string limit_10 {
-            get {
-                return ResourceManager.GetString("limit_10", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 20.
-        /// </summary>
-        internal static string limit_20 {
-            get {
-                return ResourceManager.GetString("limit_20", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 5.
-        /// </summary>
-        internal static string limit_5 {
-            get {
-                return ResourceManager.GetString("limit_5", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Limit the number of applications returned from the top level.
-        /// </summary>
-        internal static string limit_fallback_results_source {
-            get {
-                return ResourceManager.GetString("limit_fallback_results_source", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Limit fallback results to n apps.
-        /// </summary>
-        internal static string limit_fallback_results_source_description {
-            get {
-                return ResourceManager.GetString("limit_fallback_results_source_description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unlimited.
-        /// </summary>
-        internal static string limit_none {
-            get {
-                return ResourceManager.GetString("limit_none", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Open containing folder.
         /// </summary>
@@ -330,51 +258,6 @@ namespace Microsoft.CmdPal.Ext.Apps.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Uninstall.
-        /// </summary>
-        internal static string uninstall_application {
-            get {
-                return ResourceManager.GetString("uninstall_application", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to This app and its related information will be removed..
-        /// </summary>
-        internal static string uninstall_application_confirm_description {
-            get {
-                return ResourceManager.GetString("uninstall_application_confirm_description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Uninstall &quot;{0}&quot;?.
-        /// </summary>
-        internal static string uninstall_application_confirm_title {
-            get {
-                return ResourceManager.GetString("uninstall_application_confirm_title", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error while uninstalling &apos;{0}&apos;.
-        /// </summary>
-        internal static string uninstall_application_failed {
-            get {
-                return ResourceManager.GetString("uninstall_application_failed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;{0}&apos; has been successfully uninstalled..
-        /// </summary>
-        internal static string uninstall_application_successful {
-            get {
-                return ResourceManager.GetString("uninstall_application_successful", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Unpin.
         /// </summary>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Properties/Resources.resx

@@ -198,43 +198,4 @@
   <data name="unpin_app" xml:space="preserve">
     <value>Unpin</value>
   </data>
-  <data name="uninstall_application" xml:space="preserve">
-    <value>Uninstall</value>
-  </data>
-  <data name="uninstall_application_successful" xml:space="preserve">
-    <value>'{0}' has been successfully uninstalled.</value>
-  </data>
-  <data name="uninstall_application_failed" xml:space="preserve">
-    <value>Error while uninstalling '{0}'</value>
-  </data>
-  <data name="uninstall_application_confirm_description" xml:space="preserve">
-    <value>This app and its related information will be removed.</value>
-  </data>
-  <data name="uninstall_application_confirm_title" xml:space="preserve">
-    <value>Uninstall "{0}"?</value>
-  </data>
-  <data name="limit_1" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="limit_5" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="limit_10" xml:space="preserve">
-    <value>10</value>
-  </data>
-  <data name="limit_20" xml:space="preserve">
-    <value>20</value>
-  </data>
-  <data name="limit_fallback_results_source" xml:space="preserve">
-    <value>Limit the number of applications returned from the top level</value>
-  </data>
-  <data name="limit_fallback_results_source_description" xml:space="preserve">
-    <value>Limit fallback results to n apps</value>
-  </data>
-  <data name="limit_0" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="limit_none" xml:space="preserve">
-    <value>Unlimited</value>
-  </data>
-</root>
+</root>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/FallbackSystemCommandItem.cs

@@ -17,7 +17,6 @@ internal sealed partial class FallbackSystemCommandItem : FallbackCommandItem
     {
         Title = string.Empty;
         Subtitle = string.Empty;
-        Icon = Icons.LockIcon;
 
         var isBootedInUefiMode = settings.GetSystemFirmwareType() == FirmwareType.Uefi;
         var hideEmptyRB = settings.HideEmptyRecycleBin();

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/FallbackTimeDateItem.cs

@@ -22,7 +22,6 @@ internal sealed partial class FallbackTimeDateItem : FallbackCommandItem
     {
         Title = string.Empty;
         Subtitle = string.Empty;
-        Icon = Icons.TimeDateIcon;
         _settingsManager = settings;
         _timestamp = timestamp;
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Commands/SearchWebCommand.cs

@@ -34,7 +34,7 @@ internal sealed partial class SearchWebCommand : InvokableCommand
             return CommandResult.KeepOpen();
         }
 
-        if (_settingsManager.HistoryItemCount != 0)
+        if (_settingsManager.ShowHistory != Resources.history_none)
         {
             _settingsManager.SaveHistory(new HistoryItem(Arguments, DateTime.Now));
         }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Helpers/ISettingsInterface.cs

@@ -11,7 +11,7 @@ public interface ISettingsInterface
 {
     public bool GlobalIfURI { get; }
 
-    public uint HistoryItemCount { get; }
+    public string ShowHistory { get; }
 
     public List<ListItem> LoadHistory();
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Helpers/SettingsManager.cs

@@ -16,7 +16,6 @@ namespace Microsoft.CmdPal.Ext.WebSearch.Helpers;
 
 public class SettingsManager : JsonSettingsManager, ISettingsInterface
 {
-    private const string HistoryItemCountLegacySettingsKey = "ShowHistory";
     private readonly string _historyPath;
 
     private static readonly string _namespace = "websearch";
@@ -25,11 +24,11 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
 
     private static readonly List<ChoiceSetSetting.Choice> _choices =
     [
-        new ChoiceSetSetting.Choice(Resources.history_none, "None"),
-        new ChoiceSetSetting.Choice(Resources.history_1, "1"),
-        new ChoiceSetSetting.Choice(Resources.history_5, "5"),
-        new ChoiceSetSetting.Choice(Resources.history_10, "10"),
-        new ChoiceSetSetting.Choice(Resources.history_20, "20"),
+        new ChoiceSetSetting.Choice(Resources.history_none, Resources.history_none),
+        new ChoiceSetSetting.Choice(Resources.history_1, Resources.history_1),
+        new ChoiceSetSetting.Choice(Resources.history_5, Resources.history_5),
+        new ChoiceSetSetting.Choice(Resources.history_10, Resources.history_10),
+        new ChoiceSetSetting.Choice(Resources.history_20, Resources.history_20),
     ];
 
     private readonly ToggleSetting _globalIfURI = new(
@@ -38,15 +37,15 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
         Resources.plugin_global_if_uri,
         false);
 
-    private readonly ChoiceSetSetting _historyItemCount = new(
-        Namespaced(HistoryItemCountLegacySettingsKey),
-        Resources.plugin_history_item_count,
-        Resources.plugin_history_item_count,
+    private readonly ChoiceSetSetting _showHistory = new(
+        Namespaced(nameof(ShowHistory)),
+        Resources.plugin_show_history,
+        Resources.plugin_show_history,
         _choices);
 
     public bool GlobalIfURI => _globalIfURI.Value;
 
-    public uint HistoryItemCount => uint.TryParse(_historyItemCount.Value, out var value) ? value : 0;
+    public string ShowHistory => _showHistory.Value ?? string.Empty;
 
     internal static string SettingsJsonPath()
     {
@@ -91,11 +90,11 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
             // Add the new history item
             historyItems.Add(historyItem);
 
-            // Determine the maximum number of items to keep based on HistoryItemCount
-            if (HistoryItemCount > 0)
+            // Determine the maximum number of items to keep based on ShowHistory
+            if (int.TryParse(ShowHistory, out var maxHistoryItems) && maxHistoryItems > 0)
             {
                 // Keep only the most recent `maxHistoryItems` items
-                while (historyItems.Count > HistoryItemCount)
+                while (historyItems.Count > maxHistoryItems)
                 {
                     historyItems.RemoveAt(0); // Remove the oldest item
                 }
@@ -151,7 +150,7 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
         _historyPath = HistoryStateJsonPath();
 
         Settings.Add(_globalIfURI);
-        Settings.Add(_historyItemCount);
+        Settings.Add(_showHistory);
 
         // Load settings from file upon initialization
         LoadSettings();
@@ -189,11 +188,11 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
         base.SaveSettings();
         try
         {
-            if (HistoryItemCount == 0)
+            if (ShowHistory == Resources.history_none)
             {
                 ClearHistory();
             }
-            else if (HistoryItemCount > 0)
+            else if (int.TryParse(ShowHistory, out var maxHistoryItems) && maxHistoryItems > 0)
             {
                 // Trim the history file if there are more items than the new limit
                 if (File.Exists(_historyPath))
@@ -202,10 +201,10 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
                     var historyItems = JsonSerializer.Deserialize<List<HistoryItem>>(existingContent, WebSearchJsonSerializationContext.Default.ListHistoryItem) ?? [];
 
                     // Check if trimming is needed
-                    if (historyItems.Count > HistoryItemCount)
+                    if (historyItems.Count > maxHistoryItems)
                     {
-                        // Trim the list to keep only the most recent `HistoryItemCount` items
-                        historyItems = historyItems.Skip((int)(historyItems.Count - HistoryItemCount)).ToList();
+                        // Trim the list to keep only the most recent `maxHistoryItems` items
+                        historyItems = historyItems.Skip(historyItems.Count - maxHistoryItems).ToList();
 
                         // Save the trimmed history back to the file
                         var trimmedHistoryJson = JsonSerializer.Serialize(historyItems, WebSearchJsonSerializationContext.Default.ListHistoryItem);

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Pages/WebSearchListPage.cs

@@ -33,7 +33,7 @@ internal sealed partial class WebSearchListPage : DynamicListPage
         _allItems = [];
         Id = "com.microsoft.cmdpal.websearch";
         _settingsManager = settingsManager;
-        _historyItems = _settingsManager.HistoryItemCount != 0 ? _settingsManager.LoadHistory() : null;
+        _historyItems = _settingsManager.ShowHistory != Resources.history_none ? _settingsManager.LoadHistory() : null;
         if (_historyItems is not null)
         {
             _allItems.AddRange(_historyItems);
@@ -57,7 +57,7 @@ internal sealed partial class WebSearchListPage : DynamicListPage
 
         if (_historyItems is not null)
         {
-            filteredHistoryItems = _settingsManager.HistoryItemCount != 0 ? ListHelpers.FilterList(_historyItems, query).OfType<ListItem>() : null;
+            filteredHistoryItems = _settingsManager.ShowHistory != Resources.history_none ? ListHelpers.FilterList(_historyItems, query).OfType<ListItem>() : null;
         }
 
         var results = new List<ListItem>();

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Properties/Resources.Designer.cs

@@ -168,15 +168,6 @@ namespace Microsoft.CmdPal.Ext.WebSearch.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Determines the number of history items to show from previous searches.
-        /// </summary>
-        public static string plugin_history_item_count {
-            get {
-                return ResourceManager.GetString("plugin_history_item_count", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to In the default browser.
         /// </summary>
@@ -240,6 +231,15 @@ namespace Microsoft.CmdPal.Ext.WebSearch.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Determines the number of history items to show from previous searches.
+        /// </summary>
+        public static string plugin_show_history {
+            get {
+                return ResourceManager.GetString("plugin_show_history", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Settings.
         /// </summary>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Properties/Resources.resx

@@ -172,7 +172,7 @@
   <data name="plugin_search_failed" xml:space="preserve">
     <value>Failed to open {0}.</value>
   </data>
-  <data name="plugin_history_item_count" xml:space="preserve">
+  <data name="plugin_show_history" xml:space="preserve">
     <value>Determines the number of history items to show from previous searches</value>
   </data>
   <data name="settings_page_name" xml:space="preserve">

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Pages/WinGetExtensionPage.cs

@@ -65,7 +65,6 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
 
             if (_results is not null && _results.Count != 0)
             {
-                var stopwatch = Stopwatch.StartNew();
                 var count = _results.Count;
                 var results = new ListItem[count];
                 var next = 0;
@@ -83,8 +82,6 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
                     }
                 }
 
-                stopwatch.Stop();
-                Logger.LogDebug($"Building ListItems took {stopwatch.ElapsedMilliseconds}ms", memberName: nameof(GetItems));
                 IsLoading = false;
                 return results;
             }
@@ -247,22 +244,15 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
 
         // foreach (var catalog in connections)
         {
-            Stopwatch findPackages_stopwatch = new();
-            findPackages_stopwatch.Start();
             Logger.LogDebug($"  Searching {catalog.Info.Name} ({query})", memberName: nameof(DoSearchAsync));
 
             ct.ThrowIfCancellationRequested();
 
-            Logger.LogDebug($"Preface for \"{searchDebugText}\" took {stopwatch.ElapsedMilliseconds}ms", memberName: nameof(DoSearchAsync));
-
             // BODGY, re: microsoft/winget-cli#5151
             // FindPackagesAsync isn't actually async.
             var internalSearchTask = Task.Run(() => catalog.FindPackages(opts), ct);
             var searchResults = await internalSearchTask;
 
-            findPackages_stopwatch.Stop();
-            Logger.LogDebug($"FindPackages for \"{searchDebugText}\" took {findPackages_stopwatch.ElapsedMilliseconds}ms", memberName: nameof(DoSearchAsync));
-
             // TODO more error handling like this:
             if (searchResults.Status != FindPackagesResultStatus.Ok)
             {
@@ -271,8 +261,6 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
                 return [];
             }
 
-            ct.ThrowIfCancellationRequested();
-
             Logger.LogDebug($"    got results for ({query})", memberName: nameof(DoSearchAsync));
 
             // FYI Using .ToArray or any other kind of enumerable loop

src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ListHelpers.cs

@@ -43,18 +43,13 @@ public partial class ListHelpers
     }
 
     public static IEnumerable<T> FilterList<T>(IEnumerable<T> items, string query, Func<string, T, int> scoreFunction)
-    {
-        return FilterListWithScores<T>(items, query, scoreFunction)
-                .Select(score => score.Item);
-    }
-
-    public static IEnumerable<Scored<T>> FilterListWithScores<T>(IEnumerable<T> items, string query, Func<string, T, int> scoreFunction)
     {
         var scores = items
             .Select(li => new Scored<T>() { Item = li, Score = scoreFunction(query, li) })
             .Where(score => score.Score > 0)
             .OrderByDescending(score => score.Score);
-        return scores;
+        return scores
+            .Select(score => score.Item);
     }
 
     /// <summary>

src/modules/fancyzones/FancyZones.UITests/DragWindowTests.cs

@@ -372,17 +372,20 @@ namespace UITests_FancyZones
         // launch FancyZones settings page
         private void LaunchFancyZones()
         {
-            this.Find<NavigationViewItem>(By.AccessibilityId("WindowingAndLayoutsNavItem")).Click();
+            if (this.FindAll<NavigationViewItem>("FancyZones").Count == 0)
+            {
+                this.Find<NavigationViewItem>("Windowing & Layouts").Click();
+            }
 
-            this.Find<NavigationViewItem>(By.AccessibilityId("FancyZonesNavItem")).Click();
-            this.Find<ToggleSwitch>(By.AccessibilityId("EnableFancyZonesToggleSwitch")).Toggle(true);
+            this.Find<NavigationViewItem>("FancyZones").Click();
+            this.Find<ToggleSwitch>("Enable FancyZones").Toggle(true);
 
             this.Session.SetMainWindowSize(WindowSize.Large);
             Find<Element>(By.AccessibilityId("HeaderPresenter")).Click();
             this.Scroll(6, "Down"); // Pull the settings page up to make sure the settings are visible
             ZoneBehaviourSettings(TestContext.TestName);
 
-            this.Find<Microsoft.PowerToys.UITest.Button>(By.AccessibilityId("LaunchLayoutEditorButton")).Click(false, 500, 10000);
+            this.Find<Microsoft.PowerToys.UITest.Button>("Launch layout editor").Click(false, 500, 10000);
             this.Session.Attach(PowerToysModule.FancyZone);
 
             // pipeline machine may have an unstable delays, causing the custom layout to be unavailable as we set. then A retry is required.
@@ -400,7 +403,7 @@ namespace UITests_FancyZones
                 this.Find<Microsoft.PowerToys.UITest.Button>("Close").Click();
                 this.Session.Attach(PowerToysModule.PowerToysSettings);
                 SetupCustomLayouts();
-                this.Find<Microsoft.PowerToys.UITest.Button>(By.AccessibilityId("LaunchLayoutEditorButton")).Click(false, 5000, 5000);
+                this.Find<Microsoft.PowerToys.UITest.Button>("Launch layout editor").Click(false, 5000, 5000);
                 this.Session.Attach(PowerToysModule.FancyZone);
                 this.Find<Microsoft.PowerToys.UITest.Button>("Maximize").Click();
 

src/modules/imageresizer/dll/dllmain.cpp

@@ -43,32 +43,11 @@ private:
     //contains the non localized key of the powertoy
     std::wstring app_key;
 
-    // Update registration based on enabled state
-    void UpdateRegistration(bool enabled)
-    {
-        if (enabled)
-        {
-#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
-            ImageResizerRuntimeRegistration::EnsureRegistered();
-            Logger::info(L"ImageResizer context menu registered");
-#endif
-        }
-        else
-        {
-#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
-            ImageResizerRuntimeRegistration::Unregister();
-            Logger::info(L"ImageResizer context menu unregistered");
-#endif
-        }
-    }
-
-
 public:
     // Constructor
     ImageResizerModule()
     {
         m_enabled = CSettingsInstance().GetEnabled();
-        UpdateRegistration(m_enabled);
         app_name = GET_RESOURCE_STRING(IDS_IMAGERESIZER);
         app_key = ImageResizerConstants::ModuleKey;
         LoggerHelpers::init_logger(app_key, L"ModuleInterface", LogSettings::imageResizerLoggerName);
@@ -133,7 +112,10 @@ public:
                 package::RegisterSparsePackage(path, packageUri);
             }
         }
-        UpdateRegistration(m_enabled);
+#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
+        ImageResizerRuntimeRegistration::EnsureRegistered();
+#endif
+
         Trace::EnableImageResizer(m_enabled);
     }
 
@@ -141,8 +123,11 @@ public:
     virtual void disable()
     {
         m_enabled = false;
-        UpdateRegistration(m_enabled);
         Trace::EnableImageResizer(m_enabled);
+#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
+        ImageResizerRuntimeRegistration::Unregister();
+        Logger::info(L"ImageResizer context menu unregistered (Win10)");
+#endif
     }
 
     // Returns if the powertoys is enabled

src/modules/powerrename/dll/dllmain.cpp

@@ -168,25 +168,6 @@ private:
     //contains the non localized key of the powertoy
     std::wstring app_key;
 
-    // Update registration based on enabled state
-    void UpdateRegistration(bool enabled)
-    {
-        if (enabled)
-        {
-#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
-            PowerRenameRuntimeRegistration::EnsureRegistered();
-            Logger::info(L"PowerRename context menu registered");
-#endif
-        }
-        else
-        {
-#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
-            PowerRenameRuntimeRegistration::Unregister();
-            Logger::info(L"PowerRename context menu unregistered");
-#endif
-        }
-    }
-
 public:
     // Return the localized display name of the powertoy
     virtual PCWSTR get_name() override
@@ -221,7 +202,9 @@ public:
                 package::RegisterSparsePackage(path, packageUri);
             }
         }
-        UpdateRegistration(m_enabled);
+#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
+        PowerRenameRuntimeRegistration::EnsureRegistered();
+#endif
     }
 
     // Disable the powertoy
@@ -229,7 +212,10 @@ public:
     {
         m_enabled = false;
         Logger::info(L"PowerRename disabled");
-        UpdateRegistration(m_enabled);
+#if defined(ENABLE_REGISTRATION) || defined(NDEBUG)
+        PowerRenameRuntimeRegistration::Unregister();
+        Logger::info(L"PowerRename context menu unregistered (Win10)");
+#endif
     }
 
     // Returns if the powertoy is enabled
@@ -329,7 +315,6 @@ public:
     void init_settings()
     {
         m_enabled = CSettingsInstance().GetEnabled();
-        UpdateRegistration(m_enabled);
         Trace::EnablePowerRename(m_enabled);
     }
 

src/modules/registrypreview/RegistryPreview/MainWindow.Events.cs

@@ -15,10 +15,10 @@ namespace RegistryPreview
         /// </summary>
         private void AppWindow_Closing(Microsoft.UI.Windowing.AppWindow sender, Microsoft.UI.Windowing.AppWindowClosingEventArgs args)
         {
-            jsonWindowPlacement.SetNamedValue("appWindow.Position.X", JsonValue.CreateNumberValue(AppWindow.Position.X));
-            jsonWindowPlacement.SetNamedValue("appWindow.Position.Y", JsonValue.CreateNumberValue(AppWindow.Position.Y));
-            jsonWindowPlacement.SetNamedValue("appWindow.Size.Width", JsonValue.CreateNumberValue(AppWindow.Size.Width));
-            jsonWindowPlacement.SetNamedValue("appWindow.Size.Height", JsonValue.CreateNumberValue(AppWindow.Size.Height));
+            jsonWindowPlacement.SetNamedValue("appWindow.Position.X", JsonValue.CreateNumberValue(appWindow.Position.X));
+            jsonWindowPlacement.SetNamedValue("appWindow.Position.Y", JsonValue.CreateNumberValue(appWindow.Position.Y));
+            jsonWindowPlacement.SetNamedValue("appWindow.Size.Width", JsonValue.CreateNumberValue(appWindow.Size.Width));
+            jsonWindowPlacement.SetNamedValue("appWindow.Size.Height", JsonValue.CreateNumberValue(appWindow.Size.Height));
         }
 
         /// <summary>

src/modules/registrypreview/RegistryPreview/RegistryPreviewXAML/MainWindow.xaml

@@ -15,19 +15,38 @@
     <Window.SystemBackdrop>
         <MicaBackdrop />
     </Window.SystemBackdrop>
+
     <Grid x:Name="MainGrid" Loaded="Grid_Loaded">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <TitleBar x:Name="titleBar">
-            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
-            <TitleBar.LeftHeader>
-                <ImageIcon
-                    Height="16"
-                    Margin="16,0,0,0"
-                    Source="/Assets/RegistryPreview/RegistryPreview.ico" />
-            </TitleBar.LeftHeader>
-        </TitleBar>
+        <Grid
+            x:Name="titleBar"
+            Grid.Row="0"
+            Height="32"
+            Margin="16,0"
+            ColumnSpacing="16"
+            IsHitTestVisible="True">
+            <Grid.ColumnDefinitions>
+                <!--<ColumnDefinition x:Name="LeftPaddingColumn" Width="0"/>-->
+                <ColumnDefinition x:Name="IconColumn" Width="Auto" />
+                <ColumnDefinition x:Name="TitleColumn" Width="Auto" />
+                <!--<ColumnDefinition x:Name="RightPaddingColumn" Width="0"/>-->
+            </Grid.ColumnDefinitions>
+            <Image
+                Grid.Column="0"
+                Width="16"
+                Height="16"
+                VerticalAlignment="Center"
+                Source="../Assets/RegistryPreview/RegistryPreview.ico" />
+            <TextBlock
+                x:Name="titleBarText"
+                Grid.Column="1"
+                VerticalAlignment="Center"
+                Style="{StaticResource CaptionTextBlockStyle}"
+                Text="{Binding ApplicationTitle}" />
+        </Grid>
+
     </Grid>
-</winuiex:WindowEx>
+</winuiex:WindowEx>

src/modules/registrypreview/RegistryPreview/RegistryPreviewXAML/MainWindow.xaml.cs

@@ -6,7 +6,6 @@ using System;
 using ManagedCommon;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.UI;
-using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
@@ -24,6 +23,7 @@ namespace RegistryPreview
         private const string APPNAME = "RegistryPreview";
 
         // private members
+        private Microsoft.UI.Windowing.AppWindow appWindow;
         private JsonObject jsonWindowPlacement;
         private string settingsFolder = string.Empty;
         private string windowPlacementFile = "app-placement.json";
@@ -38,15 +38,20 @@ namespace RegistryPreview
             settingsFolder = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"\Microsoft\PowerToys\" + APPNAME;
             OpenWindowPlacementFile(settingsFolder, windowPlacementFile);
 
+            // Update the Win32 looking window with the correct icon (and grab the appWindow handle for later)
+            IntPtr windowHandle = this.GetWindowHandle();
+            WindowId windowId = Win32Interop.GetWindowIdFromWindow(windowHandle);
+            appWindow = Microsoft.UI.Windowing.AppWindow.GetFromWindowId(windowId);
+            appWindow.SetIcon("Assets\\RegistryPreview\\RegistryPreview.ico");
+
             // TODO(stefan)
-            AppWindow.Closing += AppWindow_Closing;
+            appWindow.Closing += AppWindow_Closing;
+            Activated += MainWindow_Activated;
 
             // Extend the canvas to include the title bar so the app can support theming
             ExtendsContentIntoTitleBar = true;
-            IntPtr windowHandle = this.GetWindowHandle();
             WindowHelpers.ForceTopBorder1PixelInsetOnWindows10(windowHandle);
             SetTitleBar(titleBar);
-            AppWindow.SetIcon("Assets\\RegistryPreview\\RegistryPreview.ico");
 
             // if have settings, update the location of the window
             if (jsonWindowPlacement != null)
@@ -61,7 +66,7 @@ namespace RegistryPreview
                     // check to make sure the size values are reasonable before attempting to restore the last saved size
                     if (size.Width >= 320 && size.Height >= 240)
                     {
-                        AppWindow.Resize(size);
+                        appWindow.Resize(size);
                     }
                 }
 
@@ -75,7 +80,7 @@ namespace RegistryPreview
                     // check to make sure the move values are reasonable before attempting to restore the last saved location
                     if (point.X >= 0 && point.Y >= 0)
                     {
-                        AppWindow.Move(point);
+                        appWindow.Move(point);
                     }
                 }
             }
@@ -87,6 +92,20 @@ namespace RegistryPreview
             PowerToysTelemetry.Log.WriteEvent(new RegistryPreviewEditorStartFinishEvent() { TimeStamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() });
         }
 
+        private void MainWindow_Activated(object sender, WindowActivatedEventArgs args)
+        {
+            if (args.WindowActivationState == WindowActivationState.Deactivated)
+            {
+                titleBarText.Foreground =
+                    (SolidColorBrush)Application.Current.Resources["WindowCaptionForegroundDisabled"];
+            }
+            else
+            {
+                titleBarText.Foreground =
+                    (SolidColorBrush)Application.Current.Resources["WindowCaptionForeground"];
+            }
+        }
+
         private void Grid_Loaded(object sender, RoutedEventArgs e)
         {
             MainGrid.Children.Add(MainPage);
@@ -99,23 +118,23 @@ namespace RegistryPreview
 
             if (string.IsNullOrEmpty(filename))
             {
-                titleBar.Title = APPNAME;
-                AppWindow.Title = APPNAME;
+                titleBarText.Text = APPNAME;
+                appWindow.Title = APPNAME;
             }
             else
             {
                 string[] file = filename.Split('\\');
                 if (file.Length > 0)
                 {
-                    titleBar.Title = file[file.Length - 1] + " - " + APPNAME;
+                    titleBarText.Text = file[file.Length - 1] + " - " + APPNAME;
                 }
                 else
                 {
-                    titleBar.Title = filename + " - " + APPNAME;
+                    titleBarText.Text = filename + " - " + APPNAME;
                 }
 
                 // Continue to update the window's title, after updating the custom title bar
-                AppWindow.Title = titleBar.Title;
+                appWindow.Title = titleBarText.Text;
             }
         }
     }

src/runner/general_settings.cpp

@@ -316,6 +316,7 @@ void start_enabled_powertoys()
             should_powertoy_be_enabled = false;
         }
 
+        bool module_currently_enabled = powertoy->is_enabled();
         if (should_powertoy_be_enabled)
         {
             Logger::info(L"start_enabled_powertoys: Enabling powertoy {}", name);
@@ -324,5 +325,13 @@ void start_enabled_powertoys()
             hkmng.EnableHotkeyByModule(name);
             powertoy.UpdateHotkeyEx();
         }
+        else if (module_currently_enabled)
+        {
+            Logger::info(L"start_enabled_powertoys: Disabling powertoy {}", name);
+            powertoy->disable();
+            auto& hkmng = HotkeyConflictDetector::HotkeyConflictManager::GetInstance();
+            hkmng.DisableHotkeyByModule(name);
+            powertoy.UpdateHotkeyEx();
+        }
     }
 }

src/settings-ui/Settings.UI.XamlIndexBuilder/Program.cs

@@ -19,13 +19,6 @@ namespace Microsoft.PowerToys.Tools.XamlIndexBuilder
             "ShellPage.xaml",
         };
 
-        // Hardcoded panel-to-page mapping (temporary until generic panel host mapping is needed)
-        // Key: panel file base name (without .xaml), Value: owning page base name
-        private static readonly Dictionary<string, string> PanelPageMapping = new(StringComparer.OrdinalIgnoreCase)
-        {
-            { "MouseJumpPanel", "MouseUtilsPage" },
-        };
-
         private static JsonSerializerOptions serializeOption = new()
         {
             WriteIndented = true,
@@ -40,117 +33,32 @@ namespace Microsoft.PowerToys.Tools.XamlIndexBuilder
                 Environment.Exit(1);
             }
 
-            string xamlRootDirectory = args[0];
+            string xamlDirectory = args[0];
             string outputFile = args[1];
 
-            if (!Directory.Exists(xamlRootDirectory))
+            if (!Directory.Exists(xamlDirectory))
             {
-                Debug.WriteLine($"Error: Directory '{xamlRootDirectory}' does not exist.");
+                Debug.WriteLine($"Error: Directory '{xamlDirectory}' does not exist.");
                 Environment.Exit(1);
             }
 
             try
             {
                 var searchableElements = new List<SettingEntry>();
-                var processedFiles = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+                var xamlFiles = Directory.GetFiles(xamlDirectory, "*.xaml", SearchOption.AllDirectories);
 
-                void ScanDirectory(string root)
+                foreach (var xamlFile in xamlFiles)
                 {
-                    if (!Directory.Exists(root))
+                    var fileName = Path.GetFileName(xamlFile);
+                    if (ExcludedXamlFiles.Contains(fileName))
                     {
-                        return;
+                        // Skip ShellPage.xaml as it contains many elements not relevant for search
+                        continue;
                     }
 
-                    Debug.WriteLine($"[XamlIndexBuilder] Scanning root: {root}");
-                    var xamlFilesLocal = Directory.GetFiles(root, "*.xaml", SearchOption.AllDirectories);
-                    foreach (var xamlFile in xamlFilesLocal)
-                    {
-                        var fullPath = Path.GetFullPath(xamlFile);
-                        if (processedFiles.Contains(fullPath))
-                        {
-                            continue; // already handled (can happen if overlapping directories)
-                        }
-
-                        var fileName = Path.GetFileName(xamlFile);
-                        if (ExcludedXamlFiles.Contains(fileName))
-                        {
-                            continue; // explicitly excluded
-                        }
-
-                        Debug.WriteLine($"Processing: {fileName}");
-                        var elements = ExtractSearchableElements(xamlFile);
-
-                        // Apply hardcoded panel mapping override
-                        var baseName = Path.GetFileNameWithoutExtension(xamlFile);
-                        if (PanelPageMapping.TryGetValue(baseName, out var hostPage))
-                        {
-                            for (int i = 0; i < elements.Count; i++)
-                            {
-                                var entry = elements[i];
-                                entry.PageTypeName = hostPage;
-                                elements[i] = entry;
-                            }
-                        }
-
-                        searchableElements.AddRange(elements);
-                        processedFiles.Add(fullPath);
-                    }
-                }
-
-                // Scan well-known subdirectories under the provided root
-                var subDirs = new[] { "Views", "Panels" };
-                foreach (var sub in subDirs)
-                {
-                    ScanDirectory(Path.Combine(xamlRootDirectory, sub));
-                }
-
-                // Fallback: also scan root directly (in case some XAML lives at root level)
-                ScanDirectory(xamlRootDirectory);
-
-                // -----------------------------------------------------------------------------
-                // Explicit include section: add specific XAML files that we always want indexed
-                // even if future logic excludes them or they live outside typical scan patterns.
-                // Add future files to the ExplicitExtraXamlFiles array below.
-                // -----------------------------------------------------------------------------
-                string[] explicitExtraXamlFiles = new[]
-                {
-                    "MouseJumpPanel.xaml", // Mouse Jump settings panel
-                };
-
-                foreach (var extraFileName in explicitExtraXamlFiles)
-                {
-                    try
-                    {
-                        var matches = Directory.GetFiles(xamlRootDirectory, extraFileName, SearchOption.AllDirectories);
-                        foreach (var match in matches)
-                        {
-                            var full = Path.GetFullPath(match);
-                            if (processedFiles.Contains(full))
-                            {
-                                continue; // already processed in general scan
-                            }
-
-                            Debug.WriteLine($"Processing (explicit include): {extraFileName}");
-                            var elements = ExtractSearchableElements(full);
-                            var baseName = Path.GetFileNameWithoutExtension(full);
-                            if (PanelPageMapping.TryGetValue(baseName, out var hostPage))
-                            {
-                                for (int i = 0; i < elements.Count; i++)
-                                {
-                                    var entry = elements[i];
-                                    entry.PageTypeName = hostPage;
-                                    elements[i] = entry;
-                                }
-                            }
-
-                            searchableElements.AddRange(elements);
-                            processedFiles.Add(full);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        Debug.WriteLine($"Explicit include failed for {extraFileName}: {ex.Message}");
-                    }
+                    Debug.WriteLine($"Processing: {fileName}");
+                    var elements = ExtractSearchableElements(xamlFile);
+                    searchableElements.AddRange(elements);
                 }
 
                 searchableElements = searchableElements.OrderBy(e => e.PageTypeName).ThenBy(e => e.ElementName).ToList();
@@ -189,15 +97,15 @@ namespace Microsoft.PowerToys.Tools.XamlIndexBuilder
                     .Where(e => e.Name.LocalName == "SettingsPageControl")
                     .Where(e => e.Attribute(x + "Uid") != null);
 
-                // Extract SettingsCard elements (support both Name and x:Name)
+                // Extract SettingsCard elements
                 var settingsElements = doc.Descendants()
                     .Where(e => e.Name.LocalName == "SettingsCard")
-                    .Where(e => e.Attribute("Name") != null || e.Attribute(x + "Name") != null || e.Attribute(x + "Uid") != null);
+                    .Where(e => e.Attribute("Name") != null || e.Attribute(x + "Uid") != null);
 
-                // Extract SettingsExpander elements (support both Name and x:Name)
+                // Extract SettingsExpander elements
                 var settingsExpanderElements = doc.Descendants()
                     .Where(e => e.Name.LocalName == "SettingsExpander")
-                    .Where(e => e.Attribute("Name") != null || e.Attribute(x + "Name") != null || e.Attribute(x + "Uid") != null);
+                    .Where(e => e.Attribute("Name") != null || e.Attribute(x + "Uid") != null);
 
                 // Process SettingsPageControl elements
                 foreach (var element in settingsPageElements)
@@ -277,36 +185,16 @@ namespace Microsoft.PowerToys.Tools.XamlIndexBuilder
 
         public static string GetElementName(XElement element, XNamespace x)
         {
+            // Get Name attribute (we call it ElementName in our indexing system)
             var name = element.Attribute("Name")?.Value;
-            if (string.IsNullOrEmpty(name))
-            {
-                name = element.Attribute(x + "Name")?.Value;
-            }
-
             return name;
         }
 
         public static string GetElementUid(XElement element, XNamespace x)
         {
-            // Try x:Uid on the element itself
+            // Try x:Uid
             var uid = element.Attribute(x + "Uid")?.Value;
-            if (!string.IsNullOrWhiteSpace(uid))
-            {
-                return uid;
-            }
-
-            // Fallback: check the first direct child element's x:Uid
-            var firstChild = element.Elements().FirstOrDefault();
-            if (firstChild != null)
-            {
-                var childUid = firstChild.Attribute(x + "Uid")?.Value;
-                if (!string.IsNullOrWhiteSpace(childUid))
-                {
-                    return childUid;
-                }
-            }
-
-            return null;
+            return uid;
         }
 
         public static string GetParentElementName(XElement element, XNamespace x)
@@ -323,11 +211,6 @@ namespace Microsoft.PowerToys.Tools.XamlIndexBuilder
                     if (expanderParent?.Name.LocalName == "SettingsExpander")
                     {
                         var expanderName = expanderParent.Attribute("Name")?.Value;
-                        if (string.IsNullOrEmpty(expanderName))
-                        {
-                            expanderName = expanderParent.Attribute(x + "Name")?.Value;
-                        }
-
                         if (!string.IsNullOrEmpty(expanderName))
                         {
                             return expanderName;
@@ -338,11 +221,6 @@ namespace Microsoft.PowerToys.Tools.XamlIndexBuilder
                 {
                     // Direct child of SettingsExpander
                     var expanderName = current.Attribute("Name")?.Value;
-                    if (string.IsNullOrEmpty(expanderName))
-                    {
-                        expanderName = current.Attribute(x + "Name")?.Value;
-                    }
-
                     if (!string.IsNullOrEmpty(expanderName))
                     {
                         return expanderName;

src/settings-ui/Settings.UI.XamlIndexBuilder/Settings.UI.XamlIndexBuilder.csproj

@@ -29,15 +29,16 @@
 	<!-- Remove UI library reference to avoid pulling WindowsDesktop runtime (WindowsBase) -->
 
 	<PropertyGroup>
+		<!-- Fallback to dotnet if not provided by the environment -->
 		<DotNetExe Condition="'$(DotNetExe)' == ''">dotnet</DotNetExe>
-		<XamlRootDir Condition="'$(XamlRootDir)' == ''">$(MSBuildProjectDirectory)\..\Settings.UI\SettingsXAML</XamlRootDir>
-		<XamlRootDir Condition="'$(XamlViewsDir)' != ''">$([System.IO.Path]::GetDirectoryName('$(XamlViewsDir)'))</XamlRootDir>
+		<XamlViewsDir Condition="'$(XamlViewsDir)' == ''">$(MSBuildProjectDirectory)\..\Settings.UI\SettingsXAML\Views</XamlViewsDir>
 		<GeneratedJsonFile Condition="'$(GeneratedJsonFile)' == ''">$(MSBuildProjectDirectory)\..\Settings.UI\Assets\Settings\search.index.json</GeneratedJsonFile>
 	</PropertyGroup>
 	<Target Name="GenerateSearchIndexSelf" AfterTargets="Build">
 		<RemoveDir Directories="$(MSBuildProjectDirectory)\obj\ARM64;$(MSBuildProjectDirectory)\obj\x64;$(MSBuildProjectDirectory)\bin" />
 		<MakeDir Directories="$([System.IO.Path]::GetDirectoryName('$(GeneratedJsonFile)'))" />
-		<Message Importance="high" Text="[XamlIndexBuilder] Generating search index. Root='$(XamlRootDir)'; Out='$(GeneratedJsonFile)'; Tool='$(TargetPath)'; DotNet='$(DotNetExe)'." />
-		<Exec Command="&quot;$(DotNetExe)&quot; &quot;$(TargetPath)&quot; &quot;$(XamlRootDir)&quot; &quot;$(GeneratedJsonFile)&quot;" />
+		<Message Importance="high" Text="[XamlIndexBuilder] Generating search index. Views='$(XamlViewsDir)'; Out='$(GeneratedJsonFile)'; Tool='$(TargetPath)'; DotNet='$(DotNetExe)'." />
+		<!-- Execute via dotnet so host architecture doesn't need to match -->
+		<Exec Command="&quot;$(DotNetExe)&quot; &quot;$(TargetPath)&quot; &quot;$(XamlViewsDir)&quot; &quot;$(GeneratedJsonFile)&quot;" />
 	</Target>
 </Project>

src/settings-ui/Settings.UI/Helpers/NavigablePage.cs

@@ -17,7 +17,7 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers;
 public abstract partial class NavigablePage : Page
 {
     private const int ExpandWaitDuration = 500;
-    private const int AnimationDuration = 1850;
+    private const int AnimationDuration = 2000;
 
     private NavigationParams _pendingNavigationParams;
 
@@ -80,9 +80,6 @@ public abstract partial class NavigablePage : Page
             return;
         }
 
-        // Attempt to set keyboard focus so that screen readers announce the element and keyboard users land directly on it.
-        TrySetFocus(target);
-
         // Get the visual and compositor
         var visual = ElementCompositionPreview.GetElementVisual(target);
         var compositor = visual.Compositor;
@@ -95,9 +92,9 @@ public abstract partial class NavigablePage : Page
         dropShadow.Offset = new Vector3(0, 0, 0);
 
         var spriteVisual = compositor.CreateSpriteVisual();
-        spriteVisual.Size = new Vector2((float)target.ActualWidth + 8, (float)target.ActualHeight + 8);
+        spriteVisual.Size = new Vector2((float)target.ActualWidth, (float)target.ActualHeight);
         spriteVisual.Shadow = dropShadow;
-        spriteVisual.Offset = new Vector3(-4, -4, 0);
+        spriteVisual.Offset = new Vector3(0, 0, 0);
 
         // Insert the shadow visual behind the target element
         ElementCompositionPreview.SetElementChildVisual(target, spriteVisual);
@@ -116,129 +113,9 @@ public abstract partial class NavigablePage : Page
         ElementCompositionPreview.SetElementChildVisual(target, null);
     }
 
-    private static void TrySetFocus(FrameworkElement target)
-    {
-        try
-        {
-            // Prefer Control.Focus when available.
-            if (target is Control ctrl)
-            {
-                // Ensure it can receive focus.
-                if (!ctrl.IsTabStop)
-                {
-                    ctrl.IsTabStop = true;
-                }
-
-                ctrl.Focus(FocusState.Programmatic);
-            }
-
-            // Target is not a Control. Find first focusable descendant Control.
-            var focusCandidate = FindFirstFocusableDescendant(target);
-            if (focusCandidate != null)
-            {
-                if (!focusCandidate.IsTabStop)
-                {
-                    focusCandidate.IsTabStop = true;
-                }
-
-                focusCandidate.Focus(FocusState.Programmatic);
-                return;
-            }
-
-            // Fallback: attempt to focus parent control if no descendant found.
-            if (target.Parent is Control parent)
-            {
-                if (!parent.IsTabStop)
-                {
-                    parent.IsTabStop = true;
-                }
-
-                parent.Focus(FocusState.Programmatic);
-            }
-        }
-        catch
-        {
-            // Swallow focus exceptions; not critical. Could log if logging enabled.
-            // Leave the default focus as it is.
-        }
-    }
-
-    private static Control FindFirstFocusableDescendant(FrameworkElement root)
-    {
-        if (root == null)
-        {
-            return null;
-        }
-
-        var queue = new System.Collections.Generic.Queue<DependencyObject>();
-        queue.Enqueue(root);
-        while (queue.Count > 0)
-        {
-            var current = queue.Dequeue();
-            if (current is Control c && c.IsEnabled && c.Visibility == Visibility.Visible)
-            {
-                return c;
-            }
-
-            int count = VisualTreeHelper.GetChildrenCount(current);
-            for (int i = 0; i < count; i++)
-            {
-                queue.Enqueue(VisualTreeHelper.GetChild(current, i));
-            }
-        }
-
-        return null;
-    }
-
     protected FrameworkElement FindElementByName(string name)
     {
         var element = this.FindName(name) as FrameworkElement;
-        if (element != null)
-        {
-            return element;
-        }
-
-        if (this.Content is DependencyObject root)
-        {
-            var found = FindInDescendants(root, name);
-            if (found != null)
-            {
-                return found;
-            }
-        }
-
-        return null;
-    }
-
-    private static FrameworkElement FindInDescendants(DependencyObject root, string name)
-    {
-        if (root == null || string.IsNullOrEmpty(name))
-        {
-            return null;
-        }
-
-        var queue = new System.Collections.Generic.Queue<DependencyObject>();
-        queue.Enqueue(root);
-        while (queue.Count > 0)
-        {
-            var current = queue.Dequeue();
-            if (current is FrameworkElement fe)
-            {
-                var local = fe.FindName(name) as FrameworkElement;
-                if (local != null)
-                {
-                    return local;
-                }
-            }
-
-            int count = VisualTreeHelper.GetChildrenCount(current);
-            for (int i = 0; i < count; i++)
-            {
-                var child = VisualTreeHelper.GetChild(current, i);
-                queue.Enqueue(child);
-            }
-        }
-
-        return null;
+        return element;
     }
 }

src/settings-ui/Settings.UI/PowerToys.Settings.csproj

@@ -181,6 +181,9 @@
 		</Page>
 	</ItemGroup>
 
+	<!-- Removed nested publish/exec and copy targets. -->
+
+	<!-- Build XamlIndexBuilder before compiling Settings to ensure the search index exists without taking a project reference. -->
 	<Target Name="BuildXamlIndexBeforeSettings" BeforeTargets="CoreCompile">
 		<Message Importance="high" Text="[Settings] Building XamlIndexBuilder prior to compile. Views='$(MSBuildProjectDirectory)\SettingsXAML\Views' Out='$(GeneratedJsonFile)'" />
 		<MSBuild Projects="..\Settings.UI.XamlIndexBuilder\Settings.UI.XamlIndexBuilder.csproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=Any CPU;TargetFramework=net9.0;XamlViewsDir=$(MSBuildProjectDirectory)\SettingsXAML\Views;GeneratedJsonFile=$(GeneratedJsonFile)" />

src/settings-ui/Settings.UI/Services/SearchIndexService.cs

@@ -170,7 +170,7 @@ namespace Microsoft.PowerToys.Settings.UI.Services
 
             if (string.IsNullOrEmpty(header))
             {
-                header = GetString(resourceLoader, $"{elementUid}/Content");
+                Debug.WriteLine($"[SearchIndexService] WARNING: No header localization found for ElementUid: '{elementUid}'");
             }
 
             return (header, description);

src/settings-ui/Settings.UI/SettingsXAML/Panels/MouseJumpPanel.xaml

@@ -24,7 +24,6 @@
     <controls:SettingsGroup x:Uid="MouseUtils_MouseJump">
 
         <tkcontrols:SettingsCard
-            x:Name="MouseUtilsEnableMouseJump"
             x:Uid="MouseUtils_Enable_MouseJump"
             HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseJump.png}"
             IsEnabled="{x:Bind ViewModel.IsJumpEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
@@ -43,7 +42,6 @@
         </InfoBar>
 
         <tkcontrols:SettingsCard
-            x:Name="MouseUtilsMouseJumpActivationShortcut"
             x:Uid="MouseUtils_MouseJump_ActivationShortcut"
             HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}"
             IsEnabled="{x:Bind ViewModel.IsMouseJumpEnabled, Mode=OneWay}">
@@ -128,7 +126,6 @@
         </tkcontrols:SettingsCard>
 
         <tkcontrols:SettingsExpander
-            x:Name="MouseUtilsMouseJumpAppearance"
             x:Uid="MouseUtils_MouseJump_Appearance"
             HeaderIcon="{ui:FontIcon Glyph=&#xEB3C;}"
             IsEnabled="{x:Bind ViewModel.IsMouseJumpEnabled, Mode=OneWay}"

src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml

@@ -269,7 +269,7 @@
                     </controls:Card>
                     <controls:Card
                         x:Name="ModulesCard"
-                        x:Uid="UtilitiesHeader"
+                        Title="Modules"
                         Grid.RowSpan="2"
                         Grid.Column="1"
                         MinWidth="400"

src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml

@@ -19,11 +19,7 @@
                     x:Uid="FancyZones_EnableToggleControl_HeaderText"
                     HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FancyZones.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch
-                        x:Name="EnableFancyZonesToggleSwitch"
-                        x:Uid="ToggleSwitch"
-                        AutomationProperties.AutomationId="EnableFancyZonesToggleSwitch"
-                        IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>
                 <InfoBar
                     x:Uid="GPO_SettingIsManaged"
@@ -74,19 +70,19 @@
                         x:Uid="FancyZones_ZoneBehavior_GroupSettings"
                         IsExpanded="True">
                         <tkcontrols:SettingsExpander.Items>
-                            <tkcontrols:SettingsCard Name="FancyZonesShiftDragCheckBoxControlHeader" ContentAlignment="Left">
+                            <tkcontrols:SettingsCard ContentAlignment="Left">
                                 <CheckBox x:Uid="FancyZones_ShiftDragCheckBoxControl_Header" IsChecked="{x:Bind ViewModel.ShiftDrag, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard Name="FancyZonesMouseDragCheckBoxControlHeader" ContentAlignment="Left">
+                            <tkcontrols:SettingsCard ContentAlignment="Left">
                                 <CheckBox x:Uid="FancyZones_MouseDragCheckBoxControl_Header" IsChecked="{x:Bind ViewModel.MouseSwitch, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard Name="FancyZonesMouseMiddleClickSpanningMultipleZonesCheckBoxControlHeader" ContentAlignment="Left">
+                            <tkcontrols:SettingsCard ContentAlignment="Left">
                                 <CheckBox x:Uid="FancyZones_MouseMiddleClickSpanningMultipleZonesCheckBoxControl_Header" IsChecked="{x:Bind ViewModel.MouseMiddleClickSpanningMultipleZones, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard Name="FancyZonesShowZonesOnAllMonitorsCheckBoxControl" ContentAlignment="Left">
+                            <tkcontrols:SettingsCard ContentAlignment="Left">
                                 <CheckBox x:Uid="FancyZones_ShowZonesOnAllMonitorsCheckBoxControl" IsChecked="{x:Bind ViewModel.ShowOnAllMonitors, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard Name="FancyZonesSpanZonesAcrossMonitors" ContentAlignment="Left">
+                            <tkcontrols:SettingsCard ContentAlignment="Left">
                                 <controls:CheckBoxWithDescriptionControl x:Uid="FancyZones_SpanZonesAcrossMonitors" IsChecked="{x:Bind ViewModel.SpanZonesAcrossMonitors, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
                             <tkcontrols:SettingsCard Name="FancyZonesOverlappingZones" x:Uid="FancyZones_OverlappingZones">
@@ -110,7 +106,7 @@
                             <ComboBoxItem x:Uid="FancyZones_Radio_Default_Theme" />
                         </ComboBox>
                         <tkcontrols:SettingsExpander.Items>
-                            <tkcontrols:SettingsCard Name="FancyZonesPreviewCard" ContentAlignment="Left">
+                            <tkcontrols:SettingsCard ContentAlignment="Left">
                                 <controls:FancyZonesPreviewControl
                                     Width="192"
                                     Height="108"
@@ -122,7 +118,7 @@
                                     IsSystemTheme="{x:Bind ViewModel.SystemTheme, Mode=OneWay}"
                                     ShowZoneNumber="{x:Bind Path=ViewModel.ShowZoneNumber, Mode=OneWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard Name="FancyZonesShowZoneNumberCheckBoxControl" ContentAlignment="Left">
+                            <tkcontrols:SettingsCard ContentAlignment="Left">
                                 <CheckBox x:Uid="FancyZones_ShowZoneNumberCheckBoxControl" IsChecked="{x:Bind ViewModel.ShowZoneNumber, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
                             <tkcontrols:SettingsCard Name="FancyZonesHighlightOpacity" x:Uid="FancyZones_HighlightOpacity">
@@ -168,31 +164,28 @@
                         x:Uid="FancyZones_WindowBehavior_GroupSettings"
                         IsExpanded="True">
                         <tkcontrols:SettingsExpander.Items>
-                            <tkcontrols:SettingsCard Name="FancyZonesDisplayOrWorkAreaChangeMoveWindowsCheckBoxControl" ContentAlignment="Left">
+                            <tkcontrols:SettingsCard ContentAlignment="Left">
                                 <CheckBox x:Uid="FancyZones_DisplayOrWorkAreaChangeMoveWindowsCheckBoxControl" IsChecked="{x:Bind ViewModel.DisplayOrWorkAreaChangeMoveWindows, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard Name="FancyZonesZoneSetChangeMoveWindows" ContentAlignment="Left">
+                            <tkcontrols:SettingsCard ContentAlignment="Left">
                                 <CheckBox x:Uid="FancyZones_ZoneSetChangeMoveWindows" IsChecked="{x:Bind ViewModel.ZoneSetChangeMoveWindows, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard Name="FancyZonesAppLastZoneMoveWindows" ContentAlignment="Left">
+                            <tkcontrols:SettingsCard ContentAlignment="Left">
                                 <CheckBox x:Uid="FancyZones_AppLastZoneMoveWindows" IsChecked="{x:Bind ViewModel.AppLastZoneMoveWindows, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard Name="FancyZonesOpenWindowOnActiveMonitor" ContentAlignment="Left">
+                            <tkcontrols:SettingsCard ContentAlignment="Left">
                                 <CheckBox x:Uid="FancyZones_OpenWindowOnActiveMonitor" IsChecked="{x:Bind ViewModel.OpenWindowOnActiveMonitor, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard Name="FancyZonesRestoreSize" ContentAlignment="Left">
+                            <tkcontrols:SettingsCard ContentAlignment="Left">
                                 <CheckBox x:Uid="FancyZones_RestoreSize" IsChecked="{x:Bind ViewModel.RestoreSize, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard Name="FancyZonesMakeDraggedWindowTransparentCheckBoxControl" ContentAlignment="Left">
+                            <tkcontrols:SettingsCard ContentAlignment="Left">
                                 <CheckBox x:Uid="FancyZones_MakeDraggedWindowTransparentCheckBoxControl" IsChecked="{x:Bind ViewModel.MakeDraggedWindowsTransparent, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard Name="FancyZonesAllowChildWindowSnap" ContentAlignment="Left">
+                            <tkcontrols:SettingsCard ContentAlignment="Left">
                                 <CheckBox x:Uid="FancyZones_AllowChildWindowSnap" IsChecked="{x:Bind ViewModel.AllowChildWindowSnap, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard
-                                Name="FancyZonesDisableRoundCornersOnWindowSnap"
-                                ContentAlignment="Left"
-                                Visibility="{x:Bind ViewModel.Windows11, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                            <tkcontrols:SettingsCard ContentAlignment="Left" Visibility="{x:Bind ViewModel.Windows11, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
                                 <CheckBox x:Uid="FancyZones_DisableRoundCornersOnWindowSnap" IsChecked="{x:Bind ViewModel.DisableRoundCornersOnWindowSnap, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
                         </tkcontrols:SettingsExpander.Items>
@@ -206,7 +199,7 @@
                         <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.WindowSwitching, Mode=TwoWay}" />
                         <tkcontrols:SettingsExpander.Items>
                             <!--  HACK: For some weird reason, a Shortcut Control is not working correctly if it's the first item in the expander, so we add an invisible card as the first one.  -->
-                            <tkcontrols:SettingsCard Name="FancyZonesWindowSwitchingPlaceholder" Visibility="Collapsed" />
+                            <tkcontrols:SettingsCard Visibility="Collapsed" />
                             <tkcontrols:SettingsCard
                                 Name="FancyZonesHotkeyNextTabControl"
                                 x:Uid="FancyZones_HotkeyNextTabControl"
@@ -255,10 +248,7 @@
                                     </ComboBoxItem>
                                 </ComboBox>
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard
-                                Name="FancyZonesMoveWindowsAcrossAllMonitorsCheckBoxControl"
-                                ContentAlignment="Left"
-                                IsEnabled="{x:Bind ViewModel.SnapHotkeysCategoryEnabled, Mode=OneWay}">
+                            <tkcontrols:SettingsCard ContentAlignment="Left" IsEnabled="{x:Bind ViewModel.SnapHotkeysCategoryEnabled, Mode=OneWay}">
                                 <CheckBox x:Uid="FancyZones_MoveWindowsAcrossAllMonitorsCheckBoxControl" IsChecked="{x:Bind ViewModel.MoveWindowsAcrossMonitors, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
                         </tkcontrols:SettingsExpander.Items>
@@ -272,10 +262,7 @@
                         HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
                         <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.QuickLayoutSwitch, Mode=TwoWay}" />
                         <tkcontrols:SettingsExpander.Items>
-                            <tkcontrols:SettingsCard
-                                Name="FancyZonesFlashZonesOnQuickSwitch"
-                                ContentAlignment="Left"
-                                IsEnabled="{x:Bind ViewModel.QuickSwitchEnabled, Mode=OneWay}">
+                            <tkcontrols:SettingsCard ContentAlignment="Left" IsEnabled="{x:Bind ViewModel.QuickSwitchEnabled, Mode=OneWay}">
                                 <CheckBox x:Uid="FancyZones_FlashZonesOnQuickSwitch" IsChecked="{x:Bind ViewModel.FlashZonesOnQuickSwitch, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
                         </tkcontrols:SettingsExpander.Items>
@@ -290,10 +277,7 @@
                         HeaderIcon="{ui:FontIcon Glyph=&#xECE4;}"
                         IsExpanded="True">
                         <tkcontrols:SettingsExpander.Items>
-                            <tkcontrols:SettingsCard
-                                Name="FancyZonesExcludeAppsTextBoxControl"
-                                HorizontalContentAlignment="Stretch"
-                                ContentAlignment="Vertical">
+                            <tkcontrols:SettingsCard HorizontalContentAlignment="Stretch" ContentAlignment="Vertical">
                                 <TextBox
                                     x:Uid="FancyZones_ExcludeApps_TextBoxControl"
                                     MinWidth="240"

src/settings-ui/Settings.UI/SettingsXAML/Views/SearchResultsPage.xaml.cs

@@ -4,7 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using CommunityToolkit.WinUI.Controls;
 using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Services;
 using Microsoft.PowerToys.Settings.UI.ViewModels;
@@ -33,7 +32,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             if (e.Parameter is SearchResultsNavigationParams searchParams)
             {
                 ViewModel.SetSearchResults(searchParams.Query, searchParams.Results);
-                PageControl.ModuleDescription = $"{ResourceLoaderInstance.ResourceLoader.GetString("Search_ResultsFor")} '{searchParams.Query}'";
+                PageControl.ModuleDescription = string.Empty;
             }
         }
 
@@ -44,7 +43,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
 
         private void ModuleButton_Click(object sender, RoutedEventArgs e)
         {
-            if (sender is SettingsCard card && card.DataContext is SettingEntry tagEntry)
+            if (sender is CommunityToolkit.WinUI.Controls.SettingsCard card && card.DataContext is SettingEntry tagEntry)
             {
                 NavigateToModule(tagEntry);
             }
@@ -52,7 +51,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
 
         private void SettingButton_Click(object sender, RoutedEventArgs e)
         {
-            if (sender is SettingsCard card && card.DataContext is SettingEntry tagEntry)
+            if (sender is CommunityToolkit.WinUI.Controls.SettingsCard card && card.DataContext is SettingEntry tagEntry)
             {
                 NavigateToSetting(tagEntry);
             }

src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml

@@ -57,6 +57,12 @@
         </DataTemplate>
         <DataTemplate x:Key="NoResultSearchResultTemplate" x:DataType="models:SuggestionItem">
             <Grid>
+                <Rectangle
+                    Height="1"
+                    Margin="0,-4,0,0"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Top"
+                    Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
                 <TextBlock
                     Margin="8"
                     HorizontalAlignment="Center"
@@ -65,10 +71,10 @@
             </Grid>
         </DataTemplate>
         <DataTemplate x:Key="ShowAllSearchResultTemplate" x:DataType="models:SuggestionItem">
-            <Grid>
+            <Grid Padding="16,8">
                 <Rectangle
                     Height="1"
-                    Margin="0,-12,0,0"
+                    Margin="0,-4,0,0"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Top"
                     Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
@@ -86,6 +92,7 @@
             <ic:InvokeCommandAction Command="{x:Bind ViewModel.LoadedCommand}" />
         </ic:EventTriggerBehavior>
     </i:Interaction.Behaviors>
+
     <Grid x:Name="RootGrid">
         <Grid.RowDefinitions>
             <RowDefinition Height="48" />
@@ -146,17 +153,11 @@
             </NavigationView.Resources>
             <NavigationView.MenuItems>
                 <NavigationViewItem
-                    x:Name="DashboardNavigationItem"
                     x:Uid="Shell_Dashboard"
                     helpers:NavHelper.NavigateTo="views:DashboardPage"
-                    AutomationProperties.AutomationId="DashboardNavItem"
                     Icon="{ui:FontIcon Glyph=&#xE80F;}" />
 
-                <NavigationViewItem
-                    x:Name="GeneralNavigationItem"
-                    x:Uid="Shell_General"
-                    helpers:NavHelper.NavigateTo="views:GeneralPage"
-                    AutomationProperties.AutomationId="GeneralNavItem">
+                <NavigationViewItem x:Uid="Shell_General" helpers:NavHelper.NavigateTo="views:GeneralPage">
                     <NavigationViewItem.Icon>
                         <AnimatedIcon>
                             <AnimatedIcon.Source>
@@ -172,220 +173,156 @@
 
                 <!--  System Tools  -->
                 <NavigationViewItem
-                    x:Name="SystemToolsNavigationItem"
                     x:Uid="Shell_TopLevelSystemTools"
-                    AutomationProperties.AutomationId="SystemToolsNavItem"
                     Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/SystemTools.png}"
                     SelectsOnInvoked="False">
                     <NavigationViewItem.MenuItems>
                         <NavigationViewItem
-                            x:Name="AdvancedPasteNavigationItem"
                             x:Uid="Shell_AdvancedPaste"
                             helpers:NavHelper.NavigateTo="views:AdvancedPastePage"
-                            AutomationProperties.AutomationId="AdvancedPasteNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/AdvancedPaste.png}" />
                         <NavigationViewItem
-                            x:Name="AwakeNavigationItem"
                             x:Uid="Shell_Awake"
                             helpers:NavHelper.NavigateTo="views:AwakePage"
-                            AutomationProperties.AutomationId="AwakeNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Awake.png}" />
                         <NavigationViewItem
-                            x:Name="CmdPalNavigationItem"
                             x:Uid="Shell_CmdPal"
                             helpers:NavHelper.NavigateTo="views:CmdPalPage"
-                            AutomationProperties.AutomationId="CmdPalNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CmdPal.png}" />
                         <NavigationViewItem
-                            x:Name="ColorPickerNavigationItem"
                             x:Uid="Shell_ColorPicker"
                             helpers:NavHelper.NavigateTo="views:ColorPickerPage"
-                            AutomationProperties.AutomationId="ColorPickerNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ColorPicker.png}" />
                         <NavigationViewItem
-                            x:Name="PowerLauncherNavigationItem"
                             x:Uid="Shell_PowerLauncher"
                             helpers:NavHelper.NavigateTo="views:PowerLauncherPage"
-                            AutomationProperties.AutomationId="PowerLauncherNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerToysRun.png}" />
                         <NavigationViewItem
-                            x:Name="MeasureToolNavigationItem"
                             x:Uid="Shell_MeasureTool"
                             helpers:NavHelper.NavigateTo="views:MeasureToolPage"
-                            AutomationProperties.AutomationId="MeasureToolNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ScreenRuler.png}" />
                         <NavigationViewItem
-                            x:Name="ShortcutGuideNavigationItem"
                             x:Uid="Shell_ShortcutGuide"
                             helpers:NavHelper.NavigateTo="views:ShortcutGuidePage"
-                            AutomationProperties.AutomationId="ShortcutGuideNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ShortcutGuide.png}" />
                         <NavigationViewItem
-                            x:Name="TextExtractorNavigationItem"
                             x:Uid="Shell_TextExtractor"
                             helpers:NavHelper.NavigateTo="views:PowerOcrPage"
-                            AutomationProperties.AutomationId="TextExtractorNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/TextExtractor.png}" />
                         <NavigationViewItem
-                            x:Name="ZoomItNavigationItem"
                             x:Uid="Shell_ZoomIt"
                             helpers:NavHelper.NavigateTo="views:ZoomItPage"
-                            AutomationProperties.AutomationId="ZoomItNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ZoomIt.png}" />
                     </NavigationViewItem.MenuItems>
                 </NavigationViewItem>
 
                 <!--  Windowing & Layouts  -->
                 <NavigationViewItem
-                    x:Name="WindowingAndLayoutsNavigationItem"
                     x:Uid="Shell_TopLevelWindowsAndLayouts "
-                    AutomationProperties.AutomationId="WindowingAndLayoutsNavItem"
                     Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/WindowingAndLayouts.png}"
                     SelectsOnInvoked="False">
                     <NavigationViewItem.MenuItems>
                         <NavigationViewItem
-                            x:Name="AlwaysOnTopNavigationItem"
                             x:Uid="Shell_AlwaysOnTop"
                             helpers:NavHelper.NavigateTo="views:AlwaysOnTopPage"
-                            AutomationProperties.AutomationId="AlwaysOnTopNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/AlwaysOnTop.png}" />
                         <NavigationViewItem
-                            x:Name="CropAndLockNavigationItem"
                             x:Uid="Shell_CropAndLock"
                             helpers:NavHelper.NavigateTo="views:CropAndLockPage"
-                            AutomationProperties.AutomationId="CropAndLockNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CropAndLock.png}" />
                         <NavigationViewItem
-                            x:Name="FancyZonesNavigationItem"
                             x:Uid="Shell_FancyZones"
                             helpers:NavHelper.NavigateTo="views:FancyZonesPage"
-                            AutomationProperties.AutomationId="FancyZonesNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FancyZones.png}" />
                         <NavigationViewItem
-                            x:Name="WorkspacesNavigationItem"
                             x:Uid="Shell_Workspaces"
                             helpers:NavHelper.NavigateTo="views:WorkspacesPage"
-                            AutomationProperties.AutomationId="WorkspacesNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Workspaces.png}" />
                     </NavigationViewItem.MenuItems>
                 </NavigationViewItem>
 
                 <!--  Input / Output  -->
                 <NavigationViewItem
-                    x:Name="InputOutputNavigationItem"
                     x:Uid="Shell_TopLevelInputOutput"
-                    AutomationProperties.AutomationId="InputOutputNavItem"
                     Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/InputOutput.png}"
                     SelectsOnInvoked="False">
                     <NavigationViewItem.MenuItems>
                         <NavigationViewItem
-                            x:Name="KeyboardManagerNavigationItem"
                             x:Uid="Shell_KeyboardManager"
                             helpers:NavHelper.NavigateTo="views:KeyboardManagerPage"
-                            AutomationProperties.AutomationId="KeyboardManagerNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/KeyboardManager.png}" />
                         <!--  Find my mouse  -->
                         <!--  Mouse Highlighter  -->
                         <NavigationViewItem
-                            x:Name="MouseUtilitiesNavigationItem"
                             x:Uid="Shell_MouseUtilities"
                             helpers:NavHelper.NavigateTo="views:MouseUtilsPage"
-                            AutomationProperties.AutomationId="MouseUtilitiesNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseUtils.png}" />
                         <NavigationViewItem
-                            x:Name="MouseWithoutBordersNavigationItem"
                             x:Uid="Shell_MouseWithoutBorders"
                             helpers:NavHelper.NavigateTo="views:MouseWithoutBordersPage"
-                            AutomationProperties.AutomationId="MouseWithoutBordersNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseWithoutBorders.png}" />
                         <NavigationViewItem
-                            x:Name="QuickAccentNavigationItem"
                             x:Uid="Shell_QuickAccent"
                             helpers:NavHelper.NavigateTo="views:PowerAccentPage"
-                            AutomationProperties.AutomationId="QuickAccentNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/QuickAccent.png}" />
                     </NavigationViewItem.MenuItems>
                 </NavigationViewItem>
 
                 <!--  File Management  -->
                 <NavigationViewItem
-                    x:Name="FileManagementNavigationItem"
                     x:Uid="Shell_TopLevelFileManagement"
-                    AutomationProperties.AutomationId="FileManagementNavItem"
                     Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileManagement.png}"
                     SelectsOnInvoked="False">
                     <NavigationViewItem.MenuItems>
                         <NavigationViewItem
-                            x:Name="PowerPreviewNavigationItem"
                             x:Uid="Shell_PowerPreview"
                             helpers:NavHelper.NavigateTo="views:PowerPreviewPage"
-                            AutomationProperties.AutomationId="PowerPreviewNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileExplorerPreview.png}" />
                         <!--  File Explorer Thumbnails  -->
                         <NavigationViewItem
-                            x:Name="FileLocksmithNavigationItem"
                             x:Uid="Shell_FileLocksmith"
                             helpers:NavHelper.NavigateTo="views:FileLocksmithPage"
-                            AutomationProperties.AutomationId="FileLocksmithNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileLocksmith.png}" />
                         <NavigationViewItem
-                            x:Name="ImageResizerNavigationItem"
                             x:Uid="Shell_ImageResizer"
                             helpers:NavHelper.NavigateTo="views:ImageResizerPage"
-                            AutomationProperties.AutomationId="ImageResizerNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ImageResizer.png}" />
                         <NavigationViewItem
-                            x:Name="NewPlusNavigationItem"
                             x:Uid="NewPlus_Product_Name"
                             helpers:NavHelper.NavigateTo="views:NewPlusPage"
-                            AutomationProperties.AutomationId="NewPlusNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/NewPlus.png}" />
                         <NavigationViewItem
-                            x:Name="PeekNavigationItem"
                             x:Uid="Shell_Peek"
                             helpers:NavHelper.NavigateTo="views:PeekPage"
-                            AutomationProperties.AutomationId="PeekNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Peek.png}" />
                         <NavigationViewItem
-                            x:Name="PowerRenameNavigationItem"
                             x:Uid="Shell_PowerRename"
                             helpers:NavHelper.NavigateTo="views:PowerRenamePage"
-                            AutomationProperties.AutomationId="PowerRenameNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerRename.png}" />
                     </NavigationViewItem.MenuItems>
                 </NavigationViewItem>
 
                 <!--  Advanced  -->
                 <NavigationViewItem
-                    x:Name="AdvancedNavigationItem"
                     x:Uid="Shell_TopLevelAdvanced"
-                    AutomationProperties.AutomationId="AdvancedNavItem"
                     Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Advanced.png}"
                     SelectsOnInvoked="False">
                     <NavigationViewItem.MenuItems>
                         <NavigationViewItem
-                            x:Name="CmdNotFoundNavigationItem"
                             x:Uid="Shell_CmdNotFound"
                             helpers:NavHelper.NavigateTo="views:CmdNotFoundPage"
-                            AutomationProperties.AutomationId="CmdNotFoundNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CommandNotFound.png}" />
                         <NavigationViewItem
-                            x:Name="EnvironmentVariablesNavigationItem"
                             x:Uid="Shell_EnvironmentVariables"
                             helpers:NavHelper.NavigateTo="views:EnvironmentVariablesPage"
-                            AutomationProperties.AutomationId="EnvironmentVariablesNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/EnvironmentVariables.png}" />
                         <NavigationViewItem
-                            x:Name="HostsNavigationItem"
                             x:Uid="Shell_Hosts"
                             helpers:NavHelper.NavigateTo="views:HostsPage"
-                            AutomationProperties.AutomationId="HostsNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Hosts.png}" />
                         <NavigationViewItem
-                            x:Name="RegistryPreviewNavigationItem"
                             x:Uid="Shell_RegistryPreview"
                             helpers:NavHelper.NavigateTo="views:RegistryPreviewPage"
-                            AutomationProperties.AutomationId="RegistryPreviewNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/RegistryPreview.png}" />
                     </NavigationViewItem.MenuItems>
                 </NavigationViewItem>
@@ -393,27 +330,19 @@
             <NavigationView.PaneFooter>
                 <StackPanel Orientation="Vertical">
                     <NavigationViewItem
-                        x:Name="OOBENavigationItem"
                         x:Uid="OOBE_NavViewItem"
-                        AutomationProperties.AutomationId="OOBENavItem"
                         Icon="{ui:FontIcon Glyph=&#xF133;}"
                         Tapped="OOBEItem_Tapped" />
                     <NavigationViewItem
-                        x:Name="WhatIsNewNavigationItem"
                         x:Uid="WhatIsNew_NavViewItem"
-                        AutomationProperties.AutomationId="WhatIsNewNavItem"
                         Icon="{ui:FontIcon Glyph=&#xE789;}"
                         Tapped="WhatIsNewItem_Tapped" />
                     <NavigationViewItem
-                        x:Name="FeedbackNavigationItem"
                         x:Uid="Feedback_NavViewItem"
-                        AutomationProperties.AutomationId="FeedbackNavItem"
                         Icon="{ui:FontIcon Glyph=&#xED15;}"
                         Tapped="FeedbackItem_Tapped" />
                     <NavigationViewItem
-                        x:Name="CloseNavigationItem"
                         x:Uid="Close_NavViewItem"
-                        AutomationProperties.AutomationId="CloseNavItem"
                         Icon="{ui:FontIcon Glyph=&#xE7E8;}"
                         Tapped="Close_Tapped"
                         Visibility="{x:Bind ViewModel.ShowCloseMenu, Mode=OneWay}" />

src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -141,7 +142,8 @@ namespace Microsoft.PowerToys.Settings.UI.Views
         private const int SearchDebounceMs = 500;
         private bool _disposed;
 
-        // Removed trace id counter per cleanup
+        // Tracing id for correlating logs of a single search interaction
+        private static long _searchTraceIdCounter;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ShellPage"/> class.
@@ -441,11 +443,25 @@ namespace Microsoft.PowerToys.Settings.UI.Views
 
         private void ShellPage_Loaded(object sender, RoutedEventArgs e)
         {
+            Logger.LogDebug("[Search][Index] Scheduling BuildIndex...");
+            var swIndex = Stopwatch.StartNew();
             Task.Run(() =>
             {
+                Logger.LogDebug("[Search][Index] BuildIndex started");
                 SearchIndexService.BuildIndex();
             })
-            .ContinueWith(_ => { });
+            .ContinueWith(t =>
+            {
+                swIndex.Stop();
+                if (t.IsFaulted)
+                {
+                    Logger.LogDebug($"[Search][Index] BuildIndex FAILED after {swIndex.ElapsedMilliseconds} ms: {t.Exception?.Flatten().InnerException?.Message}");
+                }
+                else
+                {
+                    Logger.LogDebug($"[Search][Index] BuildIndex completed in {swIndex.ElapsedMilliseconds} ms.");
+                }
+            });
         }
 
         private void NavigationView_DisplayModeChanged(NavigationView sender, NavigationViewDisplayModeChangedEventArgs args)
@@ -496,6 +512,10 @@ namespace Microsoft.PowerToys.Settings.UI.Views
 
             var query = sender.Text?.Trim() ?? string.Empty;
 
+            var traceId = Interlocked.Increment(ref _searchTraceIdCounter);
+            var swOverall = Stopwatch.StartNew();
+            Logger.LogDebug($"[Search][TextChanged][{traceId}] start. query='{query}'");
+
             // Debounce: cancel previous pending search
             _searchDebounceCts?.Cancel();
             _searchDebounceCts?.Dispose();
@@ -508,6 +528,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                 sender.IsSuggestionListOpen = false;
                 _lastSearchResults.Clear();
                 _lastQueryText = string.Empty;
+                Logger.LogDebug($"[Search][TextChanged][{traceId}] empty query. end");
                 return;
             }
 
@@ -517,11 +538,14 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             }
             catch (TaskCanceledException)
             {
-                return; // debounce canceled
+                // A newer keystroke arrived; abandon this run
+                Logger.LogDebug($"[Search][TextChanged][{traceId}] debounce canceled at +{swOverall.ElapsedMilliseconds} ms");
+                return;
             }
 
             if (token.IsCancellationRequested)
             {
+                Logger.LogDebug($"[Search][TextChanged][{traceId}] token canceled post-debounce at +{swOverall.ElapsedMilliseconds} ms");
                 return;
             }
 
@@ -530,25 +554,106 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             try
             {
                 // If the token is already canceled before scheduling, the task won't start.
+                var swSearch = Stopwatch.StartNew();
+                Logger.LogDebug($"[Search][TextChanged][{traceId}] dispatch search...");
                 results = await Task.Run(() => SearchIndexService.Search(query, token), token);
+                swSearch.Stop();
+                Logger.LogDebug($"[Search][TextChanged][{traceId}] search done in {swSearch.ElapsedMilliseconds} ms. results={results?.Count ?? 0}");
             }
             catch (OperationCanceledException)
             {
+                Logger.LogDebug($"[Search][TextChanged][{traceId}] search canceled at +{swOverall.ElapsedMilliseconds} ms");
                 return;
             }
 
             if (token.IsCancellationRequested)
             {
+                Logger.LogDebug($"[Search][TextChanged][{traceId}] token canceled after search at +{swOverall.ElapsedMilliseconds} ms");
                 return;
             }
 
             _lastSearchResults = results;
             _lastQueryText = query;
 
-            var top = BuildSuggestionItems(query, results);
+            List<SuggestionItem> top;
+            if (results.Count == 0)
+            {
+                // Explicit no-results row
+                var rl = ResourceLoaderInstance.ResourceLoader;
+                var noResultsPrefix = rl.GetString("Shell_Search_NoResults");
+                if (string.IsNullOrEmpty(noResultsPrefix))
+                {
+                    noResultsPrefix = "No results for";
+                }
 
+                var headerText = $"{noResultsPrefix} '{query}'";
+                top =
+                [
+                    new()
+                    {
+                        Header = headerText,
+                        IsNoResults = true,
+                    },
+                ];
+
+                Logger.LogDebug($"[Search][TextChanged][{traceId}] no results -> added placeholder item (count={top.Count})");
+            }
+            else
+            {
+                // Project top 5 suggestions
+                var swProject = Stopwatch.StartNew();
+                top = [.. results.Take(5)
+                    .Select(e =>
+                    {
+                        string subtitle = string.Empty;
+                        if (e.Type != EntryType.SettingsPage)
+                        {
+                            var swSubtitle = Stopwatch.StartNew();
+                            subtitle = SearchIndexService.GetLocalizedPageName(e.PageTypeName);
+                            if (string.IsNullOrEmpty(subtitle))
+                            {
+                                // Fallback: look up the module title from the in-memory index
+                                var swFallback = Stopwatch.StartNew();
+                                subtitle = SearchIndexService.Index
+                                    .Where(x => x.Type == EntryType.SettingsPage && x.PageTypeName == e.PageTypeName)
+                                    .Select(x => x.Header)
+                                    .FirstOrDefault() ?? string.Empty;
+                                swFallback.Stop();
+                                Logger.LogDebug($"[Search][TextChanged][{traceId}] fallback subtitle for '{e.PageTypeName}' took {swFallback.ElapsedMilliseconds} ms");
+                            }
+
+                            swSubtitle.Stop();
+                            Logger.LogDebug($"[Search][TextChanged][{traceId}] subtitle for '{e.PageTypeName}' took {swSubtitle.ElapsedMilliseconds} ms");
+                        }
+
+                        return new SuggestionItem
+                        {
+                            Header = e.Header,
+                            Icon = e.Icon,
+                            PageTypeName = e.PageTypeName,
+                            ElementName = e.ElementName,
+                            ParentElementName = e.ParentElementName,
+                            Subtitle = subtitle,
+                            IsShowAll = false,
+                        };
+                    })];
+                swProject.Stop();
+                Logger.LogDebug($"[Search][TextChanged][{traceId}] project suggestions took {swProject.ElapsedMilliseconds} ms. topCount={top.Count}");
+
+                if (results.Count > 5)
+                {
+                    // Add a tail item to show all results if there are more than 5
+                    top.Add(new SuggestionItem { IsShowAll = true });
+                    Logger.LogDebug($"[Search][TextChanged][{traceId}] added 'Show all results' item");
+                }
+            }
+
+            var swUi = Stopwatch.StartNew();
             sender.ItemsSource = top;
             sender.IsSuggestionListOpen = top.Count > 0;
+            swUi.Stop();
+            swOverall.Stop();
+            Logger.LogDebug($"[Search][TextChanged][{traceId}] UI update took {swUi.ElapsedMilliseconds} ms. total={swOverall.ElapsedMilliseconds} ms");
         }
 
         private void SearchBox_SuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)
@@ -605,98 +710,23 @@ namespace Microsoft.PowerToys.Settings.UI.Views
         private void CtrlF_Invoked(KeyboardAccelerator sender, KeyboardAcceleratorInvokedEventArgs args)
         {
             SearchBox.Focus(FocusState.Programmatic);
-            args.Handled = true; // prevent further processing (e.g., unintended navigation)
         }
 
         private void SearchBox_GotFocus(object sender, RoutedEventArgs e)
         {
-            var box = sender as AutoSuggestBox;
-            var current = box?.Text?.Trim() ?? string.Empty;
-            if (string.IsNullOrEmpty(current))
-            {
-                return; // nothing to restore
-            }
-
-            // If current text matches last query and we have results, reconstruct the suggestion list.
-            if (string.Equals(current, _lastQueryText, StringComparison.Ordinal) && _lastSearchResults?.Count > 0)
-            {
-                try
-                {
-                    var top = BuildSuggestionItems(current, _lastSearchResults);
-                    box.ItemsSource = top;
-                    box.IsSuggestionListOpen = top.Count > 0;
-                }
-                catch (Exception ex)
-                {
-                    Logger.LogError($"Error restoring suggestion list {ex.Message}");
-                }
-            }
-        }
-
-        // Centralized suggestion projection logic used by TextChanged & GotFocus restore.
-        private List<SuggestionItem> BuildSuggestionItems(string query, List<SettingEntry> results)
-        {
-            results ??= new();
-            if (results.Count == 0)
-            {
-                var rl = ResourceLoaderInstance.ResourceLoader;
-                var noResultsPrefix = rl.GetString("Shell_Search_NoResults");
-                if (string.IsNullOrEmpty(noResultsPrefix))
-                {
-                    noResultsPrefix = "No results for";
-                }
-
-                var headerText = $"{noResultsPrefix} '{query}'";
-                return new List<SuggestionItem>
-                {
-                    new()
-                    {
-                        Header = headerText,
-                        IsNoResults = true,
-                    },
-                };
-            }
-
-            var list = results.Take(5).Select(e =>
-            {
-                string subtitle = string.Empty;
-                if (e.Type != EntryType.SettingsPage)
-                {
-                    subtitle = SearchIndexService.GetLocalizedPageName(e.PageTypeName);
-                    if (string.IsNullOrEmpty(subtitle))
-                    {
-                        subtitle = SearchIndexService.Index
-                            .Where(x => x.Type == EntryType.SettingsPage && x.PageTypeName == e.PageTypeName)
-                            .Select(x => x.Header)
-                            .FirstOrDefault() ?? string.Empty;
-                    }
-                }
-
-                return new SuggestionItem
-                {
-                    Header = e.Header,
-                    Icon = e.Icon,
-                    PageTypeName = e.PageTypeName,
-                    ElementName = e.ElementName,
-                    ParentElementName = e.ParentElementName,
-                    Subtitle = subtitle,
-                    IsShowAll = false,
-                };
-            }).ToList();
-
-            if (results.Count > 5)
-            {
-                list.Add(new SuggestionItem { IsShowAll = true });
-            }
-
-            return list;
+            // do not prompt unless search for text.
+            return;
         }
 
         private async void SearchBox_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
         {
+            var swSubmit = Stopwatch.StartNew();
+            Logger.LogDebug("[Search][Submit] start");
+
             // If a suggestion is selected, navigate directly
             if (args.ChosenSuggestion is SuggestionItem chosen)
             {
+                Logger.LogDebug($"[Search][Submit] chosen suggestion -> navigate to {chosen.PageTypeName} element={chosen.ElementName ?? "<page>"}");
                 NavigateFromSuggestion(chosen);
                 return;
             }
@@ -704,6 +734,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             var queryText = (args.QueryText ?? _lastQueryText)?.Trim();
             if (string.IsNullOrWhiteSpace(queryText))
             {
+                Logger.LogDebug("[Search][Submit] empty query -> navigate Dashboard");
                 NavigationService.Navigate<DashboardPage>();
                 return;
             }
@@ -711,10 +742,21 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             // Prefer cached results (from live search); if empty, perform a fresh search
             var matched = _lastSearchResults?.Count > 0 && string.Equals(_lastQueryText, queryText, StringComparison.Ordinal)
                 ? _lastSearchResults
-                : await Task.Run(() => SearchIndexService.Search(queryText));
+                : await Task.Run(() =>
+                {
+                    var sw = Stopwatch.StartNew();
+                    Logger.LogDebug($"[Search][Submit] background search for '{queryText}'...");
+                    var r = SearchIndexService.Search(queryText);
+                    sw.Stop();
+                    Logger.LogDebug($"[Search][Submit] background search done in {sw.ElapsedMilliseconds} ms. results={r?.Count ?? 0}");
+                    return r;
+                });
 
             var searchParams = new SearchResultsNavigationParams(queryText, matched);
+            Logger.LogDebug($"[Search][Submit] navigate to SearchResultsPage (results={matched?.Count ?? 0})");
             NavigationService.Navigate<SearchResultsPage>(searchParams);
+            swSubmit.Stop();
+            Logger.LogDebug($"[Search][Submit] total {swSubmit.ElapsedMilliseconds} ms");
         }
 
         public void Dispose()

src/settings-ui/Settings.UI/Strings/en-us/Resources.resw

@@ -639,17 +639,17 @@ opera.exe</value>
     <value>Additional actions</value>
   </data>
   <data name="RemapKeysList.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Current key remappings</value>
+    <value>Current Key Remappings</value>
   </data>
   <data name="RemapShortcutsList.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Current shortcut remappings</value>
+    <value>Current Shortcut Remappings</value>
   </data>
   <data name="KeyboardManager_RemappedKeysListItem.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Key remapping</value>
+    <value>Key Remapping</value>
     <comment>key as in keyboard key</comment>
   </data>
   <data name="KeyboardManager_RemappedShortcutsListItem.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Shortcut remapping</value>
+    <value>Shortcut Remapping</value>
   </data>
   <data name="KeyboardManager_RemappedTo.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Remapped to</value>
@@ -658,7 +658,7 @@ opera.exe</value>
     <value>Remapped to</value>
   </data>
   <data name="KeyboardManager_TargetApp.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>For target application</value>
+    <value>For Target Application</value>
     <comment>What computer application would this be for</comment>
   </data>
   <data name="KeyboardManager_Image.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
@@ -2902,19 +2902,20 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="MouseUtils_GlidingCursor.Description" xml:space="preserve">
     <value>An accessibility feature that lets you control the mouse with a single button using guided horizontal and vertical lines</value>
   </data>
-  <data name="MouseUtils_GlidingCursor_InitialSpeed.Header" xml:space="preserve">
+	<data name="MouseUtils_GlidingCursor_InitialSpeed.Header" xml:space="preserve">
     <value>Initial line speed</value>
   </data>
-  <data name="MouseUtils_GlidingCursor_InitialSpeed.Description" xml:space="preserve">
+	<data name="MouseUtils_GlidingCursor_InitialSpeed.Description" xml:space="preserve">
     <value>Speed of the horizontal or vertical line when it begins moving</value>
   </data>
-  <data name="MouseUtils_GlidingCursor_DelaySpeed.Header" xml:space="preserve">
+	<data name="MouseUtils_GlidingCursor_DelaySpeed.Header" xml:space="preserve">
     <value>Reduced line speed</value>
   </data>
-  <data name="MouseUtils_GlidingCursor_DelaySpeed.Description" xml:space="preserve">
+	<data name="MouseUtils_GlidingCursor_DelaySpeed.Description" xml:space="preserve">
     <value>Speed after slowing down the line with a second shortcut press</value>
   </data>
-  <data name="FancyZones_Radio_Custom_Colors.Content" xml:space="preserve">
+
+	<data name="FancyZones_Radio_Custom_Colors.Content" xml:space="preserve">
     <value>Custom colors</value>
   </data>
   <data name="FancyZones_Radio_Default_Theme.Content" xml:space="preserve">
@@ -4405,7 +4406,7 @@ Activate by holding the key for the character you want to add an accent to, then
     <value>Show minimap</value>
   </data>
   <data name="PrivacyLink.Text" xml:space="preserve">
-    <value>OpenAI privacy</value>
+    <value>OpenAI Privacy</value>
   </data>
   <data name="TermsLink.Text" xml:space="preserve">
     <value>OpenAI Terms</value>
@@ -4626,7 +4627,7 @@ Activate by holding the key for the character you want to add an accent to, then
 Copy a zoomed screen with Ctrl+C or save it by typing Ctrl+S. Crop the copy or save region by entering Ctrl+Shift instead of Ctrl.</value>
   </data>
   <data name="ZoomIt_Zoom_Shortcut.Header" xml:space="preserve">
-    <value>Zoom hotkey</value>
+    <value>Zoom Toggle Hotkey</value>
   </data>
   <data name="ZoomIt_Toggle_AnimateZoom.Header" xml:space="preserve">
     <value>Animate zoom in and zoom out</value>
@@ -4647,7 +4648,7 @@ Use LiveDraw to draw and annotate the live desktop. To activate LiveDraw, enter
 To enter and exit LiveZoom, enter the hotkey specified below.</value>
   </data>
   <data name="ZoomIt_LiveZoom_Shortcut.Header" xml:space="preserve">
-    <value>Live Zoom hotkey</value>
+    <value>Live Zoom Toggle Hotkey</value>
   </data>
   <data name="ZoomIt_DrawGroup.Header" xml:space="preserve">
     <value>Draw</value>
@@ -4666,7 +4667,7 @@ Shapes - Draw a line by holding down the Shift key, a rectangle with the Ctrl ke
 Screen - Clear the screen for a sketch pad by pressing W (white) or K (black). Copy a zoomed screen with Ctrl+C or save it by typing Ctrl+S. Crop the copy or save region by entering Ctrl+Shift instead of Ctrl.</value>
   </data>
   <data name="ZoomIt_Draw_Shortcut.Header" xml:space="preserve">
-    <value>Draw without zoom hotkey</value>
+    <value>Draw without Zoom Hotkey</value>
   </data>
   <data name="ZoomIt_TypeGroup.Header" xml:space="preserve">
     <value>Type</value>
@@ -4680,11 +4681,11 @@ The text color is the current drawing color.</value>
     <value>Text font</value>
   </data>
   <data name="ZoomIt_Type_Font_Button.Content" xml:space="preserve">
-    <value>Choose font</value>
+    <value>Choose Font</value>
     <comment>Font refers to text font</comment>
   </data>
   <data name="ZoomIt_DemoTypeGroup.Header" xml:space="preserve">
-    <value>DemoType</value>
+    <value>Demo Type</value>
   </data>
   <data name="ZoomIt_DemoTypeGroup.Description" xml:space="preserve">
     <value>Use DemoType to have ZoomIt type text specified in the input file when you enter the DemoType toggle. You can also pull input from the clipboard if it is prefixed with the [start] keyword.
@@ -4698,7 +4699,7 @@ When driving input, hit the space bar to unblock keyboard input at the end of a
 When you reach the end of the file, ZoomIt will reload the file and start at the beginning. Enter the hotkey with the Shift key in the opposite mode to step back to the last [end].</value>
   </data>
   <data name="ZoomIt_DemoType_Shortcut.Header" xml:space="preserve">
-    <value>DemoType toggle hotkey</value>
+    <value>Demo Type Toggle Hotkey</value>
   </data>
   <data name="ZoomIt_DemoType_File.Header" xml:space="preserve">
     <value>Input file</value>
@@ -4707,7 +4708,7 @@ When you reach the end of the file, ZoomIt will reload the file and start at the
     <value>Browse</value>
   </data>
   <data name="ZoomIt_DemoType_File_Picker_Dialog_Title" xml:space="preserve">
-    <value>Specify DemoType file..</value>
+    <value>Specify DemoType file...</value>
   </data>
   <data name="FilePicker_AllFilesFilter" xml:space="preserve">
     <value>All Files</value>
@@ -4730,19 +4731,19 @@ When you reach the end of the file, ZoomIt will reload the file and start at the
 Change the break timer color using the same keys that the drawing color. The break timer font is the same as text font.</value>
   </data>
   <data name="ZoomIt_Break_Shortcut.Header" xml:space="preserve">
-    <value>Start break timer hotkey</value>
+    <value>Start Break Timer Hotkey</value>
   </data>
   <data name="ZoomIt_Break_Timeout.Header" xml:space="preserve">
     <value>Timer (minutes)</value>
   </data>
   <data name="ZoomIt_Break_ShowExpiredTime.Header" xml:space="preserve">
-    <value>Show time elapsed after expiration</value>
+    <value>Show Time Elapsed After Expiration</value>
   </data>
   <data name="ZoomIt_Break_PlaySoundsFile.Header" xml:space="preserve">
-    <value>Play sound on expiration</value>
+    <value>Play Sound on Expiration</value>
   </data>
   <data name="ZoomIt_Break_SoundFile.Header" xml:space="preserve">
-    <value>Alarm sound file</value>
+    <value>Alarm Sound File</value>
   </data>
   <data name="ZoomIt_Break_SoundFile_BrowseButton.Content" xml:space="preserve">
     <value>Browse</value>
@@ -4754,7 +4755,7 @@ Change the break timer color using the same keys that the drawing color. The bre
     <value>Sounds</value>
   </data>
   <data name="ZoomIt_Break_TimerOpacity.Header" xml:space="preserve">
-    <value>Timer opacity</value>
+    <value>Timer Opacity</value>
   </data>
   <data name="ZoomIt_Break_TimerOpacity_10Percent.Content" xml:space="preserve">
     <value>10%</value>
@@ -4787,7 +4788,7 @@ Change the break timer color using the same keys that the drawing color. The bre
     <value>100%</value>
   </data>
   <data name="ZoomIt_Break_TimerPosition.Header" xml:space="preserve">
-    <value>Timer position</value>
+    <value>Timer Position</value>
   </data>
   <data name="ZoomIt_Break_TimerPosition_TopLeftCorner.Content" xml:space="preserve">
     <value>Top left corner</value>
@@ -4817,7 +4818,7 @@ Change the break timer color using the same keys that the drawing color. The bre
     <value>Bottom right corner</value>
   </data>
   <data name="ZoomIt_Break_ShowBackgroundBitmap.Header" xml:space="preserve">
-    <value>Show background bitmap</value>
+    <value>Show Background Bitmap</value>
   </data>
   <data name="ZoomIt_Break_ShowFadedDesktop.Content" xml:space="preserve">
     <value>Use faded desktop as background</value>
@@ -4826,7 +4827,7 @@ Change the break timer color using the same keys that the drawing color. The bre
     <value>Use image file as background</value>
   </data>
   <data name="ZoomIt_Break_BackgroundFile.Header" xml:space="preserve">
-    <value>Background image file</value>
+    <value>Background Image File</value>
   </data>
   <data name="ZoomIt_Break_BackgroundFile_BrowseButton.Content" xml:space="preserve">
     <value>Browse</value>
@@ -4847,14 +4848,14 @@ Change the break timer color using the same keys that the drawing color. The bre
     <value>Record</value>
   </data>
   <data name="ZoomIt_RecordGroup.Description" xml:space="preserve">
-    <value>Record video of the unzoomed live screen or a static zoomed session by entering the recording hotkey and finish the recording by entering it again.
+    <value>Record video of the unzoomed live screen or a static zoomed session by entering the recording hot key and finish the recording by entering it again.
 
 To crop the portion of the screen that will be recorded, enter the hotkey with the Shift key in the opposite mode.
 
 To record a specific window, enter the hotkey with the Alt key in the opposite mode.</value>
   </data>
   <data name="ZoomIt_Record_Shortcut.Header" xml:space="preserve">
-    <value>Record hotkey</value>
+    <value>Record Toggle Hotkey</value>
   </data>
   <data name="ZoomIt_Record_Scaling.Header" xml:space="preserve">
     <value>Scaling</value>
@@ -4875,7 +4876,7 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
     <value>Copy a region of the screen to the clipboard or enter the hotkey with the Shift key in the opposite mode to save it to a file.</value>
   </data>
   <data name="ZoomIt_Snip_Shortcut.Header" xml:space="preserve">
-    <value>Snip hotkey</value>
+    <value>Snip Toggle Hotkey</value>
   </data>
   <data name="Oobe_ZoomIt.Description" xml:space="preserve">
     <value>ZoomIt is a screen zoom, annotation, and recording tool for technical presentations and demos. You can also use ZoomIt to snip screenshots to the clipboard or to a file.</value>
@@ -4992,7 +4993,7 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
     <value>File Management</value>
   </data>
   <data name="Shell_TopLevelInputOutput.Content" xml:space="preserve">
-    <value>Input &amp; Output</value>
+    <value>Input / Output</value>
   </data>
   <data name="Shell_TopLevelWindowsAndLayouts.Content" xml:space="preserve">
     <value>Windowing &amp; Layouts</value>
@@ -5145,7 +5146,7 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
     <value>Quick access</value>
   </data>
   <data name="ShortcutsOverview.Title" xml:space="preserve">
-    <value>Shortcuts</value>
+    <value>Shortcuts overview</value>
   </data>
   <data name="NoActionsToShow.Text" xml:space="preserve">
     <value>No actions to show..</value>
@@ -5271,7 +5272,7 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
     <value>All shortcuts function correctly</value>
   </data>
   <data name="ResolveConflicts_Button.Content" xml:space="preserve">
-    <value>Resolve conflicts</value>
+	<value>Resolve conflicts</value>
   </data>
   <data name="ShortcutConflictControl_Title.Text" xml:space="preserve">
     <value>Shortcut conflicts</value>
@@ -5292,11 +5293,4 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
   <data name="Hosts_NoLeadingSpaces.Description" xml:space="preserve">
     <value>Do not prepend spaces to active lines when saving the hosts file</value>
   </data>
-  <data name="Search_ResultsFor" xml:space="preserve">
-    <value>Results for</value>
-    <comment>Prefix for search string. E.g. "Results for 'shortcut'"</comment>
-  </data>
-  <data name="UtilitiesHeader.Title" xml:space="preserve">
-    <value>Utilities</value>
-  </data>
 </root>

src/settings-ui/Settings.UI/ViewModels/MouseUtilsViewModel_MouseJump.cs

@@ -126,21 +126,14 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
         {
             var assembly = Assembly.GetExecutingAssembly();
             var assemblyName = new AssemblyName(assembly.FullName ?? throw new InvalidOperationException());
-
-            // Build the fully-qualified manifest resource name. Historically, subtle casing differences
-            // (e.g. folder names or the assembly name) caused exact (case-sensitive) lookup failures on
-            // some developer machines when the embedded resource's actual name differed only by case.
-            // Manifest resource name comparison here does not need to be case-sensitive, so we resolve
-            // the actual name using an OrdinalIgnoreCase match, then use the real casing for the stream.
             var resourceName = $"Microsoft.{assemblyName.Name}.{filename.Replace("/", ".")}";
             var resourceNames = assembly.GetManifestResourceNames();
-            var actualResourceName = resourceNames.FirstOrDefault(n => string.Equals(n, resourceName, StringComparison.OrdinalIgnoreCase));
-            if (actualResourceName is null)
+            if (!resourceNames.Contains(resourceName))
             {
-                throw new InvalidOperationException($"Embedded resource '{resourceName}' (case-insensitive) does not exist.");
+                throw new InvalidOperationException($"Embedded resource '{resourceName}' does not exist.");
             }
 
-            var stream = assembly.GetManifestResourceStream(actualResourceName)
+            var stream = assembly.GetManifestResourceStream(resourceName)
                 ?? throw new InvalidOperationException();
             var image = (Bitmap)Image.FromStream(stream);
             return image;

tools/BugReportTool/BugReportTool/ProcessesList.cpp

@@ -51,5 +51,4 @@ std::vector<std::wstring> processes =
     L"PowerToys.WorkspacesWindowArranger.exe",
     L"PowerToys.WorkspacesEditor.exe",
     L"PowerToys.ZoomIt.exe",
-    L"Microsoft.CmdPal.UI.exe",
 };

tools/build/BUILD-GUIDELINES.md

@@ -1,48 +0,0 @@
-# Build scripts – quick guideline
-
-Use these scripts to build PowerToys locally. They auto-detect your platform (x64/arm64), initialize the Visual Studio developer environment, and write helpful logs on failure.
-
-## Quick start (from cmd.exe)
-- Fast essentials (runner + settings) and NuGet restore first:
-  - `tools\build\build-essentials.cmd`
-- Build projects in the current folder:
-  - `tools\build\build.cmd`
-
-Tip: Add `D:\PowerToys\tools\build` to your PATH to use the wrappers anywhere.
-
-## When to use which
-1) `build-essentials.ps1`
-   - Restores NuGet for `PowerToys.sln` and builds essentials (runner, settings).
-   - Auto-detects Platform; initializes VS Dev environment automatically.
-   - Example (PowerShell):
-     - `./tools/build/build-essentials.ps1`
-     - `./tools/build/build-essentials.ps1 -Platform arm64 -Configuration Release`
-
-2) `build.ps1` (from any folder)
-   - Builds any `.sln/.csproj/.vcxproj` in the current directory.
-   - Auto-detects Platform; initializes VS Dev environment automatically.
-   - Accepts extra MSBuild args (forwarded to msbuild):
-     - `./tools/build/build.ps1 '/p:CIBuild=true' '/p:SomeProp=Value'`
-   - Restore only:
-     - `./tools/build/build.ps1 -RestoreOnly`
-
-3) `build-installer.ps1` (use with caution)
-   - Full local packaging pipeline (restore, build, sign MSIX, WiX v5 MSI/bootstrapper).
-   - Auto-inits VS Dev environment. Cleans some output (keeps *.exe) under `installer/`.
-   - Key options: `-PerUser true|false`, `-InstallerSuffix wix5|vnext`.
-   - Example:
-     - `./tools/build/build-installer.ps1 -Platform x64 -Configuration Release -PerUser true -InstallerSuffix wix5`
-
-## Logs and troubleshooting
-- On failure, see logs next to the solution/project being built:
-  - `build.<configuration>.<platform>.all.log` — full text log
-  - `build.<configuration>.<platform>.errors.log` — errors only
-  - `build.<configuration>.<platform>.warnings.log` — warnings only
-  - `build.<configuration>.<platform>.trace.binlog` — open with MSBuild Structured Log Viewer
-- VS environment init:
-  - Scripts try DevShell first (`Microsoft.VisualStudio.DevShell.dll` / `Enter-VsDevShell`), then fall back to `VsDevCmd.bat`.
-  - If VS isn’t found, run from “Developer PowerShell for VS 2022”, or ensure `vswhere.exe` exists under `Program Files (x86)\Microsoft Visual Studio\Installer`.
-
-## Notes
-- Override platform explicitly with `-Platform x64|arm64` if needed.
-- CMD wrappers: `build.cmd`, `build-essentials.cmd` forward all arguments to the PowerShell scripts.

tools/build/build-common.ps1

@@ -1,272 +0,0 @@
-<#
-.SYNOPSIS
-Shared build helper functions for PowerToys build scripts.
-
-.DESCRIPTION
-This file provides reusable helper functions used by the build scripts:
-- Get-BuildPaths: returns ScriptDir, OriginalCwd, RepoRoot (repo root detection)
-- RunMSBuild: wrapper around msbuild.exe (accepts optional Platform/Configuration)
-- RestoreThenBuild: performs restore and optionally builds the solution/project
-- BuildProjectsInDirectory: discovers and builds local .sln/.csproj/.vcxproj files
-- Ensure-VsDevEnvironment: initializes the Visual Studio developer environment when possible.
-  It prefers the DevShell PowerShell module (Microsoft.VisualStudio.DevShell.dll / Enter-VsDevShell),
-  falls back to running VsDevCmd.bat and importing its environment into the current PowerShell session,
-  and restores the caller's working directory after initialization.
-
-USAGE
-Dot-source this file from a script to load helpers:
-. "$PSScriptRoot\build-common.ps1"
-
-ERROR DETAILS
-When a build fails, check the logs written next to the solution/project folder:
-- build.<configuration>.<platform>.all.log — full MSBuild text log
-- build.<configuration>.<platform>.errors.log — extracted errors only
-- build.<configuration>.<platform>.warnings.log — extracted warnings only
-- build.<configuration>.<platform>.trace.binlog — binary log (open with the MSBuild Structured Log Viewer)
-
-.NOTES
-Do not execute this file directly; dot-source it from `build.ps1` or `build-installer.ps1` so helpers are available in your script scope.
-#>
-
-function RunMSBuild {
-    param (
-        [string]$Solution,
-        [string]$ExtraArgs,
-        [string]$Platform,
-        [string]$Configuration
-    )
-
-    # Prefer the solution's folder for logs; fall back to current directory
-    $logRoot = Split-Path -Path $Solution
-    if (-not $logRoot) { $logRoot = '.' }
-
-    $cfg = $null
-    if ($Configuration) { $cfg = $Configuration.ToLower() } else { $cfg = 'unknown' }
-    $plat = $null
-    if ($Platform) { $plat = $Platform.ToLower() } else { $plat = 'unknown' }
-
-    $allLog = Join-Path $logRoot ("build.{0}.{1}.all.log" -f $cfg, $plat)
-    $warningLog = Join-Path $logRoot ("build.{0}.{1}.warnings.log" -f $cfg, $plat)
-    $errorsLog = Join-Path $logRoot ("build.{0}.{1}.errors.log" -f $cfg, $plat)
-    $binLog = Join-Path $logRoot ("build.{0}.{1}.trace.binlog" -f $cfg, $plat)
-
-    $base = @(
-        $Solution
-        "/p:Platform=$Platform"
-        "/p:Configuration=$Configuration"
-        "/verbosity:normal"
-        '/clp:Summary;PerformanceSummary;ErrorsOnly;WarningsOnly'
-        "/fileLoggerParameters:LogFile=$allLog;Verbosity=detailed"
-        "/fileLoggerParameters1:LogFile=$warningLog;WarningsOnly"
-        "/fileLoggerParameters2:LogFile=$errorsLog;ErrorsOnly"
-        "/bl:$binLog"
-        '/nologo'
-    )
-
-    $cmd = $base + ($ExtraArgs -split ' ')
-    Write-Host (("[MSBUILD] {0}" -f ($cmd -join ' ')))
-
-    Push-Location $script:RepoRoot
-    try {
-        & msbuild.exe @cmd
-        if ($LASTEXITCODE -ne 0) {
-            Write-Error (("Build failed: {0}  {1}`nSee logs:`n  All: {2}`n  Errors: {3}`n  Binlog: {4}" -f $Solution, $ExtraArgs, $allLog, $errorsLog, $binLog))
-            exit $LASTEXITCODE
-        }
-    } finally {
-        Pop-Location
-    }
-}
-
-function RestoreThenBuild {
-    param (
-        [string]$Solution,
-        [string]$ExtraArgs,
-        [string]$Platform,
-        [string]$Configuration,
-        [bool]$RestoreOnly=$false
-    )
-
-    $restoreArgs = '/t:restore /p:RestorePackagesConfig=true'
-    if ($ExtraArgs) { $restoreArgs = "$restoreArgs $ExtraArgs" }
-    RunMSBuild $Solution $restoreArgs $Platform $Configuration
-
-    if (-not $RestoreOnly) {
-        $buildArgs = '/m'
-        if ($ExtraArgs) { $buildArgs = "$buildArgs $ExtraArgs" }
-        RunMSBuild $Solution $buildArgs $Platform $Configuration
-    }
-}
-
-function BuildProjectsInDirectory {
-    param(
-        [string]$DirectoryPath,
-        [string]$ExtraArgs,
-        [string]$Platform,
-        [string]$Configuration,
-        [switch]$RestoreOnly
-    )
-
-    if (-not (Test-Path $DirectoryPath)) {
-        return $false
-    }
-
-    $files = @()
-    try {
-        $files = Get-ChildItem -Path (Join-Path $DirectoryPath '*') -Include *.sln,*.csproj,*.vcxproj -File -ErrorAction SilentlyContinue
-    } catch {
-        $files = @()
-    }
-
-    if (-not $files -or $files.Count -eq 0) {
-        return $false
-    }
-
-    $names = ($files | ForEach-Object { $_.Name }) -join ', '
-    Write-Host ("[LOCAL BUILD] Found {0} project(s) in {1}: {2}" -f $files.Count, $DirectoryPath, $names)
-
-    $preferredOrder = @('.sln', '.csproj', '.vcxproj')
-    $files = $files | Sort-Object @{Expression = { [array]::IndexOf($preferredOrder, $_.Extension.ToLower()) }}
-
-    foreach ($f in $files) {
-        Write-Host ("[LOCAL BUILD] Building {0}" -f $f.FullName)
-        if ($f.Extension -eq '.sln') {
-            RestoreThenBuild $f.FullName $ExtraArgs $Platform $Configuration $RestoreOnly
-        } else {
-            $buildArgs = '/m'
-            if ($ExtraArgs) { $buildArgs = "$buildArgs $ExtraArgs" }
-            RunMSBuild $f.FullName $buildArgs $Platform $Configuration
-        }
-    }
-
-    return $true
-}
-
-function Get-DefaultPlatform {
-    <#
-    Returns a default target platform string based on the host machine (x64, arm64, x86).
-    #>
-    try {
-        $envArch = $env:PROCESSOR_ARCHITECTURE
-        if ($envArch) { $envArch = $envArch.ToLower() }
-        if ($envArch -eq 'amd64' -or $envArch -eq 'x86_64') { return 'x64' }
-        if ($envArch -match 'arm64') { return 'arm64' }
-        if ($envArch -eq 'x86') { return 'x86' }
-
-        if ($env:PROCESSOR_ARCHITEW6432) {
-            $envArch2 = $env:PROCESSOR_ARCHITEW6432.ToLower()
-            if ($envArch2 -eq 'amd64') { return 'x64' }
-            if ($envArch2 -match 'arm64') { return 'arm64' }
-        }
-
-        try {
-            $osArch = [System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture
-            switch ($osArch.ToString().ToLower()) {
-                'x64' { return 'x64' }
-                'arm64' { return 'arm64' }
-                'x86' { return 'x86' }
-            }
-        } catch {
-            # ignore - RuntimeInformation may not be available
-        }
-    } catch {
-        # ignore any errors and fall back
-    }
-
-    return 'x64'
-}
-
-function Ensure-VsDevEnvironment {
-    $OriginalLocationForVsInit = Get-Location
-    try {
-
-    if ($env:VSINSTALLDIR -or $env:VCINSTALLDIR -or $env:DevEnvDir -or $env:VCToolsInstallDir) {
-        Write-Host "[VS] VS developer environment already present"
-        return $true
-    }
-
-    # Locate vswhere if available
-    $vswhereCandidates = @(
-        "$env:ProgramFiles (x86)\Microsoft Visual Studio\Installer\vswhere.exe",
-        "$env:ProgramFiles\Microsoft Visual Studio\Installer\vswhere.exe"
-    )
-    $vswhere = $vswhereCandidates | Where-Object { Test-Path $_ } | Select-Object -First 1
-    if ($vswhere) { Write-Host "[VS] vswhere found: $vswhere" } else { Write-Host "[VS] vswhere not found" }
-
-    $instPaths = @()
-    if ($vswhere) {
-        # First try with the VC tools requirement (preferred)
-        try { $p = & $vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath 2>$null; if ($p) { $instPaths += $p } } catch {}
-        # Fallback: try without -requires to find any VS installations
-        if (-not $instPaths) {
-            try { $p2 = & $vswhere -latest -products * -property installationPath 2>$null; if ($p2) { $instPaths += $p2 } } catch {}
-        }
-    }
-
-    # Add explicit common year-based candidates as a last resort
-    if (-not $instPaths) {
-        $explicit = @(
-            "$env:ProgramFiles (x86)\Microsoft Visual Studio\2022\Community",
-            "$env:ProgramFiles (x86)\Microsoft Visual Studio\2022\Professional",
-            "$env:ProgramFiles (x86)\Microsoft Visual Studio\2022\Enterprise",
-            "$env:ProgramFiles\Microsoft Visual Studio\2022\Community",
-            "$env:ProgramFiles\Microsoft Visual Studio\2022\Professional",
-            "$env:ProgramFiles\Microsoft Visual Studio\2022\Enterprise"
-        )
-        foreach ($c in $explicit) { if (Test-Path $c) { $instPaths += $c } }
-    }
-
-    if (-not $instPaths -or $instPaths.Count -eq 0) {
-        Write-Warning "[VS] Could not locate Visual Studio installation (no candidates found)"
-        return $false
-    }
-
-    # Try each candidate installation path until one works
-    foreach ($inst in $instPaths) {
-        if (-not $inst) { continue }
-        Write-Host "[VS] Checking candidate: $inst"
-
-        $devDll = Join-Path $inst 'Common7\Tools\Microsoft.VisualStudio.DevShell.dll'
-        if (Test-Path $devDll) {
-            try {
-                Import-Module $devDll -DisableNameChecking -ErrorAction Stop
-
-                # Call Enter-VsDevShell using only the install path to avoid parameter name differences
-                try {
-                    Enter-VsDevShell -VsInstallPath $inst -ErrorAction Stop
-                    Write-Host "[VS] Entered Visual Studio DevShell at $inst"
-                    return $true
-                } catch {
-                    Write-Warning ("[VS] DevShell import/Enter-VsDevShell failed: {0}" -f $_)
-                }
-            } catch {
-                Write-Warning ("[VS] DevShell import failed: {0}" -f $_)
-            }
-        }
-
-        $vsDevCmd = Join-Path $inst 'Common7\Tools\VsDevCmd.bat'
-        if (Test-Path $vsDevCmd) {
-            Write-Host "[VS] Running VsDevCmd.bat and importing environment from $vsDevCmd"
-            try {
-                $cmdOut = cmd.exe /c "`"$vsDevCmd`" && set"
-                foreach ($line in $cmdOut) {
-                    $parts = $line -split('=',2)
-                    if ($parts.Length -eq 2) {
-                        try { [Environment]::SetEnvironmentVariable($parts[0], $parts[1], 'Process') } catch {}
-                    }
-                }
-                Write-Host "[VS] Imported environment from VsDevCmd.bat at $inst"
-                return $true
-            } catch {
-                Write-Warning ("[VS] Failed to run/import VsDevCmd.bat at {0}: {1}" -f $inst, $_)
-            }
-        }
-    }
-
-    Write-Warning "[VS] Neither DevShell module nor VsDevCmd.bat found in any candidate paths"
-    return $false
-
-    } finally {
-        try { Set-Location $OriginalLocationForVsInit } catch {}
-    }
-}

tools/build/build-essentials.cmd

@@ -1,5 +0,0 @@
-@echo off
-REM Wrapper to run build-essentials.ps1 from cmd.exe
-set SCRIPT_DIR=%~dp0
-powershell.exe -NoProfile -ExecutionPolicy Bypass -File "%SCRIPT_DIR%build-essentials.ps1" %*
-exit /b %ERRORLEVEL%

tools/build/build-essentials.ps1

@@ -1,74 +1,16 @@
-<#
-.SYNOPSIS
-Build essential native PowerToys projects (runner and settings), restoring NuGet packages first.
+cd $PSScriptRoot
+cd ..\..
+$cwd = Get-Location
+$SolutionDir = $cwd,"" -join "\"
+cd $SolutionDir
+$BuildArgs = "/p:Configuration=Release /p:Platform=x64 /p:BuildProjectReferences=false /p:SolutionDir=$SolutionDir"
 
-.DESCRIPTION
-Lightweight script to build a small set of essential C++ projects used by PowerToys' runner and native modules. This script first restores NuGet packages for the full solution (`PowerToys.sln`) and then builds the runner and settings projects. Intended for fast local builds during development.
+$ProjectsToBuild = 
+  ".\src\runner\runner.vcxproj",
+  ".\src\modules\shortcut_guide\shortcut_guide.vcxproj",
+  ".\src\modules\fancyzones\lib\FancyZonesLib.vcxproj",
+  ".\src\modules\fancyzones\dll\FancyZonesModule.vcxproj"
 
-.PARAMETER Platform
-Target platform for the build (for example: 'x64', 'arm64'). If omitted the script will attempt to auto-detect the host platform.
-
-.PARAMETER Configuration
-Build configuration (for example: 'Debug' or 'Release'). Default is 'Debug'.
-
-.EXAMPLE
-.\tools\build\build-essentials.ps1
-Restores packages for the solution and builds the default set of native projects using the auto-detected platform and Debug configuration.
-
-.EXAMPLE
-.\tools\build\build-essentials.ps1 -Platform arm64 -Configuration Release
-Restores packages and builds the essentials in Release mode for ARM64, even if your machine is running on x64.
-
-.NOTES
-- This script dot-sources `build-common.ps1` and uses the shared helper `RunMSBuild`.
-- It will call `RestoreThenBuild 'PowerToys.sln'` before building the essential projects to ensure NuGet packages are restored.
-- The script attempts to locate the repository root automatically and can be run from any folder inside the repo.
-#>
-
-param (
-    [string]$Platform = '',
-    [string]$Configuration = 'Debug'
-)
-
-# Find repository root starting from the script location
-$ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Definition
-$repoRoot = $ScriptDir
-while ($repoRoot -and -not (Test-Path (Join-Path $repoRoot "PowerToys.sln"))) {
-    $parent = Split-Path -Parent $repoRoot
-    if ($parent -eq $repoRoot) {
-        Write-Error "Could not find PowerToys repository root."
-        exit 1
-    }
-    $repoRoot = $parent
-}
-
-# Export script-scope variables used by build-common helpers
-Set-Variable -Name RepoRoot -Value $repoRoot -Scope Script -Force
-
-# Load shared helpers
-. "$PSScriptRoot\build-common.ps1"
-
-# Initialize Visual Studio dev environment
-if (-not (Ensure-VsDevEnvironment)) { exit 1 }
-
-# If platform not provided, auto-detect from host
-if (-not $Platform -or $Platform -eq '') {
-    try {
-        $Platform = Get-DefaultPlatform
-        Write-Host ("[AUTO-PLATFORM] Detected platform: {0}" -f $Platform)
-    } catch {
-        Write-Warning "Failed to auto-detect platform; defaulting to 'x64'"
-        $Platform = 'x64'
-    }
-}
-
-# Ensure solution packages are restored
-RestoreThenBuild 'PowerToys.sln' '' $Platform $Configuration $true
-
-# Build both runner and settings
-$ProjectsToBuild = @(".\src\runner\runner.vcxproj", ".\src\settings-ui\Settings.UI\PowerToys.Settings.csproj")
-$ExtraArgs = "/p:SolutionDir=$repoRoot\"
-foreach ($proj in $ProjectsToBuild) {
-    Write-Host ("[BUILD-ESSENTIALS] Building {0}" -f $proj)
-    RunMSBuild $proj $ExtraArgs $Platform $Configuration
+$ProjectsToBuild | % {
+  Invoke-Expression "msbuild $_ $BuildArgs"
 }

tools/build/build-installer.ps1

@@ -52,29 +52,12 @@ Runs the pipeline for x64 Release with 'vnext' suffix.
 #>
 
 param (
-    [string]$Platform = '',
+    [string]$Platform = 'x64',
     [string]$Configuration = 'Release',
     [string]$PerUser = 'true',
     [string]$InstallerSuffix = 'wix5'
 )
 
-# Ensure helpers are available
-. "$PSScriptRoot\build-common.ps1"
-
-# Initialize Visual Studio dev environment
-if (-not (Ensure-VsDevEnvironment)) { exit 1 }
-
-# Auto-detect platform when not provided
-if (-not $Platform -or $Platform -eq '') {
-    try {
-        $Platform = Get-DefaultPlatform
-        Write-Host ("[AUTO-PLATFORM] Detected platform: {0}" -f $Platform)
-    } catch {
-        Write-Warning "Failed to auto-detect platform; defaulting to x64"
-        $Platform = 'x64'
-    }
-}
-
 # Find the PowerToys repository root automatically
 $scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Definition
 $repoRoot = $scriptDir
@@ -97,7 +80,50 @@ if (-not $repoRoot -or -not (Test-Path (Join-Path $repoRoot "PowerToys.sln"))) {
 }
 
 Write-Host "PowerToys repository root detected: $repoRoot"
+
+function RunMSBuild {
+    param (
+        [string]$Solution, 
+        [string]$ExtraArgs  
+    )
+
+    $base = @(
+        $Solution
+        "/p:Platform=$Platform"
+        "/p:Configuration=$Configuration"
+        "/p:CIBuild=true"
+        '/verbosity:normal'
+        '/clp:Summary;PerformanceSummary;ErrorsOnly;WarningsOnly'
+        '/nologo'
+    )
+
+    $cmd = $base + ($ExtraArgs -split ' ')
+    Write-Host ("[MSBUILD] {0} {1}" -f $Solution, ($cmd -join ' '))
+    
+    # Run MSBuild from the repository root directory
+    Push-Location $repoRoot
+    try {
+        & msbuild.exe @cmd
+        if ($LASTEXITCODE -ne 0) {
+            Write-Error ("Build failed: {0}  {1}" -f $Solution, $ExtraArgs)
+            exit $LASTEXITCODE
+        }
+    } finally {
+        Pop-Location
+    }
+}
+
+function RestoreThenBuild {
+    param ([string]$Solution)
+
+    # 1) restore
+    RunMSBuild $Solution '/t:restore /p:RestorePackagesConfig=true'
+    # 2) build  -------------------------------------------------
+    RunMSBuild $Solution '/m'
+}
+
 # WiX v5 projects use WixToolset.Sdk via NuGet/MSBuild; a separate WiX 3 installation is not required here.
+
 Write-Host ("[PIPELINE] Start | Platform={0} Configuration={1} PerUser={2}" -f $Platform, $Configuration, $PerUser)
 Write-Host ''
 
@@ -108,9 +134,7 @@ if (Test-Path $cmdpalOutputPath) {
     Remove-Item $cmdpalOutputPath -Recurse -Force -ErrorAction Ignore
 }
 
-$commonArgs = '/p:CIBuild=true'
-# No local projects found (or continuing) - build full solution and tools
-RestoreThenBuild 'PowerToys.sln' $commonArgs $Platform $Configuration
+RestoreThenBuild 'PowerToys.sln'
 
 $msixSearchRoot = Join-Path $repoRoot "$Platform\$Configuration"
 $msixFiles = Get-ChildItem -Path $msixSearchRoot -Recurse -Filter *.msix |
@@ -124,8 +148,8 @@ else {
     Write-Warning "[SIGN] No .msix files found in $msixSearchRoot"
 }
 
-RestoreThenBuild 'tools\BugReportTool\BugReportTool.sln' $commonArgs $Platform $Configuration
-RestoreThenBuild 'tools\StylesReportTool\StylesReportTool.sln' $commonArgs $Platform $Configuration
+RestoreThenBuild 'tools\BugReportTool\BugReportTool.sln'
+RestoreThenBuild 'tools\StylesReportTool\StylesReportTool.sln'
 
 Write-Host '[CLEAN] installer (keep *.exe)'
 Push-Location $repoRoot
@@ -135,10 +159,10 @@ try {
     Pop-Location
 }
 
-RunMSBuild 'installer\PowerToysSetup.sln' "$commonArgs /t:restore /p:RestorePackagesConfig=true" $Platform $Configuration
+RunMSBuild 'installer\PowerToysSetup.sln' '/t:restore /p:RestorePackagesConfig=true'
 
-RunMSBuild 'installer\PowerToysSetup.sln' "$commonArgs /m /t:PowerToysInstallerVNext /p:PerUser=$PerUser /p:InstallerSuffix=$InstallerSuffix" $Platform $Configuration
+RunMSBuild 'installer\PowerToysSetup.sln' "/m /t:PowerToysInstallerVNext /p:PerUser=$PerUser /p:InstallerSuffix=$InstallerSuffix"
 
-RunMSBuild 'installer\PowerToysSetup.sln' "$commonArgs /m /t:PowerToysBootstrapperVNext /p:PerUser=$PerUser /p:InstallerSuffix=$InstallerSuffix" $Platform $Configuration
+RunMSBuild 'installer\PowerToysSetup.sln' "/m /t:PowerToysBootstrapperVNext /p:PerUser=$PerUser /p:InstallerSuffix=$InstallerSuffix"
 
 Write-Host '[PIPELINE] Completed'

tools/build/build.cmd

@@ -1,5 +0,0 @@
-@echo off
-REM Wrapper to run the PowerShell build script from cmd.exe
-set SCRIPT_DIR=%~dp0
-powershell.exe -NoProfile -ExecutionPolicy Bypass -File "%SCRIPT_DIR%build.ps1" %*
-exit /b %ERRORLEVEL%

tools/build/build.ps1

@@ -1,92 +0,0 @@
-<#
-.SYNOPSIS
-Light-weight wrapper to build local projects (solutions/projects) in the current working directory using helpers in build-common.ps1.
-
-.DESCRIPTION
-This script is intended for quick local builds. It dot-sources `build-common.ps1` and calls `BuildProjectsInDirectory` against the current directory. Use `-RestoreOnly` to only restore packages for local projects. If `-Platform` is omitted the script attempts to auto-detect the host platform.
-
-.PARAMETER Platform
-Target platform (e.g., 'x64', 'arm64'). If omitted the script will try to detect the host platform automatically.
-
-.PARAMETER Configuration
-Build configuration (e.g., 'Debug', 'Release'). Default: 'Debug'.
-
-.PARAMETER RestoreOnly
-If specified, only perform package restore for local projects and skip the build steps for a solution file (i.e. .sln).
-
-.PARAMETER ExtraArgs
-Any remaining, positional arguments passed to the script are forwarded to MSBuild as additional arguments (e.g., '/p:CIBuild=true').
-
-.EXAMPLE
-.\tools\build\build.ps1
-Builds any .sln/.csproj/.vcxproj in the current working directory (auto-detects Platform).
-
-.EXAMPLE
-.\tools\build\build.ps1 -Platform x64 -Configuration Release
-Builds local projects for x64 Release.
-
-.EXAMPLE
-.\tools\build\build.ps1 '/p:CIBuild=true' '/p:SomeOther=Value'
-Pass additional MSBuild arguments; these are forwarded to the underlying msbuild calls.
-
-.EXAMPLE
-.\tools\build\build.ps1 -RestoreOnly '/p:CIBuild=true'
-Only restores packages for local projects; ExtraArgs still forwarded to msbuild's restore phase.
-
-.NOTES
-- This file expects `build-common.ps1` to be located in the same folder and dot-sources it to load helper functions.
-- ExtraArgs are captured using PowerShell's ValueFromRemainingArguments and joined before being passed to the helpers.
-#>
-
-param (
-    [string]$Platform = '',
-    [string]$Configuration = 'Debug',
-    [switch]$RestoreOnly,
-    [Parameter(ValueFromRemainingArguments=$true)]
-    [string[]]$ExtraArgs
-)
-
-. "$PSScriptRoot\build-common.ps1"
-
-# Initialize Visual Studio dev environment
-if (-not (Ensure-VsDevEnvironment)) { exit 1 }
-
-# If user passed MSBuild-style args (e.g. './build.ps1 /p:CIBuild=true'),
-# those will bind to $Platform/$Configuration; detect those and move them to ExtraArgs.
-$positionalExtra = @()
-if ($Platform -and $Platform -match '^[\/-]') {
-    $positionalExtra += $Platform
-    $Platform = ''
-}
-if ($Configuration -and $Configuration -match '^[\/-]') {
-    $positionalExtra += $Configuration
-    $Configuration = 'Debug'
-}
-if ($positionalExtra.Count -gt 0) {
-    if (-not $ExtraArgs) { $ExtraArgs = @() }
-    $ExtraArgs = $positionalExtra + $ExtraArgs
-}
-
-# Auto-detect platform when not provided
-if (-not $Platform -or $Platform -eq '') {
-    try {
-        $Platform = Get-DefaultPlatform
-        Write-Host ("[AUTO-PLATFORM] Detected platform: {0}" -f $Platform)
-    } catch {
-        Write-Warning "Failed to auto-detect platform; defaulting to x64"
-        $Platform = 'x64'
-    }
-}
-
-$cwd = (Get-Location).ProviderPath
-$extraArgsString = $null
-if ($ExtraArgs -and $ExtraArgs.Count -gt 0) { $extraArgsString = ($ExtraArgs -join ' ') }
-
-$built = BuildProjectsInDirectory -DirectoryPath $cwd -ExtraArgs $extraArgsString -Platform $Platform -Configuration $Configuration -RestoreOnly:$RestoreOnly
-if ($built) {
-    Write-Host "[BUILD] Local projects built; exiting."
-    exit 0
-} else {
-    Write-Host "[BUILD] No local projects found in $cwd"
-    exit 0
-}