fix memory alignment issue

## Summary of the Pull Request

<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist

- [x] Closes: #41363
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx

<!-- Provide a more detailed description of the PR, other things fixed,
or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments

<!-- Describe how you validated the behavior. Add automated tests
wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed





https://github.com/user-attachments/assets/374fd1bc-8e62-4117-a613-f0d35678e3ed

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

@@ -49,6 +49,7 @@ ALPHATYPE
 AModifier
 amr
 ANDSCANS
+animatedvisuals
 Animnate
 ANull
 AOC
@@ -69,6 +70,7 @@ APPMODEL
 APPNAME
 appref
 appsettings
+appsfeatures
 appwindow
 appwiz
 appxpackage
@@ -1314,6 +1316,7 @@ PRODUCTVERSION
 Progman
 programdata
 projectname
+projitems
 PROPERTYKEY
 Propset
 PROPVARIANT
@@ -1393,6 +1396,7 @@ regkey
 regroot
 regsvr
 REINSTALLMODE
+releaseblog
 reloadable
 Relogger
 remappings
@@ -1501,6 +1505,7 @@ SETRULES
 SETSCREENSAVEACTIVE
 SETSTICKYKEYS
 SETTEXT
+settingscard
 SETTINGCHANGE
 SETTINGSCHANGED
 settingsheader
@@ -1758,11 +1763,13 @@ transcodetomp
 transicc
 TRAYMOUSEMESSAGE
 triaging
+Tru
 trl
 trx
 tsa
 tskill
 tstoi
+tweakable
 TWF
 tymed
 TYPEKEYBOARD

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

@@ -260,3 +260,7 @@ Process Process
 # ZoomIt menu items with accelerator keys
 E&xit
 St&yle
+
+# This matches a relative clause where the relative pronoun "that" is omitted.
+# Example: "Gets or sets the window the TitleBar should configure."
+\bthe\s+\w+\s+the\b

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

@@ -0,0 +1,20 @@
+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

.gitignore

@@ -355,5 +355,8 @@ src/common/Telemetry/*.etl
 # MSBuildCache
 /MSBuildCacheLogs/
 
+# PowerToys Settings generated search index (legacy location) and obj outputs
+/src/settings-ui/Settings.UI/Assets/Settings/search.index.json
+
 # PowerToysInstaller Build Temp Files
-installer/*/*.wxs.bk
+installer/*/*.wxs.bk

.pipelines/ESRPSigning_core.json

@@ -28,6 +28,8 @@
             "PowerToys.GPOWrapperProjection.dll",
             "PowerToys.AllExperiments.dll",
 
+            "Common.Search.dll",
+
             "PowerToys.AlwaysOnTop.exe",
             "PowerToys.AlwaysOnTopModuleInterface.dll",
 
@@ -280,6 +282,7 @@
                 "Mono.Cecil.Pdb.dll",
                 "Mono.Cecil.Rocks.dll",
                 "Newtonsoft.Json.dll",
+                "CommunityToolkit.WinUI.Controls.TitleBar.dll",
 
                 "NLog.dll",
                 "HtmlAgilityPack.dll",

PowerToys.sln

@@ -712,6 +712,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Preview.BgcodePreviewHandle
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Preview.BgcodeThumbnailProvider.UnitTests", "src\modules\previewpane\UnitTests-BgcodeThumbnailProvider\Preview.BgcodeThumbnailProvider.UnitTests.csproj", "{61CBF221-9452-4934-B685-146285E080D7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Search", "src\common\Common.Search\Common.Search.csproj", "{38F187B2-6638-5A40-072F-DBE5E54070A0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Settings.UI.XamlIndexBuilder", "src\settings-ui\Settings.UI.XamlIndexBuilder\Settings.UI.XamlIndexBuilder.csproj", "{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MouseUtils.UITests", "src\modules\MouseUtils\MouseUtils.UITests\MouseUtils.UITests.csproj", "{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Workspaces.Editor.UITests", "src\modules\Workspaces\WorkspacesEditorUITest\Workspaces.Editor.UITests.csproj", "{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}"
@@ -2707,6 +2711,30 @@ Global
 		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|ARM64.Build.0 = Release|ARM64
 		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|x64.ActiveCfg = Release|x64
 		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|x64.Build.0 = Release|x64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|ARM64.Build.0 = Debug|ARM64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|x64.ActiveCfg = Debug|x64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|x64.Build.0 = Debug|x64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|ARM64.ActiveCfg = Release|ARM64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|ARM64.Build.0 = Release|ARM64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|x64.ActiveCfg = Release|x64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|x64.Build.0 = Release|x64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|ARM64.Build.0 = Debug|ARM64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|x64.ActiveCfg = Debug|x64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|x64.Build.0 = Debug|x64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|ARM64.ActiveCfg = Release|ARM64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|ARM64.Build.0 = Release|ARM64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|x64.ActiveCfg = Release|x64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|x64.Build.0 = Release|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.Build.0 = Debug|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.ActiveCfg = Debug|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.Build.0 = Debug|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.ActiveCfg = Release|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.Build.0 = Release|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.ActiveCfg = Release|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.Build.0 = Release|x64
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|ARM64.Build.0 = Debug|ARM64
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|x64.ActiveCfg = Debug|x64
@@ -2900,6 +2928,7 @@ Global
 		{D1D6BC88-09AE-4FB4-AD24-5DED46A791DD} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9} = {264B412F-DB8B-4CF8-A74B-96998B183045}
+		{1AFB6476-670D-4E80-A464-657E01DFF482} = {557C4636-D7E1-4838-A504-7D19B725EE95}
 		{1A066C63-64B3-45F8-92FE-664E1CCE8077} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{5CCC8468-DEC8-4D36-99D4-5C891BEBD481} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
@@ -3167,6 +3196,8 @@ Global
 		{61CBF221-9452-4934-B685-146285E080D7} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1} = {2C318EC3-BA86-4372-B1BC-DB0F33C208B2}
 		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9} = {68328142-5B31-4715-BCBB-7B6345EE0971}
+		{38F187B2-6638-5A40-072F-DBE5E54070A0} = {1AFB6476-670D-4E80-A464-657E01DFF482}
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{9D3F3793-EFE3-4525-8782-238015DABA62} = {66E1534A-1587-42B2-912F-45C994D32904}

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.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
+[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
  
 |  Description   | Filename |
 |----------------|----------|
-| 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] |
+| 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] |
 
 This is our preferred method.
 
@@ -93,118 +93,145 @@ 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.93 - Aug 2025 Update
+### 0.94 - Sep 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 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.
+ - 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)!
 
 ### Command Palette
 
- - 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)!
+ - 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.
 
 ### Command Palette extensions
 
- - 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)!
+ - 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.
 
 ### Mouse Utilities
 
- - 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.
+ - 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)!
 
 ### Peek
 
- - 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)!
+ - 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)!
 
 ### Quick Accent
 
- - 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)!
+ - 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)!
 
 ### Settings
 
- - 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.
+ - 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.
 
 ### Documentation
 
- - 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)!
+ - 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)!
 
 ### Development
 
- - 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.
+ - 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.
 
 ### What is being planned over the next few releases
 
-For [v0.94][github-next-release-work], we'll work on the items below:
+For [v0.95][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
 

doc/devdocs/readme.md

@@ -76,6 +76,7 @@ Once you've discussed your proposed feature/fix/etc. with a team member, and an
 1. Windows 10 April 2018 Update (version 1803) or newer
 1. Visual Studio Community/Professional/Enterprise 2022 17.4 or newer
 1. A local clone of the PowerToys repository
+1. Enable long paths in Windows (see [Enable Long Paths](https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation#enabling-long-paths-in-windows-10-version-1607-and-later) for details)
 
 ### Install Visual Studio dependencies
 

doc/specs/settings-search.md

@@ -0,0 +1,233 @@
+# PowerToys Settings – Search Index (Hard-sealed)
+
+## 1. What to index
+
+This section describes the current structure of the settings pages in PowerToys. All user-facing settings are contained in the content of <controls:SettingsPageControl>. The logical and visual structure of settings follows a nested layout as shown below:
+
+```css
+SettingsPageControl
+ └─ SettingsGroup
+     └─ [SettingsExpander]
+         └─ SettingsCard
+```
+* Each SettingsGroup defines a functional section within a settings page.
+
+* An optional SettingsExpander may be used to further organize related settings inside a group.
+
+* Each actual setting is represented by a SettingsCard, which contains one user-tweakable control or a group of closely related controls.
+
+>Note: Not all SettingsCard are necessarily wrapped in a SettingsExpander; they can exist directly under a SettingsGroup. 
+
+> For indexing purposes, we are specifically targeting all SettingsCard elements. These are the smallest units of user interaction and correspond to individual configurable settings.
+
+> There could be setting item in expander, so we also need to index expander items as well.
+
+### Module
+Module is a primary type that needs to be indexed, for modules, we need to index the 'ModuleTitle' and the 'ModuleDescription'. 
+So these two should be passed in by x:Uid and binding with a key. 
+
+
+### SettingsCard/SettingsExpander
+
+Each SettingsCard/SettingsExpander should have an x:Uid for localization and indexing. The associated display strings are defined in the .resw files:
+
+{x:Uid}.Header – The visible label/title of the setting.
+{x:Uid}.Description – (optional) The tooltip or explanatory text.
+
+The index should be built around these SettingsCard elements and their x:Uid-bound resources, as they represent the actual settings users will search for.
+
+---
+
+## 2. How to Navigate
+
+### Entry
+```csharp
+enum EntryType
+{
+    SettingsPage,
+    SettingsCard,
+    SettingsExpander,
+}
+
+public class SearchableElementMetadata
+{
+    public string PageName { get; set; }    // Used to navigate to a specific page
+    public EntryType Type { get; set; }     // Used to know how should we navigate(As a page, a settingscard or an expander?)
+    public string ParentElementName { get; set; }
+    public string ElementName { get; set; }
+    public string ElementUid { get; set; }
+    public string Icon { get; set; }
+}
+```
+
+### Navigation
+The steps for navigate to an item:
+* Navigate among pages
+* [optional] Expand the expander if setting entry is inside an expander
+* [optional] Navigate within page
+
+> Use page name for navigation:
+```csharp
+Type GetPageTypeFromPageName(string PageName)
+{
+    var assembly = typeof(GeneralPage).Assembly;
+    return assembly.GetType($"Microsoft.PowerToys.Settings.UI.Views.{PageName}");
+}
+
+NavigationService.Navigate(PageType, ElementName，ParentElementName);
+```
+
+> Use ElementName and ParentElementName for in page navigation:
+```csharp
+Page.OnNavigateTo(ElementName， ParentElementName){
+    var element = this.FindName(name) as FrameworkElement;
+    var parentElement = this.FindName(ParentElementName) as FrameworkElement;
+
+    if(parentElement) {
+        expander = (Expander)parentElement;
+        if(expander){
+            expander.Expand();
+        }
+
+        // https://learn.microsoft.com/en-us/uwp/api/windows.ui.xaml.uielement.startbringintoview?view=winrt-26100        
+        element.StartBringIntoView();
+    }
+}
+```
+
+## 3. Runtime Search
+When user start typing for an entry, e.g. shortcut or 快捷键(cn version of shortcut),
+we need to go through all the entries to see if an entry matches the search text.
+
+A naive approach will be try to match all the localized text one by one and see if they match.
+Total entry is within thousand(To fill in an exact number), performance is acceptable now.
+```csharp
+// Match
+query = UserInput();
+matched = {};
+
+indexes = BuildIndex();
+
+foreach(var entry in indexes) {
+    if(entry.Match(query)) {
+        matched.Add(entry);
+    }
+}
+```
+
+And we don't intend to introduce complexity on the match algorithm discussion, so let's use powertoys FuzzMatch impl for now.
+```csharp
+MatchResult Match(this Entry entry, string query) {
+    return FuzzMatch(entry.DisplayedText, query);
+}
+
+struct MatchResult{
+    int Score;
+    bool Result;
+}
+```
+
+## 4. Search Result Page
+![search result page](./search-result.png)
+After we got matched items, map these items to a search result page according to spec.
+```c#
+ObservableCollection<SettingEntry> ModuleResult;
+ObservableCollection<SettingsGroup> GroupedSettingsResults;
+
+public class SettingsGroup : INotifyPropertyChanged
+{
+    private string _groupName;
+    private ObservableCollection<SettingEntry> _settings;
+    public string GroupName
+    {
+        get => _groupName;
+        set
+        {
+            _groupName = value;
+            OnPropertyChanged();
+        }
+    }
+    public ObservableCollection<SettingEntry> Settings
+    {
+        get => _settings;
+        set
+        {
+            _settings = value;
+            OnPropertyChanged();
+        }
+    }
+    public event PropertyChangedEventHandler PropertyChanged;
+    protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+}
+```
+
+## 5. How to do Index
+### Runtime index or build time index?
+Now We need to build all the entries in our settings.
+
+Most of the entry properties are static, and in runtime, the `SettingsCard` is compiled into native winUI3 controls <small>(I suppose, please correct here if it's wrong)</small>, it's hard to locate all the `SettingsCard`, and performance is terrible if we do search for all the pages' elements.
+
+### Build time indexing
+We can rely on xaml file parsing to get all the SettingsCard Entries. 
+And we don't want xaml file to be brought into production bundle.
+Use a project for parsing and bring that index file into production bundle is a solution.
+```csproj
+  <Target Name="GenerateSearchIndex" BeforeTargets="BeforeBuild">
+    <PropertyGroup>
+      <BuilderExe>$(MSBuildProjectDirectory)\..\Settings.UI.XamlIndexBuilder\bin\$(Configuration)\net8.0\XamlIndexBuilder.exe</BuilderExe>
+      <XamlDir>$(MSBuildProjectDirectory)\Views</XamlDir>
+      <GeneratedJson>$(MSBuildProjectDirectory)\Services\searchable_elements.json</GeneratedJson>
+    </PropertyGroup>
+    <Exec Command="&quot;$(BuilderExe)&quot; &quot;$(XamlDir)&quot; &quot;$(GeneratedJson)&quot;" />
+  </Target>
+```
+```csharp
+for(xamlFile in xamlFiles){
+    var doc = Load(xamlFile);
+    var elements = doc.Descendants();
+
+    foreach(var element in elements){
+        if(element.Name == "SettingsCard") {
+            var entry = new Entry{
+                ElementName = element.Attribute["Name"],
+                PageName = FileName,
+                Type = "SettingsCard",
+                ElementUid = element.Attribute["Uid"],
+                DisplayedText = "",
+            }
+
+            var parent = element.GetParent();
+            if(parent.Name == "SettingsExpander"){
+                entry.ParentElementName = parent.Attribute["Name"];
+            }
+        }
+    }
+}
+```
+Runtime index loading:
+```
+var entries = LoadEntriesFromFile();
+foreach(var entry in entries){
+    entry.DisplayedText = ResourceLoader.GetString(entry.Uid);
+}
+```
+So now we have all the entries and entry properties.
+
+## Overall flow:
+
+![search workflow](./workflow.png)
+
+
+## 6. Corner cases - that have not addressed yet
+
+1. CmdPal page is not in scope of this effort, that needs additional effort&design to launch and search within cmdpal settings page.
+
+2. Go back button
+
+3. Dynamic constructed settings page
+ - Shortcut guide,  with visibility converter
+ - advanced paste dynamically configured setting items
+ - powertoys run's extensions

src/common/Common.Search/Common.Search.csproj

@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <!-- Look at Directory.Build.props in root for common stuff as well -->
+  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
+
+  <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+</Project>

src/common/Common.Search/FuzzSearch/MatchOption.cs

@@ -0,0 +1,10 @@
+// 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.
+
+namespace Common.Search.FuzzSearch;
+
+public class MatchOption
+{
+    public bool IgnoreCase { get; set; } = true;
+}

src/common/Common.Search/FuzzSearch/MatchResult.cs

@@ -0,0 +1,67 @@
+// 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.
+
+namespace Common.Search.FuzzSearch;
+
+public class MatchResult
+{
+    /// <summary>
+    /// The raw calculated search score without any search precision filtering applied.
+    /// </summary>
+    private int _rawScore;
+
+    public MatchResult(bool success, SearchPrecisionScore searchPrecision)
+    {
+        Success = success;
+        SearchPrecision = searchPrecision;
+    }
+
+    public MatchResult(bool success, SearchPrecisionScore searchPrecision, List<int> matchData, int rawScore)
+    {
+        Success = success;
+        SearchPrecision = searchPrecision;
+        MatchData = matchData;
+        RawScore = rawScore;
+    }
+
+    public bool Success { get; set; }
+
+    /// <summary>
+    /// Gets the final score of the match result with search precision filters applied.
+    /// </summary>
+    public int Score { get; private set; }
+
+    public int RawScore
+    {
+        get => _rawScore;
+
+        set
+        {
+            _rawScore = value;
+            Score = ScoreAfterSearchPrecisionFilter(_rawScore);
+        }
+    }
+
+    /// <summary>
+    /// Gets matched data to highlight.
+    /// </summary>
+    public List<int> MatchData { get; private set; } = new();
+
+    public SearchPrecisionScore SearchPrecision { get; set; }
+
+    public bool IsSearchPrecisionScoreMet()
+    {
+        return IsSearchPrecisionScoreMet(_rawScore);
+    }
+
+    private bool IsSearchPrecisionScoreMet(int rawScore)
+    {
+        return rawScore >= (int)SearchPrecision;
+    }
+
+    private int ScoreAfterSearchPrecisionFilter(int rawScore)
+    {
+        return IsSearchPrecisionScoreMet(rawScore) ? rawScore : 0;
+    }
+}

src/common/Common.Search/FuzzSearch/SearchPrecisionScore.cs

@@ -0,0 +1,12 @@
+// 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.
+
+namespace Common.Search.FuzzSearch;
+
+public enum SearchPrecisionScore
+{
+    Regular = 50,
+    Low = 20,
+    None = 0,
+}

src/common/Common.Search/FuzzSearch/StringMatcher.cs

@@ -0,0 +1,272 @@
+// 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.Globalization;
+
+namespace Common.Search.FuzzSearch;
+
+public class StringMatcher
+{
+    public StringMatcher()
+    {
+    }
+
+    private static readonly char[] Separator = [' '];
+
+    /// <summary>
+    /// Current method:
+    /// Character matching + substring matching;
+    /// 1. Query search string is split into substrings, separator is whitespace.
+    /// 2. Check each query substring's characters against full compare string,
+    /// 3. if a character in the substring is matched, loop back to verify the previous character.
+    /// 4. If previous character also matches, and is the start of the substring, update list.
+    /// 5. Once the previous character is verified, move on to the next character in the query substring.
+    /// 6. Move onto the next substring's characters until all substrings are checked.
+    /// 7. Consider success and move onto scoring if every char or substring without whitespaces matched
+    /// </summary>
+    public static MatchResult FuzzyMatch(string query, string stringToCompare, MatchOption opt = null)
+    {
+        opt = opt ?? new MatchOption();
+
+        if (string.IsNullOrEmpty(stringToCompare))
+        {
+            return new MatchResult(false, SearchPrecisionScore.Regular);
+        }
+
+        SearchPrecisionScore score = SearchPrecisionScore.Regular;
+
+        var bestResult = new MatchResult(false, score);
+
+        for (int startIndex = 0; startIndex < stringToCompare.Length; startIndex++)
+        {
+            MatchResult result = FuzzyMatch(query, stringToCompare, opt, startIndex);
+            if (result.Success && (!bestResult.Success || result.Score > bestResult.Score))
+            {
+                bestResult = result;
+            }
+        }
+
+        return bestResult;
+    }
+
+    private static MatchResult FuzzyMatch(string query, string stringToCompare, MatchOption opt, int startIndex)
+    {
+        if (string.IsNullOrEmpty(stringToCompare) || string.IsNullOrEmpty(query))
+        {
+            return new MatchResult(false, SearchPrecisionScore.Regular);
+        }
+
+        ArgumentNullException.ThrowIfNull(opt);
+
+        query = query.Trim();
+
+        // Using InvariantCulture since this is internal
+        var fullStringToCompareWithoutCase = opt.IgnoreCase ? stringToCompare.ToUpper(CultureInfo.InvariantCulture) : stringToCompare;
+        var queryWithoutCase = opt.IgnoreCase ? query.ToUpper(CultureInfo.InvariantCulture) : query;
+
+        var querySubstrings = queryWithoutCase.Split(Separator, StringSplitOptions.RemoveEmptyEntries);
+        int currentQuerySubstringIndex = 0;
+        var currentQuerySubstring = querySubstrings[currentQuerySubstringIndex];
+        var currentQuerySubstringCharacterIndex = 0;
+
+        var firstMatchIndex = -1;
+        var firstMatchIndexInWord = -1;
+        var lastMatchIndex = 0;
+        bool allQuerySubstringsMatched = false;
+        bool matchFoundInPreviousLoop = false;
+        bool allSubstringsContainedInCompareString = true;
+
+        var indexList = new List<int>();
+        List<int> spaceIndices = new List<int>();
+
+        for (var compareStringIndex = startIndex; compareStringIndex < fullStringToCompareWithoutCase.Length; compareStringIndex++)
+        {
+            // To maintain a list of indices which correspond to spaces in the string to compare
+            // To populate the list only for the first query substring
+            if (fullStringToCompareWithoutCase[compareStringIndex].Equals(' ') && currentQuerySubstringIndex == 0)
+            {
+                spaceIndices.Add(compareStringIndex);
+            }
+
+            bool compareResult;
+            if (opt.IgnoreCase)
+            {
+                var fullStringToCompare = fullStringToCompareWithoutCase[compareStringIndex].ToString();
+                var querySubstring = currentQuerySubstring[currentQuerySubstringCharacterIndex].ToString();
+#pragma warning disable CA1309 // Use ordinal string comparison (We are looking for a fuzzy match here)
+                compareResult = string.Compare(fullStringToCompare, querySubstring, CultureInfo.CurrentCulture, CompareOptions.IgnoreCase | CompareOptions.IgnoreNonSpace) != 0;
+#pragma warning restore CA1309 // Use ordinal string comparison
+            }
+            else
+            {
+                compareResult = fullStringToCompareWithoutCase[compareStringIndex] != currentQuerySubstring[currentQuerySubstringCharacterIndex];
+            }
+
+            if (compareResult)
+            {
+                matchFoundInPreviousLoop = false;
+                continue;
+            }
+
+            if (firstMatchIndex < 0)
+            {
+                // first matched char will become the start of the compared string
+                firstMatchIndex = compareStringIndex;
+            }
+
+            if (currentQuerySubstringCharacterIndex == 0)
+            {
+                // first letter of current word
+                matchFoundInPreviousLoop = true;
+                firstMatchIndexInWord = compareStringIndex;
+            }
+            else if (!matchFoundInPreviousLoop)
+            {
+                // we want to verify that there is not a better match if this is not a full word
+                // in order to do so we need to verify all previous chars are part of the pattern
+                var startIndexToVerify = compareStringIndex - currentQuerySubstringCharacterIndex;
+
+                if (AllPreviousCharsMatched(startIndexToVerify, currentQuerySubstringCharacterIndex, fullStringToCompareWithoutCase, currentQuerySubstring))
+                {
+                    matchFoundInPreviousLoop = true;
+
+                    // if it's the beginning character of the first query substring that is matched then we need to update start index
+                    firstMatchIndex = currentQuerySubstringIndex == 0 ? startIndexToVerify : firstMatchIndex;
+
+                    indexList = GetUpdatedIndexList(startIndexToVerify, currentQuerySubstringCharacterIndex, firstMatchIndexInWord, indexList);
+                }
+            }
+
+            lastMatchIndex = compareStringIndex + 1;
+            indexList.Add(compareStringIndex);
+
+            currentQuerySubstringCharacterIndex++;
+
+            // if finished looping through every character in the current substring
+            if (currentQuerySubstringCharacterIndex == currentQuerySubstring.Length)
+            {
+                // if any of the substrings was not matched then consider as all are not matched
+                allSubstringsContainedInCompareString = matchFoundInPreviousLoop && allSubstringsContainedInCompareString;
+
+                currentQuerySubstringIndex++;
+
+                allQuerySubstringsMatched = AllQuerySubstringsMatched(currentQuerySubstringIndex, querySubstrings.Length);
+                if (allQuerySubstringsMatched)
+                {
+                    break;
+                }
+
+                // otherwise move to the next query substring
+                currentQuerySubstring = querySubstrings[currentQuerySubstringIndex];
+                currentQuerySubstringCharacterIndex = 0;
+            }
+        }
+
+        // proceed to calculate score if every char or substring without whitespaces matched
+        if (allQuerySubstringsMatched)
+        {
+            var nearestSpaceIndex = CalculateClosestSpaceIndex(spaceIndices, firstMatchIndex);
+            var score = CalculateSearchScore(query, stringToCompare, firstMatchIndex - nearestSpaceIndex - 1, lastMatchIndex - firstMatchIndex, allSubstringsContainedInCompareString);
+
+            return new MatchResult(true, SearchPrecisionScore.Regular, indexList, score);
+        }
+
+        return new MatchResult(false, SearchPrecisionScore.Regular);
+    }
+
+    // To get the index of the closest space which precedes the first matching index
+    private static int CalculateClosestSpaceIndex(List<int> spaceIndices, int firstMatchIndex)
+    {
+        if (spaceIndices.Count == 0)
+        {
+            return -1;
+        }
+        else
+        {
+            return spaceIndices.OrderBy(item => firstMatchIndex - item).Where(item => firstMatchIndex > item).FirstOrDefault(-1);
+        }
+    }
+
+    private static bool AllPreviousCharsMatched(int startIndexToVerify, int currentQuerySubstringCharacterIndex, string fullStringToCompareWithoutCase, string currentQuerySubstring)
+    {
+        var allMatch = true;
+        for (int indexToCheck = 0; indexToCheck < currentQuerySubstringCharacterIndex; indexToCheck++)
+        {
+            if (fullStringToCompareWithoutCase[startIndexToVerify + indexToCheck] !=
+                currentQuerySubstring[indexToCheck])
+            {
+                allMatch = false;
+            }
+        }
+
+        return allMatch;
+    }
+
+    private static List<int> GetUpdatedIndexList(int startIndexToVerify, int currentQuerySubstringCharacterIndex, int firstMatchIndexInWord, List<int> indexList)
+    {
+        var updatedList = new List<int>();
+
+        indexList.RemoveAll(x => x >= firstMatchIndexInWord);
+
+        updatedList.AddRange(indexList);
+
+        for (int indexToCheck = 0; indexToCheck < currentQuerySubstringCharacterIndex; indexToCheck++)
+        {
+            updatedList.Add(startIndexToVerify + indexToCheck);
+        }
+
+        return updatedList;
+    }
+
+    private static bool AllQuerySubstringsMatched(int currentQuerySubstringIndex, int querySubstringsLength)
+    {
+        return currentQuerySubstringIndex >= querySubstringsLength;
+    }
+
+    private static int CalculateSearchScore(string query, string stringToCompare, int firstIndex, int matchLen, bool allSubstringsContainedInCompareString)
+    {
+        // A match found near the beginning of a string is scored more than a match found near the end
+        // A match is scored more if the characters in the patterns are closer to each other,
+        // while the score is lower if they are more spread out
+
+        // The length of the match is assigned a larger weight factor.
+        const int matchLenWeightFactor = 2;
+
+        var score = 100 * (query.Length + 1) * matchLenWeightFactor / (1 + firstIndex + (matchLenWeightFactor * (matchLen + 1)));
+
+        // A match with less characters assigning more weights
+        if (stringToCompare.Length - query.Length < 5)
+        {
+            score += 20;
+        }
+        else if (stringToCompare.Length - query.Length < 10)
+        {
+            score += 10;
+        }
+
+        if (allSubstringsContainedInCompareString)
+        {
+            int count = query.Count(c => !char.IsWhiteSpace(c));
+            int threshold = 4;
+            if (count <= threshold)
+            {
+                score += count * 10;
+            }
+            else
+            {
+                score += (threshold * 10) + ((count - threshold) * 5);
+            }
+        }
+
+#pragma warning disable CA1309 // Use ordinal string comparison (Using CurrentCultureIgnoreCase since this relates to queries input by user)
+        if (string.Equals(query, stringToCompare, StringComparison.CurrentCultureIgnoreCase))
+        {
+            var bonusForExactMatch = 10;
+            score += bonusForExactMatch;
+        }
+#pragma warning restore CA1309 // Use ordinal string comparison
+
+        return score;
+    }
+}

src/common/Common.Search/GlobalSuppressions.cs

@@ -0,0 +1,24 @@
+// 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.
+
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1309:Field names should not begin with underscore", Justification = "coding style", Scope = "member", Target = "~F:Common.Search.MatchResult._rawScore")]
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1309:Field names should not begin with underscore", Justification = "coding style", Scope = "member", Target = "~F:Common.Search.StringMatcher._defaultMatchOption")]
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1309:Field names should not begin with underscore", Justification = "coding style", Scope = "member", Target = "~F:Common.Search.StringMatcher._instance")]
+[assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1101:Prefix local calls with this", Justification = "coding style", Scope = "member", Target = "~M:Common.Search.MatchResult.#ctor(System.Boolean,Common.Search.SearchPrecisionScore)")]
+[assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1101:Prefix local calls with this", Justification = "coding style", Scope = "member", Target = "~M:Common.Search.MatchResult.#ctor(System.Boolean,Common.Search.SearchPrecisionScore,System.Collections.Generic.List{System.Int32},System.Int32)")]
+[assembly: SuppressMessage("Compiler", "CS8618:Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.", Justification = "Coding style", Scope = "member", Target = "~F:Common.Search.StringMatcher._instance")]
+[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:Elements should appear in the correct order", Justification = "coding style", Scope = "member", Target = "~F:Common.Search.StringMatcher._instance")]
+[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:Elements should appear in the correct order", Justification = "coding style", Scope = "member", Target = "~F:Common.Search.StringMatcher.Separator")]
+[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:Elements should appear in the correct order", Justification = "coding style", Scope = "member", Target = "~M:Common.Search.StringMatcher.#ctor")]
+[assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1101:Prefix local calls with this", Justification = "coding style", Scope = "member", Target = "~M:Common.Search.StringMatcher.FuzzyMatch(System.String,System.String)~Common.Search.MatchResult")]
+[assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1101:Prefix local calls with this", Justification = "coding style", Scope = "member", Target = "~M:Common.Search.StringMatcher.FuzzyMatch(System.String,System.String,Common.Search.MatchOption)~Common.Search.MatchResult")]
+[assembly: SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1407:Arithmetic expressions should declare precedence", Justification = "migrate from stable code", Scope = "member", Target = "~M:Common.Search.StringMatcher.CalculateSearchScore(System.String,System.String,System.Int32,System.Int32,System.Boolean)~System.Int32")]
+[assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1101:Prefix local calls with this", Justification = "migrate from stable code", Scope = "member", Target = "~M:Common.Search.StringMatcher.FuzzyMatch(System.String,System.String,Common.Search.MatchOption,System.Int32)~Common.Search.MatchResult")]
+[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1204:Static elements should appear before instance elements", Justification = "migrate from stable code", Scope = "member", Target = "~M:Common.Search.StringMatcher.CalculateClosestSpaceIndex(System.Collections.Generic.List{System.Int32},System.Int32)~System.Int32")]

src/common/Common.Search/stylecop.json

@@ -0,0 +1,22 @@
+{
+  "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
+  "settings": {
+    "documentationRules": {
+      "companyName": "Microsoft Corporation",
+      "copyrightText": "Copyright (c) {companyName}\r\nThe {companyName} licenses this file to you under the MIT license.\r\nSee the LICENSE file in the project root for more information.",
+      "xmlHeader": false,
+      "headerDecoration": "",
+      "fileNamingConvention": "metadata",
+      "documentInterfaces": false,
+      "documentExposedElements": false,
+      "documentInternalElements": false
+    },
+    "layoutRules": {
+      "newlineAtEndOfFile": "require"
+    },
+    "orderingRules": {
+      "usingDirectivesPlacement": "outsideNamespace",
+      "systemUsingDirectivesFirst": true
+    }
+  }
+}

src/common/ManagedCommon/Logger.cs

@@ -32,17 +32,8 @@ namespace ManagedCommon
         /// <param name="isLocalLow">If the process using Logger is a low-privilege process.</param>
         public static void InitializeLogger(string applicationLogPath, bool isLocalLow = false)
         {
-            string basePath;
-            if (isLocalLow)
-            {
-                basePath = Environment.GetEnvironmentVariable("userprofile") + "\\appdata\\LocalLow\\Microsoft\\PowerToys" + applicationLogPath;
-            }
-            else
-            {
-                basePath = Constants.AppDataPath() + applicationLogPath;
-            }
-
-            string versionedPath = Path.Combine(basePath, Version);
+            string versionedPath = LogDirectoryPath(applicationLogPath, isLocalLow);
+            string basePath = Path.GetDirectoryName(versionedPath);
 
             if (!Directory.Exists(versionedPath))
             {
@@ -59,6 +50,22 @@ namespace ManagedCommon
             Task.Run(() => DeleteOldVersionLogFolders(basePath, versionedPath));
         }
 
+        public static string LogDirectoryPath(string applicationLogPath, bool isLocalLow = false)
+        {
+            string basePath;
+            if (isLocalLow)
+            {
+                basePath = Environment.GetEnvironmentVariable("userprofile") + "\\appdata\\LocalLow\\Microsoft\\PowerToys" + applicationLogPath;
+            }
+            else
+            {
+                basePath = Constants.AppDataPath() + applicationLogPath;
+            }
+
+            string versionedPath = Path.Combine(basePath, Version);
+            return versionedPath;
+        }
+
         /// <summary>
         /// Deletes old version log folders, keeping only the current version's folder.
         /// </summary>
@@ -115,13 +122,13 @@ namespace ManagedCommon
             {
                 var exMessage =
                     message + Environment.NewLine +
-                    ex.GetType() + ": " + ex.Message + Environment.NewLine;
+                    ex.GetType() + " (" + ex.HResult + "): " + ex.Message + Environment.NewLine;
 
                 if (ex.InnerException != null)
                 {
                     exMessage +=
                         "Inner exception: " + Environment.NewLine +
-                        ex.InnerException.GetType() + ": " + ex.InnerException.Message + Environment.NewLine;
+                        ex.InnerException.GetType() + " (" + ex.HResult + "): " + ex.InnerException.Message + Environment.NewLine;
                 }
 
                 exMessage +=

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

@@ -20,27 +20,14 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <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>
+        <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>
 </winuiex:WindowEx>

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

@@ -4,22 +4,19 @@
 
 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; }
@@ -34,8 +31,9 @@ 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;
-            AppTitleTextBlock.Text = title;
+            titleBar.Title = title;
 
             var handle = this.GetWindowHandle();
             RegisterWindow(handle);

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

@@ -20,30 +20,15 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <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>
-
+        <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>
         <views:MainPage x:Name="mainPage" Grid.Row="1" />
     </Grid>
-</winuiex:WindowEx>
+</winuiex:WindowEx>

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

@@ -18,30 +18,16 @@ namespace FileLocksmithUI
         {
             InitializeComponent();
             mainPage.ViewModel.IsElevated = isElevated;
+            SetTitleBar(titleBar);
             ExtendsContentIntoTitleBar = true;
-            SetTitleBar(AppTitleBar);
-            Activated += MainWindow_Activated;
+            AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Tall;
             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;
-            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"];
-            }
+            titleBar.Title = title;
         }
 
         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="15" HorizontalScrollBarVisibility="Auto">
+            <ScrollViewer Padding="16" HorizontalScrollBarVisibility="Auto">
                 <TextBlock
                     x:Name="ProcessFilesListDialogTextBlock"
                     x:Uid="ProcessFilesListDialogTextBlock"

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

@@ -20,27 +20,14 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <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>
+        <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>
 </winuiex:WindowEx>

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

@@ -9,19 +9,15 @@ 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; }
@@ -38,31 +34,18 @@ namespace Hosts
 
             var title = Host.GetService<IElevationHelper>().IsElevated ? loader.GetString("WindowAdminTitle") : loader.GetString("WindowTitle");
             Title = title;
-            AppTitleTextBlock.Text = title;
+            titleBar.Title = 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/MeasureTool/MeasureToolCore/ToolState.h

@@ -31,7 +31,11 @@ struct CommonState
 
     Measurement::Unit units = Measurement::Unit::Pixel;
 
-    POINT cursorPosSystemSpace = {}; // updated atomically
+    #pragma warning(push)
+    #pragma warning(disable : 4324)
+    alignas(8) POINT cursorPosSystemSpace = {}; // updated atomically
+    #pragma warning(pop)
+
     std::atomic_bool closeOnOtherMonitors = false;
 
     float GetPhysicalPx2MmRatio(HWND window) const

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

@@ -49,7 +49,9 @@ 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;
@@ -451,7 +453,7 @@ namespace Awake.Core
             Dictionary<string, uint> optionsList = new()
             {
                 { string.Format(CultureInfo.InvariantCulture, AwakeMinutes, 30), 1800 },
-                { string.Format(CultureInfo.InvariantCulture, AwakeHours, 1), 3600 },
+                { string.Format(CultureInfo.InvariantCulture, AwakeHour, 1), 3600 },
                 { string.Format(CultureInfo.InvariantCulture, AwakeHours, 2), 7200 },
             };
             return optionsList;

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

@@ -159,6 +159,15 @@ 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>
@@ -240,6 +249,15 @@ 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,6 +123,10 @@
   <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>
@@ -142,6 +146,10 @@
     <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 void SlowInitializeProperties()
+    public virtual void SlowInitializeProperties()
     {
         if (IsSelectedInitialized)
         {

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

@@ -47,9 +47,21 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
 
         UpdateTags(li.Tags);
 
-        TextToSuggest = li.TextToSuggest;
         Section = li.Section ?? string.Empty;
-        var extensionDetails = li.Details;
+
+        UpdateProperty(nameof(Section));
+    }
+
+    public override void SlowInitializeProperties()
+    {
+        base.SlowInitializeProperties();
+        var model = Model.Unsafe;
+        if (model is null)
+        {
+            return;
+        }
+
+        var extensionDetails = model.Details;
         if (extensionDetails is not null)
         {
             Details = new(extensionDetails, PageContext);
@@ -58,8 +70,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,10 +3,12 @@
 // 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;
 
@@ -39,7 +41,7 @@ public partial class AppStateModel : ObservableObject
     {
         if (string.IsNullOrEmpty(FilePath))
         {
-            throw new InvalidOperationException($"You must set a valid {nameof(SettingsModel.FilePath)} before calling {nameof(LoadState)}");
+            throw new InvalidOperationException($"You must set a valid {nameof(FilePath)} before calling {nameof(LoadState)}");
         }
 
         if (!File.Exists(FilePath))
@@ -77,43 +79,84 @@ 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!);
 
-            // Is it valid JSON?
-            if (JsonNode.Parse(settingsJson) is JsonObject newSettings)
+            // validate JSON
+            if (JsonNode.Parse(settingsJson) is not JsonObject newSettings)
             {
-                // Now, read the existing content from the file
-                var oldContent = File.Exists(FilePath) ? File.ReadAllText(FilePath) : "{}";
+                Logger.LogError("Failed to parse app state as a JsonObject.");
+                return;
+            }
 
-                // Is it valid JSON?
-                if (JsonNode.Parse(oldContent) is JsonObject savedSettings)
-                {
-                    foreach (var item in newSettings)
-                    {
-                        savedSettings[item.Key] = item.Value?.DeepClone();
-                    }
+            // read previous settings
+            if (!TryReadSavedState(out var savedSettings))
+            {
+                savedSettings = new JsonObject();
+            }
 
-                    var serialized = savedSettings.ToJsonString(JsonSerializationContext.Default.AppStateModel.Options);
-                    File.WriteAllText(FilePath, serialized);
+            // merge new settings into old ones
+            foreach (var item in newSettings)
+            {
+                savedSettings[item.Key] = item.Value?.DeepClone();
+            }
 
-                    // 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.");
-                }
+            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);
             }
             else
             {
-                Debug.WriteLine("Failed to parse settings file as JsonObject.");
+                // file doesn't exist (might not have been created yet), so consider this a success
+                // and return empty settings
+                savedSettings = new JsonObject();
+                return true;
             }
         }
         catch (Exception ex)
         {
-            Debug.WriteLine(ex.ToString());
+            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;
         }
     }
 

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

@@ -2,6 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using ManagedCommon;
 using Microsoft.CmdPal.UI.ViewModels.Commands;
 using Microsoft.CmdPal.UI.ViewModels.Properties;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -19,6 +20,10 @@ internal sealed partial class FallbackLogItem : FallbackCommandItem
         Title = string.Empty;
         _logMessagesPage.Name = string.Empty;
         Subtitle = Properties.Resources.builtin_log_subtitle;
+
+        var logPath = Logger.LogDirectoryPath("\\CmdPal\\Logs\\");
+        var openLogCommand = new OpenFileCommand(logPath) { Name = Resources.builtin_log_folder_command_name };
+        MoreCommands = [new CommandContextItem(openLogCommand)];
     }
 
     public override void UpdateQuery(string query)

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

@@ -27,7 +27,9 @@ public partial class MainListPage : DynamicListPage,
     private readonly IServiceProvider _serviceProvider;
 
     private readonly TopLevelCommandManager _tlcManager;
-    private IEnumerable<IListItem>? _filteredItems;
+    private IEnumerable<Scored<IListItem>>? _filteredItems;
+    private IEnumerable<Scored<IListItem>>? _filteredApps;
+    private IEnumerable<IListItem>? _allApps;
     private bool _includeApps;
     private bool _filteredItemsIncludesApps;
 
@@ -83,7 +85,7 @@ public partial class MainListPage : DynamicListPage,
         }
         else
         {
-            RaiseItemsChanged(_tlcManager.TopLevelCommands.Count);
+            RaiseItemsChanged();
         }
     }
 
@@ -148,7 +150,13 @@ public partial class MainListPage : DynamicListPage,
         {
             lock (_tlcManager.TopLevelCommands)
             {
-                return _filteredItems?.ToArray() ?? [];
+                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;
             }
         }
     }
@@ -167,6 +175,8 @@ public partial class MainListPage : DynamicListPage,
                     {
                         _filteredItemsIncludesApps = _includeApps;
                         _filteredItems = null;
+                        _filteredApps = null;
+                        _allApps = null;
                     }
                 }
 
@@ -184,6 +194,8 @@ public partial class MainListPage : DynamicListPage,
             {
                 _filteredItemsIncludesApps = _includeApps;
                 _filteredItems = null;
+                _filteredApps = null;
+                _allApps = null;
                 RaiseItemsChanged(commands.Count);
                 return;
             }
@@ -193,35 +205,49 @@ 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 (_filteredItems is null)
+            if (newFilteredItems is null && _filteredApps is null)
             {
-                _filteredItems = commands;
+                newFilteredItems = commands;
                 _filteredItemsIncludesApps = _includeApps;
+
                 if (_includeApps)
                 {
-                    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);
+                    _allApps = AllAppsCommandProvider.Page.GetItems();
                 }
             }
 
             // Produce a list of everything that matches the current filter.
-            _filteredItems = ListHelpers.FilterList<IListItem>(_filteredItems, SearchText, ScoreTopLevelItem);
-            RaiseItemsChanged(_filteredItems.Count());
+            _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();
         }
     }
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionWrapper.cs

@@ -126,6 +126,10 @@ public class ExtensionWrapper : IExtensionWrapper
                                 // We'll just return out nothing.
                                 return;
                             }
+                            else if (hr.Value != 0)
+                            {
+                                Logger.LogError($"Failed to find {ExtensionDisplayName}: {hr.Value}");
+                            }
 
                             // Marshal.ThrowExceptionForHR(hr);
                             _extensionObject = MarshalInterface<IExtension>.FromAbi((nint)extensionPtr);

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.Designer.cs

@@ -285,6 +285,15 @@ namespace Microsoft.CmdPal.UI.ViewModels.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to View log folder.
+        /// </summary>
+        public static string builtin_log_folder_command_name {
+            get {
+                return ResourceManager.GetString("builtin_log_folder_command_name", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to View log.
         /// </summary>

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.resx

@@ -135,6 +135,9 @@
   <data name="builtin_log_title" xml:space="preserve">
     <value>View log</value>
   </data>
+  <data name="builtin_log_folder_command_name" xml:space="preserve">
+    <value>View log folder</value>
+  </data>
   <data name="builtin_reload_subtitle" xml:space="preserve">
     <value>Reload Command Palette extensions</value>
   </data>

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

@@ -32,6 +32,7 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
     private string _generatedId = string.Empty;
 
     private HotkeySettings? _hotkey;
+    private IIconInfo? _initialIcon;
 
     private CommandAlias? Alias { get; set; }
 
@@ -57,6 +58,8 @@ 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
@@ -205,6 +208,8 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
             {
                 DisplayTitle = fallback.DisplayTitle;
             }
+
+            UpdateInitialIcon(false);
         }
     }
 
@@ -221,7 +226,31 @@ 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/App.xaml.cs

@@ -85,7 +85,7 @@ public partial class App : Application
         AppWindow = new MainWindow();
 
         var activatedEventArgs = Microsoft.Windows.AppLifecycle.AppInstance.GetCurrent().GetActivatedEventArgs();
-        ((MainWindow)AppWindow).HandleLaunch(activatedEventArgs);
+        ((MainWindow)AppWindow).HandleLaunchNonUI(activatedEventArgs);
     }
 
     /// <summary>

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml.cs

@@ -134,6 +134,15 @@ public sealed partial class CommandBar : UserControl,
         WeakReferenceMessenger.Default.Send<OpenContextMenuMessage>(new OpenContextMenuMessage(null, null, null, ContextMenuFilterLocation.Bottom));
     }
 
+    /// <summary>
+    /// Sets focus to the "More" button after closing the context menu,
+    /// keeping keyboard navigation intuitive.
+    /// </summary>
+    public void FocusMoreCommandsButton()
+    {
+        MoreCommandsButton?.Focus(FocusState.Programmatic);
+    }
+
     private void ContextMenuFlyout_Opened(object sender, object e)
     {
         // We need to wait until our flyout is opened to try and toss focus

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContextMenu.xaml

@@ -15,6 +15,7 @@
     xmlns:ui="using:CommunityToolkit.WinUI"
     xmlns:viewModels="using:Microsoft.CmdPal.UI.ViewModels"
     Background="Transparent"
+    PreviewKeyDown="UserControl_PreviewKeyDown"
     mc:Ignorable="d">
 
     <UserControl.Resources>

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContextMenu.xaml.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.WinUI;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.UI.Messages;
@@ -115,6 +116,24 @@ public sealed partial class ContextMenu : UserControl,
         }
     }
 
+    /// <summary>
+    /// Handles Escape to close the context menu and return focus to the "More" button.
+    /// </summary>
+    private void UserControl_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
+    {
+        if (e.Key == VirtualKey.Escape)
+        {
+            // Close the context menu (if not already handled)
+            WeakReferenceMessenger.Default.Send(new CloseContextMenuMessage());
+
+            // Find the parent CommandBar and set focus to MoreCommandsButton
+            var parent = this.FindParent<CommandBar>();
+            parent?.FocusMoreCommandsButton();
+
+            e.Handled = true;
+        }
+    }
+
     private void ViewModel_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
     {
         var prop = e.PropertyName;

src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs

@@ -123,6 +123,9 @@ public sealed partial class MainWindow : WindowEx,
         _localKeyboardListener = new LocalKeyboardListener();
         _localKeyboardListener.KeyPressed += LocalKeyboardListener_OnKeyPressed;
         _localKeyboardListener.Start();
+
+        // Force window to be created, and then cloaked. This will offset initial animation when the window is shown.
+        HideWindow();
     }
 
     private static void LocalKeyboardListener_OnKeyPressed(object? sender, LocalKeyboardListenerKeyPressedEventArgs e)
@@ -233,9 +236,6 @@ public sealed partial class MainWindow : WindowEx,
     {
         var hwnd = new HWND(hwndValue != 0 ? hwndValue : _hwnd);
 
-        // Make sure our HWND is cloaked before any possible window manipulations
-        Cloak();
-
         // Remember, IsIconic == "minimized", which is entirely different state
         // from "show/hide"
         // If we're currently minimized, restore us first, before we reveal
@@ -243,6 +243,9 @@ public sealed partial class MainWindow : WindowEx,
         // which would remain not visible to the user.
         if (PInvoke.IsIconic(hwnd))
         {
+            // Make sure our HWND is cloaked before any possible window manipulations
+            Cloak();
+
             PInvoke.ShowWindow(hwnd, SHOW_WINDOW_CMD.SW_RESTORE);
         }
 
@@ -481,8 +484,13 @@ public sealed partial class MainWindow : WindowEx,
         }
     }
 
-    public void HandleLaunch(AppActivationArguments? activatedEventArgs)
+    public void HandleLaunchNonUI(AppActivationArguments? activatedEventArgs)
     {
+        // LOAD BEARING
+        // Any reading and processing of the activation arguments must be done
+        // synchronously in this method, before it returns. The sending instance
+        // remains blocked until this returns; afterward it may quit, causing
+        // the activation arguments to be lost.
         if (activatedEventArgs is null)
         {
             Summon(string.Empty);
@@ -519,9 +527,26 @@ public sealed partial class MainWindow : WindowEx,
         }
         catch (COMException ex)
         {
+            // https://learn.microsoft.com/en-us/windows/win32/rpc/rpc-return-values
+            const int RPC_S_SERVER_UNAVAILABLE = -2147023174;
+            const int RPC_S_CALL_FAILED = 2147023170;
+
             // Accessing properties activatedEventArgs.Kind and activatedEventArgs.Data might cause COMException
             // if the args are not valid or not passed correctly.
-            Logger.LogError("COM exception when activating the application", ex);
+            if (ex.HResult is RPC_S_SERVER_UNAVAILABLE or RPC_S_CALL_FAILED)
+            {
+                Logger.LogWarning(
+                    $"COM exception (HRESULT {ex.HResult}) when accessing activation arguments. " +
+                    $"This might be due to the calling application not passing them correctly or exiting before we could read them. " +
+                    $"The application will continue running and fall back to showing the Command Palette window.");
+            }
+            else
+            {
+                Logger.LogError(
+                    $"COM exception (HRESULT {ex.HResult}) when activating the application. " +
+                    $"The application will continue running and fall back to showing the Command Palette window.",
+                    ex);
+            }
         }
 
         Summon(string.Empty);
@@ -634,8 +659,6 @@ public sealed partial class MainWindow : WindowEx,
         // so that we can bind hotkeys to individual commands
         if (!isVisible || !isRootHotkey)
         {
-            Activate();
-
             Summon(commandId);
         }
         else if (isRootHotkey)

src/modules/cmdpal/Microsoft.CmdPal.UI/Program.cs

@@ -107,12 +107,33 @@ internal sealed class Program
     {
         // Do the redirection on another thread, and use a non-blocking
         // wait method to wait for the redirection to complete.
-        var redirectSemaphore = new Semaphore(0, 1);
-        Task.Run(() =>
+        using var redirectSemaphore = new Semaphore(0, 1);
+        var redirectTimeout = TimeSpan.FromSeconds(32);
+
+        _ = Task.Run(() =>
         {
-            keyInstance.RedirectActivationToAsync(args).AsTask().Wait();
-            redirectSemaphore.Release();
+            using var cts = new CancellationTokenSource(redirectTimeout);
+            try
+            {
+                keyInstance.RedirectActivationToAsync(args)
+                    .AsTask(cts.Token)
+                    .GetAwaiter()
+                    .GetResult();
+            }
+            catch (OperationCanceledException)
+            {
+                Logger.LogError($"Failed to activate existing instance; timed out after {redirectTimeout}.");
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("Failed to activate existing instance", ex);
+            }
+            finally
+            {
+                redirectSemaphore.Release();
+            }
         });
+
         _ = PInvoke.CoWaitForMultipleObjects(
             (uint)CWMO_FLAGS.CWMO_DEFAULT,
             PInvoke.INFINITE,
@@ -124,13 +145,14 @@ internal sealed class Program
     {
         // If we already have a form, display the message now.
         // Otherwise, add it to the collection for displaying later.
-        if (App.Current is App thisApp)
+        if (App.Current?.AppWindow is MainWindow mainWindow)
         {
-            if (thisApp.AppWindow is not null and
-                MainWindow mainWindow)
-            {
-                uiContext?.Post(_ => mainWindow.HandleLaunch(args), null);
-            }
+            // LOAD BEARING
+            // This must be synchronous to ensure the method does not return
+            // before the activation is fully handled and the parameters are processed.
+            // The sending instance remains blocked until this returns; afterward it may quit,
+            // causing the activation arguments to be lost.
+            mainWindow.HandleLaunchNonUI(args);
         }
     }
 }

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

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

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

@@ -24,23 +24,15 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <!--  TO DO: Replace this with WinUI TitleBar once that ships.  -->
-        <StackPanel
-            x:Name="AppTitleBar"
-            Grid.Row="0"
-            Height="48"
-            Margin="16,0,0,0"
-            Orientation="Horizontal">
-            <Image
-                Width="16"
-                Height="16"
-                Source="ms-appx:///Assets/icon.svg" />
-            <TextBlock
-                x:Uid="CmdPalSettingsHeader"
-                Margin="12,0,0,0"
-                VerticalAlignment="Center"
-                Style="{StaticResource CaptionTextBlockStyle}" />
-        </StackPanel>
+        <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="ms-appx:///Assets/icon.svg" />
+            </TitleBar.LeftHeader>
+        </TitleBar>
         <NavigationView
             x:Name="NavView"
             Grid.Row="1"
@@ -77,7 +69,6 @@
                     x:Name="NavigationBreadcrumbBar"
                     Grid.Row="0"
                     MaxWidth="1000"
-                    Margin="16,0,0,0"
                     ItemClicked="NavigationBreadcrumbBar_ItemClicked"
                     ItemsSource="{x:Bind BreadCrumbs, Mode=OneWay}">
                     <BreadcrumbBar.ItemTemplate>

src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml.cs

@@ -31,8 +31,10 @@ public sealed partial class SettingsWindow : WindowEx,
         this.InitializeComponent();
         this.ExtendsContentIntoTitleBar = true;
         this.SetIcon();
-        this.AppWindow.Title = RS_.GetString("SettingsWindowTitle");
+        var title = RS_.GetString("SettingsWindowTitle");
+        this.AppWindow.Title = title;
         this.AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Tall;
+        this.TitleBar.Title = title;
         PositionCentered();
 
         WeakReferenceMessenger.Default.Register<NavigateToExtensionSettingsMessage>(this);

src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw

@@ -438,7 +438,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="NavigationPaneClosed" xml:space="preserve">
     <value>Navigation pane closed</value>
   </data>
-  <data name="NavigationPageOpened" xml:space="preserve">
+  <data name="NavigationPaneOpened" xml:space="preserve">
     <value>Navigation page opened</value>
   </data>
 </root>

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 string ShowHistory { get; set; }
+    public uint HistoryItemCount { get; set; }
 
-    public MockSettingsInterface(string showHistory = "none", bool globalIfUri = true, List<HistoryItem> mockHistory = null)
+    public MockSettingsInterface(uint historyItemCount = 0, bool globalIfUri = true, List<HistoryItem> mockHistory = null)
     {
         _historyItems = mockHistory ?? new List<HistoryItem>();
         GlobalIfURI = globalIfUri;
-        ShowHistory = showHistory;
+        HistoryItemCount = historyItemCount;
     }
 
     public List<ListItem> LoadHistory()
@@ -50,9 +50,9 @@ public class MockSettingsInterface : ISettingsInterface
         _historyItems.Add(historyItem);
 
         // Simulate the same logic as SettingsManager
-        if (int.TryParse(ShowHistory, out var maxHistoryItems) && maxHistoryItems > 0)
+        if (HistoryItemCount > 0)
         {
-            while (_historyItems.Count > maxHistoryItems)
+            while (_historyItems.Count > HistoryItemCount)
             {
                 _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, showHistory: "5");
+        var settings = new MockSettingsInterface(mockHistory: mockHistoryItems, historyItemCount: 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, showHistory: "5");
+        var settings = new MockSettingsInterface(mockHistory: mockHistoryItems, historyItemCount: 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, showHistory: "None");
+        var settings = new MockSettingsInterface(mockHistory: mockHistoryItems, historyItemCount: 0);
 
         var page = new WebSearchListPage(settings);
 

src/modules/cmdpal/custom.props

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

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

@@ -3,9 +3,7 @@
 // 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;
@@ -45,6 +43,28 @@ 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,6 +20,16 @@ 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
@@ -42,6 +52,14 @@ 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,
@@ -87,6 +105,7 @@ 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/CopyPathCommand.cs

@@ -1,47 +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.Properties;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.Apps.Commands;
-
-internal sealed partial class CopyPathCommand : InvokableCommand
-{
-    private readonly string _target;
-
-    public CopyPathCommand(string target)
-    {
-        Name = Resources.copy_path;
-        Icon = Icons.CopyIcon;
-
-        _target = target;
-    }
-
-    private static readonly CompositeFormat CopyFailedFormat = CompositeFormat.Parse(Resources.copy_failed);
-
-    public override CommandResult Invoke()
-    {
-        try
-        {
-            ClipboardHelper.SetText(_target);
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError("Copy failed: " + ex.Message);
-            return CommandResult.ShowToast(
-                new ToastArgs
-                {
-                    Message = string.Format(CultureInfo.CurrentCulture, CopyFailedFormat, ex.Message),
-                    Result = CommandResult.KeepOpen(),
-                });
-        }
-
-        return CommandResult.ShowToast(Resources.copied_to_clipboard);
-    }
-}

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

@@ -0,0 +1,130 @@
+// 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

@@ -0,0 +1,66 @@
+// 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,4 +21,6 @@ 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

@@ -95,7 +95,7 @@ public class UWPApplication : IUWPApplication
 
         commands.Add(
             new CommandContextItem(
-                new Commands.CopyPathCommand(Location))
+                new CopyTextCommand(Location) { Name = Resources.copy_path })
             {
                 RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.C),
             });
@@ -117,6 +117,14 @@ 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

@@ -202,7 +202,7 @@ public class Win32Program : IProgram
         }
 
         commands.Add(new CommandContextItem(
-                    new Commands.CopyPathCommand(FullPath))
+                    new CopyTextCommand(FullPath) { Name = Resources.copy_path })
         {
             RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.C),
         });
@@ -219,6 +219,16 @@ 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

@@ -78,24 +78,6 @@ namespace Microsoft.CmdPal.Ext.Apps.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Copied to clipboard!.
-        /// </summary>
-        internal static string copied_to_clipboard {
-            get {
-                return ResourceManager.GetString("copied_to_clipboard", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Copy failed ({0}). Please try again..
-        /// </summary>
-        internal static string copy_failed {
-            get {
-                return ResourceManager.GetString("copy_failed", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Copy path.
         /// </summary>
@@ -177,6 +159,78 @@ 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>
@@ -276,6 +330,51 @@ 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

@@ -172,13 +172,6 @@
   <data name="run_as_different_user" xml:space="preserve">
     <value>Run as different user</value>
   </data>
-  <data name="copy_failed" xml:space="preserve">
-    <value>Copy failed ({0}). Please try again.</value>
-    <comment>{0} is the error message</comment>
-  </data>
-  <data name="copied_to_clipboard" xml:space="preserve">
-    <value>Copied to clipboard!</value>
-  </data>
   <data name="enable_start_menu_source" xml:space="preserve">
     <value>Include apps found in the Start Menu</value>
   </data>
@@ -205,4 +198,43 @@
   <data name="unpin_app" xml:space="preserve">
     <value>Unpin</value>
   </data>
-</root>
+  <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>

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

@@ -17,6 +17,7 @@ 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,6 +22,7 @@ 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.TimeDate/Helpers/TimeDateCalculator.cs

@@ -79,16 +79,22 @@ public sealed partial class TimeDateCalculator
         }
         else
         {
+            List<(int Score, AvailableResult Item)> itemScores = [];
+
             // Generate filtered list of results
             foreach (var f in availableFormats)
             {
                 var score = f.Score(query, f.Label, f.AlternativeSearchTag);
-
                 if (score > 0)
                 {
-                    results.Add(f.ToListItem());
+                    itemScores.Add((score, f));
                 }
             }
+
+            results = itemScores
+                        .OrderByDescending(s => s.Score)
+                        .Select(s => s.Item.ToListItem())
+                        .ToList();
         }
 
         if (results.Count == 0)

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.ShowHistory != Resources.history_none)
+        if (_settingsManager.HistoryItemCount != 0)
         {
             _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 string ShowHistory { get; }
+    public uint HistoryItemCount { get; }
 
     public List<ListItem> LoadHistory();
 

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

@@ -16,6 +16,7 @@ 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";
@@ -24,11 +25,11 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
 
     private static readonly List<ChoiceSetSetting.Choice> _choices =
     [
-        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),
+        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"),
     ];
 
     private readonly ToggleSetting _globalIfURI = new(
@@ -37,15 +38,15 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
         Resources.plugin_global_if_uri,
         false);
 
-    private readonly ChoiceSetSetting _showHistory = new(
-        Namespaced(nameof(ShowHistory)),
-        Resources.plugin_show_history,
-        Resources.plugin_show_history,
+    private readonly ChoiceSetSetting _historyItemCount = new(
+        Namespaced(HistoryItemCountLegacySettingsKey),
+        Resources.plugin_history_item_count,
+        Resources.plugin_history_item_count,
         _choices);
 
     public bool GlobalIfURI => _globalIfURI.Value;
 
-    public string ShowHistory => _showHistory.Value ?? string.Empty;
+    public uint HistoryItemCount => uint.TryParse(_historyItemCount.Value, out var value) ? value : 0;
 
     internal static string SettingsJsonPath()
     {
@@ -90,11 +91,11 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
             // Add the new history item
             historyItems.Add(historyItem);
 
-            // Determine the maximum number of items to keep based on ShowHistory
-            if (int.TryParse(ShowHistory, out var maxHistoryItems) && maxHistoryItems > 0)
+            // Determine the maximum number of items to keep based on HistoryItemCount
+            if (HistoryItemCount > 0)
             {
                 // Keep only the most recent `maxHistoryItems` items
-                while (historyItems.Count > maxHistoryItems)
+                while (historyItems.Count > HistoryItemCount)
                 {
                     historyItems.RemoveAt(0); // Remove the oldest item
                 }
@@ -150,7 +151,7 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
         _historyPath = HistoryStateJsonPath();
 
         Settings.Add(_globalIfURI);
-        Settings.Add(_showHistory);
+        Settings.Add(_historyItemCount);
 
         // Load settings from file upon initialization
         LoadSettings();
@@ -188,11 +189,11 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
         base.SaveSettings();
         try
         {
-            if (ShowHistory == Resources.history_none)
+            if (HistoryItemCount == 0)
             {
                 ClearHistory();
             }
-            else if (int.TryParse(ShowHistory, out var maxHistoryItems) && maxHistoryItems > 0)
+            else if (HistoryItemCount > 0)
             {
                 // Trim the history file if there are more items than the new limit
                 if (File.Exists(_historyPath))
@@ -201,10 +202,10 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
                     var historyItems = JsonSerializer.Deserialize<List<HistoryItem>>(existingContent, WebSearchJsonSerializationContext.Default.ListHistoryItem) ?? [];
 
                     // Check if trimming is needed
-                    if (historyItems.Count > maxHistoryItems)
+                    if (historyItems.Count > HistoryItemCount)
                     {
-                        // Trim the list to keep only the most recent `maxHistoryItems` items
-                        historyItems = historyItems.Skip(historyItems.Count - maxHistoryItems).ToList();
+                        // Trim the list to keep only the most recent `HistoryItemCount` items
+                        historyItems = historyItems.Skip((int)(historyItems.Count - HistoryItemCount)).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.ShowHistory != Resources.history_none ? _settingsManager.LoadHistory() : null;
+        _historyItems = _settingsManager.HistoryItemCount != 0 ? _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.ShowHistory != Resources.history_none ? ListHelpers.FilterList(_historyItems, query).OfType<ListItem>() : null;
+            filteredHistoryItems = _settingsManager.HistoryItemCount != 0 ? 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,6 +168,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_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>
@@ -231,15 +240,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_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_show_history" xml:space="preserve">
+  <data name="plugin_history_item_count" 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,6 +65,7 @@ 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;
@@ -82,6 +83,8 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
                     }
                 }
 
+                stopwatch.Stop();
+                Logger.LogDebug($"Building ListItems took {stopwatch.ElapsedMilliseconds}ms", memberName: nameof(GetItems));
                 IsLoading = false;
                 return results;
             }
@@ -244,15 +247,22 @@ 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)
             {
@@ -261,6 +271,8 @@ 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/ext/Microsoft.CmdPal.Ext.WindowsSettings/Commands/CopySettingCommand.cs

@@ -1,39 +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.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Resources;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.CmdPal.Ext.WindowsSettings.Classes;
-using Microsoft.CmdPal.Ext.WindowsSettings.Properties;
-using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-using Windows.ApplicationModel.DataTransfer;
-using Windows.Networking.NetworkOperators;
-using Windows.UI;
-
-namespace Microsoft.CmdPal.Ext.WindowsSettings.Commands;
-
-internal sealed partial class CopySettingCommand : InvokableCommand
-{
-    private readonly WindowsSetting _entry;
-
-    internal CopySettingCommand(WindowsSetting entry)
-    {
-        Name = Resources.CopyCommand;
-        Icon = Icons.CopyIcon;
-        _entry = entry;
-    }
-
-    public override CommandResult Invoke()
-    {
-        ClipboardHelper.SetText(_entry.Command);
-
-        return CommandResult.Dismiss();
-    }
-}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsSettings/Helpers/ContextMenuHelper.cs

@@ -23,7 +23,7 @@ internal static class ContextMenuHelper
     {
         var list = new List<CommandContextItem>(1)
         {
-            new(new CopySettingCommand(entry)),
+            new(new CopyTextCommand(entry.Command) { Name = Resources.CopyCommand }),
         };
 
         return list;

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

@@ -43,13 +43,18 @@ 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
-            .Select(score => score.Item);
+        return scores;
     }
 
     /// <summary>

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

@@ -372,20 +372,17 @@ namespace UITests_FancyZones
         // launch FancyZones settings page
         private void LaunchFancyZones()
         {
-            if (this.FindAll<NavigationViewItem>("FancyZones").Count == 0)
-            {
-                this.Find<NavigationViewItem>("Windowing & Layouts").Click();
-            }
+            this.Find<NavigationViewItem>(By.AccessibilityId("WindowingAndLayoutsNavItem")).Click();
 
-            this.Find<NavigationViewItem>("FancyZones").Click();
-            this.Find<ToggleSwitch>("Enable FancyZones").Toggle(true);
+            this.Find<NavigationViewItem>(By.AccessibilityId("FancyZonesNavItem")).Click();
+            this.Find<ToggleSwitch>(By.AccessibilityId("EnableFancyZonesToggleSwitch")).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>("Launch layout editor").Click(false, 500, 10000);
+            this.Find<Microsoft.PowerToys.UITest.Button>(By.AccessibilityId("LaunchLayoutEditorButton")).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.
@@ -403,7 +400,7 @@ namespace UITests_FancyZones
                 this.Find<Microsoft.PowerToys.UITest.Button>("Close").Click();
                 this.Session.Attach(PowerToysModule.PowerToysSettings);
                 SetupCustomLayouts();
-                this.Find<Microsoft.PowerToys.UITest.Button>("Launch layout editor").Click(false, 5000, 5000);
+                this.Find<Microsoft.PowerToys.UITest.Button>(By.AccessibilityId("LaunchLayoutEditorButton")).Click(false, 5000, 5000);
                 this.Session.Attach(PowerToysModule.FancyZone);
                 this.Find<Microsoft.PowerToys.UITest.Button>("Maximize").Click();
 

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,38 +15,19 @@
     <Window.SystemBackdrop>
         <MicaBackdrop />
     </Window.SystemBackdrop>
-
     <Grid x:Name="MainGrid" Loaded="Grid_Loaded">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <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>
-
+        <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>
-</winuiex:WindowEx>
+</winuiex:WindowEx>

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

@@ -6,6 +6,7 @@ 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;
@@ -23,7 +24,6 @@ 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,20 +38,15 @@ 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;
-            Activated += MainWindow_Activated;
+            AppWindow.Closing += AppWindow_Closing;
 
             // 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)
@@ -66,7 +61,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);
                     }
                 }
 
@@ -80,7 +75,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);
                     }
                 }
             }
@@ -92,20 +87,6 @@ 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);
@@ -118,23 +99,23 @@ namespace RegistryPreview
 
             if (string.IsNullOrEmpty(filename))
             {
-                titleBarText.Text = APPNAME;
-                appWindow.Title = APPNAME;
+                titleBar.Title = APPNAME;
+                AppWindow.Title = APPNAME;
             }
             else
             {
                 string[] file = filename.Split('\\');
                 if (file.Length > 0)
                 {
-                    titleBarText.Text = file[file.Length - 1] + " - " + APPNAME;
+                    titleBar.Title = file[file.Length - 1] + " - " + APPNAME;
                 }
                 else
                 {
-                    titleBarText.Text = filename + " - " + APPNAME;
+                    titleBar.Title = filename + " - " + APPNAME;
                 }
 
                 // Continue to update the window's title, after updating the custom title bar
-                appWindow.Title = titleBarText.Text;
+                AppWindow.Title = titleBar.Title;
             }
         }
     }

src/settings-ui/Settings.UI.Library/SettingEntry.cs

@@ -0,0 +1,44 @@
+// 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.
+
+namespace Settings.UI.Library
+{
+    public enum EntryType
+    {
+        SettingsPage,
+        SettingsCard,
+        SettingsExpander,
+    }
+
+    public struct SettingEntry
+    {
+        public EntryType Type { get; set; }
+
+        public string Header { get; set; }
+
+        public string PageTypeName { get; set; }
+
+        public string ElementName { get; set; }
+
+        public string ElementUid { get; set; }
+
+        public string ParentElementName { get; set; }
+
+        public string Description { get; set; }
+
+        public string Icon { get; set; }
+
+        public SettingEntry(EntryType type, string header, string pageTypeName, string elementName, string elementUid, string parentElementName = null, string description = null, string icon = null)
+        {
+            Type = type;
+            Header = header;
+            PageTypeName = pageTypeName;
+            ElementName = elementName;
+            ElementUid = elementUid;
+            ParentElementName = parentElementName;
+            Description = description;
+            Icon = icon;
+        }
+    }
+}

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

@@ -0,0 +1,85 @@
+// 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.IO;
+using System.Linq;
+using System.Xml.Linq;
+
+namespace Microsoft.PowerToys.Tools.XamlIndexBuilder
+{
+    public static class ModuleIconResolver
+    {
+        // Hardcoded page-level overrides for module -> icon path
+        private static readonly System.Collections.Generic.Dictionary<string, string> FileNameOverrides = new System.Collections.Generic.Dictionary<string, string>(System.StringComparer.OrdinalIgnoreCase)
+        {
+            // Example overrides; expand as needed
+            { "FancyZonesPage.xaml", "/Assets/Settings/Icons/FancyZones.png" },
+            { "FileLocksmithPage.xaml", "/Assets/Settings/Icons/FileLocksmith.png" },
+            { "CmdNotFoundPage.xaml", "/Assets/Settings/Icons/CommandNotFound.png" },
+            { "PowerLauncherPage.xaml", "/Assets/Settings/Icons/PowerToysRun.png" },
+        };
+
+        // Contract:
+        // - Input: absolute path to the module XAML file (e.g., FancyZonesPage.xaml)
+        // - Output: app-relative icon path (e.g., "/Assets/Settings/Icons/FancyZones.png"), or null if not found
+        // - Strategy: take the first SettingsCard under the page and read its HeaderIcon value
+        public static string ResolveIconFromFirstSettingsCard(string xamlFilePath)
+        {
+            if (string.IsNullOrWhiteSpace(xamlFilePath))
+            {
+                return null;
+            }
+
+            try
+            {
+                var doc = XDocument.Load(xamlFilePath);
+
+                // Prefer looking inside SettingsPageControl.ModuleContent to avoid picking cards in Resources/DataTemplates
+                var pageControl = doc.Descendants().FirstOrDefault(e => e.Name.LocalName == "SettingsPageControl");
+
+                if (pageControl != null)
+                {
+                    // Locate the property element <SettingsPageControl.ModuleContent>
+                    var moduleContent = pageControl
+                        .Elements()
+                        .FirstOrDefault(e => e.Name.LocalName.EndsWith(".ModuleContent", System.StringComparison.OrdinalIgnoreCase))
+                        ?? pageControl
+                            .Descendants()
+                            .FirstOrDefault(e => e.Name.LocalName.EndsWith(".ModuleContent", System.StringComparison.OrdinalIgnoreCase));
+
+                    if (moduleContent != null)
+                    {
+                        // Find the first SettingsCard under ModuleContent and try to read its HeaderIcon
+                        var firstCardUnderModule = moduleContent
+                            .Descendants()
+                            .FirstOrDefault(e => e.Name.LocalName == "SettingsCard");
+
+                        if (firstCardUnderModule != null)
+                        {
+                            var icon = Program.ExtractIconValue(firstCardUnderModule);
+                            if (!string.IsNullOrWhiteSpace(icon))
+                            {
+                                return icon;
+                            }
+                        }
+                    }
+                }
+
+                // Fallback to hardcoded overrides by file name
+                var fileName = Path.GetFileName(xamlFilePath);
+                if (!string.IsNullOrEmpty(fileName) && FileNameOverrides.TryGetValue(fileName, out var overrideIcon))
+                {
+                    return overrideIcon;
+                }
+
+                return null;
+            }
+            catch
+            {
+                // Non-fatal: let caller decide fallback
+                return null;
+            }
+        }
+    }
+}

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

@@ -0,0 +1,436 @@
+// 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.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text.Json;
+using System.Xml.Linq;
+
+namespace Microsoft.PowerToys.Tools.XamlIndexBuilder
+{
+    public class Program
+    {
+        private static readonly HashSet<string> ExcludedXamlFiles = new(StringComparer.OrdinalIgnoreCase)
+        {
+            "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,
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+        };
+
+        public static void Main(string[] args)
+        {
+            if (args.Length < 2)
+            {
+                Debug.WriteLine("Usage: XamlIndexBuilder <xaml-directory> <output-json-file>");
+                Environment.Exit(1);
+            }
+
+            string xamlRootDirectory = args[0];
+            string outputFile = args[1];
+
+            if (!Directory.Exists(xamlRootDirectory))
+            {
+                Debug.WriteLine($"Error: Directory '{xamlRootDirectory}' does not exist.");
+                Environment.Exit(1);
+            }
+
+            try
+            {
+                var searchableElements = new List<SettingEntry>();
+                var processedFiles = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+                void ScanDirectory(string root)
+                {
+                    if (!Directory.Exists(root))
+                    {
+                        return;
+                    }
+
+                    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}");
+                    }
+                }
+
+                searchableElements = searchableElements.OrderBy(e => e.PageTypeName).ThenBy(e => e.ElementName).ToList();
+
+                string json = JsonSerializer.Serialize(searchableElements, serializeOption);
+                File.WriteAllText(outputFile, json);
+
+                Debug.WriteLine($"Successfully generated index with {searchableElements.Count} elements.");
+                Debug.WriteLine($"Output written to: {outputFile}");
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"Error: {ex.Message}");
+                Environment.Exit(1);
+            }
+        }
+
+        public static List<SettingEntry> ExtractSearchableElements(string xamlFile)
+        {
+            var elements = new List<SettingEntry>();
+            string pageName = Path.GetFileNameWithoutExtension(xamlFile);
+
+            try
+            {
+                // Load XAML as XML
+                var doc = XDocument.Load(xamlFile);
+
+                // Define namespaces
+                XNamespace x = "http://schemas.microsoft.com/winfx/2006/xaml";
+                XNamespace controls = "http://schemas.microsoft.com/winfx/2006/xaml/presentation";
+                XNamespace labs = "using:CommunityToolkit.Labs.WinUI";
+                XNamespace winui = "using:CommunityToolkit.WinUI.UI.Controls";
+
+                // Extract SettingsPageControl elements
+                var settingsPageElements = doc.Descendants()
+                    .Where(e => e.Name.LocalName == "SettingsPageControl")
+                    .Where(e => e.Attribute(x + "Uid") != null);
+
+                // Extract SettingsCard elements (support both Name and x:Name)
+                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);
+
+                // Extract SettingsExpander elements (support both Name and x:Name)
+                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);
+
+                // Process SettingsPageControl elements
+                foreach (var element in settingsPageElements)
+                {
+                    var elementUid = GetElementUid(element, x);
+
+                    // Prefer the first SettingsCard.HeaderIcon as the module icon
+                    var moduleImageSource = ModuleIconResolver.ResolveIconFromFirstSettingsCard(xamlFile);
+
+                    if (!string.IsNullOrEmpty(elementUid))
+                    {
+                        elements.Add(new SettingEntry
+                        {
+                            PageTypeName = pageName,
+                            Type = EntryType.SettingsPage,
+                            ParentElementName = string.Empty,
+                            ElementName = string.Empty,
+                            ElementUid = elementUid,
+                            Icon = moduleImageSource,
+                        });
+                    }
+                }
+
+                // Process SettingsCard elements
+                foreach (var element in settingsElements)
+                {
+                    var elementName = GetElementName(element, x);
+                    var elementUid = GetElementUid(element, x);
+                    var headerIcon = ExtractIconValue(element);
+
+                    if (!string.IsNullOrEmpty(elementName) || !string.IsNullOrEmpty(elementUid))
+                    {
+                        var parentElementName = GetParentElementName(element, x);
+
+                        elements.Add(new SettingEntry
+                        {
+                            PageTypeName = pageName,
+                            Type = EntryType.SettingsCard,
+                            ParentElementName = parentElementName,
+                            ElementName = elementName,
+                            ElementUid = elementUid,
+                            Icon = headerIcon,
+                        });
+                    }
+                }
+
+                // Process SettingsExpander elements
+                foreach (var element in settingsExpanderElements)
+                {
+                    var elementName = GetElementName(element, x);
+                    var elementUid = GetElementUid(element, x);
+                    var headerIcon = ExtractIconValue(element);
+
+                    if (!string.IsNullOrEmpty(elementName) || !string.IsNullOrEmpty(elementUid))
+                    {
+                        var parentElementName = GetParentElementName(element, x);
+
+                        elements.Add(new SettingEntry
+                        {
+                            PageTypeName = pageName,
+                            Type = EntryType.SettingsExpander,
+                            ParentElementName = parentElementName,
+                            ElementName = elementName,
+                            ElementUid = elementUid,
+                            Icon = headerIcon,
+                        });
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"Error processing {xamlFile}: {ex.Message}");
+            }
+
+            return elements;
+        }
+
+        public static string GetElementName(XElement element, XNamespace x)
+        {
+            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
+            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;
+        }
+
+        public static string GetParentElementName(XElement element, XNamespace x)
+        {
+            // Look for parent SettingsExpander
+            var current = element.Parent;
+            while (current != null)
+            {
+                // Check if we're inside a SettingsExpander.Items or just directly inside SettingsExpander
+                if (current.Name.LocalName == "Items")
+                {
+                    // Check if the parent of Items is SettingsExpander
+                    var expanderParent = current.Parent;
+                    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;
+                        }
+                    }
+                }
+                else if (current.Name.LocalName == "SettingsExpander")
+                {
+                    // 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;
+                    }
+                }
+
+                current = current.Parent;
+            }
+
+            return string.Empty;
+        }
+
+        public static string ExtractIconValue(XElement element)
+        {
+            var headerIconAttribute = element.Attribute("HeaderIcon")?.Value;
+
+            if (string.IsNullOrEmpty(headerIconAttribute))
+            {
+                // Try nested property element: <SettingsCard.HeaderIcon> ... </SettingsCard.HeaderIcon>
+                var headerIconProperty = element.Elements()
+                    .FirstOrDefault(e => e.Name.LocalName.EndsWith(".HeaderIcon", StringComparison.OrdinalIgnoreCase));
+
+                if (headerIconProperty != null)
+                {
+                    // Prefer explicit icon elements within the HeaderIcon property
+                    var pathIcon = headerIconProperty.Descendants().FirstOrDefault(d => d.Name.LocalName == "PathIcon");
+                    if (pathIcon != null)
+                    {
+                        var dataAttr = pathIcon.Attribute("Data")?.Value;
+                        if (!string.IsNullOrWhiteSpace(dataAttr))
+                        {
+                            return dataAttr.Trim();
+                        }
+                    }
+
+                    var fontIcon = headerIconProperty.Descendants().FirstOrDefault(d => d.Name.LocalName == "FontIcon");
+                    if (fontIcon != null)
+                    {
+                        var glyphAttr = fontIcon.Attribute("Glyph")?.Value;
+                        if (!string.IsNullOrWhiteSpace(glyphAttr))
+                        {
+                            return glyphAttr.Trim();
+                        }
+                    }
+
+                    var bitmapIcon = headerIconProperty.Descendants().FirstOrDefault(d => d.Name.LocalName == "BitmapIcon");
+                    if (bitmapIcon != null)
+                    {
+                        var sourceAttr = bitmapIcon.Attribute("Source")?.Value;
+                        if (!string.IsNullOrWhiteSpace(sourceAttr))
+                        {
+                            return sourceAttr.Trim();
+                        }
+                    }
+                }
+
+                return null;
+            }
+
+            // Parse different icon markup extensions
+            // Example: {ui:BitmapIcon Source=/Assets/Settings/Icons/AlwaysOnTop.png}
+            if (headerIconAttribute.Contains("BitmapIcon") && headerIconAttribute.Contains("Source="))
+            {
+                var sourceStart = headerIconAttribute.IndexOf("Source=", StringComparison.OrdinalIgnoreCase) + "Source=".Length;
+                var sourceEnd = headerIconAttribute.IndexOf('}', sourceStart);
+                if (sourceEnd == -1)
+                {
+                    sourceEnd = headerIconAttribute.Length;
+                }
+
+                return headerIconAttribute.Substring(sourceStart, sourceEnd - sourceStart).Trim();
+            }
+
+            // Example: {ui:FontIcon Glyph=&#xEDA7;}
+            if (headerIconAttribute.Contains("FontIcon") && headerIconAttribute.Contains("Glyph="))
+            {
+                var glyphStart = headerIconAttribute.IndexOf("Glyph=", StringComparison.OrdinalIgnoreCase) + "Glyph=".Length;
+                var glyphEnd = headerIconAttribute.IndexOf('}', glyphStart);
+                if (glyphEnd == -1)
+                {
+                    glyphEnd = headerIconAttribute.Length;
+                }
+
+                return headerIconAttribute.Substring(glyphStart, glyphEnd - glyphStart).Trim();
+            }
+
+            // If it doesn't match known patterns, return the original value
+            return headerIconAttribute;
+        }
+    }
+}

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

@@ -0,0 +1,44 @@
+// 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.
+
+namespace Microsoft.PowerToys.Tools.XamlIndexBuilder
+{
+    public enum EntryType
+    {
+        SettingsPage,
+        SettingsCard,
+        SettingsExpander,
+    }
+
+    public struct SettingEntry
+    {
+        public EntryType Type { get; set; }
+
+        public string Header { get; set; }
+
+        public string PageTypeName { get; set; }
+
+        public string ElementName { get; set; }
+
+        public string ElementUid { get; set; }
+
+        public string ParentElementName { get; set; }
+
+        public string Description { get; set; }
+
+        public string Icon { get; set; }
+
+        public SettingEntry(EntryType type, string header, string pageTypeName, string elementName, string elementUid, string parentElementName = null, string description = null, string icon = null)
+        {
+            Type = type;
+            Header = header;
+            PageTypeName = pageTypeName;
+            ElementName = elementName;
+            ElementUid = elementUid;
+            ParentElementName = parentElementName;
+            Description = description;
+            Icon = icon;
+        }
+    }
+}

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

@@ -0,0 +1,43 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<!-- Import common props to satisfy repo audit; override problematic bits below for this console tool. -->
+	<Import Project="..\..\Common.Dotnet.CsWinRT.props" />
+
+	<PropertyGroup>
+		<TargetFramework>net9.0</TargetFramework>
+		<OutputType>Exe</OutputType>
+	<RootNamespace>Microsoft.PowerToys.Tools.XamlIndexBuilder</RootNamespace>
+		<AssemblyName>XamlIndexBuilder</AssemblyName>
+		<!-- Platform-agnostic: framework-dependent DLL executed via dotnet -->
+		<SelfContained>false</SelfContained>
+		<UseAppHost>false</UseAppHost>
+		<PlatformTarget>AnyCPU</PlatformTarget>
+		<RuntimeIdentifier></RuntimeIdentifier>
+		<!-- Keep tool output out of product scan paths to avoid deps.json audit conflicts -->
+		<OutputPath>$(MSBuildProjectDirectory)\obj\XamlIndexBuilder\$(Configuration)\</OutputPath>
+	</PropertyGroup>
+
+	<!-- Remove CsWinRT package introduced by common props; not needed for this tool and causes Windows metadata errors -->
+	<ItemGroup>
+		<PackageReference Remove="Microsoft.Windows.CsWinRT" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="System.Text.Json" />
+		<PackageReference Include="System.CommandLine" />
+	</ItemGroup>
+
+	<!-- Remove UI library reference to avoid pulling WindowsDesktop runtime (WindowsBase) -->
+
+	<PropertyGroup>
+		<DotNetExe Condition="'$(DotNetExe)' == ''">dotnet</DotNetExe>
+		<XamlRootDir Condition="'$(XamlRootDir)' == ''">$(MSBuildProjectDirectory)\..\Settings.UI\SettingsXAML</XamlRootDir>
+		<XamlRootDir Condition="'$(XamlViewsDir)' != ''">$([System.IO.Path]::GetDirectoryName('$(XamlViewsDir)'))</XamlRootDir>
+		<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;" />
+	</Target>
+</Project>

src/settings-ui/Settings.UI/Converters/IconConverter.cs

@@ -0,0 +1,133 @@
+// 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 Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Markup;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Media.Imaging;
+
+namespace Microsoft.PowerToys.Settings.UI.Converters
+{
+    public partial class IconConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is not string iconValue || string.IsNullOrEmpty(iconValue))
+            {
+                // Return a default icon based on the parameter
+                var defaultGlyph = parameter?.ToString() ?? "\uE8B7"; // Default gear icon
+                return new FontIcon { Glyph = defaultGlyph };
+            }
+
+            // Check if it's a single Unicode character (most common case after JSON deserialization)
+            if (iconValue.Length == 1)
+            {
+                return new FontIcon { Glyph = iconValue };
+            }
+
+            // Handle HTML numeric character references, e.g. "" or ""
+            if (iconValue.StartsWith("&#", StringComparison.Ordinal) && iconValue.EndsWith(';'))
+            {
+                var inner = iconValue.Substring(2, iconValue.Length - 3); // strip &# and ;
+                try
+                {
+                    string glyph;
+                    if (inner.StartsWith("x", StringComparison.OrdinalIgnoreCase))
+                    {
+                        var hex = inner.Substring(1);
+                        if (int.TryParse(hex, System.Globalization.NumberStyles.HexNumber, null, out int codePointHex))
+                        {
+                            glyph = char.ConvertFromUtf32(codePointHex);
+                            return new FontIcon { Glyph = glyph };
+                        }
+                    }
+                    else if (int.TryParse(inner, out int codePointDec))
+                    {
+                        glyph = char.ConvertFromUtf32(codePointDec);
+                        return new FontIcon { Glyph = glyph };
+                    }
+                }
+                catch
+                {
+                    // fall through to other handlers
+                }
+            }
+
+            if (iconValue.StartsWith("\\u", StringComparison.OrdinalIgnoreCase) && iconValue.Length == 6)
+            {
+                var hexPart = iconValue.Substring(2); // Remove \u
+                if (int.TryParse(hexPart, System.Globalization.NumberStyles.HexNumber, null, out int codePoint))
+                {
+                    var unicodeChar = char.ConvertFromUtf32(codePoint);
+                    return new FontIcon { Glyph = unicodeChar };
+                }
+            }
+
+            // Check if it's an image path
+            if (iconValue.Contains('/') || iconValue.Contains('\\') || iconValue.Contains(".png", StringComparison.OrdinalIgnoreCase) || iconValue.Contains(".jpg", StringComparison.OrdinalIgnoreCase) || iconValue.Contains(".ico", StringComparison.OrdinalIgnoreCase) || iconValue.Contains(".svg", StringComparison.OrdinalIgnoreCase))
+            {
+                // Handle different path formats
+                var imagePath = iconValue;
+
+                // Convert ms-appx:/// paths to local paths
+                if (imagePath.StartsWith("ms-appx:///", StringComparison.OrdinalIgnoreCase))
+                {
+                    imagePath = imagePath.Substring("ms-appx:///".Length);
+                }
+
+                // Ensure path starts with /
+                if (!imagePath.StartsWith('/'))
+                {
+                    imagePath = "/" + imagePath;
+                }
+
+                var uri = new Uri($"ms-appx://{imagePath}");
+
+                if (imagePath.EndsWith(".svg", StringComparison.OrdinalIgnoreCase))
+                {
+                    // Render SVG using ImageIcon + SvgImageSource
+                    return new ImageIcon
+                    {
+                        Source = new SvgImageSource(uri),
+                    };
+                }
+                else
+                {
+                    return new BitmapIcon
+                    {
+                        UriSource = uri,
+                        ShowAsMonochrome = false,
+                    };
+                }
+            }
+
+            // Try to interpret as raw SVG path data (PathIcon.Data)
+            // Many of our XAML PathIcon usages (e.g., AdvancedPastePage) provide a Data string like "M128 766q0-42 ...".
+            // If parsing succeeds, render it as a PathIcon.
+            try
+            {
+                var geometryObj = XamlBindingHelper.ConvertValue(typeof(Geometry), iconValue);
+                if (geometryObj is Geometry geometry)
+                {
+                    return new PathIcon { Data = geometry };
+                }
+            }
+            catch
+            {
+                // Ignore parse errors and fall back below.
+            }
+
+            // If all else fails, return default icon
+            var fallbackGlyph = parameter?.ToString() ?? "\uE8B7";
+            return new FontIcon { Glyph = fallbackGlyph };
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

src/settings-ui/Settings.UI/Converters/SearchSuggestionTemplateSelector.cs

@@ -0,0 +1,40 @@
+// 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 Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.ViewModels;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.PowerToys.Settings.UI.Converters;
+
+public sealed partial class SearchSuggestionTemplateSelector : DataTemplateSelector
+{
+    public DataTemplate DefaultSuggestionTemplate { get; set; }
+
+    public DataTemplate NoResultsSuggestionTemplate { get; set; }
+
+    public DataTemplate ShowAllSuggestionTemplate { get; set; }
+
+    protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
+    {
+        if (item is SuggestionItem suggestionItem)
+        {
+            if (suggestionItem.IsNoResults)
+            {
+                return NoResultsSuggestionTemplate;
+            }
+
+            if (suggestionItem.IsShowAll)
+            {
+                return ShowAllSuggestionTemplate ?? NoResultsSuggestionTemplate ?? DefaultSuggestionTemplate;
+            }
+
+            return DefaultSuggestionTemplate;
+        }
+
+        return DefaultSuggestionTemplate;
+    }
+}

src/settings-ui/Settings.UI/Converters/UriToImageConverter.cs

@@ -0,0 +1,25 @@
+// 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.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Media.Imaging;
+
+namespace Microsoft.PowerToys.Settings.UI.Converters
+{
+    public sealed partial class UriToImageSourceConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            return value is Uri uri ? new BitmapImage(uri) : null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+            => throw new NotImplementedException();
+    }
+}

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

@@ -0,0 +1,244 @@
+// 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.Numerics;
+using System.Threading.Tasks;
+using CommunityToolkit.WinUI.Controls;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Hosting;
+using Microsoft.UI.Xaml.Media;
+using Windows.UI;
+
+namespace Microsoft.PowerToys.Settings.UI.Helpers;
+
+public abstract partial class NavigablePage : Page
+{
+    private const int ExpandWaitDuration = 500;
+    private const int AnimationDuration = 1850;
+
+    private NavigationParams _pendingNavigationParams;
+
+    public NavigablePage()
+    {
+        Loaded += OnPageLoaded;
+    }
+
+    protected override void OnNavigatedTo(Microsoft.UI.Xaml.Navigation.NavigationEventArgs e)
+    {
+        base.OnNavigatedTo(e);
+
+        // Handle both old string parameter and new NavigationParams
+        if (e.Parameter is NavigationParams navParams)
+        {
+            _pendingNavigationParams = navParams;
+        }
+        else if (e.Parameter is string elementKey)
+        {
+            _pendingNavigationParams = new NavigationParams(elementKey);
+        }
+    }
+
+    private async void OnPageLoaded(object sender, RoutedEventArgs e)
+    {
+        if (_pendingNavigationParams != null && !string.IsNullOrEmpty(_pendingNavigationParams.ElementName))
+        {
+            // First, expand parent if specified
+            if (!string.IsNullOrEmpty(_pendingNavigationParams.ParentElementName))
+            {
+                var parentElement = FindElementByName(_pendingNavigationParams.ParentElementName);
+                if (parentElement is SettingsExpander expander)
+                {
+                    expander.IsExpanded = true;
+
+                    // Give time for the expander to animate
+                    await Task.Delay(ExpandWaitDuration);
+                }
+            }
+
+            // Then find and navigate to the target element
+            var target = FindElementByName(_pendingNavigationParams.ElementName);
+
+            target?.StartBringIntoView(new BringIntoViewOptions
+            {
+                VerticalOffset = -20,
+                AnimationDesired = true,
+            });
+
+            await OnTargetElementNavigatedAsync(target, _pendingNavigationParams.ElementName);
+
+            _pendingNavigationParams = null;
+        }
+    }
+
+    protected virtual async Task OnTargetElementNavigatedAsync(FrameworkElement target, string elementKey)
+    {
+        if (target == null)
+        {
+            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;
+
+        // Create a subtle glow effect using drop shadow
+        var dropShadow = compositor.CreateDropShadow();
+        dropShadow.Color = (Color)Application.Current.Resources["SystemAccentColorLight2"];
+        dropShadow.BlurRadius = 16f;
+        dropShadow.Opacity = 0f;
+        dropShadow.Offset = new Vector3(0, 0, 0);
+
+        var spriteVisual = compositor.CreateSpriteVisual();
+        spriteVisual.Size = new Vector2((float)target.ActualWidth + 8, (float)target.ActualHeight + 8);
+        spriteVisual.Shadow = dropShadow;
+        spriteVisual.Offset = new Vector3(-4, -4, 0);
+
+        // Insert the shadow visual behind the target element
+        ElementCompositionPreview.SetElementChildVisual(target, spriteVisual);
+
+        // Create a simple fade in/out animation
+        var fadeAnimation = compositor.CreateScalarKeyFrameAnimation();
+        fadeAnimation.InsertKeyFrame(0f, 0f);
+        fadeAnimation.InsertKeyFrame(0.5f, 0.3f);
+        fadeAnimation.InsertKeyFrame(1f, 0f);
+        fadeAnimation.Duration = TimeSpan.FromMilliseconds(AnimationDuration);
+
+        dropShadow.StartAnimation("Opacity", fadeAnimation);
+        await Task.Delay(AnimationDuration);
+
+        // Clean up the shadow visual
+        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;
+    }
+}

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

@@ -0,0 +1,18 @@
+// 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.
+
+namespace Microsoft.PowerToys.Settings.UI.Helpers;
+
+public class NavigationParams
+{
+    public string ElementName { get; set; }
+
+    public string ParentElementName { get; set; }
+
+    public NavigationParams(string elementName, string parentElementName = null)
+    {
+        ElementName = elementName;
+        ParentElementName = parentElementName;
+    }
+}

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

@@ -1,161 +1,188 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\..\Common.SelfContained.props" />
+	<!-- Look at Directory.Build.props in root for common stuff as well -->
+	<Import Project="..\..\Common.Dotnet.CsWinRT.props" />
+	<Import Project="..\..\Common.SelfContained.props" />
 
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>Microsoft.PowerToys.Settings.UI</RootNamespace>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-    <UseWinUI>true</UseWinUI>
-    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-    <WindowsPackageType>None</WindowsPackageType>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-    <ApplicationIcon>Assets\Settings\icon.ico</ApplicationIcon>
-    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
-    <!-- OutputPath looks like this because it has to be called both by settings and publish.cmd -->
-    <OutputPath>..\..\..\$(Platform)\$(Configuration)\WinUI3Apps</OutputPath>
-    <!-- MRT from windows app sdk will search for a pri file with the same name of the module before defaulting to resources.pri -->
-    <ProjectPriFileName>PowerToys.Settings.pri</ProjectPriFileName>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Remove="Assets\Settings\Modules\APDialog.dark.png" />
-    <None Remove="Assets\Settings\Modules\APDialog.light.png" />
-    <None Remove="SettingsXAML\Controls\Dashboard\CheckUpdateControl.xaml" />
-    <None Remove="SettingsXAML\Controls\Dashboard\ShortcutConflictControl.xaml" />
-    <None Remove="SettingsXAML\Controls\KeyVisual\KeyCharPresenter.xaml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Remove="SettingsXAML\App.xaml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="SettingsXAML\App.xaml" />
-  </ItemGroup>
+	<PropertyGroup>
+		<OutputType>WinExe</OutputType>
+		<RootNamespace>Microsoft.PowerToys.Settings.UI</RootNamespace>
+		<ApplicationManifest>app.manifest</ApplicationManifest>
+		<UseWinUI>true</UseWinUI>
+		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+		<WindowsPackageType>None</WindowsPackageType>
+		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+		<ApplicationIcon>Assets\Settings\icon.ico</ApplicationIcon>
+		<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
+		<!-- OutputPath looks like this because it has to be called both by settings and publish.cmd -->
+		<OutputPath>..\..\..\$(Platform)\$(Configuration)\WinUI3Apps</OutputPath>
+		<!-- MRT from windows app sdk will search for a pri file with the same name of the module before defaulting to resources.pri -->
+		<ProjectPriFileName>PowerToys.Settings.pri</ProjectPriFileName>
+	</PropertyGroup>
+	<ItemGroup>
+		<None Remove="Assets\Settings\Modules\APDialog.dark.png" />
+		<None Remove="Assets\Settings\Modules\APDialog.light.png" />
+		<None Remove="SettingsXAML\Controls\Dashboard\CheckUpdateControl.xaml" />
+		<None Remove="SettingsXAML\Controls\Dashboard\ShortcutConflictControl.xaml" />
+		<None Remove="SettingsXAML\Controls\KeyVisual\KeyCharPresenter.xaml" />
+		<None Remove="SettingsXAML\Controls\TitleBar\TitleBar.xaml" />
+	</ItemGroup>
+	<ItemGroup>
+		<Page Remove="SettingsXAML\App.xaml" />
+	</ItemGroup>
+	<ItemGroup>
+		<ApplicationDefinition Include="SettingsXAML\App.xaml" />
+	</ItemGroup>
 
 
-  <!-- See https://learn.microsoft.com/windows/apps/develop/platform/csharp-winrt/net-projection-from-cppwinrt-component for more info -->
-  <PropertyGroup>
-    <CsWinRTIncludes>PowerToys.GPOWrapper;PowerToys.ZoomItSettingsInterop</CsWinRTIncludes>
-    <CsWinRTGeneratedFilesDir>$(OutDir)</CsWinRTGeneratedFilesDir>
-    <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
-  </PropertyGroup>
+	<!-- See https://learn.microsoft.com/windows/apps/develop/platform/csharp-winrt/net-projection-from-cppwinrt-component for more info -->
+	<PropertyGroup>
+		<CsWinRTIncludes>PowerToys.GPOWrapper;PowerToys.ZoomItSettingsInterop</CsWinRTIncludes>
+		<CsWinRTGeneratedFilesDir>$(OutDir)</CsWinRTGeneratedFilesDir>
+		<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <Content Include="Assets\Settings\SplashScreen.scale-200.png" />
-    <Content Include="Assets\Settings\LockScreenLogo.scale-200.png" />
-    <Content Include="Assets\Settings\Square150x150Logo.scale-200.png" />
-    <Content Include="Assets\Settings\Square44x44Logo.scale-200.png" />
-    <Content Include="Assets\Settings\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Content Include="Assets\Settings\StoreLogo.png" />
-    <Content Include="Assets\Settings\Wide310x150Logo.scale-200.png" />
-  </ItemGroup>
+	<ItemGroup>
+		<Content Include="Assets\Settings\SplashScreen.scale-200.png" />
+		<Content Include="Assets\Settings\LockScreenLogo.scale-200.png" />
+		<Content Include="Assets\Settings\Square150x150Logo.scale-200.png" />
+		<Content Include="Assets\Settings\Square44x44Logo.scale-200.png" />
+		<Content Include="Assets\Settings\Square44x44Logo.targetsize-24_altform-unplated.png" />
+		<Content Include="Assets\Settings\StoreLogo.png" />
+		<Content Include="Assets\Settings\Wide310x150Logo.scale-200.png" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="Images\MouseJump-Desktop.png" />
-  </ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Include="Images\MouseJump-Desktop.png" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" />
-    <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" />
-    <PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" />
-    <PackageReference Include="CommunityToolkit.WinUI.Animations" />
-    <PackageReference Include="CommunityToolkit.WinUI.Extensions" />
-    <PackageReference Include="CommunityToolkit.WinUI.Converters" />
-    <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Markdown" />
-    <PackageReference Include="System.Net.Http" />
-    <PackageReference Include="System.Private.Uri" />
-    <PackageReference Include="System.Text.RegularExpressions" />
-    <PackageReference Include="WinUIEx" />
-    <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
-    <PackageReference Include="MessagePack" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-    <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" />
-    <PackageReference Include="StreamJsonRpc" />
-    <!-- HACK: Microsoft.Extensions.Hosting is referenced, even if it is not used, to force dll versions to be the same as in other projects. Really only needed since the Experimentation APIs that are added in CI reference some net standard 2.0 assemblies. -->
-    <PackageReference Include="Microsoft.Extensions.Hosting" />
-    <!-- HACK: To make sure the version pulled in by Microsoft.Extensions.Hosting is current. -->
-    <PackageReference Include="System.Text.Json" />
-    <!-- This line forces the WebView2 version used by Windows App SDK to be the one we expect from Directory.Packages.props . -->
-    <PackageReference Include="Microsoft.Web.WebView2" />
-    <!-- HACK: CmdPal uses CommunityToolkit.Common directly. Align the version. -->
-    <PackageReference Include="CommunityToolkit.Common" />
-    <!-- HACK: MWB and Advanced Paste. Align the version.  got flagged when https://github.com/microsoft/PowerToys/pull/38779 was done -->
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
-    <Manifest Include="$(ApplicationManifest)" />
-  </ItemGroup>
-  <!-- Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
-       Tools extension to be activated for this project even if the Windows App SDK Nuget
-       package has not yet been restored -->
+	<ItemGroup>
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" />
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" />
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" />
+		<PackageReference Include="CommunityToolkit.WinUI.Animations" />
+		<PackageReference Include="CommunityToolkit.WinUI.Extensions" />
+		<PackageReference Include="CommunityToolkit.WinUI.Converters" />
+		<PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Markdown" />
+		<PackageReference Include="System.Net.Http" />
+		<PackageReference Include="System.Private.Uri" />
+		<PackageReference Include="System.Text.RegularExpressions" />
+		<PackageReference Include="WinUIEx" />
+		<!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
+		<PackageReference Include="MessagePack" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" />
+		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
+		<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" />
+		<PackageReference Include="StreamJsonRpc" />
+		<!-- HACK: Microsoft.Extensions.Hosting is referenced, even if it is not used, to force dll versions to be the same as in other projects. Really only needed since the Experimentation APIs that are added in CI reference some net standard 2.0 assemblies. -->
+		<PackageReference Include="Microsoft.Extensions.Hosting" />
+		<!-- HACK: To make sure the version pulled in by Microsoft.Extensions.Hosting is current. -->
+		<PackageReference Include="System.Text.Json" />
+		<!-- This line forces the WebView2 version used by Windows App SDK to be the one we expect from Directory.Packages.props . -->
+		<PackageReference Include="Microsoft.Web.WebView2" />
+		<!-- HACK: CmdPal uses CommunityToolkit.Common directly. Align the version. -->
+		<PackageReference Include="CommunityToolkit.Common" />
+		<!-- HACK: MWB and Advanced Paste. Align the version.  got flagged when https://github.com/microsoft/PowerToys/pull/38779 was done -->
+		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
+		<Manifest Include="$(ApplicationManifest)" />
+	</ItemGroup>
+	<!-- Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
+		   Tools extension to be activated for this project even if the Windows App SDK Nuget
+		   package has not yet been restored -->
 
-  <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnablePreviewMsixTooling)'=='true'">
-    <ProjectCapability Include="Msix" />
-  </ItemGroup>
+	<ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnablePreviewMsixTooling)'=='true'">
+		<ProjectCapability Include="Msix" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <!-- HACK: Common.UI is referenced, even if it is not used, to force dll versions to be the same as in other projects that use it. It's still unclear why this is the case, but this is need for flattening the install directory. -->
-    <ProjectReference Include="..\..\common\Common.UI\Common.UI.csproj" />
-    <ProjectReference Include="..\..\common\AllExperiments\AllExperiments.csproj" />
-    <ProjectReference Include="..\..\common\GPOWrapper\GPOWrapper.vcxproj" />
-    <ProjectReference Include="..\..\common\interop\PowerToys.Interop.vcxproj" />
-    <ProjectReference Include="..\..\modules\ZoomIt\ZoomItSettingsInterop\ZoomItSettingsInterop.vcxproj" />
-    <ProjectReference Include="..\..\common\ManagedCommon\ManagedCommon.csproj" />
-    <ProjectReference Include="..\..\common\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
-    <ProjectReference Include="..\..\modules\MouseUtils\MouseJump.Common\MouseJump.Common.csproj" />
-    <ProjectReference Include="..\Settings.UI.Library\Settings.UI.Library.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<!-- HACK: Common.UI is referenced, even if it is not used, to force dll versions to be the same as in other projects that use it. It's still unclear why this is the case, but this is need for flattening the install directory. -->
+		<ProjectReference Include="..\..\common\Common.Search\Common.Search.csproj" />
+		<ProjectReference Include="..\..\common\Common.UI\Common.UI.csproj" />
+		<ProjectReference Include="..\..\common\AllExperiments\AllExperiments.csproj" />
+		<ProjectReference Include="..\..\common\GPOWrapper\GPOWrapper.vcxproj" />
+		<ProjectReference Include="..\..\common\interop\PowerToys.Interop.vcxproj" />
+		<ProjectReference Include="..\..\modules\ZoomIt\ZoomItSettingsInterop\ZoomItSettingsInterop.vcxproj" />
+		<ProjectReference Include="..\..\common\ManagedCommon\ManagedCommon.csproj" />
+		<ProjectReference Include="..\..\common\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
+		<ProjectReference Include="..\..\modules\MouseUtils\MouseJump.Common\MouseJump.Common.csproj" />
+		<ProjectReference Include="..\Settings.UI.Library\Settings.UI.Library.csproj" />
+	</ItemGroup>
 
-  <PropertyGroup>
-    <!-- TODO: fix issues and reenable -->
-    <!-- These are caused by streamjsonrpc dependency on Microsoft.VisualStudio.Threading.Analyzers -->
-    <!-- We might want to add that to the project and fix the issues as well -->
-    <NoWarn>VSTHRD002;VSTHRD110;VSTHRD100;VSTHRD200;VSTHRD101</NoWarn>
-  </PropertyGroup>
+	<!-- XamlIndexBuilder now outputs directly to Assets\Settings -->
+	<PropertyGroup>
+		<GeneratedJsonFile>$(MSBuildProjectDirectory)\Assets\Settings\search.index.json</GeneratedJsonFile>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <None Update="Assets\Settings\icon.ico">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
+	<!-- No RID/Platform plumbing needed here. XamlIndexBuilder handles generation after its own Build. -->
 
-  <ItemGroup>
-    <None Update="Assets\Settings\Scripts\CheckCmdNotFoundRequirements.ps1">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="Assets\Settings\Scripts\InstallWinGetClientModule.ps1">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="Assets\Settings\Scripts\InstallPowerShell7.ps1">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="Assets\Settings\Scripts\EnableModule.ps1">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="Assets\Settings\Scripts\DisableModule.ps1">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <Page Update="SettingsXAML\Controls\KeyVisual\KeyCharPresenter.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="SettingsXAML\Controls\Dashboard\ShortcutConflictControl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="SettingsXAML\Controls\Dashboard\CheckUpdateControl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
+	<PropertyGroup>
+		<!-- TODO: fix issues and reenable -->
+		<!-- These are caused by streamjsonrpc dependency on Microsoft.VisualStudio.Threading.Analyzers -->
+		<!-- We might want to add that to the project and fix the issues as well -->
+		<NoWarn>VSTHRD002;VSTHRD110;VSTHRD100;VSTHRD200;VSTHRD101</NoWarn>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <Page Update="SettingsXAML\OOBE\Views\OobeWorkspaces.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-    </Page>
-    <Page Update="SettingsXAML\Panels\MouseJumpPanel.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-    </Page>
-    <Page Update="SettingsXAML\Views\WorkspacesPage.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-    </Page>
-  </ItemGroup>
+	<!-- Removed hard-coded resource exclusion. -->
 
-</Project>
+	<ItemGroup>
+		<!-- Ensure the generated search index is present in the project; only if it exists to prevent CS1566 in clean CI -->
+		<Content Include="$(GeneratedJsonFile)" Condition="Exists('$(GeneratedJsonFile)')">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+		<!-- Embed the generated search index; logical name must match PrebuiltIndexResourceName -->
+		<EmbeddedResource Include="$(GeneratedJsonFile)" Condition="Exists('$(GeneratedJsonFile)')">
+			<LogicalName>Microsoft.PowerToys.Settings.UI.Assets.search.index.json</LogicalName>
+		</EmbeddedResource>
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Update="Assets\Settings\icon.ico">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Update="Assets\Settings\Scripts\CheckCmdNotFoundRequirements.ps1">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="Assets\Settings\Scripts\InstallWinGetClientModule.ps1">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="Assets\Settings\Scripts\InstallPowerShell7.ps1">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="Assets\Settings\Scripts\EnableModule.ps1">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="Assets\Settings\Scripts\DisableModule.ps1">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>		<Page Update="SettingsXAML\Controls\TitleBar\TitleBar.xaml">
+		</Page>
+		<Page Update="SettingsXAML\Controls\KeyVisual\KeyCharPresenter.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
+		<Page Update="SettingsXAML\Controls\Dashboard\ShortcutConflictControl.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
+		<Page Update="SettingsXAML\Controls\Dashboard\CheckUpdateControl.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
+	</ItemGroup>
+
+	<ItemGroup>
+		<Page Update="SettingsXAML\OOBE\Views\OobeWorkspaces.xaml">
+			<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+		</Page>
+		<Page Update="SettingsXAML\Panels\MouseJumpPanel.xaml">
+			<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+		</Page>
+		<Page Update="SettingsXAML\Views\WorkspacesPage.xaml">
+			<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+		</Page>
+	</ItemGroup>
+
+	<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)" />
+	</Target>
+</Project>

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

@@ -0,0 +1,338 @@
+// 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.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Common.Search.FuzzSearch;
+using Microsoft.PowerToys.Settings.UI.Helpers;
+using Microsoft.PowerToys.Settings.UI.Views;
+using Microsoft.Windows.ApplicationModel.Resources;
+using Settings.UI.Library;
+
+namespace Microsoft.PowerToys.Settings.UI.Services
+{
+    public static class SearchIndexService
+    {
+        private static readonly object _lockObject = new();
+        private static readonly Dictionary<string, string> _pageNameCache = [];
+        private static readonly Dictionary<string, (string HeaderNorm, string DescNorm)> _normalizedTextCache = new();
+        private static readonly Dictionary<string, Type> _pageTypeCache = new();
+        private static ImmutableArray<SettingEntry> _index = [];
+        private static bool _isIndexBuilt;
+        private static bool _isIndexBuilding;
+        private const string PrebuiltIndexResourceName = "Microsoft.PowerToys.Settings.UI.Assets.search.index.json";
+        private static JsonSerializerOptions _serializerOptions = new() { PropertyNameCaseInsensitive = true };
+
+        public static ImmutableArray<SettingEntry> Index
+        {
+            get
+            {
+                lock (_lockObject)
+                {
+                    return _index;
+                }
+            }
+        }
+
+        public static bool IsIndexReady
+        {
+            get
+            {
+                lock (_lockObject)
+                {
+                    return _isIndexBuilt;
+                }
+            }
+        }
+
+        public static void BuildIndex()
+        {
+            lock (_lockObject)
+            {
+                if (_isIndexBuilt || _isIndexBuilding)
+                {
+                    return;
+                }
+
+                _isIndexBuilding = true;
+
+                // Clear caches on rebuild
+                _normalizedTextCache.Clear();
+                _pageTypeCache.Clear();
+            }
+
+            try
+            {
+                var builder = ImmutableArray.CreateBuilder<SettingEntry>();
+                LoadIndexFromPrebuiltData(builder);
+
+                lock (_lockObject)
+                {
+                    _index = builder.ToImmutable();
+                    _isIndexBuilt = true;
+                    _isIndexBuilding = false;
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"[SearchIndexService] CRITICAL ERROR building search index: {ex.Message}\n{ex.StackTrace}");
+                lock (_lockObject)
+                {
+                    _isIndexBuilding = false;
+                    _isIndexBuilt = false;
+                }
+            }
+        }
+
+        private static void LoadIndexFromPrebuiltData(ImmutableArray<SettingEntry>.Builder builder)
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            var resourceLoader = ResourceLoaderInstance.ResourceLoader;
+            SettingEntry[] metadataList;
+
+            Debug.WriteLine($"[SearchIndexService] Attempting to load prebuilt index from: {PrebuiltIndexResourceName}");
+
+            try
+            {
+                using Stream stream = assembly.GetManifestResourceStream(PrebuiltIndexResourceName);
+                if (stream == null)
+                {
+                    Debug.WriteLine($"[SearchIndexService] ERROR: Embedded resource '{PrebuiltIndexResourceName}' not found. Ensure it's correctly embedded and the name matches.");
+                    return;
+                }
+
+                using StreamReader reader = new(stream);
+                string json = reader.ReadToEnd();
+                if (string.IsNullOrWhiteSpace(json))
+                {
+                    Debug.WriteLine("[SearchIndexService] ERROR: Embedded resource was empty.");
+                    return;
+                }
+
+                metadataList = JsonSerializer.Deserialize<SettingEntry[]>(json, _serializerOptions);
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"[SearchIndexService] ERROR: Failed to load or deserialize prebuilt index: {ex.Message}");
+                return;
+            }
+
+            if (metadataList == null || metadataList.Length == 0)
+            {
+                Debug.WriteLine("[SearchIndexService] Prebuilt index is empty or deserialization failed.");
+                return;
+            }
+
+            foreach (ref var metadata in metadataList.AsSpan())
+            {
+                if (metadata.Type == EntryType.SettingsPage)
+                {
+                    (metadata.Header, metadata.Description) = GetLocalizedModuleTitleAndDescription(resourceLoader, metadata.ElementUid);
+                }
+                else
+                {
+                    (metadata.Header, metadata.Description) = GetLocalizedSettingHeaderAndDescription(resourceLoader, metadata.ElementUid);
+                }
+
+                if (string.IsNullOrEmpty(metadata.Header))
+                {
+                    continue;
+                }
+
+                builder.Add(metadata);
+
+                // Cache the page name mapping for SettingsPage entries
+                if (metadata.Type == EntryType.SettingsPage && !string.IsNullOrEmpty(metadata.Header))
+                {
+                    _pageNameCache[metadata.PageTypeName] = metadata.Header;
+                }
+            }
+
+            Debug.WriteLine($"[SearchIndexService] Finished loading index. Total entries: {builder.Count}");
+        }
+
+        private static (string Header, string Description) GetLocalizedSettingHeaderAndDescription(ResourceLoader resourceLoader, string elementUid)
+        {
+            string header = GetString(resourceLoader, $"{elementUid}/Header");
+            string description = GetString(resourceLoader, $"{elementUid}/Description");
+
+            if (string.IsNullOrEmpty(header))
+            {
+                header = GetString(resourceLoader, $"{elementUid}/Content");
+            }
+
+            return (header, description);
+        }
+
+        private static (string Title, string Description) GetLocalizedModuleTitleAndDescription(ResourceLoader resourceLoader, string elementUid)
+        {
+            string title = GetString(resourceLoader, $"{elementUid}/ModuleTitle");
+            string description = GetString(resourceLoader, $"{elementUid}/ModuleDescription");
+
+            return (title, description);
+        }
+
+        private static string GetString(ResourceLoader rl, string key)
+        {
+            try
+            {
+                string value = rl.GetString(key);
+                return string.IsNullOrWhiteSpace(value) ? string.Empty : value;
+            }
+            catch (Exception)
+            {
+                return string.Empty;
+            }
+        }
+
+        public static List<SettingEntry> Search(string query)
+        {
+            return Search(query, CancellationToken.None);
+        }
+
+        public static List<SettingEntry> Search(string query, CancellationToken token)
+        {
+            if (string.IsNullOrWhiteSpace(query))
+            {
+                return [];
+            }
+
+            var currentIndex = Index;
+            if (currentIndex.IsEmpty)
+            {
+                Debug.WriteLine("[SearchIndexService] Search called but index is empty.");
+                return [];
+            }
+
+            var normalizedQuery = NormalizeString(query);
+            var bag = new ConcurrentBag<(SettingEntry Hit, double Score)>();
+            var po = new ParallelOptions
+            {
+                CancellationToken = token,
+                MaxDegreeOfParallelism = Math.Max(1, Environment.ProcessorCount - 1),
+            };
+
+            try
+            {
+                Parallel.ForEach(currentIndex, po, entry =>
+                {
+                    var (headerNorm, descNorm) = GetNormalizedTexts(entry);
+                    var captionScoreResult = StringMatcher.FuzzyMatch(normalizedQuery, headerNorm);
+                    double score = captionScoreResult.Score;
+
+                    if (!string.IsNullOrEmpty(descNorm))
+                    {
+                        var descriptionScoreResult = StringMatcher.FuzzyMatch(normalizedQuery, descNorm);
+                        if (descriptionScoreResult.Success)
+                        {
+                            score = Math.Max(score, descriptionScoreResult.Score * 0.8);
+                        }
+                    }
+
+                    if (score > 0)
+                    {
+                        var pageType = GetPageTypeFromName(entry.PageTypeName);
+                        if (pageType != null)
+                        {
+                            bag.Add((entry, score));
+                        }
+                    }
+                });
+            }
+            catch (OperationCanceledException)
+            {
+                return [];
+            }
+
+            return bag
+                .OrderByDescending(r => r.Score)
+                .Select(r => r.Hit)
+                .ToList();
+        }
+
+        private static Type GetPageTypeFromName(string pageTypeName)
+        {
+            if (string.IsNullOrEmpty(pageTypeName))
+            {
+                return null;
+            }
+
+            lock (_lockObject)
+            {
+                if (_pageTypeCache.TryGetValue(pageTypeName, out var cached))
+                {
+                    return cached;
+                }
+
+                var assembly = typeof(GeneralPage).Assembly;
+                var type = assembly.GetType($"Microsoft.PowerToys.Settings.UI.Views.{pageTypeName}");
+                _pageTypeCache[pageTypeName] = type;
+                return type;
+            }
+        }
+
+        private static (string HeaderNorm, string DescNorm) GetNormalizedTexts(SettingEntry entry)
+        {
+            if (entry.ElementUid == null && entry.Header == null)
+            {
+                return (NormalizeString(entry.Header), NormalizeString(entry.Description));
+            }
+
+            var key = entry.ElementUid ?? $"{entry.PageTypeName}|{entry.ElementName}";
+            lock (_lockObject)
+            {
+                if (_normalizedTextCache.TryGetValue(key, out var cached))
+                {
+                    return cached;
+                }
+            }
+
+            var headerNorm = NormalizeString(entry.Header);
+            var descNorm = NormalizeString(entry.Description);
+            lock (_lockObject)
+            {
+                _normalizedTextCache[key] = (headerNorm, descNorm);
+            }
+
+            return (headerNorm, descNorm);
+        }
+
+        private static string NormalizeString(string input)
+        {
+            if (string.IsNullOrEmpty(input))
+            {
+                return string.Empty;
+            }
+
+            var normalized = input.ToLowerInvariant().Normalize(NormalizationForm.FormKD);
+            var stringBuilder = new StringBuilder();
+            foreach (var c in normalized)
+            {
+                var unicodeCategory = CharUnicodeInfo.GetUnicodeCategory(c);
+                if (unicodeCategory != UnicodeCategory.NonSpacingMark)
+                {
+                    stringBuilder.Append(c);
+                }
+            }
+
+            return stringBuilder.ToString();
+        }
+
+        public static string GetLocalizedPageName(string pageTypeName)
+        {
+            return _pageNameCache.TryGetValue(pageTypeName, out string cachedName) ? cachedName : string.Empty;
+        }
+    }
+}

src/settings-ui/Settings.UI/SettingsXAML/App.xaml

@@ -11,6 +11,7 @@
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
                 <ResourceDictionary Source="/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml" />
                 <ResourceDictionary Source="/SettingsXAML/Controls/KeyVisual/KeyCharPresenter.xaml" />
+                <ResourceDictionary Source="/SettingsXAML/Controls/TitleBar/TitleBar.xaml" />
                 <ResourceDictionary Source="/SettingsXAML/Styles/TextBlock.xaml" />
                 <ResourceDictionary Source="/SettingsXAML/Styles/Button.xaml" />
                 <ResourceDictionary Source="/SettingsXAML/Styles/InfoBadge.xaml" />
@@ -49,8 +50,12 @@
                 TrueValue="Collapsed" />
             <tkconverters:StringFormatConverter x:Key="StringFormatConverter" />
             <tkconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
+            <tkconverters:EmptyObjectToObjectConverter
+                x:Key="EmptyObjectToObjectConverter"
+                EmptyValue="Collapsed"
+                NotEmptyValue="Visible" />
             <converters:UpdateStateToBoolConverter x:Key="UpdateStateToBoolConverter" />
-
+            <tkconverters:StringVisibilityConverter x:Key="StringVisibilityConverter" />
             <x:Double x:Key="SettingsCardSpacing">2</x:Double>
 
             <!--  Overrides  -->

src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml

@@ -3,6 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
@@ -11,6 +12,7 @@
     <UserControl.Resources>
         <x:Double x:Key="PageMaxWidth">1000</x:Double>
         <x:Double x:Key="PageHeaderMaxWidth">1020</x:Double>
+        <converters:UriToImageSourceConverter x:Key="UriToImageSourceConverter" />
     </UserControl.Resources>
     <Grid Padding="20,0,0,0" RowSpacing="24">
         <Grid.RowDefinitions>
@@ -38,10 +40,7 @@
                 </Grid.RowDefinitions>
 
                 <!--  Top panel  -->
-                <Grid
-                    MaxWidth="{StaticResource PageMaxWidth}"
-                    ColumnSpacing="16"
-                    RowSpacing="16">
+                <Grid MaxWidth="{StaticResource PageMaxWidth}" RowSpacing="16">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="*" />
@@ -52,14 +51,12 @@
                     </Grid.RowDefinitions>
                     <Border
                         MaxWidth="160"
+                        Margin="0,0,16,0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Top"
-                        CornerRadius="{StaticResource OverlayCornerRadius}">
-                        <Image AutomationProperties.AccessibilityView="Raw">
-                            <Image.Source>
-                                <BitmapImage UriSource="{x:Bind ModuleImageSource}" />
-                            </Image.Source>
-                        </Image>
+                        CornerRadius="{StaticResource OverlayCornerRadius}"
+                        Visibility="{x:Bind ModuleImageSource, Converter={StaticResource EmptyObjectToObjectConverter}}">
+                        <Image AutomationProperties.AccessibilityView="Raw" Source="{x:Bind ModuleImageSource, Converter={StaticResource UriToImageSourceConverter}, Mode=OneWay}" />
                     </Border>
 
                     <StackPanel x:Name="DescriptionPanel" Grid.Column="1">
@@ -73,7 +70,8 @@
                             x:Name="PrimaryLinksControl"
                             Margin="0,8,0,0"
                             IsTabStop="False"
-                            ItemsSource="{x:Bind PrimaryLinks}">
+                            ItemsSource="{x:Bind PrimaryLinks}"
+                            Visibility="{x:Bind PrimaryLinks.Count, Converter={StaticResource DoubleToVisibilityConverter}}">
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate x:DataType="controls:PageLink">
                                     <HyperlinkButton NavigateUri="{x:Bind Link}" Style="{StaticResource TextButtonStyle}">

src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml.cs

@@ -2,6 +2,7 @@
 // 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.Collections.ObjectModel;
 
 using Microsoft.UI.Xaml;
@@ -30,9 +31,9 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             set => SetValue(ModuleDescriptionProperty, value);
         }
 
-        public string ModuleImageSource
+        public Uri ModuleImageSource
         {
-            get => (string)GetValue(ModuleImageSourceProperty);
+            get => (Uri)GetValue(ModuleImageSourceProperty);
             set => SetValue(ModuleImageSourceProperty, value);
         }
 
@@ -60,13 +61,13 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             set { SetValue(ModuleContentProperty, value); }
         }
 
-        public static readonly DependencyProperty ModuleTitleProperty = DependencyProperty.Register("ModuleTitle", typeof(string), typeof(SettingsPageControl), new PropertyMetadata(default(string)));
-        public static readonly DependencyProperty ModuleDescriptionProperty = DependencyProperty.Register("ModuleDescription", typeof(string), typeof(SettingsPageControl), new PropertyMetadata(default(string)));
-        public static readonly DependencyProperty ModuleImageSourceProperty = DependencyProperty.Register("ModuleImageSource", typeof(string), typeof(SettingsPageControl), new PropertyMetadata(default(string)));
-        public static readonly DependencyProperty PrimaryLinksProperty = DependencyProperty.Register("PrimaryLinks", typeof(ObservableCollection<PageLink>), typeof(SettingsPageControl), new PropertyMetadata(new ObservableCollection<PageLink>()));
-        public static readonly DependencyProperty SecondaryLinksHeaderProperty = DependencyProperty.Register("SecondaryLinksHeader", typeof(string), typeof(SettingsPageControl), new PropertyMetadata(default(string)));
-        public static readonly DependencyProperty SecondaryLinksProperty = DependencyProperty.Register("SecondaryLinks", typeof(ObservableCollection<PageLink>), typeof(SettingsPageControl), new PropertyMetadata(new ObservableCollection<PageLink>()));
-        public static readonly DependencyProperty ModuleContentProperty = DependencyProperty.Register("ModuleContent", typeof(object), typeof(SettingsPageControl), new PropertyMetadata(new Grid()));
+        public static readonly DependencyProperty ModuleTitleProperty = DependencyProperty.Register(nameof(ModuleTitle), typeof(string), typeof(SettingsPageControl), new PropertyMetadata(defaultValue: null));
+        public static readonly DependencyProperty ModuleDescriptionProperty = DependencyProperty.Register(nameof(ModuleDescription), typeof(string), typeof(SettingsPageControl), new PropertyMetadata(defaultValue: null));
+        public static readonly DependencyProperty ModuleImageSourceProperty = DependencyProperty.Register(nameof(ModuleImageSource), typeof(Uri), typeof(SettingsPageControl), new PropertyMetadata(null));
+        public static readonly DependencyProperty PrimaryLinksProperty = DependencyProperty.Register(nameof(PrimaryLinks), typeof(ObservableCollection<PageLink>), typeof(SettingsPageControl), new PropertyMetadata(new ObservableCollection<PageLink>()));
+        public static readonly DependencyProperty SecondaryLinksHeaderProperty = DependencyProperty.Register(nameof(SecondaryLinksHeader), typeof(string), typeof(SettingsPageControl), new PropertyMetadata(default(string)));
+        public static readonly DependencyProperty SecondaryLinksProperty = DependencyProperty.Register(nameof(SecondaryLinks), typeof(ObservableCollection<PageLink>), typeof(SettingsPageControl), new PropertyMetadata(new ObservableCollection<PageLink>()));
+        public static readonly DependencyProperty ModuleContentProperty = DependencyProperty.Register(nameof(ModuleContent), typeof(object), typeof(SettingsPageControl), new PropertyMetadata(new Grid()));
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {

src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml.cs

@@ -548,18 +548,14 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
                             }
                         }
 
-                        if (conflictingModules.Count > 0)
+                        var moduleNames = conflictingModules.ToArray();
+                        if (string.Equals(moduleNames[0], "System", StringComparison.OrdinalIgnoreCase))
                         {
-                            var moduleNames = conflictingModules.ToArray();
-                            var conflictMessage = moduleNames.Length == 1
-                                ? $"Conflict detected with {moduleNames[0]}"
-                                : $"Conflicts detected with: {string.Join(", ", moduleNames)}";
-
-                            c.ConflictMessage = conflictMessage;
+                            c.ConflictMessage = ResourceLoaderInstance.ResourceLoader.GetString("SysHotkeyConflictTooltipText");
                         }
                         else
                         {
-                            c.ConflictMessage = "Conflict detected with unknown module";
+                            c.ConflictMessage = ResourceLoaderInstance.ResourceLoader.GetString("InAppHotkeyConflictTooltipText");
                         }
 
                         c.HasConflict = true;

src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml

@@ -64,7 +64,7 @@
                     IsTabStop="{Binding ElementName=ShortcutContentControl, Path=IsWarningAltGr, Mode=OneWay}"
                     Severity="Warning" />
                 <InfoBar
-                    Title="Hotkey Conflict"
+                    x:Uid="WarningShortcutConflict"
                     IsClosable="False"
                     IsOpen="{Binding ElementName=ShortcutContentControl, Path=HasConflict, Mode=OneWay}"
                     IsTabStop="{Binding ElementName=ShortcutContentControl, Path=HasConflict, Mode=OneWay}"

src/settings-ui/Settings.UI/SettingsXAML/Controls/TitleBar/TitleBar.Properties.cs

@@ -0,0 +1,229 @@
+// 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 Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.PowerToys.Settings.UI.Controls;
+
+public partial class TitleBar : Control
+{
+    /// <summary>
+    /// The backing <see cref="DependencyProperty"/> for the <see cref="Icon"/> property.
+    /// </summary>
+    public static readonly DependencyProperty IconProperty = DependencyProperty.Register(nameof(Icon), typeof(IconElement), typeof(TitleBar), new PropertyMetadata(null, IconChanged));
+
+    /// <summary>
+    /// The backing <see cref="DependencyProperty"/> for the <see cref="Title"/> property.
+    /// </summary>
+    public static readonly DependencyProperty TitleProperty = DependencyProperty.Register(nameof(Title), typeof(string), typeof(TitleBar), new PropertyMetadata(default(string)));
+
+    /// <summary>
+    /// The backing <see cref="DependencyProperty"/> for the <see cref="Subtitle"/> property.
+    /// </summary>
+    public static readonly DependencyProperty SubtitleProperty = DependencyProperty.Register(nameof(Subtitle), typeof(string), typeof(TitleBar), new PropertyMetadata(default(string)));
+
+    /// <summary>
+    /// The backing <see cref="DependencyProperty"/> for the <see cref="Content"/> property.
+    /// </summary>
+    public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(nameof(Content), typeof(object), typeof(TitleBar), new PropertyMetadata(null, ContentChanged));
+
+    /// <summary>
+    /// The backing <see cref="DependencyProperty"/> for the <see cref="Footer"/> property.
+    /// </summary>
+    public static readonly DependencyProperty FooterProperty = DependencyProperty.Register(nameof(Footer), typeof(object), typeof(TitleBar), new PropertyMetadata(null, FooterChanged));
+
+    /// <summary>
+    /// The backing <see cref="DependencyProperty"/> for the <see cref="IsBackButtonVisible"/> property.
+    /// </summary>
+    public static readonly DependencyProperty IsBackButtonVisibleProperty = DependencyProperty.Register(nameof(IsBackButtonVisible), typeof(bool), typeof(TitleBar), new PropertyMetadata(false, IsBackButtonVisibleChanged));
+
+    /// <summary>
+    /// The backing <see cref="DependencyProperty"/> for the <see cref="IsPaneButtonVisible"/> property.
+    /// </summary>
+    public static readonly DependencyProperty IsPaneButtonVisibleProperty = DependencyProperty.Register(nameof(IsPaneButtonVisible), typeof(bool), typeof(TitleBar), new PropertyMetadata(false, IsPaneButtonVisibleChanged));
+
+    /// <summary>
+    /// The backing <see cref="DependencyProperty"/> for the <see cref="DisplayMode"/> property.
+    /// </summary>
+    public static readonly DependencyProperty DisplayModeProperty = DependencyProperty.Register(nameof(DisplayMode), typeof(DisplayMode), typeof(TitleBar), new PropertyMetadata(DisplayMode.Standard, DisplayModeChanged));
+
+    /// <summary>
+    /// The backing <see cref="DependencyProperty"/> for the <see cref="CompactStateBreakpoint
+    /// "/> property.
+    /// </summary>
+    public static readonly DependencyProperty CompactStateBreakpointProperty = DependencyProperty.Register(nameof(CompactStateBreakpoint), typeof(int), typeof(TitleBar), new PropertyMetadata(850));
+
+    /// <summary>
+    /// The backing <see cref="DependencyProperty"/> for the <see cref="AutoConfigureCustomTitleBar"/> property.
+    /// </summary>
+    public static readonly DependencyProperty AutoConfigureCustomTitleBarProperty = DependencyProperty.Register(nameof(AutoConfigureCustomTitleBar), typeof(bool), typeof(TitleBar), new PropertyMetadata(true, AutoConfigureCustomTitleBarChanged));
+
+    /// <summary>
+    /// The backing <see cref="DependencyProperty"/> for the <see cref="Window"/> property.
+    /// </summary>
+    public static readonly DependencyProperty WindowProperty = DependencyProperty.Register(nameof(Window), typeof(Window), typeof(TitleBar), new PropertyMetadata(null));
+
+    /// <summary>
+    /// The event that gets fired when the back button is clicked
+    /// </summary>
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
+    public event EventHandler<RoutedEventArgs>? BackButtonClick;
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
+
+    /// <summary>
+    /// The event that gets fired when the pane toggle button is clicked
+    /// </summary>
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
+    public event EventHandler<RoutedEventArgs>? PaneButtonClick;
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
+
+    /// <summary>
+    /// Gets or sets the Icon
+    /// </summary>
+    public IconElement Icon
+    {
+        get => (IconElement)GetValue(IconProperty);
+        set => SetValue(IconProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the Title
+    /// </summary>
+    public string Title
+    {
+        get => (string)GetValue(TitleProperty);
+        set => SetValue(TitleProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the Subtitle
+    /// </summary>
+    public string Subtitle
+    {
+        get => (string)GetValue(SubtitleProperty);
+        set => SetValue(SubtitleProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the content shown at the center of the TitleBar. When setting this, using DisplayMode=Tall is recommended.
+    /// </summary>
+    public object Content
+    {
+        get => (object)GetValue(ContentProperty);
+        set => SetValue(ContentProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the content shown at the right of the TitleBar, next to the caption buttons. When setting this, using DisplayMode=Tall is recommended.
+    /// </summary>
+    public object Footer
+    {
+        get => (object)GetValue(FooterProperty);
+        set => SetValue(FooterProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets DisplayMode. Compact is default (32px), Tall is recommended when setting the Content or Footer.
+    /// </summary>
+    public DisplayMode DisplayMode
+    {
+        get => (DisplayMode)GetValue(DisplayModeProperty);
+        set => SetValue(DisplayModeProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether gets or sets the visibility of the back button.
+    /// </summary>
+    public bool IsBackButtonVisible
+    {
+        get => (bool)GetValue(IsBackButtonVisibleProperty);
+        set => SetValue(IsBackButtonVisibleProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether gets or sets the visibility of the pane toggle button.
+    /// </summary>
+    public bool IsPaneButtonVisible
+    {
+        get => (bool)GetValue(IsPaneButtonVisibleProperty);
+        set => SetValue(IsPaneButtonVisibleProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the breakpoint of when the compact state is triggered.
+    /// </summary>
+    public int CompactStateBreakpoint
+    {
+        get => (int)GetValue(CompactStateBreakpointProperty);
+        set => SetValue(CompactStateBreakpointProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether gets or sets if the TitleBar should auto configure ExtendContentIntoTitleBar and CaptionButton background colors.
+    /// </summary>
+    public bool AutoConfigureCustomTitleBar
+    {
+        get => (bool)GetValue(AutoConfigureCustomTitleBarProperty);
+        set => SetValue(AutoConfigureCustomTitleBarProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the window the TitleBar should configure.
+    /// </summary>
+    public Window Window
+    {
+        get => (Window)GetValue(WindowProperty);
+        set => SetValue(WindowProperty, value);
+    }
+
+    private static void IsBackButtonVisibleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((TitleBar)d).Update();
+    }
+
+    private static void IsPaneButtonVisibleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((TitleBar)d).Update();
+    }
+
+    private static void DisplayModeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((TitleBar)d).Update();
+    }
+
+    private static void ContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((TitleBar)d).Update();
+    }
+
+    private static void FooterChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((TitleBar)d).Update();
+    }
+
+    private static void IconChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((TitleBar)d).Update();
+    }
+
+    private static void AutoConfigureCustomTitleBarChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (((TitleBar)d).AutoConfigureCustomTitleBar)
+        {
+            ((TitleBar)d).Configure();
+        }
+        else
+        {
+            ((TitleBar)d).Reset();
+        }
+    }
+}
+
+public enum DisplayMode
+{
+    Standard,
+    Tall,
+}

src/settings-ui/Settings.UI/SettingsXAML/Controls/TitleBar/TitleBar.WASDK.cs

@@ -0,0 +1,195 @@
+// 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.Collections.Generic;
+using System.Linq;
+using Microsoft.UI;
+using Microsoft.UI.Input;
+using Microsoft.UI.Windowing;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+using Windows.Foundation;
+using Windows.Graphics;
+
+namespace Microsoft.PowerToys.Settings.UI.Controls;
+
+[TemplatePart(Name = nameof(PART_FooterPresenter), Type = typeof(ContentPresenter))]
+[TemplatePart(Name = nameof(PART_ContentPresenter), Type = typeof(ContentPresenter))]
+
+public partial class TitleBar : Control
+{
+#pragma warning disable SA1306 // Field names should begin with lower-case letter
+#pragma warning disable SA1310 // Field names should not contain underscore
+#pragma warning disable SA1400 // Access modifier should be declared
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
+    ContentPresenter? PART_ContentPresenter;
+    ContentPresenter? PART_FooterPresenter;
+    #pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
+#pragma warning restore SA1400 // Access modifier should be declared
+#pragma warning restore SA1306 // Field names should begin with lower-case letter
+#pragma warning restore SA1310 // Field names should not contain underscore
+
+    private void SetWASDKTitleBar()
+    {
+        if (this.Window == null)
+        {
+            return;
+        }
+
+        if (AutoConfigureCustomTitleBar)
+        {
+            Window.AppWindow.TitleBar.ExtendsContentIntoTitleBar = true;
+
+            this.Window.SizeChanged -= Window_SizeChanged;
+            this.Window.SizeChanged += Window_SizeChanged;
+            this.Window.Activated -= Window_Activated;
+            this.Window.Activated += Window_Activated;
+
+            if (Window.Content is FrameworkElement rootElement)
+            {
+                UpdateCaptionButtons(rootElement);
+                rootElement.ActualThemeChanged += (s, e) =>
+                {
+                    UpdateCaptionButtons(rootElement);
+                };
+            }
+
+            PART_ContentPresenter = GetTemplateChild(nameof(PART_ContentPresenter)) as ContentPresenter;
+            PART_FooterPresenter = GetTemplateChild(nameof(PART_FooterPresenter)) as ContentPresenter;
+
+            // Get caption button occlusion information.
+            int captionButtonOcclusionWidthRight = Window.AppWindow.TitleBar.RightInset;
+            int captionButtonOcclusionWidthLeft = Window.AppWindow.TitleBar.LeftInset;
+            PART_LeftPaddingColumn!.Width = new GridLength(captionButtonOcclusionWidthLeft);
+            PART_RightPaddingColumn!.Width = new GridLength(captionButtonOcclusionWidthRight);
+
+            if (DisplayMode == DisplayMode.Tall)
+            {
+                // Choose a tall title bar to provide more room for interactive elements
+                // like search box or person picture controls.
+                Window.AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Tall;
+            }
+            else
+            {
+                Window.AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Standard;
+            }
+
+            // Recalculate the drag region for the custom title bar
+            // if you explicitly defined new draggable areas.
+            SetDragRegionForCustomTitleBar();
+
+            _isAutoConfigCompleted = true;
+        }
+    }
+
+    private void Window_SizeChanged(object sender, WindowSizeChangedEventArgs args)
+    {
+        UpdateVisualStateAndDragRegion(args.Size);
+    }
+
+    private void UpdateCaptionButtons(FrameworkElement rootElement)
+    {
+        Window.AppWindow.TitleBar.ButtonBackgroundColor = Colors.Transparent;
+        Window.AppWindow.TitleBar.ButtonInactiveBackgroundColor = Colors.Transparent;
+        if (rootElement.ActualTheme == ElementTheme.Dark)
+        {
+            Window.AppWindow.TitleBar.ButtonForegroundColor = Colors.White;
+            Window.AppWindow.TitleBar.ButtonInactiveForegroundColor = Colors.DarkGray;
+        }
+        else
+        {
+            Window.AppWindow.TitleBar.ButtonForegroundColor = Colors.Black;
+            Window.AppWindow.TitleBar.ButtonInactiveForegroundColor = Colors.DarkGray;
+        }
+    }
+
+    private void ResetWASDKTitleBar()
+    {
+        if (this.Window == null)
+        {
+            return;
+        }
+
+        // Only reset if we were the ones who configured
+        if (_isAutoConfigCompleted)
+        {
+            Window.AppWindow.TitleBar.ExtendsContentIntoTitleBar = false;
+            this.Window.SizeChanged -= Window_SizeChanged;
+            this.Window.Activated -= Window_Activated;
+            SizeChanged -= this.TitleBar_SizeChanged;
+            Window.AppWindow.TitleBar.ResetToDefault();
+        }
+    }
+
+    private void Window_Activated(object sender, WindowActivatedEventArgs args)
+    {
+        if (args.WindowActivationState == WindowActivationState.Deactivated)
+        {
+            VisualStateManager.GoToState(this, WindowDeactivatedState, true);
+        }
+        else
+        {
+            VisualStateManager.GoToState(this, WindowActivatedState, true);
+        }
+    }
+
+    public void SetDragRegionForCustomTitleBar()
+    {
+        if (AutoConfigureCustomTitleBar && Window is not null)
+        {
+            ClearDragRegions(NonClientRegionKind.Passthrough);
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
+            var items = new FrameworkElement?[] { PART_ContentPresenter, PART_FooterPresenter, PART_ButtonHolder };
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
+            var validItems = items.Where(x => x is not null).Select(x => x!).ToArray(); // Prune null items
+
+            SetDragRegion(NonClientRegionKind.Passthrough, validItems);
+        }
+    }
+
+    public double GetRasterizationScaleForElement(UIElement element)
+    {
+        if (element.XamlRoot != null)
+        {
+            return element.XamlRoot.RasterizationScale;
+        }
+
+        return 0.0;
+    }
+
+    public void SetDragRegion(NonClientRegionKind nonClientRegionKind, params FrameworkElement[] frameworkElements)
+    {
+        List<RectInt32> rects = new List<RectInt32>();
+        var scale = GetRasterizationScaleForElement(this);
+
+        foreach (var frameworkElement in frameworkElements)
+        {
+            if (frameworkElement == null)
+            {
+                continue;
+            }
+
+            GeneralTransform transformElement = frameworkElement.TransformToVisual(null);
+            Rect bounds = transformElement.TransformBounds(new Rect(0, 0, frameworkElement.ActualWidth, frameworkElement.ActualHeight));
+            var transparentRect = new RectInt32(
+                _X: (int)Math.Round(bounds.X * scale),
+                _Y: (int)Math.Round(bounds.Y * scale),
+                _Width: (int)Math.Round(bounds.Width * scale),
+                _Height: (int)Math.Round(bounds.Height * scale));
+            rects.Add(transparentRect);
+        }
+
+        if (rects.Count > 0)
+        {
+            InputNonClientPointerSource.GetForWindowId(Window.AppWindow.Id).SetRegionRects(nonClientRegionKind, rects.ToArray());
+        }
+    }
+
+    public void ClearDragRegions(NonClientRegionKind nonClientRegionKind)
+    {
+        InputNonClientPointerSource.GetForWindowId(Window.AppWindow.Id).ClearRegionRects(nonClientRegionKind);
+    }
+}

src/settings-ui/Settings.UI/SettingsXAML/Controls/TitleBar/TitleBar.cs

@@ -0,0 +1,220 @@
+// 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 Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Windows.Foundation;
+
+namespace Microsoft.PowerToys.Settings.UI.Controls;
+
+[TemplateVisualState(Name = BackButtonVisibleState, GroupName = BackButtonStates)]
+[TemplateVisualState(Name = BackButtonCollapsedState, GroupName = BackButtonStates)]
+[TemplateVisualState(Name = PaneButtonVisibleState, GroupName = PaneButtonStates)]
+[TemplateVisualState(Name = PaneButtonCollapsedState, GroupName = PaneButtonStates)]
+[TemplateVisualState(Name = WindowActivatedState, GroupName = ActivationStates)]
+[TemplateVisualState(Name = WindowDeactivatedState, GroupName = ActivationStates)]
+[TemplateVisualState(Name = StandardState, GroupName = DisplayModeStates)]
+[TemplateVisualState(Name = TallState, GroupName = DisplayModeStates)]
+[TemplateVisualState(Name = IconVisibleState, GroupName = IconStates)]
+[TemplateVisualState(Name = IconCollapsedState, GroupName = IconStates)]
+[TemplateVisualState(Name = ContentVisibleState, GroupName = ContentStates)]
+[TemplateVisualState(Name = ContentCollapsedState, GroupName = ContentStates)]
+[TemplateVisualState(Name = FooterVisibleState, GroupName = FooterStates)]
+[TemplateVisualState(Name = FooterCollapsedState, GroupName = FooterStates)]
+[TemplateVisualState(Name = WideState, GroupName = ReflowStates)]
+[TemplateVisualState(Name = NarrowState, GroupName = ReflowStates)]
+[TemplatePart(Name = PartBackButton, Type = typeof(Button))]
+[TemplatePart(Name = PartPaneButton, Type = typeof(Button))]
+[TemplatePart(Name = nameof(PART_LeftPaddingColumn), Type = typeof(ColumnDefinition))]
+[TemplatePart(Name = nameof(PART_RightPaddingColumn), Type = typeof(ColumnDefinition))]
+[TemplatePart(Name = nameof(PART_ButtonHolder), Type = typeof(StackPanel))]
+
+public partial class TitleBar : Control
+{
+    private const string PartBackButton = "PART_BackButton";
+    private const string PartPaneButton = "PART_PaneButton";
+
+    private const string BackButtonVisibleState = "BackButtonVisible";
+    private const string BackButtonCollapsedState = "BackButtonCollapsed";
+    private const string BackButtonStates = "BackButtonStates";
+
+    private const string PaneButtonVisibleState = "PaneButtonVisible";
+    private const string PaneButtonCollapsedState = "PaneButtonCollapsed";
+    private const string PaneButtonStates = "PaneButtonStates";
+
+    private const string WindowActivatedState = "Activated";
+    private const string WindowDeactivatedState = "Deactivated";
+    private const string ActivationStates = "WindowActivationStates";
+
+    private const string IconVisibleState = "IconVisible";
+    private const string IconCollapsedState = "IconCollapsed";
+    private const string IconStates = "IconStates";
+
+    private const string StandardState = "Standard";
+    private const string TallState = "Tall";
+    private const string DisplayModeStates = "DisplayModeStates";
+
+    private const string ContentVisibleState = "ContentVisible";
+    private const string ContentCollapsedState = "ContentCollapsed";
+    private const string ContentStates = "ContentStates";
+
+    private const string FooterVisibleState = "FooterVisible";
+    private const string FooterCollapsedState = "FooterCollapsed";
+    private const string FooterStates = "FooterStates";
+
+    private const string WideState = "Wide";
+    private const string NarrowState = "Narrow";
+    private const string ReflowStates = "ReflowStates";
+
+#pragma warning disable SA1306 // Field names should begin with lower-case letter
+#pragma warning disable SA1310 // Field names should not contain underscore
+#pragma warning disable SA1400 // Access modifier should be declared
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
+    ColumnDefinition? PART_RightPaddingColumn;
+    ColumnDefinition? PART_LeftPaddingColumn;
+    StackPanel? PART_ButtonHolder;
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
+#pragma warning restore SA1400 // Access modifier should be declared
+#pragma warning restore SA1306 // Field names should begin with lower-case letter
+#pragma warning restore SA1310 // Field names should not contain underscore
+
+    // We only want to reset TitleBar configuration in app, if we're the TitleBar instance that's managing that state.
+    private bool _isAutoConfigCompleted;
+
+    public TitleBar()
+    {
+        this.DefaultStyleKey = typeof(TitleBar);
+    }
+
+    protected override void OnApplyTemplate()
+    {
+        PART_LeftPaddingColumn = GetTemplateChild(nameof(PART_LeftPaddingColumn)) as ColumnDefinition;
+        PART_RightPaddingColumn = GetTemplateChild(nameof(PART_RightPaddingColumn)) as ColumnDefinition;
+        ConfigureButtonHolder();
+        Configure();
+        if (GetTemplateChild(PartBackButton) is Button backButton)
+        {
+            backButton.Click -= BackButton_Click;
+            backButton.Click += BackButton_Click;
+        }
+
+        if (GetTemplateChild(PartPaneButton) is Button paneButton)
+        {
+            paneButton.Click -= PaneButton_Click;
+            paneButton.Click += PaneButton_Click;
+        }
+
+        SizeChanged -= this.TitleBar_SizeChanged;
+        SizeChanged += this.TitleBar_SizeChanged;
+
+        Update();
+        base.OnApplyTemplate();
+    }
+
+    private void TitleBar_SizeChanged(object sender, SizeChangedEventArgs e)
+    {
+        UpdateVisualStateAndDragRegion(e.NewSize);
+    }
+
+    private void UpdateVisualStateAndDragRegion(Size size)
+    {
+        if (size.Width <= CompactStateBreakpoint)
+        {
+            if (Content != null || Footer != null)
+            {
+                VisualStateManager.GoToState(this, NarrowState, true);
+            }
+        }
+        else
+        {
+            VisualStateManager.GoToState(this, WideState, true);
+        }
+
+        SetDragRegionForCustomTitleBar();
+    }
+
+    private void BackButton_Click(object sender, RoutedEventArgs e)
+    {
+        BackButtonClick?.Invoke(this, new RoutedEventArgs());
+    }
+
+    private void PaneButton_Click(object sender, RoutedEventArgs e)
+    {
+        PaneButtonClick?.Invoke(this, new RoutedEventArgs());
+    }
+
+    private void ConfigureButtonHolder()
+    {
+        if (PART_ButtonHolder != null)
+        {
+            PART_ButtonHolder.SizeChanged -= PART_ButtonHolder_SizeChanged;
+        }
+
+        PART_ButtonHolder = GetTemplateChild(nameof(PART_ButtonHolder)) as StackPanel;
+
+        if (PART_ButtonHolder != null)
+        {
+            PART_ButtonHolder.SizeChanged += PART_ButtonHolder_SizeChanged;
+        }
+    }
+
+    private void PART_ButtonHolder_SizeChanged(object sender, SizeChangedEventArgs e)
+    {
+        SetDragRegionForCustomTitleBar();
+    }
+
+    private void Configure()
+    {
+        SetWASDKTitleBar();
+    }
+
+    public void Reset()
+    {
+        ResetWASDKTitleBar();
+    }
+
+    private void Update()
+    {
+        if (Icon != null)
+        {
+            VisualStateManager.GoToState(this, IconVisibleState, true);
+        }
+        else
+        {
+            VisualStateManager.GoToState(this, IconCollapsedState, true);
+        }
+
+        VisualStateManager.GoToState(this, IsBackButtonVisible ? BackButtonVisibleState : BackButtonCollapsedState, true);
+        VisualStateManager.GoToState(this, IsPaneButtonVisible ? PaneButtonVisibleState : PaneButtonCollapsedState, true);
+
+        if (DisplayMode == DisplayMode.Tall)
+        {
+            VisualStateManager.GoToState(this, TallState, true);
+        }
+        else
+        {
+            VisualStateManager.GoToState(this, StandardState, true);
+        }
+
+        if (Content != null)
+        {
+            VisualStateManager.GoToState(this, ContentVisibleState, true);
+        }
+        else
+        {
+            VisualStateManager.GoToState(this, ContentCollapsedState, true);
+        }
+
+        if (Footer != null)
+        {
+            VisualStateManager.GoToState(this, FooterVisibleState, true);
+        }
+        else
+        {
+            VisualStateManager.GoToState(this, FooterCollapsedState, true);
+        }
+
+        SetDragRegionForCustomTitleBar();
+    }
+}

src/settings-ui/Settings.UI/SettingsXAML/Controls/TitleBar/TitleBar.xaml

@@ -0,0 +1,371 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls">
+
+    <x:Double x:Key="TitleBarCompactHeight">32</x:Double>
+    <x:Double x:Key="TitleBarTallHeight">48</x:Double>
+    <x:Double x:Key="TitleBarContentMinWidth">360</x:Double>
+    <Style BasedOn="{StaticResource DefaultTitleBarStyle}" TargetType="local:TitleBar" />
+
+    <Style x:Key="DefaultTitleBarStyle" TargetType="local:TitleBar">
+        <Setter Property="MinHeight" Value="{ThemeResource TitleBarCompactHeight}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="local:TitleBar">
+                    <Grid
+                        x:Name="PART_RootGrid"
+                        Height="{TemplateBinding MinHeight}"
+                        Padding="4,0,0,0"
+                        VerticalAlignment="Stretch"
+                        Background="{TemplateBinding Background}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition x:Name="PART_LeftPaddingColumn" Width="0" />
+                            <ColumnDefinition x:Name="PART_ButtonsHolderColumn" Width="Auto" />
+                            <ColumnDefinition x:Name="PART_IconColumn" Width="Auto" />
+                            <ColumnDefinition x:Name="PART_TitleColumn" Width="Auto" />
+                            <ColumnDefinition
+                                x:Name="PART_LeftDragColumn"
+                                Width="*"
+                                MinWidth="4" />
+                            <ColumnDefinition x:Name="PART_ContentColumn" Width="Auto" />
+                            <ColumnDefinition
+                                x:Name="PART_RightDragColumn"
+                                Width="*"
+                                MinWidth="4" />
+                            <ColumnDefinition x:Name="PART_FooterColumn" Width="Auto" />
+                            <ColumnDefinition x:Name="PART_RightPaddingColumn" Width="0" />
+                        </Grid.ColumnDefinitions>
+                        <Border
+                            x:Name="PART_IconHolder"
+                            Grid.Column="2"
+                            Margin="12,0,0,0"
+                            VerticalAlignment="Center">
+                            <Viewbox
+                                x:Name="PART_Icon"
+                                MaxWidth="16"
+                                MaxHeight="16">
+                                <ContentPresenter
+                                    x:Name="PART_IconPresenter"
+                                    AutomationProperties.AccessibilityView="Raw"
+                                    Content="{TemplateBinding Icon}"
+                                    HighContrastAdjustment="None" />
+                            </Viewbox>
+                        </Border>
+
+                        <StackPanel
+                            x:Name="PART_TitleHolder"
+                            Grid.Column="3"
+                            Margin="16,0,0,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Orientation="Horizontal"
+                            Spacing="4">
+                            <TextBlock
+                                x:Name="PART_TitleText"
+                                MinWidth="48"
+                                Margin="0,0,0,1"
+                                Foreground="{ThemeResource TextFillColorPrimaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="{TemplateBinding Title}"
+                                TextTrimming="CharacterEllipsis"
+                                TextWrapping="NoWrap" />
+                            <TextBlock
+                                x:Name="PART_SubtitleText"
+                                MinWidth="48"
+                                Margin="0,0,0,1"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="{TemplateBinding Subtitle}"
+                                TextTrimming="CharacterEllipsis"
+                                TextWrapping="NoWrap" />
+                        </StackPanel>
+                        <Grid
+                            x:Name="PART_DragRegion"
+                            Grid.Column="2"
+                            Grid.ColumnSpan="6"
+                            Background="Transparent" />
+                        <StackPanel
+                            x:Name="PART_ButtonHolder"
+                            Grid.Column="1"
+                            Orientation="Horizontal">
+                            <Button
+                                x:Name="PART_BackButton"
+                                Style="{ThemeResource TitleBarBackButtonStyle}"
+                                ToolTipService.ToolTip="Back" />
+                            <Button
+                                x:Name="PART_PaneButton"
+                                Style="{StaticResource TitleBarPaneToggleButtonStyle}"
+                                ToolTipService.ToolTip="Toggle menu" />
+                        </StackPanel>
+
+                        <ContentPresenter
+                            x:Name="PART_ContentPresenter"
+                            Grid.Column="5"
+                            MinWidth="{ThemeResource TitleBarContentMinWidth}"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Center"
+                            HorizontalContentAlignment="Stretch"
+                            Content="{TemplateBinding Content}" />
+                        <ContentPresenter
+                            x:Name="PART_FooterPresenter"
+                            Grid.Column="7"
+                            Margin="4,0,8,0"
+                            HorizontalContentAlignment="Right"
+                            Content="{TemplateBinding Footer}" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="BackButtonStates">
+                                <VisualState x:Name="BackButtonVisible" />
+                                <VisualState x:Name="BackButtonCollapsed">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_BackButton.Visibility" Value="Collapsed" />
+                                        <Setter Target="PART_BackButton.Visibility" Value="Collapsed" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="PaneButtonStates">
+                                <VisualState x:Name="PaneButtonVisible" />
+                                <VisualState x:Name="PaneButtonCollapsed">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_PaneButton.Visibility" Value="Collapsed" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="IconStates">
+                                <VisualState x:Name="IconVisible" />
+                                <VisualState x:Name="IconCollapsed">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_IconHolder.Visibility" Value="Collapsed" />
+                                        <Setter Target="PART_TitleHolder.Margin" Value="4,0,0,0" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="ContentStates">
+                                <VisualState x:Name="ContentVisible" />
+                                <VisualState x:Name="ContentCollapsed">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_ContentPresenter.Visibility" Value="Collapsed" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FooterStates">
+                                <VisualState x:Name="FooterVisible" />
+                                <VisualState x:Name="FooterCollapsed">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_FooterPresenter.Visibility" Value="Collapsed" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="ReflowStates">
+                                <VisualState x:Name="Wide" />
+                                <VisualState x:Name="Narrow">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_TitleHolder.Visibility" Value="Collapsed" />
+                                        <Setter Target="PART_LeftDragColumn.Width" Value="Auto" />
+                                        <Setter Target="PART_RightDragColumn.Width" Value="Auto" />
+                                        <Setter Target="PART_RightDragColumn.MinWidth" Value="16" />
+                                        <Setter Target="PART_LeftDragColumn.MinWidth" Value="16" />
+                                        <Setter Target="PART_ContentColumn.Width" Value="*" />
+                                        <!--  Content can stretch now  -->
+                                        <Setter Target="PART_ContentPresenter.MinWidth" Value="0" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="WindowActivationStates">
+                                <VisualState x:Name="Activated" />
+                                <VisualState x:Name="Deactivated">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_TitleText.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />
+                                        <Setter Target="PART_SubtitleText.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />
+                                        <Setter Target="PART_BackButton.IsEnabled" Value="False" />
+                                        <Setter Target="PART_PaneButton.IsEnabled" Value="False" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="DisplayModeStates">
+                                <VisualState x:Name="Standard" />
+                                <VisualState x:Name="Tall">
+                                    <VisualState.Setters>
+                                        <Setter Target="PART_RootGrid.MinHeight" Value="{ThemeResource TitleBarTallHeight}" />
+                                        <Setter Target="PART_RootGrid.Padding" Value="4" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--  Copy of WinUI NavigationBackButtonNormalStyle - cannot use it as it picks up the generic.xaml version, not the WinUI version  -->
+    <Style x:Key="TitleBarBackButtonStyle" TargetType="Button">
+        <Setter Property="Background" Value="{ThemeResource NavigationViewBackButtonBackground}" />
+        <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForegroundChecked}" />
+        <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="MaxHeight" Value="40" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+        <Setter Property="Content" Value="&#xE72B;" />
+        <Setter Property="Padding" Value="12,4,12,4" />
+        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid
+                        x:Name="RootGrid"
+                        Padding="{TemplateBinding Padding}"
+                        Background="{TemplateBinding Background}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+                        <AnimatedIcon
+                            x:Name="Content"
+                            Width="16"
+                            Height="16"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            AnimatedIcon.State="Normal"
+                            AutomationProperties.AccessibilityView="Raw">
+                            <animatedvisuals:AnimatedBackVisualSource />
+                            <AnimatedIcon.FallbackIconSource>
+                                <FontIconSource
+                                    FontFamily="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=FontFamily}"
+                                    FontSize="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=FontSize}"
+                                    Glyph="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content}"
+                                    MirroredWhenRightToLeft="True" />
+                            </AnimatedIcon.FallbackIconSource>
+                        </AnimatedIcon>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonBackgroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonForegroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                    <VisualState.Setters>
+                                        <Setter Target="Content.(AnimatedIcon.State)" Value="PointerOver" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonBackgroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonForegroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                    <VisualState.Setters>
+                                        <Setter Target="Content.(AnimatedIcon.State)" Value="Pressed" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--  Copy of WinUI PaneToggleButtonStyle - cannot use it as it picks up the generic.xaml version, not the WinUI version  -->
+    <Style x:Key="TitleBarPaneToggleButtonStyle" TargetType="Button">
+        <Setter Property="Background" Value="{ThemeResource NavigationViewBackButtonBackground}" />
+        <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForegroundChecked}" />
+        <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="MaxHeight" Value="40" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+        <Setter Property="Content" Value="&#xE700;" />
+        <Setter Property="Padding" Value="12,4,12,4" />
+        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid
+                        x:Name="RootGrid"
+                        Padding="{TemplateBinding Padding}"
+                        Background="{TemplateBinding Background}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+                        <AnimatedIcon
+                            x:Name="Content"
+                            Width="16"
+                            Height="16"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            AnimatedIcon.State="Normal"
+                            AutomationProperties.AccessibilityView="Raw">
+                            <animatedvisuals:AnimatedGlobalNavigationButtonVisualSource />
+                            <AnimatedIcon.FallbackIconSource>
+                                <FontIconSource
+                                    FontFamily="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=FontFamily}"
+                                    FontSize="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=FontSize}"
+                                    Glyph="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content}"
+                                    MirroredWhenRightToLeft="True" />
+                            </AnimatedIcon.FallbackIconSource>
+                        </AnimatedIcon>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonBackgroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonForegroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                    <VisualState.Setters>
+                                        <Setter Target="Content.(AnimatedIcon.State)" Value="PointerOver" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonBackgroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonForegroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                    <VisualState.Setters>
+                                        <Setter Target="Content.(AnimatedIcon.State)" Value="Pressed" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewButtonForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>