Fix PowerToys Run shortcut conflict display when module is disabled

Co-authored-by: yeelam-gordon <73506701+yeelam-gordon@users.noreply.github.com>
Initial plan
2026-01-06 12:27:01 +01:00 · 2025-08-29 08:46:37 +00:00 · 2025-08-29 08:33:59 +00:00
209 changed files with 2023 additions and 5643 deletions
--- a/.github/actions/spell-check/allow/code.txt
+++ b/.github/actions/spell-check/allow/code.txt
@@ -94,7 +94,6 @@ onefuzzingestionpreparationtool
 OTP
 Yubi
 Yubico
-Perplexity
 svgl

 # KEYS
@@ -320,4 +319,4 @@ MRUINFO
 REGSTR

 # Misc Win32 APIs and PInvokes
-INVOKEIDLIST
+INVOKEIDLIST
--- a/.github/actions/spell-check/allow/names.txt
+++ b/.github/actions/spell-check/allow/names.txt
@@ -29,8 +29,6 @@ shortcutguide

 # 8LWXpg is user name but user folder causes a flag
 LWXpg
-# 0x6f677548 is user name but user folder causes a flag
-x6f677548
 Adoumie
 Advaith
 alekhyareddy
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -70,7 +70,6 @@ APPMODEL
 APPNAME
 appref
 appsettings
-appsfeatures
 appwindow
 appwiz
 appxpackage
@@ -247,7 +246,6 @@ CONFIGW
 CONFLICTINGMODIFIERKEY
 CONFLICTINGMODIFIERSHORTCUT
 CONOUT
-coreclr
 constexpr
 contentdialog
 contentfiles
@@ -269,8 +267,6 @@ cpcontrols
 cph
 cplusplus
 CPower
-cpptools
-cppvsdbg
 cppwinrt
 createdump
 CREATEPROCESS
@@ -282,7 +278,6 @@ CRH
 critsec
 cropandlock
 Crossdevice
-csdevkit
 CSearch
 CSettings
 cso
@@ -310,7 +305,6 @@ CXVIRTUALSCREEN
 CYSCREEN
 CYSMICON
 CYVIRTUALSCREEN
-Czechia
 cziplib
 Dac
 dacl
@@ -335,7 +329,6 @@ Deact
 debugbreak
 decryptor
 Dedup
-Deduplicator
 Deeplink
 DEFAULTBOOTSTRAPPERINSTALLFOLDER
 DEFAULTCOLOR
@@ -441,7 +434,6 @@ EDITSHORTCUTS
 EDITTEXT
 EFile
 ekus
-emojis
 ENABLEDELAYEDEXPANSION
 ENABLEDPOPUP
 ENABLETAB
@@ -806,7 +798,6 @@ KEYBOARDMANAGEREDITORLIBRARYWRAPPER
 keyboardmanagerstate
 keyboardmanagerui
 keyboardtester
-keycap
 KEYEVENTF
 KEYIMAGE
 keynum
@@ -1324,7 +1315,6 @@ PRODUCTVERSION
 Progman
 programdata
 projectname
-projitems
 PROPERTYKEY
 Propset
 PROPVARIANT
@@ -1404,7 +1394,6 @@ regkey
 regroot
 regsvr
 REINSTALLMODE
-releaseblog
 reloadable
 Relogger
 remappings
@@ -1455,6 +1444,7 @@ rstringalnum
 rstringalpha
 rstringdigit
 rtb
+RTB
 RTLREADING
 rtm
 runas
@@ -1787,13 +1777,10 @@ UACUI
 UAL
 uap
 UBR
-UBreak
-ubrk
 UCallback
 ucrt
 ucrtd
 uefi
-UError
 uesc
 UFlags
 UHash
@@ -1801,7 +1788,6 @@ UIA
 UIEx
 uild
 uitests
-UITo
 ULONGLONG
 ums
 uncompilable
@@ -1864,7 +1850,6 @@ VFT
 vget
 vgetq
 viewmodels
-virama
 VIRTKEY
 VIRTUALDESK
 VISEGRADRELAY
@@ -2016,7 +2001,6 @@ XButton
 xclip
 xcopy
 XDeployment
-xdf
 XDocument
 XElement
 xfd
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -1,43 +0,0 @@
-# PowerToys – Copilot guide (concise)
-
-This is the top-level guide for AI changes. Keep edits small, follow existing patterns, and cite exact paths in PRs.
-
-Repo map (1‑line per area)
- Core apps: `src/runner/**` (tray/loader), `src/settings-ui/**` (Settings app)
- Shared libs: `src/common/**`
- Modules: `src/modules/*` (one per utility; Command Palette in `src/modules/cmdpal/**`)
- Build tools/docs: `tools/**`, `doc/devdocs/**`
-
-Build and test (defaults)
- Prerequisites: Visual Studio 2022 17.4+, minimal Windows 10 1803+.
- Build discipline:
-  - One terminal per operation (build → test). Don’t switch/open new ones mid-flow.
-  - After making changes, `cd` to the project folder that changed (`.csproj`/`.vcxproj`).
-  - Use script(s) to build, synchronously block and wait in foreground for it to finish: `tools/build/build.ps1|.cmd` (current folder), `build-essentials.*` (once per brand new build for missing nuget packages)
-  - Treat build **exit code 0** as success; any non-zero exit code is a failure, have Copilot read the errors log in the build folder (e.g., `build.*.*.errors.log`) and surface problems.
-  - Don’t start tests or launch Runner until the previous step succeeded.
- Tests (fast + targeted):
-  - Find the test project by product code prefix (e.g., FancyZones, AdvancedPaste). Look for a sibling folder or 1–2 levels up named like `<Product>*UnitTests` or `<Product>*UITests`.
-  - Build the test project, wait for **exit**, then run only those tests via VS Test Explorer or `vstest.console.exe` with filters. Avoid `dotnet test` in this repo.
-  - Add/adjust tests when changing behavior; if skipped, state why (e.g., comment-only, string rename).
-
-Pull requests (expectations)
- Atomic: one logical change; no drive‑by refactors.
- Describe: problem / approach / risk / test evidence.
- List: touched paths if not obvious.
-
-When to ask for clarification
- Ambiguous spec after scanning relevant docs (see below).
- Cross-module impact (shared enum/struct) not clear.
- Security / elevation / installer changes.
-
-Logging (use existing stacks)
- C++: `src/common/logger/**` (`Logger::info|warn|error|debug`). Keep hot paths quiet (hooks, tight loops).
- C#: `ManagedCommon.Logger` (`LogInfo|LogWarning|LogError|LogDebug|LogTrace`). Some UIs use injected `ILogger` via `LoggerInstance.Logger`.
-
-Docs to consult
- `tools/build/BUILD-GUIDELINES.md`
- `doc/devdocs/core/architecture.md`, `doc/devdocs/core/runner.md`, `doc/devdocs/core/settings/readme.md`, `doc/devdocs/modules/readme.md`
-
-Done checklist (self review before finishing)
- Build clean? Tests updated/passed? No unintended formatting? Any new dependency? Documented skips?
--- a/.github/workflows/manual-batch-issue-deduplication.yml
+++ b/.github/workflows/manual-batch-issue-deduplication.yml
@@ -1,38 +0,0 @@
-name: Manual Batch Issue Deduplication
-
-on:
-  workflow_dispatch:
-    inputs:
-      issue_numbers:
-        description: "JSON array of issue numbers to deduplicate (e.g. [101,102,103])"
-        required: true
-      since:
-        description: "Only compare against issues created after this date (ISO 8601, e.g. 2019-05-05T00:00:00Z)"
-        required: false
-        default: "2019-05-05T00:00:00Z"
-      label_as_duplicate:
-        description: "Apply duplicate label if duplicates are found (true/false)"
-        required: false
-        default: "true"
-
-permissions:
-  models: read
-  issues: write
-
-jobs:
-  deduplicate:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        issue: ${{ fromJson(github.event.inputs.issue_numbers) }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Run GenAI Issue Deduplicator
-        uses: pelikhan/action-genai-issue-dedup@v0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          github_issue: ${{ matrix.issue }}
-          label_as_duplicate: ${{ github.event.inputs.label_as_duplicate }}
-          
--- a/.pipelines/v2/templates/job-build-project.yml
+++ b/.pipelines/v2/templates/job-build-project.yml
@@ -411,28 +411,9 @@ jobs:
          !**\obj\**

  - pwsh: |-
-      $Packages = Get-ChildItem -Recurse -Filter "Microsoft.CmdPal.UI_*.msix"
-      Write-Host "Found $($Packages.Count) CmdPal MSIX package(s):"
-      foreach ($pkg in $Packages) {
-          Write-Host "  - $($pkg.FullName)"
-      }
-      
-      if ($Packages.Count -gt 0) {
-          # Priority: Look for platform-specific MSIX (x64/arm64) first, then fallback to any
-          $PlatformPackage = $Packages | Where-Object { $_.Name -match "Microsoft\.CmdPal\.UI_.*_(x64|arm64)\.msix$" } | Select-Object -First 1
-          if ($PlatformPackage) {
-              $Package = $PlatformPackage
-              Write-Host "Using platform-specific package: $($Package.FullName)"
-          } else {
-              $Package = $Packages | Select-Object -First 1
-              Write-Host "Using first available package: $($Package.FullName)"
-          }
-          
-          $PackageFilename = $Package.FullName
-          Write-Host "##vso[task.setvariable variable=CmdPalPackagePath]${PackageFilename}"
-      } else {
-          Write-Warning "No CmdPal MSIX packages found!"
-      }
+      $Package = (Get-ChildItem -Recurse -Filter "Microsoft.CmdPal.UI_*.msix" | Select -First 1)
+      $PackageFilename = $Package.FullName
+      Write-Host "##vso[task.setvariable variable=CmdPalPackagePath]${PackageFilename}"
    displayName: Locate the CmdPal MSIX

  - ${{ if eq(parameters.codeSign, true) }}:
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,43 +0,0 @@
-{
-    "version": "0.2.0",
-    "inputs": [
-        {
-            "id": "arch",
-            "type": "pickString",
-            "description": "Select target architecture",
-            "options": ["x64", "arm64"],
-            "default": "x64"
-        }
-    ],
-    "configurations": [
-        {
-            "name": "Run native executable (no build)",
-            "type": "cppvsdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}\\${input:arch}\\Debug\\PowerToys.exe",
-            "args": [],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-            "console": "integratedTerminal"
-        },
-        {
-            "name": "C/C++ Attach to PowerToys Process (native)",
-            "type": "cppvsdbg",
-            "request": "attach",
-            "processId": "${command:pickProcess}",
-            "symbolSearchPath": "${workspaceFolder}\\${input:arch}\\Debug;${workspaceFolder}\\Debug;${workspaceFolder}\\symbols"
-        },
-        {
-            "name": "Run managed code (managed, no build, ARCH configurable)",
-            "type": "coreclr",
-            "request": "launch",
-            "program": "${workspaceFolder}\\${input:arch}\\Debug\\WinUI3Apps\\PowerToys.Settings.exe",
-            "args": [],
-            "cwd": "${workspaceFolder}",
-            "env": {},
-            "console": "internalConsole",
-            "stopAtEntry": false
-        }
-    ]
-}
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -45,7 +45,7 @@
    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.8" />
    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.15.0" />
    <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
-    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3179.45" />
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
    <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.8" />
    <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
@@ -57,8 +57,8 @@
      This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail.
 	-->
    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4948" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.250907003" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
    <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
    <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
    <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -262,6 +262,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{B39DC643
 		src\common\utils\EventLocker.h = src\common\utils\EventLocker.h
 		src\common\utils\EventWaiter.h = src\common\utils\EventWaiter.h
 		src\common\utils\excluded_apps.h = src\common\utils\excluded_apps.h
+		src\common\utils\shell_ext_registration.h = src\common\utils\shell_ext_registration.h
 		src\common\utils\exec.h = src\common\utils\exec.h
 		src\common\utils\game_mode.h = src\common\utils\game_mode.h
 		src\common\utils\gpo.h = src\common\utils\gpo.h
@@ -281,7 +282,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{B39DC643
 		src\common\utils\registry.h = src\common\utils\registry.h
 		src\common\utils\resources.h = src\common\utils\resources.h
 		src\common\utils\serialized.h = src\common\utils\serialized.h
-		src\common\utils\shell_ext_registration.h = src\common\utils\shell_ext_registration.h
 		src\common\utils\string_utils.h = src\common\utils\string_utils.h
 		src\common\utils\timeutil.h = src\common\utils\timeutil.h
 		src\common\utils\UnhandledExceptionHandler.h = src\common\utils\UnhandledExceptionHandler.h
@@ -793,10 +793,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Window
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.UnitTestBase", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.UnitTestsBase\Microsoft.CmdPal.Ext.UnitTestBase.csproj", "{00D8659C-2068-40B6-8B86-759CD6284BBB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{E11826E1-76DF-42AC-985C-164CC2EE57A1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenRuler.UITests", "src\modules\MeasureTool\Tests\ScreenRuler.UITests\ScreenRuler.UITests.csproj", "{66C069F8-C548-4CA6-8CDE-239104D68E88}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Apps.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.Apps.UnitTests\Microsoft.CmdPal.Ext.Apps.UnitTests.csproj", "{E816D7B1-4688-4ECB-97CC-3D8E798F3830}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Bookmarks.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.Bookmarks.UnitTests\Microsoft.CmdPal.Ext.Bookmarks.UnitTests.csproj", "{E816D7B3-4688-4ECB-97CC-3D8E798F3832}"
@@ -2699,22 +2695,6 @@ Global
 		{61CBF221-9452-4934-B685-146285E080D7}.Release|ARM64.Build.0 = Release|ARM64
 		{61CBF221-9452-4934-B685-146285E080D7}.Release|x64.ActiveCfg = Release|x64
 		{61CBF221-9452-4934-B685-146285E080D7}.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
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Debug|ARM64.Build.0 = Debug|ARM64
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Debug|x64.ActiveCfg = Debug|x64
@@ -2731,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
@@ -2883,14 +2887,6 @@ Global
 		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|ARM64.Build.0 = Release|ARM64
 		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|x64.ActiveCfg = Release|x64
 		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|x64.Build.0 = Release|x64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Debug|ARM64.Build.0 = Debug|ARM64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Debug|x64.ActiveCfg = Debug|x64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Debug|x64.Build.0 = Debug|x64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Release|ARM64.ActiveCfg = Release|ARM64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Release|ARM64.Build.0 = Release|ARM64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Release|x64.ActiveCfg = Release|x64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Release|x64.Build.0 = Release|x64
 		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Debug|ARM64.Build.0 = Debug|ARM64
 		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Debug|x64.ActiveCfg = Debug|x64
@@ -2932,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}
@@ -3197,10 +3194,10 @@ Global
 		{9BC1C986-1E97-4D07-A7B1-CE226C239EFA} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{99CA1509-FB73-456E-AFAF-AB89C017BD72} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
 		{61CBF221-9452-4934-B685-146285E080D7} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
-		{38F187B2-6638-5A40-072F-DBE5E54070A0} = {1AFB6476-670D-4E80-A464-657E01DFF482}
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
 		{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}
@@ -3236,8 +3233,6 @@ Global
 		{E816D7AF-4688-4ECB-97CC-3D8E798F3828} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{E816D7B0-4688-4ECB-97CC-3D8E798F3829} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{00D8659C-2068-40B6-8B86-759CD6284BBB} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{E11826E1-76DF-42AC-985C-164CC2EE57A1} = {7AC943C9-52E8-44CF-9083-744D8049667B}
-		{66C069F8-C548-4CA6-8CDE-239104D68E88} = {E11826E1-76DF-42AC-985C-164CC2EE57A1}
 		{E816D7B1-4688-4ECB-97CC-3D8E798F3830} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{E816D7B3-4688-4ECB-97CC-3D8E798F3832} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{E816D7B2-4688-4ECB-97CC-3D8E798F3831} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
--- a/README.md
+++ b/README.md
@@ -35,19 +35,19 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 Go to the [Microsoft PowerToys GitHub releases page][github-release-link] and click on `Assets` at the bottom to show the files available in the release. Please use the appropriate PowerToys installer that matches your machine's architecture and install scope. For most, it is `x64` and per-user.

 <!-- items that need to be updated release to release -->
-[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.95%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.94%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.94.0/PowerToysUserSetup-0.94.0-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.94.0/PowerToysUserSetup-0.94.0-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.94.0/PowerToysSetup-0.94.0-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.94.0/PowerToysSetup-0.94.0-arm64.exe
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.94%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.93%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysUserSetup-0.93.0-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysUserSetup-0.93.0-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysSetup-0.93.0-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysSetup-0.93.0-arm64.exe
 
 |  Description   | Filename |
 |----------------|----------|
-| Per user - x64       | [PowerToysUserSetup-0.94.0-x64.exe][ptUserX64] |
-| Per user - ARM64     | [PowerToysUserSetup-0.94.0-arm64.exe][ptUserArm64] |
-| Machine wide - x64   | [PowerToysSetup-0.94.0-x64.exe][ptMachineX64] |
-| Machine wide - ARM64 | [PowerToysSetup-0.94.0-arm64.exe][ptMachineArm64] |
+| Per user - x64       | [PowerToysUserSetup-0.93.0-x64.exe][ptUserX64] |
+| Per user - ARM64     | [PowerToysUserSetup-0.93.0-arm64.exe][ptUserArm64] |
+| Machine wide - x64   | [PowerToysSetup-0.93.0-x64.exe][ptMachineX64] |
+| Machine wide - ARM64 | [PowerToysSetup-0.93.0-arm64.exe][ptMachineArm64] |

 This is our preferred method.

@@ -93,145 +93,118 @@ For guidance on developing for PowerToys, please read the [developer docs](./doc

 Our [prioritized roadmap][roadmap] of features and utilities that the core team is focusing on.

-### 0.94 - Sep 2025 Update
+### 0.93 - Aug 2025 Update

 In this release, we focused on new features, stability, optimization improvements, and automation.

-For an in-depth look at the latest changes, visit the [release blog](https://aka.ms/powertoys-releaseblog).
-
 **✨Highlights**

- - PowerToys Settings added a Settings search with fuzzy matching, suggestions, a results page, and UX polish to make finding options faster.
- - A comprehensive hotkey conflict detection system was introduced in Settings to surface and help resolve conflicting shortcuts. Note that the default hotkey settings (Win+Ctrl+Shift+T, Win+Ctrl+V, Win+Ctrl+T, Win+Shift+T) may overlap with existing Windows system shortcuts. This is expected. You can resolve the conflict by assigning different hotkeys.
- - Mouse Utilities added a “Gliding cursor” accessibility feature to Mouse Pointer Crosshairs for single‑button cursor movement and clicking. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
- - The installer was upgraded to WiX 5 after WiX 3 reached end-of-life; this move improved installer security, reliability, and community support.
- - Tons of bug fixes and improvements for Command Palette, including visual updates and new support for filters on ListPages (handy for extension developers).
- - Hosts Editor now has a “No leading spaces” option so active host entries can start at column 0 even if others are disabled. Thanks [@mohammed-saalim](https://github.com/mohammed-saalim)!
- - Context menu registration was moved from the installer to runtime to avoid loading disabled modules (runtime registrations).
- - Quick Accent now supports Maltese, and frequently used accents appear first (and are remembered across sessions). Thanks [@rovercoder](https://github.com/rovercoder)! [@davidegiacometti](https://github.com/davidegiacometti)!
-
-### Always On Top
-
- - Fixed the border hover cursor so it shows the arrow instead of the wait cursor. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - PowerToys settings debuts a modern, card-based dashboard with clearer descriptions and faster navigation for a streamlined user experience.
+ - Command Palette had over 99 issues resolved, including bringing back Clipboard History, adding context menu shortcuts, pinning favorite apps, and supporting history in Run.
+ - Command Palette reduced its startup memory usage by ~15%, load time by ~40%, built-in extensions loading time by ~70%, and installation size by ~55%—all due to using the full Ahead-of-Time (AOT) compilation mode in Windows App SDK.
+ - Peek now supports instant previews and embedded thumbnails for Binary G-code (.bgcode) 3D printing files, making it easy to inspect models at a glance. Thanks [@pedrolamas](https://github.com/pedrolamas)!
+ - Mouse Utilities introduces a new spotlight highlighting mode that dims the screen and draws attention to your cursor, perfect for presentations.
+ - Test coverage improvements for multiple PowerToys modules including Command Palette, Advanced Paste, Peek, Text Extractor, and PowerRename — ensuring better reliability and quality, with over 600 new unit tests (mostly for Command Palette) and doubled UI automation coverage.

 ### Command Palette

- - Applied single-click activation only to pointer input; keyboard always activates immediately. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Let context menus open at the cursor by removing window-bound constraints. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Made error messages clearer with timestamps, HRESULTs, and full details for easier diagnosis. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Prevented crashes and improved robustness when updating providers without commands. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Ensured the Settings window reliably comes to the front when opened. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Replaced the Clipboard History icon with a colorful Fluent icon. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Hardened ContentIcon to avoid duplicate parenting and improve diagnostics. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Standardized null checks using C# pattern matching for safer behavior.
- - Improved accessibility by focusing the activation shortcut dialog and making text reachable. Thanks [@chatasweetie](https://github.com/chatasweetie)!
- - Moved the extension SDK to a stable Windows SDK and cleaned up message namespaces.
- - Added path shortcuts: ~ to home, and / or \\ to system root, plus UNC support. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Fixed a race in cancellation handling to avoid InvalidOperationException. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Aligned separator styling with WinUI 3 for consistent visuals. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added ARM64 PDBs to the Extensions SDK NuGet for better debugging.
- - Added single-select filters to DynamicListPage and updated Windows Services sample.
- - Updated main page placeholder text to better describe what can be searched. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Removed explicit WinAppSDK/WebView2 dependencies from toolkit and API. Thanks [@rluengen](https://github.com/rluengen)!
- - Added a local keyboard hook to handle the GoBack key reliably. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Propagated alias changes safely and resolved conflicts across view models.
- - Allowed providers to override Dispose with a virtual method.
- - Fixed memory leaks by cleaning up removed or cancelled list items.
- - Sorted DateTime extension results by relevance for better usability.
- - Reduced search text “jiggling” by avoiding redundant change notifications.
- - Centralized automation notifications in a UIHelper for better accessibility. Thanks [@chatasweetie](https://github.com/chatasweetie)!
- - Preserved Adaptive Card action types during trimming via DynamicDependency.
- - Added an acrylic backdrop and refined styling to the context menu. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Prevented disposed pages and Settings windows from handling stale messages. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Made the extension API easier to evolve without breaking clients.
- - Added “evil” sample pages to help reproduce tricky bugs.
- - Fixed WinGet trim-safety issues by replacing LINQ with manual iteration.
- - Cancelled stale list fetches to avoid older results overwriting newer ones in CmdPal.
+ - Ensured screen readers are notified when the selected item in the list changes for better accessibility.
+ - Fixed command title changes not being properly notified to screen readers. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Made icon controls excluded from keyboard navigation by default for better accessibility. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Improved UI design with better text sizing and alignment.
+ - Fixed keyboard shortcuts to work better in text boxes and context menus.
+ - Added right-click context menus with critical command styling and separators.
+ - Improved various context menu issues, improving item selection, handling of long titles, search bar text scaling, initial item behavior, and primary button functionality.
+ - Fixed context menu crashes with better type handling.
+ - Fixed "Reload" command to work with both uppercase and lowercase letters.
+ - Added mouse back button support for easier navigation. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed Alt+Left Arrow navigation not working when search box contains text. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Updated back button tooltip to show keyboard shortcut information. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed Command Palette window not appearing properly when activated. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed Command Palette window staying hidden from taskbar after File Explorer restarts. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed window focus not returning to previous app properly.
+ - Fixed Command Palette window to always appear on top when shown and move to bottom when hidden. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed window hiding to properly work on UI thread. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed crashes and improved stability with better synchronization of Command list updates. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Improved extension disposal with better error handling to prevent crashes. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Improved stability by fixing a UI threading issue when loading more results, preventing possible crashes and ensuring the loading state resets if loading fails. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Enhanced icon loading stability with better exception handling. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added thread safety to recent commands to prevent crashes. Thanks [@MaoShengelia](https://github.com/MaoShengelia)!
+ - Fixed acrylic (frosted glass) system backdrop display issues by ensuring proper UI thread handling. Thanks [@jiripolasek](https://github.com/jiripolasek)!

 ### Command Palette extensions

- - Improved empty states and ranking logic for multiple extensions. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Added app icons to the All Apps "Run" context command when available.
- - Restored missing builtin icons by standardizing extension dependencies.
- - Unblocked local deployment by adding WinAppSDK to two sample extensions.
-
-### Hosts File Editor
-
- - Added a "No leading spaces" option so active hosts entries can start at column 0 even when others are disabled. Thanks [@mohammed-saalim](https://github.com/mohammed-saalim)!
-
-### Image Resizer
-
- - Fixed Image Resizer localization by installing satellite resources under the WinUI 3 apps culture path.
+ - Added settings to each provider to control which fallback commands are enabled. Thanks [@jiripolasek](https://github.com/jiripolasek)! for fixing a regression in this feature.
+ - Added sample code showing how Command Palette extensions can track when their pages are loaded or unloaded. [Check it out here](./src/modules/cmdpal/ext/SamplePagesExtension/OnLoadPage.cs).
+ - Fixed *Calculator* to accept regular spaces in numbers that use space separators. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Added a new setting to *Calculator* to make "Copy" the primary button (replacing “Save”) and enable "Close on Enter", streamlining the workflow. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Improved *Apps* indexing error handling and removed obsolete code. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Prevented apps from showing in search when the *Apps* extension is disabled. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added ability to pin/unpin *Apps* using Ctrl+P shortcut.
+ - Added keyboard shortcuts to the *Apps* context menu items for faster access. 
+ - Added all file context menu options to the *Apps* items context menu, making all file actions available there for better functionality.
+ - Streamlined All *Apps* extension settings by removing redundant descriptions, making the UI clearer.
+ - Added command history to the *Run* page for easier access to previous commands.
+ - Fixed directory path handling in *Run* fallback for better file navigation.
+ - Fixed URL fallback item hiding properly in *Web Search* extension when search query becomes invalid. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added proper empty state message for *Web Search* extension when no results found. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added fallback command to *Windows Settings* extension for better search results.
+ - Re-enabled *Clipboard History* feature with proper window handling.
+ - Improved *Add Bookmark* extension to automatically detect file, folder, or URL types without manual input.
+ - Updated terminology from "Kill process" to "End task" in *Window Walker* for consistency with Windows.
+ - Fixed minor grammar error in SamplePagesExtension code comments. Thanks [@purofle](https://github.com/purofle)!

 ### Mouse Utilities

- - Introduced "Gliding cursor" to control the pointer and click with a single hotkey for better accessibility. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
-
-### Mouse Without Borders
-
- - Blocked Easy Mouse from switching machines during fullscreen apps, with an allow-list for exceptions. Thanks [@dot-tb](https://github.com/dot-tb)!
+ - Added a new spotlight highlighting mode that creates a large transparent circle around your cursor with a backdrop effect, providing an alternative to the traditional circle highlight. Perfect for presentations where you want to focus attention on a specific area while dimming the rest of the screen.

 ### Peek

- - Added Visual Studio shared project file types to XML preview and fixed bgcode handler registration. Thanks [@rezanid](https://github.com/rezanid)!
- - Fixes bgcode preview handler registration and events for reliable previews. Thanks [@pedrolamas](https://github.com/pedrolamas)!
-
-### PowerRename
-
- - Changed the Explorer accelerator key to PowErRename to avoid clashing with the New menu. Thanks [@aaron-ni](https://github.com/aaron-ni)!
+ - Added preview and thumbnail support for Binary G-code (.bgcode) files used in 3D printing. You can now see embedded thumbnails and preview these compressed 3D printing files directly in Peek and File Explorer. Thanks [@pedrolamas](https://github.com/pedrolamas)!

 ### Quick Accent

- - Remembered character usage across sessions so frequently used accents appear first. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Added Maltese language support with specific characters and the Euro symbol. Thanks [@rovercoder](https://github.com/rovercoder)!
- - Reduced GPU usage issues by making the window Topmost only when the picker is visible. Thanks [@daverayment](https://github.com/daverayment)!
+ - Added Vietnamese language support to Quick Accent, mappings for Vietnamese vowels (a, e, i, o, u, y) and the letter d. Thanks [@octastylos-pseudodipteros](https://github.com/octastylos-pseudodipteros)!

 ### Settings

- - Added telemetry to track usage of the new shortcut conflict detection workflow.
- - Moved the shutdown action from the title bar to a footer menu item with confirmation. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Implemented comprehensive hotkey conflict detection with a dedicated resolution dialog.
- - Added branded visuals for Office and Copilot keys in the KeyVisual control.
- - Introduced Settings search with fuzzy matching and navigation to specific controls.
- - Corrected Spanish localization so product names like Awake remain in English across Settings and OOBE.
- - Simplified the Advanced Paste description in Settings for quicker reading and consistent capitalization. Thanks [@OldUser101](https://github.com/OldUser101)!
- - Localized conflict messages in the conflict window and dialog.
-
-### Installer
-
- - Upgraded the installer to WiX 5 with silent "Files in Use" handling for smoother winget installs.
- - Switched Win10 context menu modules to runtime registration and added cleanup on uninstall to avoid stale entries.
+ - Completely redesigned the Settings dashboard with a modern card-based layout featuring organized sections for quick actions and shortcuts overview, replacing the old module list.
+ - Rewrote setting descriptions to be more concise and follow Windows writing style guidelines, making them easier to understand.
+ - Improved formatting and readability of release notes in the "What's New" section with better typography and spacing.
+ - Added missing deep link support for various settings pages (Peek, Quick Accent, PowerToys Run, etc.) so you can jump directly to specific settings.
+ - Resolved an issue where the settings page header would drift away from its position when resizing the settings window.
+ - Resolved a settings crash related to incompatible property names in ZoomIt configuration.

 ### Documentation

- - Adds docs for building the installer locally and testing winget installs.
- - Fixed a broken style guide link in developer documentation. Thanks [@denizmaral](https://github.com/denizmaral)!
+ - Added detailed step-by-step instructions for first-time developers building the Command Palette module, including prerequisites and Visual Studio setup guidance. Thanks [@chatasweetie](https://github.com/chatasweetie)!
+ - **Fixed Broken SDK Link**: Corrected a broken markdown link in the Command Palette SDK README that was pointing to an incorrect directory path. Thanks [@ChrisGuzak](https://github.com/ChrisGuzak)!
+ - Added documentation for the "Open With Cursor" plugin that enables opening Visual Studio and VS Code recent files using Cursor AI. Thanks [@VictorNoxx](https://github.com/VictorNoxx)!
+ - Added documentation for two new community plugins - Hotkeys plugin for creating custom keyboard shortcuts, and RandomGen plugin for generating random data like passwords, colors, and placeholder text. Thanks [@ruslanlap](https://github.com/ruslanlap)!

 ### Development

- - Excluded test and coverage DLLs from BinSkim scans to cut false positives and speed up security analysis.
- - Simplified NOTICE maintenance by removing version numbers and filtering out Microsoft/System packages.
- - Improved NuGet dependency validation to prevent package downgrades and catch issues during restore.
- - Updated UTF.Unknown to a modern version to improve compatibility without breaking changes. Thanks [@304NotModified](https://github.com/304NotModified)!
- - Refreshed package catalog in CI before installing dependencies to prevent Linux workflow failures.
- - Refactored CmdPal tests with dependency injection and added coverage for queries and settings.
- - Added unit tests to verify Close on Enter swaps Copy/Save as expected. Thanks [@mohammed-saalim](https://github.com/mohammed-saalim)!
- - Added accessibility IDs to CmdPal UI for stable UI tests.
- - Rewrote system command tests with a new test base and cleaner patterns.
- - Added unit tests for WebSearch and Shell extensions with mockable settings.
- - Added unit tests and abstractions for Apps and Bookmarks extensions.
- - Cleans up AI‑generated tests; adds meaningful query tests across extensions.
- - Removed the obsolete debug dialog from Settings for a smoother developer loop.
+ - Updated .NET libraries to 9.0.8 for performance and security. Thanks [@snickler](https://github.com/snickler)!
+ - Updated the spell check system to version 0.0.25 with better GitHub integration and SARIF reporting, plus fixed numerous spelling errors throughout the codebase including property names and documentation. Thanks [@jsoref](https://github.com/jsoref)!
+ - Cleaned up spelling check configuration to eliminate false positives and excessive noise that was appearing in every pull request, making the development process smoother.
+ - Replaced NuGet feed with Azure Artifacts for better package management.
+ - Implemented configurable UI test pipeline that can use pre-built official releases instead of building everything from scratch, reducing test execution time from 2+ hours.
+ - Replaced brittle pixel-by-pixel image comparison with perceptual hash (pHash) technology that's more robust to minor rendering differences - no more test failures due to anti-aliasing or compression artifacts.
+ - Reduced CI/fuzzing/UI test timeouts from 4 hours to 90 minutes, dramatically improving developer feedback loops and preventing long waits when builds get stuck.
+ - Standardized test project naming across the entire codebase and improved pipeline result identification by adding platform/install mode context to test run titles. Thanks [@khmyznikov](https://github.com/khmyznikov)!
+ - Added comprehensive UI test suites for multiple PowerToys modules including Command Palette, Advanced Paste, Peek, Text Extractor, and PowerRename - ensuring better reliability and quality.
+ - Enhanced UI test automation with command-line argument support, better session management, and improved element location methods using pattern matching to avoid failures from minor differences in exact matches.

 ### What is being planned over the next few releases

-For [v0.95][github-next-release-work], we'll work on the items below:
+For [v0.94][github-next-release-work], we'll work on the items below:

 - Continued Command Palette polish
 - Working on Shortcut Guide v2 (Thanks [@noraa-junker](https://github.com/noraa-junker)!)
+ - Working on upgrading the installer to WiX 5
+ - Working on shortcut conflict detection
+ - Working on setting search
 - Upgrading Keyboard Manager's editor UI
- - UI tweaking utility with day/night theme switcher
- - DSC v3 support for top utilities
 - New UI automation tests
 - Stability, bug fixes

--- a/doc/devdocs/development/debugging.md
+++ b/doc/devdocs/development/debugging.md
@@ -18,8 +18,8 @@ You can build the entire solution from the command line, which is sometimes fast
 1. Open Developer Command Prompt for VS 2022
 2. Navigate to the repository root directory
 3. Run the following command(don't forget to set the correct platform):
-   ```pwsh
-   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.sln /tl /p:NuGetInteractive="true"
+   ```
+   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.sln
   ```
 4. This process should complete in approximately 13-14 minutes for a full build

--- a/doc/devdocs/development/dev-with-vscode.md
+++ b/doc/devdocs/development/dev-with-vscode.md
@@ -1,128 +0,0 @@
-## Developing PowerToys with Visual Studio Code
-
-This guide shows how to build, debug, and contribute to PowerToys using VS Code instead of (or alongside) full Visual Studio. It focuses on common inner‑loop tasks for C++, .NET, and mixed scenarios present in the solution.
-
-> PowerToys is a large mixed C++ / C# / WinAppSDK solution. VS Code works well for incremental development and quick module iterations, but occasionally you may still prefer full Visual Studio for designer tooling or specialized diagnostics.
-
---
-VS Code extensions Needed:
-
-| Area | Extension | Notes |
-|------|-----------|-------|
-| C++ | ms-vscode.cpptools | IntelliSense, debugging (cppvsdbg) |
-| C# | ms-dotnettools.csdevkit (or C#) | Language service / test explorer |
-
---
-
-## Building in VS Code
-### Configure developer powershell for vs2022 for more convenient dev in vscode.
-1. Configure profile in in settings, entry:  "terminal.integrated.profiles.windows"
-2. Add below config as entry:
-```json
-    "Developer PowerShell for VS 2022": {
-		// Configure based on your preference
-        "path": "C:\\Program Files\\WindowsApps\\Microsoft.PowerShell_7.5.2.0_arm64__8wekyb3d8bbwe\\pwsh.exe",
-        "args": [
-            "-NoExit",
-            "-Command",
-            "& {",
-            "$orig = Get-Location;",
-            // Configure based on your environment
-            "& 'C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Common7\\Tools\\Launch-VsDevShell.ps1';",
-            "Set-Location $orig",
-            "}"
-        ]
-    },
-```
-3. [Optional] Set Developer PowerShell for VS 2022 as your default profile, so that you can get a deep integration with vscode coding agent. 
-
-4. Now You can build with plain `msbuild` or configure tasks.json in below section
-Or reach out to "tools\build\BUILD-GUIDELINES.md"
-
-### Sample plain msbuild command
-```powershell
-# Restore:
-msbuild powertoys.sln -t:restore -p:configuration=debug -p:platform=x64 -m
-
-# Build powertoys sln
-msbuild powertoys.sln -p:configuration=debug -p:platform=x64 -m
-
-# dotnet project
-msbuild src\settings-ui\Settings.UI\PowerToys.Settings.csproj -p:Platform=x64 -p:Configuration=Debug -m
-
-# native project
-msbuild "src\modules\MouseUtils\FindMyMouse\FindMyMouse.vcxproj" -p:Configuration=Debug -p:Platform=x64 -m
-```
-
---
-
-## Debugging
-
-### Existing launch configuration
-
-The repo provides `.vscode/launch.json` with:
-
- `Run PowerToys.exe (no build)`: Launches the already-built executable at `x64/Debug/PowerToys.exe` using `cppvsdbg`.
-
-Build first, then press F5. To switch configuration (Release / ARM64) either edit the path or create additional launch entries.
-
-### Attaching to a running instance
-
-If PowerToys is already running, you can attach to that process:
-
-2. VS Code command palette: “C/C++: (Windows) Attach to Process”.
-3. Filter for `PowerToys.exe` / module-specific processes.
-
-### Debugging managed components
-
-Many modules have a managed component loaded into the PowerToys process. `cppvsdbg` can debug mixed mode, but if you need richer .NET inspection you can create a second configuration using `type: coreclr` and `processId` attachment after the native launch, or just attach separately:
-
-Similar for attach to managed code.
-> Note: In arm64 machine, can only debug arm64 code.
-
-```jsonc
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Run native executable (no build)",
-            "type": "cppvsdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}\\x64\\Debug\\PowerToys.exe",
-            "args": [],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-            "console": "integratedTerminal"
-        },
-        {
-            "name": "C/C++ Attach to PowerToys Process (native)",
-            "type": "cppvsdbg",
-            "request": "attach",
-            "processId": "${command:pickProcess}",
-            "symbolSearchPath": "${workspaceFolder}\\x64\\Debug;${workspaceFolder}\\Debug;${workspaceFolder}\\symbols"
-        },
-        {
-            "name": "Run managed code (managed, no build)",
-            "type": "coreclr",
-            "request": "launch",
-            "program": "${workspaceFolder}\\arm64\\Debug\\WinUI3Apps\\PowerToys.Settings.exe",
-            "args": [],
-            "cwd": "${workspaceFolder}",
-            "env": {},
-            "console": "internalConsole",
-            "stopAtEntry": false
-        }
-    ]
-}
-```
---
-
-## 6. Common tasks & tips
-
-| Task | Command / Action | Notes |
-|------|------------------|-------|
-| Clean | `git clean -xdf` (careful) or `msbuild /t:Clean PowerToys.sln` | Deep clean removes packages & build outputs |
-| Rebuild single project | `msbuild path\to\proj.vcxproj /t:Rebuild -p:Platform=x64 -p:Configuration=Debug` | Faster than whole solution |
-| Generate installer (rare in inner loop) | See `tools\build\build-installer.ps1` | Usually not needed for local debug |
-| Resource conversion errors | Re-run restore + build | Triggers custom PowerShell targets |
--- a/doc/devdocs/readme.md
+++ b/doc/devdocs/readme.md
@@ -76,7 +76,6 @@ 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

--- a/doc/thirdPartyRunPlugins.md
+++ b/doc/thirdPartyRunPlugins.md
@@ -73,5 +73,4 @@ Below are community created plugins that target a website or software.  They are
 | [YubicoOauthOTP](https://github.com/dlnilsson/Community.PowerToys.Run.Plugin.YubicoOauthOTP) | [dlnilsson](https://github.com/dlnilsson) | Display generated codes from OATH accounts stored on the YubiKey in powerToys Run  |
 | [Firefox Bookmark](https://github.com/8LWXpg/PowerToysRun-FirefoxBookmark) | [8LWXpg](https://github.com/8LWXpg) | Open bookmarks in Firefox based browser |
 | [Linear](https://github.com/vednig/powertoys-linear) | [vednig](https://github.com/vednig) | Create Linear Issues directly from Powertoys Run |
-| [PerplexitySearchShortcut](https://github.com/0x6f677548/PowerToys-Run-PerplexitySearchShortcut) | [0x6f677548](https://github.com/0x6f677548) | Search Perplexity |
 | [SpeedTest](https://github.com/ruslanlap/PowerToysRun-SpeedTest) | [ruslanlap](https://github.com/ruslanlap) | One-command internet speed tests with real-time results, modern UI, and shareable links. |
--- a/installer/PowerToysSetup/CmdPal.wxs
+++ b/installer/PowerToysSetup/CmdPal.wxs
@@ -9,6 +9,13 @@
  <Fragment>
    <DirectoryRef Id="WinUI3AppsInstallFolder">
      <Directory Id="CmdPalInstallFolder" Name="CmdPal">
+        <Directory Id="CmdPalDepsInstallFolder" Name="Dependencies">
+        <?if $(sys.BUILDARCH) = x64 ?>
+          <Directory Id="CmdPalDepsX64InstallFolder" Name="x64" />
+        <?else ?>
+          <Directory Id="CmdPalDepsArm64InstallFolder" Name="arm64" />
+        <?endif ?>
+        </Directory>
      </Directory>
    </DirectoryRef>

@@ -26,14 +33,41 @@
      </Component>
    </DirectoryRef>

+    <?if $(sys.BUILDARCH) = x64 ?>
+    <DirectoryRef Id="CmdPalDepsX64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64">
+      <Component Id="Module_CmdPal_Deps" Win64="yes" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64\Microsoft.VCLibs.x64.14.00.Desktop.appx" />
+      </Component>
+    </DirectoryRef>
+    <?else ?>
+    <DirectoryRef Id="CmdPalDepsArm64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64">
+      <Component Id="Module_CmdPal_Deps" Win64="yes" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64\Microsoft.VCLibs.ARM64.14.00.Desktop.appx" />
+      </Component>
+    </DirectoryRef>
+    <?endif ?>
+
    <ComponentGroup Id="CmdPalComponentGroup">
      <Component Id="RemoveCmdPalFolder" Guid="2DF90C08-CC75-4245-A14E-B82904636C53" Directory="INSTALLFOLDER">
        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
          <RegistryValue Type="string" Name="RemoveCmdPalFolder" Value="" KeyPath="yes"/>
        </RegistryKey>
        <RemoveFolder Id="RemoveCmdPalInstallDirFolder" Directory="CmdPalInstallFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveCmdPalDepsInstallDirFolder" Directory="CmdPalDepsInstallFolder" On="uninstall"/>
+    <?if $(sys.BUILDARCH) = x64 ?>
+        <RemoveFolder Id="RemoveCmdPalDepsX64InstallDirFolder" Directory="CmdPalDepsX64InstallFolder" On="uninstall"/>
+    <?else ?>
+        <RemoveFolder Id="RemoveCmdPalDepsArm64InstallDirFolder" Directory="CmdPalDepsArm64InstallFolder" On="uninstall"/>
+    <?endif ?>
      </Component>
      <ComponentRef Id="Module_CmdPal" />
+      <ComponentRef Id="Module_CmdPal_Deps" />
    </ComponentGroup>

  </Fragment>
--- a/installer/PowerToysSetupVNext/CmdPal.wxs
+++ b/installer/PowerToysSetupVNext/CmdPal.wxs
@@ -4,6 +4,13 @@
  <Fragment>
    <DirectoryRef Id="WinUI3AppsInstallFolder">
      <Directory Id="CmdPalInstallFolder" Name="CmdPal">
+        <Directory Id="CmdPalDepsInstallFolder" Name="Dependencies">
+        <?if $(sys.BUILDARCH) = x64 ?>
+          <Directory Id="CmdPalDepsX64InstallFolder" Name="x64" />
+        <?else?>
+          <Directory Id="CmdPalDepsArm64InstallFolder" Name="arm64" />
+        <?endif?>
+        </Directory>
      </Directory>
    </DirectoryRef>
    <DirectoryRef Id="CmdPalInstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test">
@@ -18,14 +25,40 @@
        <?endif?>
      </Component>
    </DirectoryRef>
+    <?if $(sys.BUILDARCH) = x64 ?>
+    <DirectoryRef Id="CmdPalDepsX64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64">
+      <Component Id="Module_CmdPal_Deps" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0" Bitness="always64">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes" />
+        </RegistryKey>
+        <File Id="Microsoft.VCLibs.x64.14.00.Desktop.appx" Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64\Microsoft.VCLibs.x64.14.00.Desktop.appx" />
+      </Component>
+    </DirectoryRef>
+    <?else?>
+    <DirectoryRef Id="CmdPalDepsArm64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64">
+      <Component Id="Module_CmdPal_Deps" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0" Bitness="always64">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes" />
+        </RegistryKey>
+        <File Id="Microsoft.VCLibs.ARM64.14.00.Desktop.appx" Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64\Microsoft.VCLibs.ARM64.14.00.Desktop.appx" />
+      </Component>
+    </DirectoryRef>
+    <?endif?>
    <ComponentGroup Id="CmdPalComponentGroup">
      <Component Id="RemoveCmdPalFolder" Guid="2DF90C08-CC75-4245-A14E-B82904636C53" Directory="INSTALLFOLDER">
        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
          <RegistryValue Type="string" Name="RemoveCmdPalFolder" Value="" KeyPath="yes" />
        </RegistryKey>
        <RemoveFolder Id="RemoveCmdPalInstallDirFolder" Directory="CmdPalInstallFolder" On="uninstall" />
+        <RemoveFolder Id="RemoveCmdPalDepsInstallDirFolder" Directory="CmdPalDepsInstallFolder" On="uninstall" />
+    <?if $(sys.BUILDARCH) = x64 ?>
+        <RemoveFolder Id="RemoveCmdPalDepsX64InstallDirFolder" Directory="CmdPalDepsX64InstallFolder" On="uninstall" />
+    <?else?>
+        <RemoveFolder Id="RemoveCmdPalDepsArm64InstallDirFolder" Directory="CmdPalDepsArm64InstallFolder" On="uninstall" />
+    <?endif?>
      </Component>
      <ComponentRef Id="Module_CmdPal" />
+      <ComponentRef Id="Module_CmdPal_Deps" />
    </ComponentGroup>
  </Fragment>
 </Wix>
--- a/src/common/ManagedCommon/Logger.cs
+++ b/src/common/ManagedCommon/Logger.cs
@@ -122,13 +122,13 @@ namespace ManagedCommon
            {
                var exMessage =
                    message + Environment.NewLine +
-                    ex.GetType() + " (" + ex.HResult + "): " + ex.Message + Environment.NewLine;
+                    ex.GetType() + ": " + ex.Message + Environment.NewLine;

                if (ex.InnerException != null)
                {
                    exMessage +=
                        "Inner exception: " + Environment.NewLine +
-                        ex.InnerException.GetType() + " (" + ex.HResult + "): " + ex.InnerException.Message + Environment.NewLine;
+                        ex.InnerException.GetType() + ": " + ex.InnerException.Message + Environment.NewLine;
                }

                exMessage +=
--- a/src/common/UITestAutomation/ModuleConfigData.cs
+++ b/src/common/UITestAutomation/ModuleConfigData.cs
@@ -33,7 +33,6 @@ namespace Microsoft.PowerToys.UITest
        Workspaces,
        PowerRename,
        CommandPalette,
-        ScreenRuler,
    }

    /// <summary>
@@ -105,7 +104,6 @@ namespace Microsoft.PowerToys.UITest
                [PowerToysModule.Workspaces] = new ModuleInfo("PowerToys.WorkspacesEditor.exe", "Workspaces Editor"),
                [PowerToysModule.PowerRename] = new ModuleInfo("PowerToys.PowerRename.exe", "PowerRename", "WinUI3Apps"),
                [PowerToysModule.CommandPalette] = new ModuleInfo("Microsoft.CmdPal.UI.exe", "PowerToys Command Palette", "WinUI3Apps\\CmdPal"),
-                [PowerToysModule.ScreenRuler] = new ModuleInfo("PowerToys.MeasureToolUI.exe", "PowerToys.ScreenRuler", "WinUI3Apps"),
            };
        }

--- a/src/common/UITestAutomation/UITestBase.cs
+++ b/src/common/UITestAutomation/UITestBase.cs
@@ -4,7 +4,6 @@

 using System.Collections.ObjectModel;
 using System.Diagnostics;
-using System.IO;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -95,7 +94,6 @@ namespace Microsoft.PowerToys.UITest
                {
                    Task.Delay(1000).Wait();
                    AddScreenShotsToTestResultsDirectory();
-                    AddLogFilesToTestResultsDirectory();
                }
            }

@@ -600,92 +598,6 @@ namespace Microsoft.PowerToys.UITest
            }
        }

-        /// <summary>
-        /// Copies PowerToys log files to test results directory when test fails.
-        /// Renames files to include the directory structure after \PowerToys.
-        /// </summary>
-        protected void AddLogFilesToTestResultsDirectory()
-        {
-            try
-            {
-                var localAppDataLow = Path.Combine(
-                    Environment.GetEnvironmentVariable("USERPROFILE") ?? string.Empty,
-                    "AppData",
-                    "LocalLow",
-                    "Microsoft",
-                    "PowerToys");
-
-                if (Directory.Exists(localAppDataLow))
-                {
-                    CopyLogFilesFromDirectory(localAppDataLow, string.Empty);
-                }
-
-                var localAppData = Path.Combine(
-                    Environment.GetEnvironmentVariable("LOCALAPPDATA") ?? string.Empty,
-                    "Microsoft",
-                    "PowerToys");
-
-                if (Directory.Exists(localAppData))
-                {
-                    CopyLogFilesFromDirectory(localAppData, string.Empty);
-                }
-            }
-            catch (Exception ex)
-            {
-                // Don't fail the test if log file copying fails
-                Console.WriteLine($"Failed to copy log files: {ex.Message}");
-            }
-        }
-
-        /// <summary>
-        /// Recursively copies log files from a directory and renames them with directory structure.
-        /// </summary>
-        /// <param name="sourceDir">Source directory to copy from</param>
-        /// <param name="relativePath">Relative path from PowerToys folder</param>
-        private void CopyLogFilesFromDirectory(string sourceDir, string relativePath)
-        {
-            if (!Directory.Exists(sourceDir))
-            {
-                return;
-            }
-
-            // Process log files in current directory
-            var logFiles = Directory.GetFiles(sourceDir, "*.log");
-            foreach (var logFile in logFiles)
-            {
-                try
-                {
-                    var fileName = Path.GetFileName(logFile);
-                    var fileNameWithoutExt = Path.GetFileNameWithoutExtension(fileName);
-                    var extension = Path.GetExtension(fileName);
-
-                    // Create new filename with directory structure
-                    var directoryPart = string.IsNullOrEmpty(relativePath) ? string.Empty : relativePath.Replace("\\", "-") + "-";
-                    var newFileName = $"{directoryPart}{fileNameWithoutExt}{extension}";
-
-                    // Copy file to test results directory with new name
-                    var testResultsDir = TestContext.TestResultsDirectory ?? Path.GetTempPath();
-                    var destinationPath = Path.Combine(testResultsDir, newFileName);
-
-                    File.Copy(logFile, destinationPath, true);
-                    TestContext.AddResultFile(destinationPath);
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine($"Failed to copy log file {logFile}: {ex.Message}");
-                }
-            }
-
-            // Recursively process subdirectories
-            var subdirectories = Directory.GetDirectories(sourceDir);
-            foreach (var subdir in subdirectories)
-            {
-                var dirName = Path.GetFileName(subdir);
-                var newRelativePath = string.IsNullOrEmpty(relativePath) ? dirName : Path.Combine(relativePath, dirName);
-                CopyLogFilesFromDirectory(subdir, newRelativePath);
-            }
-        }
-
        /// <summary>
        /// Restart scope exe.
        /// </summary>
--- a/src/common/common.instructions.md
+++ b/src/common/common.instructions.md
@@ -1,16 +0,0 @@
---
-applyTo: "**/*.cs,**/*.cpp,**/*.c,**/*.h,**/*.hpp"
---
-# Common – shared libraries guidance (concise)
-
-Scope
- Logging, IPC, settings, DPI, telemetry, utilities consumed by multiple modules.
-
-Guidelines
- Avoid breaking public headers/APIs; if changed, search & update all callers.
- Coordinate ABI-impacting struct/class layout changes; keep binary compatibility.
- Watch perf in hot paths (hooks, timers, serialization); avoid avoidable allocations.
- Ask before adding third‑party deps or changing serialization formats.
-
-Acceptance
- No unintended ABI breaks, no noisy logs, new non-obvious symbols briefly commented.
--- a/src/dsc/PowerToys.Settings.DSC.Schema.Generator/PowerToys.Settings.DSC.Schema.Generator.csproj
+++ b/src/dsc/PowerToys.Settings.DSC.Schema.Generator/PowerToys.Settings.DSC.Schema.Generator.csproj
@@ -31,11 +31,11 @@
    <!-- The following sections assume that the machine we're building on is always x64. That means we won't be able to run/inspect arm64 executables, therefore we must always execute x64 generator. -->

    <Target Name="PostBuildAction" AfterTargets="Build" Outputs="$(GeneratedDSCModule)" Condition="'$(Platform)'!='ARM64'">
-        <Exec Command="&quot;$(OutDir)$(AssemblyName).exe&quot; &quot;..\..\..\x64\$(Configuration)\WinUI3Apps\PowerToys.Settings.UI.Lib.dll&quot; $(GeneratedDSCModule) $(GeneratedDSCManifest)" />
+        <Exec Command="&quot;$(OutDir)$(AssemblyName).exe&quot; &quot;$(SolutionDir)x64\$(Configuration)\WinUI3Apps\PowerToys.Settings.UI.Lib.dll&quot; $(GeneratedDSCModule) $(GeneratedDSCManifest)" />
    </Target>

    <Target Name="PreBuild" BeforeTargets="PreBuildEvent" Condition="'$(Platform)'=='ARM64'">
-      <Exec Command="&quot;$(MSBuildToolsPath)\msbuild.exe&quot; PowerToys.sln -p:Configuration=&quot;$(Configuration)&quot; -p:Platform=&quot;x64&quot; -verbosity:m -t:DSC\PowerToys_Settings_DSC_Schema_Generator" WorkingDirectory="..\..\..\" />
+      <Exec Command="&quot;$(MSBuildToolsPath)\msbuild.exe&quot; PowerToys.sln -p:Configuration=&quot;$(Configuration)&quot; -p:Platform=&quot;x64&quot; -verbosity:m -t:DSC\PowerToys_Settings_DSC_Schema_Generator" WorkingDirectory="$(SolutionDir)" />
    </Target>

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

 using System;
 using System.Runtime.InteropServices;
+
 using EnvironmentVariables.Win32;
 using EnvironmentVariablesUILib;
 using EnvironmentVariablesUILib.Helpers;
 using EnvironmentVariablesUILib.ViewModels;
 using ManagedCommon;
 using Microsoft.UI.Dispatching;
-using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using WinUIEx;

 namespace EnvironmentVariables
 {
+    /// <summary>
+    /// An empty window that can be used on its own or navigated to within a Frame.
+    /// </summary>
    public sealed partial class MainWindow : WindowEx
    {
        private EnvironmentVariablesMainPage MainPage { get; }
@@ -31,9 +34,8 @@ namespace EnvironmentVariables
            AppWindow.SetIcon("Assets/EnvironmentVariables/EnvironmentVariables.ico");
            var loader = ResourceLoaderInstance.ResourceLoader;
            var title = App.GetService<IElevationHelper>().IsElevated ? loader.GetString("WindowAdminTitle") : loader.GetString("WindowTitle");
-
            Title = title;
-            titleBar.Title = title;
+            AppTitleTextBlock.Text = title;

            var handle = this.GetWindowHandle();
            RegisterWindow(handle);
--- a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml
+++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml
@@ -20,15 +20,30 @@
            <RowDefinition Height="Auto" />
            <RowDefinition Height="*" />
        </Grid.RowDefinitions>
-        <TitleBar x:Name="titleBar">
-            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
-            <TitleBar.LeftHeader>
-                <ImageIcon
-                    Height="16"
-                    Margin="16,0,0,0"
-                    Source="/Assets/FileLocksmith/Icon.ico" />
-            </TitleBar.LeftHeader>
-        </TitleBar>
+        <Grid
+            x:Name="AppTitleBar"
+            Height="32"
+            ColumnSpacing="16">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition x:Name="LeftPaddingColumn" Width="0" />
+                <ColumnDefinition x:Name="IconColumn" Width="Auto" />
+                <ColumnDefinition x:Name="TitleColumn" Width="Auto" />
+                <ColumnDefinition x:Name="RightDragColumn" Width="*" />
+                <ColumnDefinition x:Name="RightPaddingColumn" Width="0" />
+            </Grid.ColumnDefinitions>
+            <Image
+                Grid.Column="1"
+                Width="16"
+                Height="16"
+                VerticalAlignment="Center"
+                Source="../Assets/FileLocksmith/Icon.ico" />
+            <TextBlock
+                x:Name="AppTitleTextBlock"
+                Grid.Column="2"
+                VerticalAlignment="Center"
+                Style="{StaticResource CaptionTextBlockStyle}" />
+        </Grid>
+
        <views:MainPage x:Name="mainPage" Grid.Row="1" />
    </Grid>
-</winuiex:WindowEx>
+</winuiex:WindowEx>
--- a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml.cs
+++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml.cs
@@ -18,16 +18,30 @@ namespace FileLocksmithUI
        {
            InitializeComponent();
            mainPage.ViewModel.IsElevated = isElevated;
-            SetTitleBar(titleBar);
            ExtendsContentIntoTitleBar = true;
-            AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Tall;
+            SetTitleBar(AppTitleBar);
+            Activated += MainWindow_Activated;
            AppWindow.SetIcon("Assets/FileLocksmith/Icon.ico");
            WindowHelpers.ForceTopBorder1PixelInsetOnWindows10(this.GetWindowHandle());

            var loader = ResourceLoaderInstance.ResourceLoader;
            var title = isElevated ? loader.GetString("AppAdminTitle") : loader.GetString("AppTitle");
            Title = title;
-            titleBar.Title = title;
+            AppTitleTextBlock.Text = title;
+        }
+
+        private void MainWindow_Activated(object sender, WindowActivatedEventArgs args)
+        {
+            if (args.WindowActivationState == WindowActivationState.Deactivated)
+            {
+                AppTitleTextBlock.Foreground =
+                    (SolidColorBrush)App.Current.Resources["WindowCaptionForegroundDisabled"];
+            }
+            else
+            {
+                AppTitleTextBlock.Foreground =
+                    (SolidColorBrush)App.Current.Resources["WindowCaptionForeground"];
+            }
        }

        public void Dispose()
--- a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml
+++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml
@@ -190,7 +190,7 @@
                TextWrapping="Wrap" />
        </ContentDialog>
        <ContentDialog x:Name="ProcessFilesListDialog" x:Uid="ProcessFilesListDialog">
-            <ScrollViewer Padding="16" HorizontalScrollBarVisibility="Auto">
+            <ScrollViewer Padding="15" HorizontalScrollBarVisibility="Auto">
                <TextBlock
                    x:Name="ProcessFilesListDialogTextBlock"
                    x:Uid="ProcessFilesListDialogTextBlock"
--- a/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml
+++ b/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml
@@ -20,14 +20,27 @@
            <RowDefinition Height="Auto" />
            <RowDefinition Height="*" />
        </Grid.RowDefinitions>
-        <TitleBar x:Name="titleBar">
-            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
-            <TitleBar.LeftHeader>
-                <ImageIcon
-                    Height="16"
-                    Margin="16,0,0,0"
-                    Source="/Assets/Hosts/Hosts.ico" />
-            </TitleBar.LeftHeader>
-        </TitleBar>
+        <Grid
+            x:Name="titleBar"
+            Height="32"
+            ColumnSpacing="16">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition x:Name="LeftPaddingColumn" Width="0" />
+                <ColumnDefinition x:Name="IconColumn" Width="Auto" />
+                <ColumnDefinition x:Name="TitleColumn" Width="Auto" />
+                <ColumnDefinition x:Name="RightPaddingColumn" Width="0" />
+            </Grid.ColumnDefinitions>
+            <Image
+                Grid.Column="1"
+                Width="16"
+                Height="16"
+                VerticalAlignment="Center"
+                Source="../Assets/Hosts/Hosts.ico" />
+            <TextBlock
+                x:Name="AppTitleTextBlock"
+                Grid.Column="2"
+                VerticalAlignment="Center"
+                Style="{StaticResource CaptionTextBlockStyle}" />
+        </Grid>
    </Grid>
 </winuiex:WindowEx>
--- a/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml.cs
+++ b/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml.cs
@@ -9,15 +9,19 @@ using HostsUILib.Helpers;
 using HostsUILib.Views;
 using ManagedCommon;
 using Microsoft.PowerToys.Telemetry;
-using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.Windows.ApplicationModel.Resources;
 using WinUIEx;

+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
 namespace Hosts
 {
+    /// <summary>
+    /// An empty window that can be used on its own or navigated to within a Frame.
+    /// </summary>
    public sealed partial class MainWindow : WindowEx
    {
        private HostsMainPage MainPage { get; }
@@ -34,18 +38,31 @@ namespace Hosts

            var title = Host.GetService<IElevationHelper>().IsElevated ? loader.GetString("WindowAdminTitle") : loader.GetString("WindowTitle");
            Title = title;
-            titleBar.Title = title;
+            AppTitleTextBlock.Text = title;

            var handle = this.GetWindowHandle();

            WindowHelpers.ForceTopBorder1PixelInsetOnWindows10(handle);
            WindowHelpers.BringToForeground(handle);
+            Activated += MainWindow_Activated;

            MainPage = Host.GetService<HostsMainPage>();

            PowerToysTelemetry.Log.WriteEvent(new HostEditorStartFinishEvent() { TimeStamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() });
        }

+        private void MainWindow_Activated(object sender, WindowActivatedEventArgs args)
+        {
+            if (args.WindowActivationState == WindowActivationState.Deactivated)
+            {
+                AppTitleTextBlock.Foreground = (SolidColorBrush)App.Current.Resources["WindowCaptionForegroundDisabled"];
+            }
+            else
+            {
+                AppTitleTextBlock.Foreground = (SolidColorBrush)App.Current.Resources["WindowCaptionForeground"];
+            }
+        }
+
        private void Grid_Loaded(object sender, RoutedEventArgs e)
        {
            MainGrid.Children.Add(MainPage);
--- a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
+++ b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props')" />
  <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props')" />
  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
  <PropertyGroup Label="Globals">
@@ -147,13 +141,7 @@
    <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
    <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets')" />
    <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" />
  </ImportGroup>
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
@@ -165,19 +153,7 @@
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets'))" />    
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets'))" />
  </Target>
 </Project>
--- a/src/modules/MeasureTool/MeasureToolCore/ToolState.h
+++ b/src/modules/MeasureTool/MeasureToolCore/ToolState.h
@@ -31,11 +31,7 @@ struct CommonState

    Measurement::Unit units = Measurement::Unit::Pixel;

-    #pragma warning(push)
-    #pragma warning(disable : 4324)
-    alignas(8) POINT cursorPosSystemSpace = {}; // updated atomically
-    #pragma warning(pop)
-
+    POINT cursorPosSystemSpace = {}; // updated atomically
    std::atomic_bool closeOnOtherMonitors = false;

    float GetPhysicalPx2MmRatio(HWND window) const
--- a/src/modules/MeasureTool/MeasureToolCore/packages.config
+++ b/src/modules/MeasureTool/MeasureToolCore/packages.config
@@ -4,14 +4,5 @@
  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
  <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.26100.4188" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.8.250907003" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.Base" version="1.8.250831001" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.Foundation" version="1.8.250906002" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.WinUI" version="1.8.250906003" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.Runtime" version="1.8.250907003" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.DWrite" version="1.8.25090401" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.InteractiveExperiences" version="1.8.250906004" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.Widgets" version="1.8.250904007" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.AI" version="1.8.37" targetFramework="native" />
-  <package id="Microsoft.Windows.SDK.BuildTools.MSIX" version="1.7.20250829.1" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.7.250513003" targetFramework="native" />
 </packages>
--- a/src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/MainWindow.xaml
+++ b/src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/MainWindow.xaml
@@ -5,7 +5,6 @@
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:winuiex="using:WinUIEx"
-    Title="PowerToys.ScreenRuler"
    IsAlwaysOnTop="True"
    IsMaximizable="False"
    IsMinimizable="False"
@@ -251,7 +250,6 @@
            <ToggleButton
                Name="btnBounds"
                x:Uid="BtnBounds"
-                AutomationProperties.AutomationId="Button_Bounds"
                Click="BoundsTool_Click"
                Content="&#xEF20;"
                KeyboardAcceleratorPlacementMode="Auto"
@@ -269,7 +267,6 @@
            <ToggleButton
                Name="btnSpacing"
                x:Uid="BtnSpacing"
-                AutomationProperties.AutomationId="Button_Spacing"
                Click="MeasureTool_Click"
                Style="{StaticResource ToggleButtonRadioButtonStyle}">
                <ToolTipService.ToolTip>
@@ -287,7 +284,6 @@
            <ToggleButton
                Name="btnHorizontalSpacing"
                x:Uid="BtnHorizontalSpacing"
-                AutomationProperties.AutomationId="Button_SpacingHorizontal"
                Click="HorizontalMeasureTool_Click"
                Style="{StaticResource ToggleButtonRadioButtonStyle}">
                <ToolTipService.ToolTip>
@@ -308,7 +304,6 @@
            <ToggleButton
                Name="btnVerticalSpacing"
                x:Uid="BtnVerticalSpacing"
-                AutomationProperties.AutomationId="Button_SpacingVertical"
                Click="VerticalMeasureTool_Click"
                Style="{StaticResource ToggleButtonRadioButtonStyle}">
                <ToolTipService.ToolTip>
@@ -329,7 +324,6 @@
            <AppBarSeparator />
            <Button
                x:Uid="BtnClosePanel"
-                AutomationProperties.AutomationId="Button_Close"
                Click="ClosePanelTool_Click"
                Content="&#xE8BB;"
                Foreground="{StaticResource CloseButtonBackgroundPointerOver}">
--- a/src/modules/MeasureTool/Tests/ScreenRuler.UITests/Package.appxmanifest
+++ b/src/modules/MeasureTool/Tests/ScreenRuler.UITests/Package.appxmanifest
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  IgnorableNamespaces="uap rescap">
-
-  <Identity
-    Name="d4d0f157-5c12-4390-9689-152b0c86a582"
-    Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
-    Version="1.0.0.0" />
-
-  <mp:PhoneIdentity PhoneProductId="d4d0f157-5c12-4390-9689-152b0c86a582" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
-
-  <Properties>
-    <DisplayName>ScreenRuler.UITests</DisplayName>
-    <PublisherDisplayName>Microsoft</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
-  </Properties>
-
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
-  </Dependencies>
-
-  <Resources>
-    <Resource Language="x-generate"/>
-  </Resources>
-
-  <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="$targetentrypoint$">
-      <uap:VisualElements
-        DisplayName="ScreenRuler.UITests"
-        Description="ScreenRuler.UITests"
-        BackgroundColor="transparent"
-        Square150x150Logo="Assets\Square150x150Logo.png"
-        Square44x44Logo="Assets\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" />
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
-      </uap:VisualElements>
-    </Application>
-  </Applications>
-
-  <Capabilities>
-    <rescap:Capability Name="runFullTrust" />
-  </Capabilities>
-</Package>
--- a/src/modules/MeasureTool/Tests/ScreenRuler.UITests/ScreenRuler.UITests.csproj
+++ b/src/modules/MeasureTool/Tests/ScreenRuler.UITests/ScreenRuler.UITests.csproj
@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-  <PropertyGroup>
-	  <RootNamespace>PowerToys.ScreenRuler.UITests</RootNamespace>
-	  <AssemblyName>ScreenRuler.UITests</AssemblyName>
-	  <IsPackable>false</IsPackable>
-	  <IsTestProject>true</IsTestProject>
-	  <Nullable>enable</Nullable>
-	  <OutputType>Library</OutputType>
-
-	  <!-- This is a UI test, so don't run as part of MSBuild -->
-	  <RunVSTest>false</RunVSTest>
-  </PropertyGroup>
-  <PropertyGroup>
-	  <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\tests\ScreenRuler.UITests\</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-	  <PackageReference Include="MSTest" />
-	  <ProjectReference Include="..\..\..\..\common\UITestAutomation\UITestAutomation.csproj" />
-  </ItemGroup>
-</Project>
- 
--- a/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestBounds.cs
+++ b/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestBounds.cs
@@ -1,27 +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 Microsoft.PowerToys.UITest;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace ScreenRuler.UITests
-{
-    [TestClass]
-    public class TestBounds : UITestBase
-    {
-        public TestBounds()
-            : base(PowerToysModule.PowerToysSettings, WindowSize.Large)
-        {
-        }
-
-        [TestMethod("ScreenRuler.BoundsTool")]
-        [TestCategory("Spacing")]
-        public void TestScreenRulerBoundsTool()
-        {
-            TestHelper.InitializeTest(this, "bounds test");
-            TestHelper.PerformBoundsToolTest(this);
-            TestHelper.CleanupTest(this);
-        }
-    }
-}
--- a/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestHelper.cs
+++ b/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestHelper.cs
@@ -1,466 +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.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.PowerToys.UITest;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace ScreenRuler.UITests
-{
-    public static class TestHelper
-    {
-        private static readonly string[] ShortcutSeparators = { " + ", "+", " " };
-
-        // Button automation names from Resources.resw
-        public const string BoundsButtonId = "Button_Bounds";
-        public const string SpacingButtonName = "Button_Spacing";
-        public const string HorizontalSpacingButtonName = "Button_SpacingHorizontal";
-        public const string VerticalSpacingButtonName = "Button_SpacingVertical";
-        public const string CloseButtonId = "Button_Close";
-
-        /// <summary>
-        /// Performs common test initialization: navigate to settings, enable toggle, verify shortcut
-        /// </summary>
-        /// <param name="testBase">The test base instance</param>
-        /// <param name="testName">Name of the test for assertions</param>
-        /// <returns>The activation keys for the test</returns>
-        public static Key[] InitializeTest(UITestBase testBase, string testName)
-        {
-            LaunchFromSetting(testBase);
-
-            var toggleSwitch = SetScreenRulerToggle(testBase, enable: true);
-            Assert.IsTrue(
-                toggleSwitch.IsOn,
-                $"Screen Ruler toggle switch should be ON for {testName}");
-
-            var activationKeys = ReadActivationShortcut(testBase);
-            Assert.IsNotNull(activationKeys, "Should be able to read activation shortcut");
-            Assert.IsTrue(activationKeys.Length > 0, "Activation shortcut should contain at least one key");
-
-            return activationKeys;
-        }
-
-        /// <summary>
-        /// Performs common test cleanup: close ScreenRuler UI
-        /// </summary>
-        /// <param name="testBase">The test base instance</param>
-        public static void CleanupTest(UITestBase testBase)
-        {
-            CloseScreenRulerUI(testBase);
-
-            // Ensure we're attached to settings after cleanup
-            try
-            {
-                testBase.Session.Attach(PowerToysModule.PowerToysSettings);
-            }
-            catch
-            {
-                // Ignore attachment errors - this is just cleanup
-            }
-        }
-
-        /// <summary>
-        /// Navigate to the Screen Ruler (Measure Tool) settings page
-        /// </summary>
-        public static void LaunchFromSetting(UITestBase testBase)
-        {
-            var screenRulers = testBase.Session.FindAll<NavigationViewItem>(By.AccessibilityId("ScreenRulerNavItem"));
-
-            if (screenRulers.Count == 0)
-            {
-                testBase.Session.Find<NavigationViewItem>(By.AccessibilityId("SystemToolsNavItem"), 5000).Click(msPostAction: 500);
-            }
-
-            testBase.Session.Find<NavigationViewItem>(By.AccessibilityId("ScreenRulerNavItem"), 5000).Click(msPostAction: 500);
-        }
-
-        /// <summary>
-        /// Set the Screen Ruler toggle switch to the specified state
-        /// </summary>
-        public static ToggleSwitch SetScreenRulerToggle(UITestBase testBase, bool enable)
-        {
-            var toggleSwitch = testBase.Session.Find<ToggleSwitch>(By.AccessibilityId("Toggle_ScreenRuler"), 5000);
-
-            if (toggleSwitch.IsOn != enable)
-            {
-                toggleSwitch.Click(msPreAction: 1000, msPostAction: 2000);
-            }
-
-            if (toggleSwitch.IsOn != enable)
-            {
-                testBase.Session.SendKey(Key.Space, msPreAction: 0, msPostAction: 2000);
-            }
-
-            return toggleSwitch;
-        }
-
-        /// <summary>
-        /// Set the Screen Ruler toggle and verify its state
-        /// </summary>
-        /// <param name="testBase">The test base instance</param>
-        /// <param name="enable">True to enable, false to disable</param>
-        /// <param name="testName">Name of the test for assertion messages</param>
-        public static void SetAndVerifyScreenRulerToggle(UITestBase testBase, bool enable, string testName)
-        {
-            var toggleSwitch = SetScreenRulerToggle(testBase, enable);
-            Assert.AreEqual(
-                enable,
-                toggleSwitch.IsOn,
-                $"Screen Ruler toggle switch should be {(enable ? "ON" : "OFF")} for {testName}");
-        }
-
-        /// <summary>
-        /// Read the current activation shortcut from the ShortcutControl
-        /// </summary>
-        public static Key[] ReadActivationShortcut(UITestBase testBase)
-        {
-            var shortcutCard = testBase.Session.Find<Element>(By.AccessibilityId("Shortcut_ScreenRuler"), 5000);
-            var shortcutButton = shortcutCard.Find<Element>(By.AccessibilityId("EditButton"), 5000);
-            return ParseShortcutText(shortcutButton.HelpText);
-        }
-
-        /// <summary>
-        /// Parse shortcut text like "Win + Ctrl + Shift + M" into Key array
-        /// </summary>
-        private static Key[] ParseShortcutText(string shortcutText)
-        {
-            if (string.IsNullOrEmpty(shortcutText))
-            {
-                return new Key[] { Key.Win, Key.Ctrl, Key.Shift, Key.M };
-            }
-
-            var keys = new List<Key>();
-            var parts = shortcutText.Split(ShortcutSeparators, StringSplitOptions.RemoveEmptyEntries);
-
-            foreach (var part in parts)
-            {
-                var cleanPart = part.Trim().ToLowerInvariant();
-                var key = cleanPart switch
-                {
-                    "win" or "windows" => Key.Win,
-                    "ctrl" or "control" => Key.Ctrl,
-                    "shift" => Key.Shift,
-                    "alt" => Key.Alt,
-                    _ when cleanPart.Length == 1 && char.IsLetter(cleanPart[0]) &&
-                         cleanPart[0] >= 'a' && cleanPart[0] <= 'z' =>
-                        (Key)Enum.Parse(typeof(Key), cleanPart.ToUpperInvariant()),
-                    _ => (Key?)null,
-                };
-
-                if (key.HasValue)
-                {
-                    keys.Add(key.Value);
-                }
-            }
-
-            return keys.Count > 0 ? keys.ToArray() : new Key[] { Key.Win, Key.Ctrl, Key.Shift, Key.M };
-        }
-
-        /// <summary>
-        /// Check if ScreenRulerUI window is open
-        /// </summary>
-        public static bool IsScreenRulerUIOpen(UITestBase testBase) => testBase.IsWindowOpen("PowerToys.ScreenRuler");
-
-        /// <summary>
-        /// Wait for ScreenRulerUI to reach the specified state within the timeout
-        /// </summary>
-        public static bool WaitForScreenRulerUIState(UITestBase testBase, bool shouldBeOpen, int timeoutMs = 5000, int pollingIntervalMs = 100)
-        {
-            var endTime = DateTime.Now.AddMilliseconds(timeoutMs);
-
-            while (DateTime.Now < endTime)
-            {
-                if (IsScreenRulerUIOpen(testBase) == shouldBeOpen)
-                {
-                    return true;
-                }
-
-                Task.Delay(pollingIntervalMs).Wait();
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Wait for ScreenRulerUI to appear within the specified timeout
-        /// </summary>
-        public static bool WaitForScreenRulerUI(UITestBase testBase, int timeoutMs = 5000) =>
-            WaitForScreenRulerUIState(testBase, shouldBeOpen: true, timeoutMs);
-
-        /// <summary>
-        /// Wait for ScreenRulerUI to disappear within the specified timeout
-        /// </summary>
-        public static bool WaitForScreenRulerUIToDisappear(UITestBase testBase, int timeoutMs = 5000) =>
-            WaitForScreenRulerUIState(testBase, shouldBeOpen: false, timeoutMs);
-
-        /// <summary>
-        /// Close ScreenRulerUI if it's open
-        /// </summary>
-        public static void CloseScreenRulerUI(UITestBase testBase)
-        {
-            if (IsScreenRulerUIOpen(testBase))
-            {
-                try
-                {
-                    // Attach to ScreenRuler window before trying to find and click close button
-                    testBase.Session.Attach(PowerToysModule.ScreenRuler);
-                    var closeButton = testBase.Session.Find<Element>(By.AccessibilityId(CloseButtonId), 15000, true);
-                    closeButton?.Click();
-                }
-                catch
-                {
-                    // If we can't find the close button, ignore - the window might have closed already
-                }
-                finally
-                {
-                    // Attach back to settings after closing
-                    try
-                    {
-                        testBase.Session.Attach(PowerToysModule.PowerToysSettings);
-                    }
-                    catch
-                    {
-                        // Ignore attachment errors
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Get a specific ScreenRulerUI button by its automation name
-        /// </summary>
-        public static Element? GetScreenRulerButton(UITestBase testBase, string buttonName, int timeoutMs = 1000)
-        {
-            return testBase.Session.Find<Element>(By.AccessibilityId(buttonName), timeoutMs, true);
-
-            /*
-            try
-            {
-                // Attach to ScreenRuler window before trying to find buttons
-                testBase.Session.Attach(PowerToysModule.ScreenRuler);
-                return testBase.Session.Find<Element>(By.AccessibilityId(buttonName), timeoutMs, true);
-            }
-            catch
-            {
-                return null;
-            }
-            finally
-            {
-                // Attach back to settings if needed for further operations
-                // This ensures we don't break the test flow
-                try
-                {
-                    testBase.Session.Attach(PowerToysModule.PowerToysSettings);
-                }
-                catch
-                {
-                    // Ignore attachment errors - the calling code will handle as needed
-                }
-            }
-            */
-        }
-
-        /// <summary>
-        /// Clear the clipboard content using STA thread
-        /// </summary>
-        public static void ClearClipboard()
-        {
-            ExecuteInSTAThread(() => System.Windows.Forms.Clipboard.Clear());
-        }
-
-        /// <summary>
-        /// Get text content from clipboard using STA thread
-        /// </summary>
-        public static string GetClipboardText()
-        {
-            string result = string.Empty;
-            ExecuteInSTAThread(() =>
-            {
-                if (System.Windows.Forms.Clipboard.ContainsText())
-                {
-                    result = System.Windows.Forms.Clipboard.GetText();
-                }
-            });
-            return result ?? string.Empty;
-        }
-
-        /// <summary>
-        /// Execute an action in an STA thread with error handling
-        /// </summary>
-        private static void ExecuteInSTAThread(Action action)
-        {
-            try
-            {
-                var staThread = new Thread(() =>
-                {
-                    try
-                    {
-                        action();
-                    }
-                    catch
-                    {
-                        // Ignore clipboard errors
-                    }
-                });
-
-                staThread.SetApartmentState(ApartmentState.STA);
-                staThread.Start();
-                staThread.Join(TimeSpan.FromSeconds(5));
-            }
-            catch
-            {
-                // Ignore clipboard errors
-            }
-        }
-
-        /// <summary>
-        /// Validate clipboard content contains valid spacing measurement for the specified type
-        /// </summary>
-        public static bool ValidateSpacingClipboardContent(string clipboardText, string spacingType)
-        {
-            if (string.IsNullOrEmpty(clipboardText))
-            {
-                return false;
-            }
-
-            return spacingType switch
-            {
-                "Spacing" => Regex.IsMatch(clipboardText, @"\d+\s*[<5B>x×]\s*\d+"),
-                "Horizontal Spacing" or "Vertical Spacing" => Regex.IsMatch(clipboardText, @"^\d+$"),
-                _ => false,
-            };
-        }
-
-        /// <summary>
-        /// Perform a complete spacing tool test operation
-        /// </summary>
-        public static void PerformSpacingToolTest(UITestBase testBase, string buttonId, string testName)
-        {
-            ClearClipboard();
-
-            // Launch ScreenRuler UI
-            var activationKeys = ReadActivationShortcut(testBase);
-            testBase.SendKeys(activationKeys);
-
-            Assert.IsTrue(
-                WaitForScreenRulerUI(testBase, 2000),
-                $"ScreenRulerUI should appear after pressing activation shortcut for {testName}: {string.Join(" + ", activationKeys)}");
-
-            // Attach to ScreenRuler window and click spacing button
-            // testBase.Session.Attach(PowerToysModule.ScreenRuler);
-            var spacingButton = testBase.Session.Find<Element>(By.AccessibilityId(buttonId), 15000, true);
-            Assert.IsNotNull(spacingButton, $"{testName} button should be found");
-
-            spacingButton!.Click();
-            Task.Delay(500).Wait();
-
-            // Perform measurement action (stay attached to ScreenRuler for this)
-            PerformMeasurementAction(testBase);
-
-            // Validate results
-            ValidateClipboardResults(testName);
-
-            // Cleanup - this will handle session attachment properly
-            CloseScreenRulerUI(testBase);
-            Assert.IsTrue(
-                WaitForScreenRulerUIToDisappear(testBase, 2000),
-                $"{testName}: ScreenRulerUI should close after calling CloseScreenRulerUI");
-        }
-
-        /// <summary>
-        /// Perform a bounds tool test operation
-        /// </summary>
-        public static void PerformBoundsToolTest(UITestBase testBase)
-        {
-            ClearClipboard();
-
-            var activationKeys = ReadActivationShortcut(testBase);
-            testBase.SendKeys(activationKeys);
-
-            Assert.IsTrue(
-                WaitForScreenRulerUI(testBase, 2000),
-                $"ScreenRulerUI should appear after pressing activation shortcut: {string.Join(" + ", activationKeys)}");
-
-            // Attach to ScreenRuler window and click bounds button
-            // testBase.Session.Attach(PowerToysModule.ScreenRuler);
-            var boundsButton = testBase.Session.Find<Element>(By.AccessibilityId(BoundsButtonId), 15000, true);
-            Assert.IsNotNull(boundsButton, "Bounds button should be found");
-
-            boundsButton.Click();
-            Task.Delay(500).Wait();
-
-            // Perform drag operation to create 100x100 box (stay attached to ScreenRuler)
-            var currentPos = testBase.GetMousePosition();
-            int startX = currentPos.Item1;
-            int startY = currentPos.Item2 + 200;
-
-            testBase.MoveMouseTo(startX, startY);
-            Task.Delay(200).Wait();
-
-            // Drag operation
-            testBase.Session.PerformMouseAction(MouseActionType.LeftDown);
-            Task.Delay(100).Wait();
-
-            testBase.MoveMouseTo(startX + 99, startY + 99);
-            Task.Delay(200).Wait();
-
-            testBase.Session.PerformMouseAction(MouseActionType.LeftUp);
-            Task.Delay(500).Wait();
-
-            // Dismiss selection
-            testBase.Session.PerformMouseAction(MouseActionType.RightClick);
-            Task.Delay(500).Wait();
-
-            // Validate results
-            string clipboardText = GetClipboardText();
-            Assert.IsFalse(string.IsNullOrEmpty(clipboardText), "Clipboard should contain measurement data");
-            Assert.IsTrue(
-                clipboardText.Contains("100 × 100") || clipboardText.Contains("100 x 100"),
-                $"Clipboard should contain '100 x 100', but contained: '{clipboardText}'");
-
-            // Cleanup - this will handle session attachment properly
-            CloseScreenRulerUI(testBase);
-            Assert.IsTrue(
-                WaitForScreenRulerUIToDisappear(testBase, 2000),
-                "ScreenRulerUI should close after calling CloseScreenRulerUI");
-        }
-
-        /// <summary>
-        /// Perform a measurement action (move mouse and click)
-        /// </summary>
-        private static void PerformMeasurementAction(UITestBase testBase)
-        {
-            var currentPos = testBase.GetMousePosition();
-            int startX = currentPos.Item1;
-            int startY = currentPos.Item2 + 200;
-
-            testBase.MoveMouseTo(startX, startY);
-            Task.Delay(200).Wait();
-
-            testBase.Session.PerformMouseAction(MouseActionType.LeftClick);
-            Task.Delay(500).Wait();
-
-            testBase.Session.PerformMouseAction(MouseActionType.RightClick);
-            Task.Delay(500).Wait();
-        }
-
-        /// <summary>
-        /// Validate clipboard results for spacing tests
-        /// </summary>
-        private static void ValidateClipboardResults(string testName)
-        {
-            string clipboardText = GetClipboardText();
-            Assert.IsFalse(string.IsNullOrEmpty(clipboardText), $"{testName}: Clipboard should contain measurement data");
-
-            bool containsValidPattern = ValidateSpacingClipboardContent(clipboardText, testName);
-            Assert.IsTrue(
-                containsValidPattern,
-                $"{testName}: Clipboard should contain valid spacing measurement, but contained: '{clipboardText}'");
-        }
-    }
-}
--- a/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestShortcutActivation.cs
+++ b/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestShortcutActivation.cs
@@ -1,72 +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.Threading.Tasks;
-using Microsoft.PowerToys.UITest;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace ScreenRuler.UITests
-{
-    [TestClass]
-    public class TestShortcutActivation : UITestBase
-    {
-        public TestShortcutActivation()
-            : base(PowerToysModule.PowerToysSettings, WindowSize.Large)
-        {
-        }
-
-        [TestMethod("ScreenRuler.ShortcutActivation")]
-        [TestCategory("Activation")]
-        public void TestScreenRulerShortcutActivation()
-        {
-            var activationKeys = TestHelper.InitializeTest(this, "activation test");
-
-            // Test 1: Press the activation shortcut and verify the toolbar appears
-            SendKeys(activationKeys);
-            bool screenRulerAppeared = TestHelper.WaitForScreenRulerUI(this, 1000);
-            Assert.IsTrue(
-                screenRulerAppeared,
-                $"ScreenRulerUI should appear after pressing activation shortcut: {string.Join(" + ", activationKeys)}");
-
-            // Test 2: Press the activation shortcut again and verify the toolbar disappears
-            SendKeys(activationKeys);
-            bool screenRulerDisappeared = TestHelper.WaitForScreenRulerUIToDisappear(this, 1000);
-            Assert.IsTrue(
-                screenRulerDisappeared,
-                $"ScreenRulerUI should disappear after pressing activation shortcut again: {string.Join(" + ", activationKeys)}");
-
-            // Test 3: Disable Screen Ruler and verify that the activation shortcut no longer activates the utility
-            // Ensure we're attached to settings UI before toggling
-            Session.Attach(PowerToysModule.PowerToysSettings);
-            TestHelper.SetAndVerifyScreenRulerToggle(this, enable: false, "disabled state test");
-
-            // Try to activate with shortcut while disabled
-            SendKeys(activationKeys);
-            Task.Delay(1000).Wait();
-            Assert.IsFalse(
-                TestHelper.IsScreenRulerUIOpen(this),
-                "ScreenRulerUI should not appear when Screen Ruler is disabled");
-
-            // Test 4: Enable Screen Ruler and press the activation shortcut and verify the toolbar appears
-            // Ensure we're attached to settings UI before toggling
-            Session.Attach(PowerToysModule.PowerToysSettings);
-            TestHelper.SetAndVerifyScreenRulerToggle(this, enable: true, "re-enabled state test");
-
-            SendKeys(activationKeys);
-            screenRulerAppeared = TestHelper.WaitForScreenRulerUI(this, 1000);
-            Assert.IsTrue(
-                screenRulerAppeared,
-                $"ScreenRulerUI should appear after re-enabling and pressing activation shortcut: {string.Join(" + ", activationKeys)}");
-
-            // Test 5: Verify the utility can be closed via the cleanup method
-            TestHelper.CloseScreenRulerUI(this);
-            bool screenRulerClosed = TestHelper.WaitForScreenRulerUIToDisappear(this, 1000);
-            Assert.IsTrue(
-                screenRulerClosed,
-                "ScreenRulerUI should close after calling CloseScreenRulerUI");
-
-            TestHelper.CleanupTest(this);
-        }
-    }
-}
--- a/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestSpacing.cs
+++ b/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestSpacing.cs
@@ -1,27 +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 Microsoft.PowerToys.UITest;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace ScreenRuler.UITests
-{
-    [TestClass]
-    public class TestSpacing : UITestBase
-    {
-        public TestSpacing()
-            : base(PowerToysModule.PowerToysSettings, WindowSize.Large)
-        {
-        }
-
-        [TestMethod("ScreenRuler.SpacingTool")]
-        [TestCategory("Spacing")]
-        public void TestScreenRulerSpacingTool()
-        {
-            TestHelper.InitializeTest(this, "spacing test");
-            TestHelper.PerformSpacingToolTest(this, TestHelper.SpacingButtonName, "Spacing");
-            TestHelper.CleanupTest(this);
-        }
-    }
-}
--- a/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestSpacingHorizontal.cs
+++ b/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestSpacingHorizontal.cs
@@ -1,27 +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 Microsoft.PowerToys.UITest;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace ScreenRuler.UITests
-{
-    [TestClass]
-    public class TestSpacingHorizontal : UITestBase
-    {
-        public TestSpacingHorizontal()
-            : base(PowerToysModule.PowerToysSettings, WindowSize.Large)
-        {
-        }
-
-        [TestMethod("ScreenRuler.HorizontalSpacingTool")]
-        [TestCategory("Spacing")]
-        public void TestScreenRulerHorizontalSpacingTool()
-        {
-            TestHelper.InitializeTest(this, "horizontal spacing test");
-            TestHelper.PerformSpacingToolTest(this, TestHelper.HorizontalSpacingButtonName, "Horizontal Spacing");
-            TestHelper.CleanupTest(this);
-        }
-    }
-}
--- a/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestSpacingVertical.cs
+++ b/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestSpacingVertical.cs
@@ -1,27 +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 Microsoft.PowerToys.UITest;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace ScreenRuler.UITests
-{
-    [TestClass]
-    public class TestSpacingVertical : UITestBase
-    {
-        public TestSpacingVertical()
-            : base(PowerToysModule.PowerToysSettings, WindowSize.Large)
-        {
-        }
-
-        [TestMethod("ScreenRuler.VerticalSpacingTool")]
-        [TestCategory("Spacing")]
-        public void TestScreenRulerVerticalSpacingTool()
-        {
-            TestHelper.InitializeTest(this, "vertical spacing test");
-            TestHelper.PerformSpacingToolTest(this, TestHelper.VerticalSpacingButtonName, "Vertical Spacing");
-            TestHelper.CleanupTest(this);
-        }
-    }
-}
--- a/src/modules/MeasureTool/Tests/ScreenRuler.UITests/app.manifest
+++ b/src/modules/MeasureTool/Tests/ScreenRuler.UITests/app.manifest
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="ScreenRuler.UITests.app"/>
-
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- The ID below informs the system that this application is compatible with OS features first introduced in Windows 10. 
-      It is necessary to support features in unpackaged applications, for example the custom titlebar implementation.
-      For more info see https://docs.microsoft.com/windows/apps/windows-app-sdk/use-windows-app-sdk-run-time#declare-os-compatibility-in-your-application-manifest -->
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
-    </application>
-  </compatibility>
-  
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
-    </windowsSettings>
-  </application>
-</assembly>
--- a/src/modules/MouseUtils/MouseUtils.UITests/FindMyMouseTests.cs
+++ b/src/modules/MouseUtils/MouseUtils.UITests/FindMyMouseTests.cs
@@ -49,23 +49,23 @@ namespace MouseUtils.UITests
            settings.BackgroundColor = "000000";
            settings.SpotlightColor = "FFFFFF";

-            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
+            var foundCustom = this.Find<Custom>("Find My Mouse");
            Assert.IsNotNull(foundCustom);

            if (CheckAnimationEnable(ref foundCustom))
            {
-                foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
+                foundCustom = this.Find<Custom>("Find My Mouse");
            }

            if (foundCustom != null)
            {
-                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
+                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);

                SetFindMyMouseActivationMethod(ref foundCustom, "Press Left Control twice");
                Assert.IsNotNull(foundCustom, "Find My Mouse group not found.");
                SetFindMyMouseAppearanceBehavior(ref foundCustom, ref settings);

-                var excludedApps = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseExcludedApps));
+                var excludedApps = foundCustom.Find<TextBlock>("Excluded apps");
                if (excludedApps != null)
                {
                    excludedApps.Click();
@@ -115,23 +115,23 @@ namespace MouseUtils.UITests
            settings.BackgroundColor = "FF0000";
            settings.SpotlightColor = "0000FF";

-            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
+            var foundCustom = this.Find<Custom>("Find My Mouse");
            Assert.IsNotNull(foundCustom);

            if (CheckAnimationEnable(ref foundCustom))
            {
-                foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
+                foundCustom = this.Find<Custom>("Find My Mouse");
            }

            if (foundCustom != null)
            {
-                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
+                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);

                SetFindMyMouseActivationMethod(ref foundCustom, "Press Left Control twice");
                Assert.IsNotNull(foundCustom, "Find My Mouse group not found.");
                SetFindMyMouseAppearanceBehavior(ref foundCustom, ref settings);

-                var excludedApps = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseExcludedApps));
+                var excludedApps = foundCustom.Find<TextBlock>("Excluded apps");
                if (excludedApps != null)
                {
                    excludedApps.Click();
@@ -170,27 +170,27 @@ namespace MouseUtils.UITests
            settings.AnimationDuration = "0";
            settings.BackgroundColor = "000000";
            settings.SpotlightColor = "FFFFFF";
-            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
+            var foundCustom = this.Find<Custom>("Find My Mouse");

            Assert.IsNotNull(foundCustom);

            if (CheckAnimationEnable(ref foundCustom))
            {
-                foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
+                foundCustom = this.Find<Custom>("Find My Mouse");
            }

            if (foundCustom != null)
            {
-                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
+                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);

-                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
+                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);

-                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
+                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
                SetFindMyMouseActivationMethod(ref foundCustom, "Press Left Control twice");
                Assert.IsNotNull(foundCustom);
                SetFindMyMouseAppearanceBehavior(ref foundCustom, ref settings);

-                var excludedApps = foundCustom.Find<Group>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseExcludedApps));
+                var excludedApps = foundCustom.Find<TextBlock>("Excluded apps");
                if (excludedApps != null)
                {
                    excludedApps.Click();
@@ -212,14 +212,14 @@ namespace MouseUtils.UITests
            VerifySpotlightAppears(ref settings);

            // [Test Case] Disable FindMyMouse. Verify the overlay no longer appears when you press Left Ctrl twice
-            foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
+            foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
            Task.Delay(1000).Wait();
            ActivateSpotlight(ref settings);

            VerifySpotlightDisappears(ref settings);

            // [Test Case] Press Left Ctrl twice and verify the overlay appears
-            foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
+            foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
            Task.Delay(2000).Wait();
            ActivateSpotlight(ref settings);
            VerifySpotlightAppears(ref settings);
@@ -240,27 +240,27 @@ namespace MouseUtils.UITests
            settings.AnimationDuration = "0";
            settings.BackgroundColor = "000000";
            settings.SpotlightColor = "FFFFFF";
-            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
+            var foundCustom = this.Find<Custom>("Find My Mouse");

            Assert.IsNotNull(foundCustom);

            if (CheckAnimationEnable(ref foundCustom))
            {
-                foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
+                foundCustom = this.Find<Custom>("Find My Mouse");
            }

            if (foundCustom != null)
            {
-                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
+                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);

-                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
+                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);

-                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
+                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
                SetFindMyMouseActivationMethod(ref foundCustom, "Press Left Control twice");
                Assert.IsNotNull(foundCustom);
                SetFindMyMouseAppearanceBehavior(ref foundCustom, ref settings);

-                var excludedApps = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseExcludedApps));
+                var excludedApps = foundCustom.Find<TextBlock>("Excluded apps");
                if (excludedApps != null)
                {
                    excludedApps.Click();
@@ -282,14 +282,14 @@ namespace MouseUtils.UITests
            VerifySpotlightAppears(ref settings);

            // [Test Case] Disable FindMyMouse. Verify the overlay no longer appears when you press Left Ctrl twice
-            foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
+            foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
            Task.Delay(1000).Wait();
            ActivateSpotlight(ref settings);

            VerifySpotlightDisappears(ref settings);

            // [Test Case] Press Left Ctrl twice and verify the overlay appears
-            foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
+            foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
            Task.Delay(2000).Wait();
            ActivateSpotlight(ref settings);
            VerifySpotlightAppears(ref settings);
@@ -310,17 +310,17 @@ namespace MouseUtils.UITests
            settings.AnimationDuration = "0";
            settings.BackgroundColor = "000000";
            settings.SpotlightColor = "FFFFFF";
-            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
+            var foundCustom = this.Find<Custom>("Find My Mouse");
            if (foundCustom != null)
            {
-                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
+                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);

-                // foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
+                // foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
                SetFindMyMouseActivationMethod(ref foundCustom, "Press Left Control twice");
                Assert.IsNotNull(foundCustom, "Find My Mouse group not found.");

                // SetFindMyMouseAppearanceBehavior(ref foundCustom, ref settings);
-                var excludedApps = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseExcludedApps));
+                var excludedApps = foundCustom.Find<TextBlock>("Excluded apps");
                if (excludedApps != null)
                {
                    excludedApps.Click();
@@ -340,7 +340,7 @@ namespace MouseUtils.UITests
            // VerifySpotlightSettings(ref settings);

            // [Test Case] Disable FindMyMouse. Verify the overlay no longer appears when you press Left Ctrl twice
-            foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
+            foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
            Task.Delay(2000).Wait();
            Session.SendKey(Key.LCtrl, 0, 0);
            Task.Delay(100).Wait();
@@ -382,6 +382,9 @@ namespace MouseUtils.UITests

            var colorBackground = this.GetPixelColorString(location.Item1 + radius + 50, location.Item2 + radius + 50);
            Assert.AreEqual("#" + settings.BackgroundColor, colorBackground);
+
+            var colorBackground2 = this.GetPixelColorString(location.Item1 + radius + 100, location.Item2 + radius + 100);
+            Assert.AreEqual("#" + settings.BackgroundColor, colorBackground2);
        }

        private void ActivateSpotlight(ref FindMyMouseSettings settings)
@@ -424,7 +427,7 @@ namespace MouseUtils.UITests
        private void SetFindMyMouseActivationMethod(ref Custom? foundCustom, string method)
        {
            Assert.IsNotNull(foundCustom);
-            var groupActivation = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseActivationMethod));
+            var groupActivation = foundCustom.Find<TextBlock>("Activation method");
            if (groupActivation != null)
            {
                groupActivation.Click();
@@ -453,17 +456,17 @@ namespace MouseUtils.UITests
        private void SetFindMyMouseAppearanceBehavior(ref Custom foundCustom, ref FindMyMouseSettings settings)
        {
            Assert.IsNotNull(foundCustom);
-            var groupAppearanceBehavior = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseAppearanceBehavior));
+            var groupAppearanceBehavior = foundCustom.Find<TextBlock>("Appearance & behavior");
            if (groupAppearanceBehavior != null)
            {
                // groupAppearanceBehavior.Click();
-                if (foundCustom.FindAll(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseOverlayOpacity)).Count == 0)
+                if (foundCustom.FindAll<Slider>("Overlay opacity (%)").Count == 0)
                {
                    groupAppearanceBehavior.Click();
                }

                // Set the BackGround color
-                var backgroundColor = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseBackgroundColor));
+                var backgroundColor = foundCustom.Find<Group>("Background color");
                Assert.IsNotNull(backgroundColor);

                var button = backgroundColor.Find<Button>(By.XPath(".//Button"));
@@ -502,7 +505,7 @@ namespace MouseUtils.UITests
                button.Click();

                // Set the Spotlight color
-                var spotlightColor = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseSpotlightColor));
+                var spotlightColor = foundCustom.Find<Group>("Spotlight color");
                Assert.IsNotNull(spotlightColor);

                var spotlightColorButton = spotlightColor.Find<Button>(By.XPath(".//Button"));
@@ -542,7 +545,7 @@ namespace MouseUtils.UITests
                spotlightColorButton.Click(false, 500, 1500);

                // Set the overlay opacity to overlayOpacity%
-                var overlayOpacitySlider = foundCustom.Find<Slider>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseOverlayOpacity));
+                var overlayOpacitySlider = foundCustom.Find<Slider>("Overlay opacity (%)");
                Assert.IsNotNull(overlayOpacitySlider);
                Assert.IsNotNull(settings.OverlayOpacity);
                int overlayOpacityValue = int.Parse(settings.OverlayOpacity, CultureInfo.InvariantCulture);
@@ -551,7 +554,7 @@ namespace MouseUtils.UITests
                Task.Delay(1000).Wait();

                // Set the Fade Initial zoom to 0
-                var spotlightInitialZoomSlider = foundCustom.Find<Slider>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseSpotlightZoom));
+                var spotlightInitialZoomSlider = foundCustom.Find<Slider>("Spotlight initial zoom");
                Assert.IsNotNull(spotlightInitialZoomSlider);
                Task.Delay(1000).Wait();
                spotlightInitialZoomSlider.QuickSetValue(int.Parse(settings.InitialZoom, CultureInfo.InvariantCulture));
@@ -559,8 +562,7 @@ namespace MouseUtils.UITests
                Task.Delay(1000).Wait();

                //// Change the edit value
-                var spotlightRadius = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseSpotlightRadius));
-                var spotlightRadiusEdit = spotlightRadius.Find<TextBox>(By.AccessibilityId("InputBox"));
+                var spotlightRadiusEdit = foundCustom.Find<TextBox>("Spotlight radius (px) Minimum5");
                Assert.IsNotNull(spotlightRadiusEdit);
                Task.Delay(1000).Wait();
                spotlightRadiusEdit.SetText(settings.Radius);
@@ -568,12 +570,11 @@ namespace MouseUtils.UITests
                Task.Delay(1000).Wait();

                // Set the duration to 0 ms
-                var spotlightAnimationDuration = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseAnimationDuration));
-                var spotlightAnimationDurationEdit = spotlightAnimationDuration.Find<TextBox>(By.AccessibilityId("InputBox"));
-                Assert.IsNotNull(spotlightAnimationDurationEdit);
+                var spotlightAnimationDuration = foundCustom.Find<TextBox>("Animation duration (ms) Minimum0");
+                Assert.IsNotNull(spotlightAnimationDuration);
                Task.Delay(1000).Wait();
-                spotlightAnimationDurationEdit.SetText(settings.AnimationDuration);
-                Assert.AreEqual(settings.AnimationDuration, spotlightAnimationDurationEdit.Text);
+                spotlightAnimationDuration.SetText(settings.AnimationDuration);
+                Assert.AreEqual(settings.AnimationDuration, spotlightAnimationDuration.Text);
                Task.Delay(1000).Wait();

                // groupAppearanceBehavior.Click();
@@ -621,19 +622,19 @@ namespace MouseUtils.UITests
            this.Session.SetMainWindowSize(WindowSize.Large);

            // Goto Hosts File Editor setting page
-            if (this.FindAll(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Count == 0)
+            if (this.FindAll<NavigationViewItem>("Mouse utilities", 10000).Count == 0)
            {
                // Expand Advanced list-group if needed
-                this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.InputOutputNavItem)).Click();
+                this.Find<NavigationViewItem>("Input / Output").Click();
            }

            if (reload)
            {
-                this.Find<NavigationViewItem>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.KeyboardManagerNavItem)).Click();
+                this.Find<NavigationViewItem>("Keyboard Manager").Click();
            }

            Task.Delay(1000).Wait();
-            this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Click();
+            this.Find<NavigationViewItem>("Mouse utilities").Click();
        }
    }
 }
--- a/src/modules/MouseUtils/MouseUtils.UITests/MouseHighlighterTests.cs
+++ b/src/modules/MouseUtils/MouseUtils.UITests/MouseHighlighterTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// 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.

@@ -24,10 +24,10 @@ namespace MouseUtils.UITests
        public void TestEnableMouseHighlighter()
        {
            LaunchFromSetting();
-            var foundCustom0 = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
+            var foundCustom0 = this.Find<Custom>("Find My Mouse");
            if (foundCustom0 != null)
            {
-                foundCustom0.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
+                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
            }
            else
            {
@@ -42,11 +42,11 @@ namespace MouseUtils.UITests
            settings.FadeDelay = "0";
            settings.FadeDuration = "90";

-            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighter));
+            var foundCustom = this.Find<Custom>("Mouse Highlighter");
            if (foundCustom != null)
            {
-                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).Toggle(true);
-                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).Toggle(false);
+                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(true);
+                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(false);

                var xy = Session.GetMousePosition();
                Session.MoveMouseTo(xy.Item1, xy.Item2 - 100);
@@ -54,7 +54,7 @@ namespace MouseUtils.UITests
                Session.PerformMouseAction(MouseActionType.ScrollDown);
                Session.PerformMouseAction(MouseActionType.ScrollDown);
                Session.PerformMouseAction(MouseActionType.ScrollDown);
-                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).Toggle(true);
+                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(true);

                // Change the shortcut key for MouseHighlighter
                // [TestCase]Change activation shortcut and test it
@@ -107,7 +107,7 @@ namespace MouseUtils.UITests
                VerifyMouseHighlighterNotAppears(ref settings, "rightClick");

                // [Test Case] Disable Mouse Highlighter and verify that the module is not activated when you press the activation shortcut.
-                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).Toggle(false);
+                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(false);
                xy = Session.GetMousePosition();
                Session.MoveMouseTo(xy.Item1 - 100, xy.Item2);

@@ -119,7 +119,7 @@ namespace MouseUtils.UITests

                // [Test Case] With left mouse button pressed, drag the mouse and verify the highlight is dragged with the pointer.
                // [Test Case] With right mouse button pressed, drag the mouse and verify the highlight is dragged with the pointer.
-                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).Toggle(true);
+                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(true);
                xy = Session.GetMousePosition();
                Session.MoveMouseTo(xy.Item1 - 100, xy.Item2);

@@ -143,10 +143,10 @@ namespace MouseUtils.UITests
        public void TestMouseHighlighterDifferentSettings()
        {
            LaunchFromSetting();
-            var foundCustom0 = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
+            var foundCustom0 = this.Find<Custom>("Find My Mouse");
            if (foundCustom0 != null)
            {
-                foundCustom0.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
+                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
            }
            else
            {
@@ -161,11 +161,11 @@ namespace MouseUtils.UITests
            settings.FadeDelay = "0";
            settings.FadeDuration = "90";

-            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighter));
+            var foundCustom = this.Find<Custom>("Mouse Highlighter");
            if (foundCustom != null)
            {
-                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).Toggle(true);
-                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).Toggle(false);
+                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(true);
+                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(false);

                var xy = Session.GetMousePosition();
                Session.MoveMouseTo(xy.Item1, xy.Item2 - 100);
@@ -173,7 +173,7 @@ namespace MouseUtils.UITests
                Session.PerformMouseAction(MouseActionType.ScrollDown);
                Session.PerformMouseAction(MouseActionType.ScrollDown);
                Session.PerformMouseAction(MouseActionType.ScrollDown);
-                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).Toggle(true);
+                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(true);

                // Change the shortcut key for MouseHighlighter
                // [TestCase] Test the different settings and verify they apply - Change activation shortcut and test it
@@ -387,7 +387,7 @@ namespace MouseUtils.UITests
        private void SetColor(ref Custom foundCustom, string colorName = "Primary button highlight color", string colorValue = "000000", string opacity = "0")
        {
            Assert.IsNotNull(foundCustom);
-            var groupAppearanceBehavior = foundCustom.Find<Group>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterAppearanceBehavior));
+            var groupAppearanceBehavior = foundCustom.Find<TextBlock>("Appearance & behavior");
            if (groupAppearanceBehavior != null)
            {
                if (foundCustom.FindAll<TextBox>("Fade duration (ms) Minimum0").Count == 0)
@@ -439,7 +439,7 @@ namespace MouseUtils.UITests
        private void SetMouseHighlighterAppearanceBehavior(ref Custom foundCustom, ref MouseHighlighterSettings settings)
        {
            Assert.IsNotNull(foundCustom);
-            var groupAppearanceBehavior = foundCustom.Find<Group>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterAppearanceBehavior));
+            var groupAppearanceBehavior = foundCustom.Find<TextBlock>("Appearance & behavior");
            if (groupAppearanceBehavior != null)
            {
                // groupAppearanceBehavior.Click();
@@ -477,7 +477,7 @@ namespace MouseUtils.UITests
            }
            else
            {
-                Assert.Fail("MouseHighlighter Appearance & behavior group not found.");
+                Assert.Fail("Appearance & behavior group not found.");
            }
        }

@@ -485,14 +485,14 @@ namespace MouseUtils.UITests
        {
            this.Session.SetMainWindowSize(WindowSize.Large);

-            // Goto Mouse utilities setting page
-            if (this.FindAll(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Count == 0)
+            // Goto Hosts File Editor setting page
+            if (this.FindAll<NavigationViewItem>("Mouse utilities").Count == 0)
            {
-                // Expand Input / Output list-group if needed
-                this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.InputOutputNavItem)).Click();
+                // Expand Advanced list-group if needed
+                this.Find<NavigationViewItem>("Input / Output").Click();
            }

-            this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Click();
+            this.Find<NavigationViewItem>("Mouse utilities").Click();
        }
    }
 }
--- a/src/modules/MouseUtils/MouseUtils.UITests/MouseJumpTests.cs
+++ b/src/modules/MouseUtils/MouseUtils.UITests/MouseJumpTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// 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.

@@ -29,11 +29,11 @@ namespace MouseUtils.UITests
        public void TestEnableMouseJump2()
        {
            LaunchFromSetting();
-            var foundCustom0 = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
+            var foundCustom0 = this.Find<Custom>("Find My Mouse");
            if (foundCustom0 != null)
            {
-                foundCustom0.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
-                foundCustom0.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
+                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
            }
            else
            {
@@ -45,10 +45,10 @@ namespace MouseUtils.UITests
                Session.PerformMouseAction(MouseActionType.ScrollDown);
            }

-            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseJump));
+            var foundCustom = this.Find<Custom>("Mouse Jump");
            if (foundCustom != null)
            {
-                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseJumpToggle)).Toggle(true);
+                foundCustom.Find<ToggleSwitch>("Enable Mouse Jump").Toggle(true);

                var xy = Session.GetMousePosition();
                Session.MoveMouseTo(xy.Item1, xy.Item2 - 100);
@@ -89,7 +89,7 @@ namespace MouseUtils.UITests
                Task.Delay(1000).Wait();

                // [TestCase] Enable Mouse Jump. Then - Disable Mouse Jump and verify that the module is not activated when you press the activation shortcut.
-                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseJumpToggle)).Toggle(false);
+                foundCustom.Find<ToggleSwitch>("Enable Mouse Jump").Toggle(false);
                Session.MoveMouseTo(screenCenter.CenterX, screenCenter.CenterY - 300, 500, 1000);
                Session.SendKeys(Key.Win, Key.Shift, Key.Z);
                Task.Delay(500).Wait();
@@ -108,11 +108,11 @@ namespace MouseUtils.UITests
        public void TestEnableMouseJump3()
        {
            LaunchFromSetting();
-            var foundCustom0 = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
+            var foundCustom0 = this.Find<Custom>("Find My Mouse");
            if (foundCustom0 != null)
            {
-                foundCustom0.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
-                foundCustom0.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
+                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
            }
            else
            {
@@ -124,10 +124,10 @@ namespace MouseUtils.UITests
                Session.PerformMouseAction(MouseActionType.ScrollDown);
            }

-            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseJump));
+            var foundCustom = this.Find<Custom>("Mouse Jump");
            if (foundCustom != null)
            {
-                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseJumpToggle)).Toggle(true);
+                foundCustom.Find<ToggleSwitch>("Enable Mouse Jump").Toggle(true);

                var xy = Session.GetMousePosition();
                Session.MoveMouseTo(xy.Item1, xy.Item2 - 100);
@@ -215,23 +215,23 @@ namespace MouseUtils.UITests
            Session.SetMainWindowSize(WindowSize.Large);
            Task.Delay(1000).Wait();

-            // Goto Mouse utilities setting page
-            if (this.FindAll(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Count == 0)
+            // Goto Hosts File Editor setting page
+            if (this.FindAll<NavigationViewItem>("Mouse utilities").Count == 0)
            {
-                // Expand Input / Output list-group if needed
-                this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.InputOutputNavItem)).Click();
+                // Expand Advanced list-group if needed
+                this.Find<NavigationViewItem>("Input / Output").ClickCenter();
                Task.Delay(2000).Wait();
            }

-            // Goto Mouse utilities setting page
-            if (this.FindAll(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Count == 0)
+            // Goto Hosts File Editor setting page
+            if (this.FindAll<NavigationViewItem>("Mouse utilities").Count == 0)
            {
                RestartScopeExe();
                Session.SetMainWindowSize(WindowSize.Large);
                Task.Delay(1000).Wait();

-                // Expand Input / Output list-group if needed
-                this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.InputOutputNavItem)).Click();
+                // Expand Advanced list-group if needed
+                this.Find<NavigationViewItem>("Input / Output").ClickCenter();
                Task.Delay(2000).Wait();
            }

@@ -243,7 +243,7 @@ namespace MouseUtils.UITests
            }
            else
            {
-                this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Click();
+                this.Find<NavigationViewItem>("Mouse utilities").Click();
            }
        }
    }
--- a/src/modules/MouseUtils/MouseUtils.UITests/MousePointerCrosshairsTests.cs
+++ b/src/modules/MouseUtils/MouseUtils.UITests/MousePointerCrosshairsTests.cs
@@ -249,7 +249,7 @@ namespace MouseUtils.UITests
        private void SetColor(ref Custom foundCustom, string colorName, string colorValue = "000000")
        {
            Assert.IsNotNull(foundCustom);
-            var groupAppearanceBehavior = foundCustom.Find<Group>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MousePointerCrosshairsAppearanceBehavior));
+            var groupAppearanceBehavior = foundCustom.Find<TextBlock>("Appearance & behavior");
            if (groupAppearanceBehavior != null)
            {
                // Set primary button highlight color
@@ -277,7 +277,7 @@ namespace MouseUtils.UITests
        private void SetMousePointerCrosshairsAppearanceBehavior(ref Custom foundCustom, ref MousePointerCrosshairsSettings settings)
        {
            Assert.IsNotNull(foundCustom);
-            var groupAppearanceBehavior = foundCustom.Find<Group>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MousePointerCrosshairsAppearanceBehavior));
+            var groupAppearanceBehavior = foundCustom.Find<TextBlock>("Appearance & behavior");
            if (groupAppearanceBehavior != null)
            {
                // groupAppearanceBehavior.Click();
@@ -337,7 +337,7 @@ namespace MouseUtils.UITests
            }
            else
            {
-                Assert.Fail("MousePointerCrosshairs Appearance & behavior group not found.");
+                Assert.Fail("Appearance & behavior group not found.");
            }
        }

@@ -371,16 +371,8 @@ namespace MouseUtils.UITests

        public Custom? FindMouseUtilElement(MouseUtilsSettings.MouseUtils element)
        {
-            string accessibilityId = element switch
-            {
-                MouseUtilsSettings.MouseUtils.FindMyMouse => MouseUtilsSettings.AccessibilityIds.FindMyMouse,
-                MouseUtilsSettings.MouseUtils.MouseHighlighter => MouseUtilsSettings.AccessibilityIds.MouseHighlighter,
-                MouseUtilsSettings.MouseUtils.MousePointerCrosshairs => MouseUtilsSettings.AccessibilityIds.MousePointerCrosshairs,
-                MouseUtilsSettings.MouseUtils.MouseJump => MouseUtilsSettings.AccessibilityIds.MouseJump,
-                _ => throw new ArgumentException($"Unknown MouseUtils element: {element}"),
-            };
-
-            var foundCustom = this.Find<Custom>(By.AccessibilityId(accessibilityId));
+            var elementName = MouseUtilsSettings.GetMouseUtilUIName(element);
+            var foundCustom = this.Find<Custom>(elementName);
            for (int i = 0; i < 20; i++)
            {
                if (foundCustom != null)
@@ -389,7 +381,7 @@ namespace MouseUtils.UITests
                }

                Session.PerformMouseAction(MouseActionType.ScrollDown);
-                foundCustom = this.Find<Custom>(By.AccessibilityId(accessibilityId));
+                foundCustom = this.Find<Custom>(elementName);
            }

            return foundCustom;
@@ -399,14 +391,14 @@ namespace MouseUtils.UITests
        {
            Session.SetMainWindowSize(WindowSize.Large);

-            // Goto Mouse utilities setting page
-            if (this.FindAll(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Count == 0)
+            // Goto Hosts File Editor setting page
+            if (this.FindAll<NavigationViewItem>("Mouse utilities").Count == 0)
            {
-                // Expand Input / Output list-group if needed
-                this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.InputOutputNavItem)).Click();
+                // Expand Advanced list-group if needed
+                this.Find<NavigationViewItem>("Input / Output").Click();
            }

-            this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Click();
+            this.Find<NavigationViewItem>("Mouse utilities").Click();
        }
    }
 }
--- a/src/modules/MouseUtils/MouseUtils.UITests/util/MouseUtilsSettings.cs
+++ b/src/modules/MouseUtils/MouseUtils.UITests/util/MouseUtilsSettings.cs
@@ -11,48 +11,6 @@ namespace MouseUtils.UITests
 {
    public class MouseUtilsSettings
    {
-        // Accessibility ID constants
-        public static class AccessibilityIds
-        {
-            // Mouse Utils module IDs
-            public const string FindMyMouse = "MouseUtils_FindMyMouseTestId";
-            public const string MouseHighlighter = "MouseUtils_MouseHighlighterTestId";
-            public const string MousePointerCrosshairs = "MouseUtils_MousePointerCrosshairsTestId";
-            public const string MouseJump = "MouseUtils_MouseJumpTestId";
-
-            // ToggleSwitch IDs
-            public const string FindMyMouseToggle = "MouseUtils_FindMyMouseToggleId";
-            public const string MouseHighlighterToggle = "MouseUtils_MouseHighlighterToggleId";
-            public const string MousePointerCrosshairsToggle = "MouseUtils_MousePointerCrosshairsToggleId";
-            public const string MouseJumpToggle = "MouseUtils_MouseJumpToggleId";
-
-            // Find My Mouse UI Element IDs
-            public const string FindMyMouseActivationMethod = "MouseUtils_FindMyMouseActivationMethodId";
-            public const string FindMyMouseAppearanceBehavior = "MouseUtils_FindMyMouseAppearanceBehaviorId";
-            public const string FindMyMouseExcludedApps = "MouseUtils_FindMyMouseExcludedAppsId";
-            public const string FindMyMouseBackgroundColor = "MouseUtils_FindMyMouseBackgroundColorId";
-            public const string FindMyMouseSpotlightColor = "MouseUtils_FindMyMouseSpotlightColorId";
-            public const string FindMyMouseOverlayOpacity = "MouseUtils_FindMyMouseOverlayOpacityId";
-            public const string FindMyMouseSpotlightZoom = "MouseUtils_FindMyMouseSpotlightZoomId";
-            public const string FindMyMouseSpotlightRadius = "MouseUtils_FindMyMouseSpotlightRadiusId";
-            public const string FindMyMouseAnimationDuration = "MouseUtils_FindMyMouseAnimationDurationId";
-
-            // Mouse Highlighter UI Element IDs
-            public const string MouseHighlighterActivationShortcut = "MouseUtils_MouseHighlighterActivationShortcutId";
-            public const string MouseHighlighterAppearanceBehavior = "MouseUtils_MouseHighlighterAppearanceBehaviorId";
-
-            // Mouse Pointer Crosshairs UI Element IDs
-            public const string MousePointerCrosshairsAppearanceBehavior = "MouseUtils_MousePointerCrosshairsAppearanceBehaviorId";
-
-            // Mouse Jump UI Element IDs
-            public const string MouseJumpActivationShortcut = "MouseUtils_MouseJumpActivationShortcutId";
-
-            // Navigation IDs
-            public const string InputOutputNavItem = "InputOutputNavItem";
-            public const string MouseUtilitiesNavItem = "MouseUtilitiesNavItem";
-            public const string KeyboardManagerNavItem = "KeyboardManagerNavItem";
-        }
-
        // Mouse Utils Modules
        public enum MouseUtils
        {
--- a/src/modules/PowerOCR/PowerOCR-UITests/PowerOCRTests.cs
+++ b/src/modules/PowerOCR/PowerOCR-UITests/PowerOCRTests.cs
@@ -2,10 +2,8 @@
 // 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.UITest;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OpenQA.Selenium.Interactions;
 using static Microsoft.PowerToys.UITest.UITestBase;

 namespace PowerOCR.UITests;
@@ -21,274 +19,41 @@ public class PowerOCRTests : UITestBase
    [TestInitialize]
    public void TestInitialize()
    {
-        if (FindAll<NavigationViewItem>(By.AccessibilityId("TextExtractorNavItem")).Count == 0)
+        if (FindAll<NavigationViewItem>("Text Extractor").Count == 0)
        {
-            // Expand System Tools list-group if needed
-            Find<NavigationViewItem>(By.AccessibilityId("SystemToolsNavItem")).Click();
+            // Expand Advanced list-group if needed
+            Find<NavigationViewItem>("System Tools").Click();
        }

-        Find<NavigationViewItem>(By.AccessibilityId("TextExtractorNavItem")).Click();
+        Find<NavigationViewItem>("Text Extractor").Click();

-        Find<ToggleSwitch>(By.AccessibilityId("EnableTextExtractorToggleSwitch")).Toggle(true);
+        Find<ToggleSwitch>("Enable Text Extractor").Toggle(true);

-        // Reset activation shortcut to default (Win+Shift+T)
-        var shortcutControl = Find<Element>(By.AccessibilityId("TextExtractorActivationShortcut"), 5000);
-        if (shortcutControl != null)
-        {
-            shortcutControl.Click();
-            Thread.Sleep(500);
-
-            // Set default shortcut Win+Shift+T
-            SendKeys(Key.Win, Key.Shift, Key.T);
-            Thread.Sleep(1000);
-
-            // Click Save to confirm
-            var saveButton = Find<Button>(By.Name("Save"), 3000);
-            if (saveButton != null)
-            {
-                saveButton.Click();
-                Thread.Sleep(1000);
-            }
-        }
+        SendKeys(Key.Win, Key.D);
    }

    [TestMethod("PowerOCR.DetectTextExtractor")]
    [TestCategory("PowerOCR Detection")]
    public void DetectTextExtractorTest()
    {
-        // Step 1: Press the activation shortcut and verify the overlay appears
-        SendKeys(Key.Win, Key.Shift, Key.T);
-        var textExtractorWindow = Find<Element>(By.AccessibilityId("TextExtractorWindow"), 10000, true);
-        Assert.IsNotNull(textExtractorWindow, "TextExtractor window should be found after hotkey activation");
-
-        // Step 2: Press Escape and verify the overlay disappears
-        SendKeys(Key.Esc);
-        Thread.Sleep(3000);
-
-        var windowsAfterEscape = FindAll<Element>(By.AccessibilityId("TextExtractorWindow"), 2000, true);
-        Assert.AreEqual(0, windowsAfterEscape.Count, "TextExtractor window should be dismissed after pressing Escape");
-
-        // Step 3: Press the activation shortcut again and verify the overlay appears
-        SendKeys(Key.Win, Key.Shift, Key.T);
-
-        textExtractorWindow = Find<Element>(By.AccessibilityId("TextExtractorWindow"), 10000, true);
-        Assert.IsNotNull(textExtractorWindow, "TextExtractor window should appear again after hotkey activation");
-
-        // Step 4: Right-click and select Cancel. Verify the overlay disappears
-        textExtractorWindow.Click(rightClick: true);
-        Thread.Sleep(500);
-
-        // Look for Cancel menu item using its AutomationId
-        var cancelMenuItem = Find<Element>(By.AccessibilityId("CancelMenuItem"), 3000, true);
-        Assert.IsNotNull(cancelMenuItem, "Cancel menu item should be available in context menu");
-
-        cancelMenuItem.Click();
-        Thread.Sleep(3000);
-
-        var windowsAfterCancel = FindAll<Element>(By.AccessibilityId("TextExtractorWindow"), 2000, true);
-        Assert.AreEqual(0, windowsAfterCancel.Count, "TextExtractor window should be dismissed after clicking Cancel");
-    }
-
-    [TestMethod("PowerOCR.DisableTextExtractorTest")]
-    [TestCategory("PowerOCR Settings")]
-    public void DisableTextExtractorTest()
-    {
-        Find<ToggleSwitch>(By.AccessibilityId("EnableTextExtractorToggleSwitch")).Toggle(false);
-
-        SendKeys(Key.Win, Key.Shift, Key.T);
-
-        // Verify that no TextExtractor window appears
-        var windowsWhenDisabled = FindAll<Element>(By.AccessibilityId("TextExtractorWindow"), 10000, true);
-        Assert.AreEqual(0, windowsWhenDisabled.Count, "TextExtractor window should not appear when the utility is disabled");
-    }
-
-    [TestMethod("PowerOCR.ActivationShortcutSettingsTest")]
-    [TestCategory("PowerOCR Settings")]
-    public void ActivationShortcutSettingsTest()
-    {
-        // Find the activation shortcut control
-        var shortcutControl = Find<Element>(By.AccessibilityId("TextExtractorActivationShortcut"), 5000);
-        Assert.IsNotNull(shortcutControl, "Activation shortcut control should be found");
-
-        // Click to focus the shortcut control
-        shortcutControl.Click();
-        Thread.Sleep(500);
-
-        // Test changing the shortcut to Ctrl+Shift+T
-        SendKeys(Key.Ctrl, Key.Shift, Key.T);
-        Thread.Sleep(1000);
-
-        // Click the Save button to confirm the shortcut change
-        var saveButton = Find<Button>(By.Name("Save"), 3000);
-        Assert.IsNotNull(saveButton, "Save button should be found in the shortcut dialog");
-        saveButton.Click();
-        Thread.Sleep(1000);
-
-        // Test the new shortcut
-        SendKeys(Key.Ctrl, Key.Shift, Key.T);
-        Thread.Sleep(3000);
-
-        var textExtractorWindow = FindAll<Element>(By.AccessibilityId("TextExtractorWindow"), 3000, true);
-        Assert.IsTrue(textExtractorWindow.Count > 0, "TextExtractor should activate with new shortcut Ctrl+Shift+T");
-    }
-
-    [TestMethod("PowerOCR.OCRLanguageSettingsTest")]
-    [TestCategory("PowerOCR Settings")]
-    public void OCRLanguageSettingsTest()
-    {
-        // Find the language combo box
-        var languageComboBox = Find<ComboBox>(By.AccessibilityId("TextExtractorLanguageComboBox"), 5000);
-        Assert.IsNotNull(languageComboBox, "Language combo box should be found");
-
-        // Click to open the dropdown
-        languageComboBox.Click();
-
-        // Verify dropdown is opened by checking if dropdown items are available
-        var dropdownItems = FindAll<Element>(By.ClassName("ComboBoxItem"), 2000);
-        Assert.IsTrue(dropdownItems.Count > 0, "Dropdown should contain language options");
-
-        // Close dropdown by pressing Escape
-        SendKeys(Key.Esc);
-    }
-
-    [TestMethod("PowerOCR.OCRLanguageSelectionTest")]
-    [TestCategory("PowerOCR Language")]
-    public void OCRLanguageSelectionTest()
-    {
-        // Activate Text Extractor overlay
-        SendKeys(Key.Win, Key.Shift, Key.T);
-        Thread.Sleep(3000);
-
-        var textExtractorWindow = Find<Element>(By.AccessibilityId("TextExtractorWindow"), 10000, true);
-        Assert.IsNotNull(textExtractorWindow, "TextExtractor window should be found after hotkey activation");
-
-        // Right-click on the canvas to open context menu
-        textExtractorWindow.Click(rightClick: true);
-
-        // Look for language options that should appear after Cancel menu item
-        var allMenuItems = FindAll<Element>(By.ClassName("MenuItem"), 2000, true);
-        if (allMenuItems.Count > 4)
+        try
        {
-            // Find the Cancel menu item first
-            Element? cancelItem = null;
-            int cancelIndex = -1;
-            for (int i = 0; i < allMenuItems.Count; i++)
-            {
-                if (allMenuItems[i].GetAttribute("AutomationId") == "CancelMenuItem")
-                {
-                    cancelItem = allMenuItems[i];
-                    cancelIndex = i;
-                    break;
-                }
-            }
+            SendKeys(Key.Win, Key.Shift, Key.T);

-            Assert.IsNotNull(cancelItem, "Cancel menu item should be found");
+            Thread.Sleep(5000);

-            // Look for language options after Cancel menu item
-            if (cancelIndex >= 0 && cancelIndex < allMenuItems.Count - 1)
-            {
-                // Select the first language option after Cancel
-                var languageOption = allMenuItems[cancelIndex + 1];
-                languageOption.Click();
-                Thread.Sleep(1000);
+            var textExtractorWindow = Find("TextExtractor", 10000, true);

-                Assert.IsTrue(true, "Language selection changed successfully through right-click menu");
-            }
+            Assert.IsNotNull(textExtractorWindow, "TextExtractor window should be found after hotkey activation");
+
+            Console.WriteLine("✓ TextExtractor window detected successfully after hotkey activation");
+
+            SendKeys(Key.Esc);
        }
-
-        // Close the TextExtractor overlay
-        SendKeys(Key.Esc);
-        Thread.Sleep(1000);
-    }
-
-    [TestMethod("PowerOCR.TextSelectionAndClipboardTest")]
-    [TestCategory("PowerOCR Selection")]
-    public void TextSelectionAndClipboardTest()
-    {
-        // Clear clipboard first using STA thread
-        ClearClipboardSafely();
-        Thread.Sleep(500);
-
-        // Activate Text Extractor overlay
-        SendKeys(Key.Win, Key.Shift, Key.T);
-        Thread.Sleep(3000);
-
-        var textExtractorWindow = Find<Element>(By.AccessibilityId("TextExtractorWindow"), 10000, true);
-        Assert.IsNotNull(textExtractorWindow, "TextExtractor window should be found after hotkey activation");
-
-        // Click on the TextExtractor window to position cursor
-        textExtractorWindow.Click();
-        Thread.Sleep(500);
-
-        // Get screen dimensions for full screen selection
-        var primaryScreen = System.Windows.Forms.Screen.PrimaryScreen;
-        Assert.IsNotNull(primaryScreen, "Primary screen should be available");
-
-        var screenWidth = primaryScreen.Bounds.Width;
-        var screenHeight = primaryScreen.Bounds.Height;
-
-        // Define full screen selection area
-        var startX = 0;
-        var startY = 0;
-        var endX = screenWidth;
-        var endY = screenHeight;
-
-        // Perform continuous mouse drag to select entire screen
-        PerformSeleniumDrag(startX, startY, endX, endY);
-        Thread.Sleep(3000); // Wait longer for full screen OCR processing
-
-        // Verify text was copied to clipboard using STA thread
-        var clipboardText = GetClipboardTextSafely();
-
-        Assert.IsFalse(string.IsNullOrWhiteSpace(clipboardText), "Clipboard should contain extracted text after selection");
-
-        // Close the TextExtractor overlay
-        SendKeys(Key.Esc);
-        Thread.Sleep(1000);
-    }
-
-    private static void ClearClipboardSafely()
-    {
-        var thread = new System.Threading.Thread(() =>
+        catch (Exception ex)
        {
-            System.Windows.Forms.Clipboard.Clear();
-        });
-        thread.SetApartmentState(System.Threading.ApartmentState.STA);
-        thread.Start();
-        thread.Join();
-    }
-
-    private static string GetClipboardTextSafely()
-    {
-        string result = string.Empty;
-        var thread = new System.Threading.Thread(() =>
-        {
-            try
-            {
-                result = System.Windows.Forms.Clipboard.GetText();
-            }
-            catch (Exception)
-            {
-                result = string.Empty;
-            }
-        });
-        thread.SetApartmentState(System.Threading.ApartmentState.STA);
-        thread.Start();
-        thread.Join();
-        return result;
-    }
-
-    private void PerformSeleniumDrag(int startX, int startY, int endX, int endY)
-    {
-        // Use Selenium Actions for proper drag and drop operation
-        var actions = new Actions(Session.Root);
-
-        // Move to start position, click and hold, drag to end position, then release
-        actions.MoveByOffset(startX, startY)
-               .ClickAndHold()
-               .MoveByOffset(endX - startX, endY - startY)
-               .Release()
-               .Build()
-               .Perform();
+            Console.WriteLine($"Failed to detect TextExtractor window: {ex.Message}");
+            Assert.Fail("TextExtractor window was not found after hotkey activation");
+        }
    }
 }
--- a/src/modules/PowerOCR/PowerOCR-UITests/tests-checklist-text-extractor.md
+++ b/src/modules/PowerOCR/PowerOCR-UITests/tests-checklist-text-extractor.md
@@ -1,15 +0,0 @@
-## Text Extractor
- * Enable Text Extractor. Then:
-   - [x] Press the activation shortcut and verify the overlay appears.
-   - [x] Press Escape and verify the overlay disappears.
-   - [x] Press the activation shortcut and verify the overlay appears.
-   - [x] Right-click and select Cancel. Verify the overlay disappears.
-   - [x] Disable Text Extractor and verify that the activation shortcut no longer activates the utility.
- * With Text Extractor enabled and activated:
-   - [x] Try to select text and verify it is copied to the clipboard.
-   - [x] Try to select a different OCR language by right-clicking and verify the change is applied.
- * In a multi-monitor setup with different DPIs on each monitor:
-   - [ ] Verify text is correctly captured on all monitors.
- * Test the different settings and verify they are applied:
-   - [x] Activation shortcut
-   - [x] OCR Language
--- a/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml
+++ b/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml
@@ -6,7 +6,6 @@
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:p="clr-namespace:PowerOCR.Properties"
    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
-    x:Name="TextExtractorWindow"
    Title="TextExtractor"
    ui:Design.Background="Transparent"
    AllowsTransparency="True"
@@ -88,7 +87,6 @@
                    <Separator />
                    <MenuItem
                        Name="CancelMenuItem"
-                        AutomationProperties.AutomationId="CancelMenuItem"
                        Click="CancelMenuItem_Click"
                        Header="{x:Static p:Resources.Cancel}" />
                </ContextMenu>
@@ -119,7 +117,6 @@
                <ComboBox
                    x:Name="LanguagesComboBox"
                    Margin="4,0"
-                    AutomationProperties.AutomationId="OCROverlayLanguagesComboBox"
                    AutomationProperties.Name="{x:Static p:Resources.SelectedLang}"
                    SelectionChanged="LanguagesComboBox_SelectionChanged">
                    <ComboBox.ItemTemplate>
--- a/src/modules/ZoomIt/ZoomIt/ZoomIt.rc
+++ b/src/modules/ZoomIt/ZoomIt/ZoomIt.rc
@@ -121,8 +121,8 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
    DEFPUSHBUTTON   "OK",IDOK,166,306,50,14
    PUSHBUTTON      "Cancel",IDCANCEL,223,306,50,14
-    LTEXT           "ZoomIt v9.01",IDC_VERSION,42,7,73,10
-    LTEXT           "Copyright © 2006-2025 Mark Russinovich",IDC_COPYRIGHT,42,17,166,8
+    LTEXT           "ZoomIt v9.0",IDC_VERSION,42,7,73,10
+    LTEXT           "Copyright <EFBFBD> 2006-2024 Mark Russinovich",IDC_COPYRIGHT,42,17,166,8
    CONTROL         "<a HREF=""https://www.sysinternals.com"">Sysinternals - www.sysinternals.com</a>",IDC_LINK,
                    "SysLink",WS_TABSTOP,42,26,150,9
    ICON            "APPICON",IDC_STATIC,12,9,20,20
--- a/src/modules/ZoomIt/ZoomIt/Zoomit.cpp
+++ b/src/modules/ZoomIt/ZoomIt/Zoomit.cpp
@@ -3525,10 +3525,6 @@ winrt::fire_and_forget StartRecordingAsync( HWND hWnd, LPRECT rcCrop, HWND hWndR
        }
        if( destFile == nullptr ) {

-            if (stream) {
-                stream.Close();
-                stream = nullptr;
-            }
            co_await file.DeleteAsync();
        }
        else {
@@ -3548,10 +3544,6 @@ winrt::fire_and_forget StartRecordingAsync( HWND hWnd, LPRECT rcCrop, HWND hWndR
    }
    else {

-        if (stream) {
-            stream.Close();
-            stream = nullptr;
-        }
        co_await file.DeleteAsync();
        g_RecordingSession = nullptr;
    }
@@ -4024,10 +4016,7 @@ LRESULT APIENTRY MainWndProc(
            // Now copy crop or copy+save
            if( LOWORD( wParam ) == SNIP_SAVE_HOTKEY )
            {
-                // Hide cursor for screen capture
-                ShowCursor(false);
                SendMessage( hWnd, WM_COMMAND, IDC_SAVE_CROP, ( zoomed ? 0 : SHALLOW_ZOOM ) );
-                ShowCursor(true);
            }
            else
            {
@@ -4059,6 +4048,12 @@ LRESULT APIENTRY MainWndProc(
                    OutputDebug( L"Exiting liveDraw after snip\n" );
                    SendMessage( hWnd, WM_KEYDOWN, VK_ESCAPE, 0 );
                }
+                else
+                {
+                    // Set wparam to 1 to exit without animation
+                    OutputDebug(L"Exiting zoom after snip\n" );
+                    SendMessage( hWnd, WM_HOTKEY, ZOOM_HOTKEY, SHALLOW_DESTROY );
+                }
            }
            break;
        }
@@ -5783,26 +5778,17 @@ LRESULT APIENTRY MainWndProc(

            if( !g_DrawingShape ) {

-                // If the point has changed, draw a line to it
-                if (prevPt.x != LOWORD(lParam) || prevPt.y != HIWORD(lParam)) {
-                    Gdiplus::Graphics	dstGraphics(hdcScreenCompat);
-                    if ((GetWindowLong(g_hWndMain, GWL_EXSTYLE) & WS_EX_LAYERED) == 0)
-                    {
-                        dstGraphics.SetSmoothingMode(Gdiplus::SmoothingModeAntiAlias);
-                    }
-                    Gdiplus::Color	color = ColorFromColorRef(g_PenColor);
-                    Gdiplus::Pen pen(color, static_cast<Gdiplus::REAL>(g_PenWidth));
-                    Gdiplus::GraphicsPath path;
-                    pen.SetLineJoin(Gdiplus::LineJoinRound);
-                    path.AddLine(prevPt.x, prevPt.y, LOWORD(lParam), HIWORD(lParam));
-                    dstGraphics.DrawPath(&pen, &path);
-                }
-                // Draw a dot at the current point, if the point hasn't changed
-                else {
-                    MoveToEx(hdcScreenCompat, prevPt.x, prevPt.y, NULL);
-                    LineTo(hdcScreenCompat, LOWORD(lParam), HIWORD(lParam));
-                    InvalidateRect(hWnd, NULL, FALSE);
+                Gdiplus::Graphics	dstGraphics(hdcScreenCompat);
+                if( ( GetWindowLong( g_hWndMain, GWL_EXSTYLE ) & WS_EX_LAYERED ) == 0 )
+                {
+                    dstGraphics.SetSmoothingMode(Gdiplus::SmoothingModeAntiAlias);
                }
+                Gdiplus::Color	color = ColorFromColorRef(g_PenColor);
+                Gdiplus::Pen pen(color, static_cast<Gdiplus::REAL>(g_PenWidth));
+                Gdiplus::GraphicsPath path;
+                pen.SetLineJoin(Gdiplus::LineJoinRound);
+                path.AddLine(prevPt.x, prevPt.y, LOWORD(lParam), HIWORD(lParam));
+                dstGraphics.DrawPath(&pen, &path);

                prevPt.x = LOWORD( lParam );
                prevPt.y = HIWORD( lParam );
--- a/src/modules/cmdpal/.editorconfig
+++ b/src/modules/cmdpal/.editorconfig
@@ -2,44 +2,28 @@
 # You can modify the rules from these initially generated values to suit your own policies.
 # You can learn more about editorconfig here: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference.

-##################################################
-# Global settings
-##################################################
-
-[*.{cs,vb}]
-tab_width = 4
-indent_size = 4
-end_of_line = crlf
-indent_style = space
-insert_final_newline = true
-file_header_template = Copyright (c) Microsoft Corporation\nThe Microsoft Corporation licenses this file to you under the MIT license.\nSee the LICENSE file in the project root for more information.
-
-##################################################
-# C# specific formatting
-##################################################
-
 [*.cs]
-# ----------------------------------------------
-# Core editorconfig formatting - indentation
-# ----------------------------------------------
+
+file_header_template = Copyright (c) Microsoft Corporation\r\nThe Microsoft Corporation licenses this file to you under the MIT license.\r\nSee the LICENSE file in the project root for more information.
+
+#Core editorconfig formatting - indentation
+
+#use soft tabs (spaces) for indentation
+indent_style = space
+
+#Formatting - new line options

 #place else statements on a new line
 csharp_new_line_before_else = true
 #require braces to be on a new line for lambdas, methods, control_blocks, types, properties, and accessors (also known as "Allman" style)
 csharp_new_line_before_open_brace = all

-# ----------------------------------------------
-# Formatting - organize using options
-# ----------------------------------------------
+#Formatting - organize using options

-# sort System.* using directives alphabetically, and place them before other usings
+#sort System.* using directives alphabetically, and place them before other usings
 dotnet_sort_system_directives_first = true
-# Do not place System.* using directives before other using directives.
-dotnet_separate_import_directive_groups = false

-# ----------------------------------------------
-# Formatting - spacing options
-# ----------------------------------------------
+#Formatting - spacing options

 #require NO space between a cast and the value
 csharp_space_after_cast = false
@@ -60,29 +44,17 @@ csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
 #place a space character after the opening parenthesis and before the closing parenthesis of a method declaration parameter list.
 csharp_space_between_method_declaration_parameter_list_parentheses = false

-# ----------------------------------------------
-# Formatting - wrapping options
-# ----------------------------------------------
+#Formatting - wrapping options

 #leave code block on separate lines
 csharp_preserve_single_line_blocks = true
-#put each statement on a separate line
-csharp_preserve_single_line_statements = false

-##################################################
-# C# style rules
-##################################################
-
-# ----------------------------------------------
-# Style - Code block preferences
-# ----------------------------------------------
+#Style - Code block preferences

 #prefer curly braces even for one line of code
 csharp_prefer_braces = true:suggestion

-# ----------------------------------------------
-# Style - expression bodied member options
-# ----------------------------------------------
+#Style - expression bodied member options

 #prefer expression bodies for accessors
 csharp_style_expression_bodied_accessors = true:warning
@@ -93,73 +65,55 @@ csharp_style_expression_bodied_methods = when_on_single_line:silent
 #prefer expression-bodied members for properties
 csharp_style_expression_bodied_properties = true:warning

-# ----------------------------------------------
-# Style - expression level options
-# ----------------------------------------------
+#Style - expression level options

 #prefer out variables to be declared before the method call
 csharp_style_inlined_variable_declaration = false:suggestion
 #prefer the language keyword for member access expressions, instead of the type name, for types that have a keyword to represent them
 dotnet_style_predefined_type_for_member_access = true:suggestion

-# ----------------------------------------------
-# Style - Expression-level  preferences
-# ----------------------------------------------
+#Style - Expression-level  preferences

 #prefer default over default(T)
 csharp_prefer_simple_default_expression = true:suggestion
 #prefer objects to be initialized using object initializers when possible
 dotnet_style_object_initializer = true:suggestion

-# ----------------------------------------------
-# Style - implicit and explicit types
-# ----------------------------------------------
+#Style - implicit and explicit types

 #prefer var over explicit type in all cases, unless overridden by another code style rule
 csharp_style_var_elsewhere = true:suggestion
 #prefer var is used to declare variables with built-in system types such as int
-csharp_style_var_for_built_in_types = true:warning
+csharp_style_var_for_built_in_types = true:suggestion
 #prefer var when the type is already mentioned on the right-hand side of a declaration expression
 csharp_style_var_when_type_is_apparent = true:suggestion

-# ----------------------------------------------
-# Style - language keyword and framework type options
-# ----------------------------------------------
+#Style - language keyword and framework type options

 #prefer the language keyword for local variables, method parameters, and class members, instead of the type name, for types that have a keyword to represent them
 dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion

-# ----------------------------------------------
-# Style - Language rules
-# ----------------------------------------------
-
+#Style - Language rules
 csharp_style_implicit_object_creation_when_type_is_apparent = true:warning
+csharp_style_var_for_built_in_types = true:warning

-# ----------------------------------------------
-# Style - modifier options
-# ----------------------------------------------
+#Style - modifier options

 #prefer accessibility modifiers to be declared except for public interface members. This will currently not differ from always and will act as future proofing for if C# adds default interface methods.
 dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion

-# ----------------------------------------------
-# Style - Modifier preferences
-# ----------------------------------------------
+#Style - Modifier preferences

 #when this rule is set to a list of modifiers, prefer the specified ordering.
 csharp_preferred_modifier_order = public,private,protected,internal,static,async,readonly,override,sealed,abstract,virtual:warning
 dotnet_style_readonly_field = true:warning

-# ----------------------------------------------
-# Style - Pattern matching
-# ----------------------------------------------
+#Style - Pattern matching

 #prefer pattern matching instead of is expression with type casts
 csharp_style_pattern_matching_over_as_with_null_check = true:warning

-# ----------------------------------------------
-# Style - qualification options
-# ----------------------------------------------
+#Style - qualification options

 #prefer events not to be prefaced with this. or Me. in Visual Basic
 dotnet_style_qualification_for_event = false:suggestion
@@ -169,26 +123,20 @@ dotnet_style_qualification_for_field = false:suggestion
 dotnet_style_qualification_for_method = false:suggestion
 #prefer properties not to be prefaced with this. or Me. in Visual Basic
 dotnet_style_qualification_for_property = false:suggestion
-
-# ----------------------------------------------
-# Style - expression bodies
-# ----------------------------------------------
+csharp_indent_labels = one_less_than_current
+csharp_using_directive_placement = outside_namespace:silent
+csharp_prefer_simple_using_statement = true:warning
+csharp_style_namespace_declarations = file_scoped:warning
 csharp_style_expression_bodied_operators = false:silent
 csharp_style_expression_bodied_indexers = true:silent
 csharp_style_expression_bodied_lambdas = true:silent
 csharp_style_expression_bodied_local_functions = false:silent

-# ----------------------------------------------
-# Style - Miscellaneous preferences
-# ----------------------------------------------
-
-csharp_indent_labels = one_less_than_current
-csharp_using_directive_placement = outside_namespace:silent
-csharp_prefer_simple_using_statement = true:warning
-csharp_style_namespace_declarations = file_scoped:warning
-
 [*.{cs,vb}]
 dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4
+indent_size = 4
+end_of_line = crlf
 dotnet_style_coalesce_expression = true:suggestion
 dotnet_style_null_propagation = true:suggestion
 dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
@@ -198,13 +146,12 @@ dotnet_style_collection_initializer = true:suggestion
 dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
 dotnet_style_prefer_conditional_expression_over_assignment = true:silent
 dotnet_style_prefer_conditional_expression_over_return = true:silent
+[*.{cs,vb}]
+
+#Style - Unnecessary code rules
 csharp_style_unused_value_assignment_preference = discard_variable:warning

-##################################################
-# Naming rules
-##################################################
-
-[*.{cs,vb}]
+#### Naming styles ####

 # Naming rules

@@ -256,11 +203,7 @@ dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
 dotnet_style_prefer_compound_assignment = true:warning
 dotnet_style_prefer_simplified_interpolation = true:suggestion

+# Diagnostic configuration

-##################################################
-# Diagnostics
-##################################################
-
-[*.{cs,vb}]
 # CS8305: Type is for evaluation purposes only and is subject to change or removal in future updates.
 dotnet_diagnostic.CS8305.severity = suggestion
--- a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props
+++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props
@@ -9,7 +9,7 @@
    <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.183" />
    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.250907003" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
    <PackageVersion Include="Shmuelie.WinRTServer" Version="2.1.1" />
    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
    <PackageVersion Include="System.Text.Json" Version="9.0.8" />
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Commands/ConfirmableCommand.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Common/Commands/ConfirmableCommand.cs
@@ -1,155 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Common.Commands;
-
-public sealed partial class ConfirmableCommand : InvokableCommand
-{
-    private readonly IInvokableCommand? _command;
-
-    public Func<bool>? IsConfirmationRequired { get; init; }
-
-    public required string ConfirmationTitle { get; init; }
-
-    public required string ConfirmationMessage { get; init; }
-
-    public required IInvokableCommand Command
-    {
-        get => _command!;
-        init
-        {
-            if (_command is INotifyPropChanged oldNotifier)
-            {
-                oldNotifier.PropChanged -= InnerCommand_PropChanged;
-            }
-
-            _command = value;
-
-            if (_command is INotifyPropChanged notifier)
-            {
-                notifier.PropChanged += InnerCommand_PropChanged;
-            }
-
-            OnPropertyChanged(nameof(Name));
-            OnPropertyChanged(nameof(Id));
-            OnPropertyChanged(nameof(Icon));
-        }
-    }
-
-    public override string Name
-    {
-        get => (_command as Command)?.Name ?? base.Name;
-        set
-        {
-            if (_command is Command cmd)
-            {
-                cmd.Name = value;
-            }
-            else
-            {
-                base.Name = value;
-            }
-        }
-    }
-
-    public override string Id
-    {
-        get => (_command as Command)?.Id ?? base.Id;
-        set
-        {
-            var previous = Id;
-            if (_command is Command cmd)
-            {
-                cmd.Id = value;
-            }
-            else
-            {
-                base.Id = value;
-            }
-
-            if (previous != Id)
-            {
-                OnPropertyChanged(nameof(Id));
-            }
-        }
-    }
-
-    public override IconInfo Icon
-    {
-        get => (_command as Command)?.Icon ?? base.Icon;
-        set
-        {
-            if (_command is Command cmd)
-            {
-                cmd.Icon = value;
-            }
-            else
-            {
-                base.Icon = value;
-            }
-        }
-    }
-
-    public ConfirmableCommand()
-    {
-        // Allow init-only construction
-    }
-
-    [SetsRequiredMembers]
-    public ConfirmableCommand(IInvokableCommand command, string confirmationTitle, string confirmationMessage, Func<bool>? isConfirmationRequired = null)
-    {
-        ArgumentNullException.ThrowIfNull(command);
-        ArgumentException.ThrowIfNullOrWhiteSpace(confirmationMessage);
-        ArgumentNullException.ThrowIfNull(confirmationMessage);
-
-        IsConfirmationRequired = isConfirmationRequired;
-        ConfirmationTitle = confirmationTitle;
-        ConfirmationMessage = confirmationMessage;
-        Command = command;
-    }
-
-    private void InnerCommand_PropChanged(object sender, IPropChangedEventArgs args)
-    {
-        var property = args.PropertyName;
-
-        if (string.IsNullOrEmpty(property) || property == nameof(Name))
-        {
-            OnPropertyChanged(nameof(Name));
-        }
-
-        if (string.IsNullOrEmpty(property) || property == nameof(Id))
-        {
-            OnPropertyChanged(nameof(Id));
-        }
-
-        if (string.IsNullOrEmpty(property) || property == nameof(Icon))
-        {
-            OnPropertyChanged(nameof(Icon));
-        }
-    }
-
-    public override ICommandResult Invoke()
-    {
-        var showConfirmationDialog = IsConfirmationRequired?.Invoke() ?? true;
-        if (showConfirmationDialog)
-        {
-            return CommandResult.Confirm(new ConfirmationArgs
-            {
-                Title = ConfirmationTitle,
-                Description = ConfirmationMessage,
-                PrimaryCommand = Command,
-                IsPrimaryCommandCritical = true,
-            });
-        }
-        else
-        {
-            return Command.Invoke(this) ?? CommandResult.Dismiss();
-        }
-    }
-}
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/WellKnownKeyChords.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/WellKnownKeyChords.cs
@@ -1,51 +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 Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-using Windows.System;
-
-namespace Microsoft.CmdPal.Common.Helpers;
-
-/// <summary>
-/// Well-known key chords used in the Command Palette and extensions.
-/// </summary>
-/// <remarks>
-/// Assigned key chords should not conflict with system or application shortcuts.
-/// However, the key chords in this class are not guaranteed to be unique and may conflict
-/// with each other, especially when commands appear together in the same menu.
-/// </remarks>
-public static class WellKnownKeyChords
-{
-    /// <summary>
-    /// Gets the well-known key chord for opening the file location. Shortcut: Ctrl+Shift+E.
-    /// </summary>
-    public static KeyChord OpenFileLocation { get; } = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: (int)VirtualKey.E);
-
-    /// <summary>
-    /// Gets the well-known key chord for copying the file path. Shortcut: Ctrl+Shift+C.
-    /// </summary>
-    public static KeyChord CopyFilePath { get; } = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: (int)VirtualKey.C);
-
-    /// <summary>
-    /// Gets the well-known key chord for opening the current location in a console. Shortcut: Ctrl+Shift+R.
-    /// </summary>
-    public static KeyChord OpenInConsole { get; } = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: (int)VirtualKey.R);
-
-    /// <summary>
-    /// Gets the well-known key chord for running the selected item as administrator. Shortcut: Ctrl+Shift+Enter.
-    /// </summary>
-    public static KeyChord RunAsAdministrator { get; } = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: (int)VirtualKey.Enter);
-
-    /// <summary>
-    /// Gets the well-known key chord for running the selected item as a different user. Shortcut: Ctrl+Shift+U.
-    /// </summary>
-    public static KeyChord RunAsDifferentUser { get; } = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: (int)VirtualKey.U);
-
-    /// <summary>
-    /// Gets the well-known key chord for toggling the pin state. Shortcut: Ctrl+P.
-    /// </summary>
-    public static KeyChord TogglePin { get; } = KeyChordHelpers.FromModifiers(ctrl: true, vkey: (int)VirtualKey.P);
-}
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandItemViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandItemViewModel.cs
@@ -160,7 +160,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
        Initialized |= InitializedState.Initialized;
    }

-    public virtual void SlowInitializeProperties()
+    public void SlowInitializeProperties()
    {
        if (IsSelectedInitialized)
        {
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ContextMenuViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ContextMenuViewModel.cs
@@ -5,7 +5,6 @@
 using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
-using ManagedCommon;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -118,46 +117,36 @@ public partial class ContextMenuViewModel : ObservableObject,
    /// Generates a mapping of key -> command item for this particular item's
    /// MoreCommands. (This won't include the primary Command, but it will
    /// include the secondary one). This map can be used to quickly check if a
-    /// shortcut key was pressed. In case there are duplicate keybindings, the first
-    /// one is used and the rest are ignored.
+    /// shortcut key was pressed
    /// </summary>
    /// <returns>a dictionary of KeyChord -> Context commands, for all commands
    /// that have a shortcut key set.</returns>
-    private Dictionary<KeyChord, CommandContextItemViewModel> Keybindings()
+    public Dictionary<KeyChord, CommandContextItemViewModel> Keybindings()
    {
-        var result = new Dictionary<KeyChord, CommandContextItemViewModel>();
-
-        var menu = CurrentContextMenu;
-        if (menu is null)
+        if (CurrentContextMenu is null)
        {
-            return result;
+            return [];
        }

-        foreach (var item in menu)
-        {
-            if (item is CommandContextItemViewModel cmd && cmd.HasRequestedShortcut)
-            {
-                var key = cmd.RequestedShortcut ?? new KeyChord(0, 0, 0);
-                var added = result.TryAdd(key, cmd);
-                if (!added)
-                {
-                    Logger.LogWarning($"Ignoring duplicate keyboard shortcut {KeyChordHelpers.FormatForDebug(key)} on command '{cmd.Title ?? cmd.Name ?? "(unknown)"}'");
-                }
-            }
-        }
-
-        return result;
+        return CurrentContextMenu
+            .OfType<CommandContextItemViewModel>()
+            .Where(c => c.HasRequestedShortcut)
+            .ToDictionary(
+            c => c.RequestedShortcut ?? new KeyChord(0, 0, 0),
+            c => c);
    }

    public ContextKeybindingResult? CheckKeybinding(bool ctrl, bool alt, bool shift, bool win, VirtualKey key)
    {
        var keybindings = Keybindings();
-
-        // Does the pressed key match any of the keybindings?
-        var pressedKeyChord = KeyChordHelpers.FromModifiers(ctrl, alt, shift, win, key, 0);
-        if (keybindings.TryGetValue(pressedKeyChord, out var item))
+        if (keybindings is not null)
        {
-            return InvokeCommand(item);
+            // Does the pressed key match any of the keybindings?
+            var pressedKeyChord = KeyChordHelpers.FromModifiers(ctrl, alt, shift, win, key, 0);
+            if (keybindings.TryGetValue(pressedKeyChord, out var item))
+            {
+                return InvokeCommand(item);
+            }
        }

        return null;
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ExtensionObjectViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ExtensionObjectViewModel.cs
@@ -51,36 +51,6 @@ public abstract partial class ExtensionObjectViewModel : ObservableObject
        DoOnUiThread(() => OnPropertyChanged(propertyName));
    }

-    protected void UpdateProperty(string propertyName1, string propertyName2)
-    {
-        DoOnUiThread(() =>
-        {
-            OnPropertyChanged(propertyName1);
-            OnPropertyChanged(propertyName2);
-        });
-    }
-
-    protected void UpdateProperty(string propertyName1, string propertyName2, string propertyName3)
-    {
-        DoOnUiThread(() =>
-        {
-            OnPropertyChanged(propertyName1);
-            OnPropertyChanged(propertyName2);
-            OnPropertyChanged(propertyName3);
-        });
-    }
-
-    protected void UpdateProperty(params string[] propertyNames)
-    {
-        DoOnUiThread(() =>
-        {
-            foreach (var propertyName in propertyNames)
-            {
-                OnPropertyChanged(propertyName);
-            }
-        });
-    }
-
    protected void ShowException(Exception ex, string? extensionHint = null)
    {
        if (PageContext.TryGetTarget(out var pageContext))
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/FiltersViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/FiltersViewModel.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 CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;

@@ -9,11 +10,14 @@ namespace Microsoft.CmdPal.Core.ViewModels;

 public partial class FiltersViewModel : ExtensionObjectViewModel
 {
-    private readonly ExtensionObject<IFilters> _filtersModel;
+    private readonly ExtensionObject<IFilters> _filtersModel = new(null);

-    public string CurrentFilterId { get; private set; } = string.Empty;
+    [ObservableProperty]
+    public partial string CurrentFilterId { get; set; } = string.Empty;

-    public IFilterItemViewModel[] Filters { get; private set; } = [];
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(ShouldShowFilters))]
+    public partial IFilterItemViewModel[] Filters { get; set; } = [];

    public bool ShouldShowFilters => Filters.Length > 0;

@@ -30,11 +34,23 @@ public partial class FiltersViewModel : ExtensionObjectViewModel
            if (_filtersModel.Unsafe is not null)
            {
                var filters = _filtersModel.Unsafe.GetFilters();
-                Filters = BuildFilters(filters ?? []);
-                UpdateProperty(nameof(Filters), nameof(ShouldShowFilters));
+                Filters = filters.Select<IFilterItem, IFilterItemViewModel>(filter =>
+                {
+                    var filterItem = filter as IFilter;
+                    if (filterItem != null)
+                    {
+                        var filterVM = new FilterItemViewModel(filterItem!, PageContext);
+                        filterVM.InitializeProperties();

-                CurrentFilterId = _filtersModel.Unsafe.CurrentFilterId ?? string.Empty;
-                UpdateProperty(nameof(CurrentFilterId));
+                        return filterVM;
+                    }
+                    else
+                    {
+                        return new SeparatorViewModel();
+                    }
+                }).ToArray();
+
+                CurrentFilterId = _filtersModel.Unsafe.CurrentFilterId;

                return;
            }
@@ -45,27 +61,7 @@ public partial class FiltersViewModel : ExtensionObjectViewModel
        }

        Filters = [];
-        UpdateProperty(nameof(Filters), nameof(ShouldShowFilters));
-
        CurrentFilterId = string.Empty;
-        UpdateProperty(nameof(CurrentFilterId));
-    }
-
-    private IFilterItemViewModel[] BuildFilters(IFilterItem[] filters)
-    {
-        return [..filters.Select<IFilterItem, IFilterItemViewModel>(filter =>
-        {
-            if (filter is IFilter filterItem)
-            {
-                var filterItemViewModel = new FilterItemViewModel(filterItem!, PageContext);
-                filterItemViewModel.InitializeProperties();
-                return filterItemViewModel;
-            }
-            else
-            {
-                return new SeparatorViewModel();
-            }
-        })];
    }

    public override void SafeCleanup()
@@ -74,9 +70,9 @@ public partial class FiltersViewModel : ExtensionObjectViewModel

        foreach (var filter in Filters)
        {
-            if (filter is FilterItemViewModel filterItemViewModel)
+            if (filter is FilterItemViewModel filterVM)
            {
-                filterItemViewModel.SafeCleanup();
+                filterVM.SafeCleanup();
            }
        }

--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/GalleryGridPropertiesViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/GalleryGridPropertiesViewModel.cs
@@ -1,34 +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 Microsoft.CmdPal.Core.ViewModels.Models;
-using Microsoft.CommandPalette.Extensions;
-
-namespace Microsoft.CmdPal.Core.ViewModels;
-
-public class GalleryGridPropertiesViewModel : IGridPropertiesViewModel
-{
-    private readonly ExtensionObject<IGalleryGridLayout> _model;
-
-    public GalleryGridPropertiesViewModel(IGalleryGridLayout galleryGridLayout)
-    {
-        _model = new(galleryGridLayout);
-    }
-
-    public bool ShowTitle { get; set; }
-
-    public bool ShowSubtitle { get; set; }
-
-    public void InitializeProperties()
-    {
-        var model = _model.Unsafe;
-        if (model is null)
-        {
-            return; // throw?
-        }
-
-        ShowTitle = model.ShowTitle;
-        ShowSubtitle = model.ShowSubtitle;
-    }
-}
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IGridPropertiesViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IGridPropertiesViewModel.cs
@@ -1,10 +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.
-
-namespace Microsoft.CmdPal.Core.ViewModels;
-
-public interface IGridPropertiesViewModel
-{
-    void InitializeProperties();
-}
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ListItemViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ListItemViewModel.cs
@@ -47,21 +47,9 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte

        UpdateTags(li.Tags);

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

-        TextToSuggest = model.TextToSuggest;
        UpdateProperty(nameof(TextToSuggest));
+        UpdateProperty(nameof(Section));
    }

    protected override void FetchProperty(string propertyName)
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ListViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ListViewModel.cs
@@ -45,10 +45,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
        (!_isFetching) &&
        IsLoading == false;

-    public bool IsGridView { get; private set; }
-
-    public IGridPropertiesViewModel? GridProperties { get; private set; }
-
    // Remember - "observable" properties from the model (via PropChanged)
    // cannot be marked [ObservableProperty]
    public bool ShowDetails { get; private set; }
@@ -520,13 +516,6 @@ public partial class ListViewModel : PageViewModel, IDisposable

        _isDynamic = model is IDynamicListPage;

-        IsGridView = model.GridProperties is not null;
-        UpdateProperty(nameof(IsGridView));
-
-        GridProperties = LoadGridPropertiesViewModel(model.GridProperties);
-        GridProperties?.InitializeProperties();
-        UpdateProperty(nameof(GridProperties));
-
        ShowDetails = model.ShowDetails;
        UpdateProperty(nameof(ShowDetails));

@@ -548,27 +537,9 @@ public partial class ListViewModel : PageViewModel, IDisposable
        model.ItemsChanged += Model_ItemsChanged;
    }

-    private IGridPropertiesViewModel? LoadGridPropertiesViewModel(IGridProperties? gridProperties)
-    {
-        if (gridProperties is IMediumGridLayout mediumGridLayout)
-        {
-            return new MediumGridPropertiesViewModel(mediumGridLayout);
-        }
-        else if (gridProperties is IGalleryGridLayout galleryGridLayout)
-        {
-            return new GalleryGridPropertiesViewModel(galleryGridLayout);
-        }
-        else if (gridProperties is ISmallGridLayout smallGridLayout)
-        {
-            return new SmallGridPropertiesViewModel(smallGridLayout);
-        }
-
-        return null;
-    }
-
    public void LoadMoreIfNeeded()
    {
-        var model = _model.Unsafe;
+        var model = this._model.Unsafe;
        if (model is null)
        {
            return;
@@ -612,7 +583,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
    {
        base.FetchProperty(propertyName);

-        var model = _model.Unsafe;
+        var model = this._model.Unsafe;
        if (model is null)
        {
            return; // throw?
@@ -620,20 +591,14 @@ public partial class ListViewModel : PageViewModel, IDisposable

        switch (propertyName)
        {
-            case nameof(GridProperties):
-                IsGridView = model.GridProperties is not null;
-                GridProperties = LoadGridPropertiesViewModel(model.GridProperties);
-                GridProperties?.InitializeProperties();
-                UpdateProperty(nameof(IsGridView));
-                break;
            case nameof(ShowDetails):
-                ShowDetails = model.ShowDetails;
+                this.ShowDetails = model.ShowDetails;
                break;
            case nameof(PlaceholderText):
-                _modelPlaceholderText = model.PlaceholderText;
+                this._modelPlaceholderText = model.PlaceholderText;
                break;
            case nameof(SearchText):
-                SearchText = model.SearchText;
+                this.SearchText = model.SearchText;
                break;
            case nameof(EmptyContent):
                EmptyContent = new(new(model.EmptyContent), PageContext);
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/MediumGridPropertiesViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/MediumGridPropertiesViewModel.cs
@@ -1,31 +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 Microsoft.CmdPal.Core.ViewModels.Models;
-using Microsoft.CommandPalette.Extensions;
-
-namespace Microsoft.CmdPal.Core.ViewModels;
-
-public class MediumGridPropertiesViewModel : IGridPropertiesViewModel
-{
-    private readonly ExtensionObject<IMediumGridLayout> _model;
-
-    public MediumGridPropertiesViewModel(IMediumGridLayout mediumGridLayout)
-    {
-        _model = new(mediumGridLayout);
-    }
-
-    public bool ShowTitle { get; set; }
-
-    public void InitializeProperties()
-    {
-        var model = _model.Unsafe;
-        if (model is null)
-        {
-            return; // throw?
-        }
-
-        ShowTitle = model.ShowTitle;
-    }
-}
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateCommandBarMessage.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateCommandBarMessage.cs
@@ -3,9 +3,7 @@
 // See the LICENSE file in the project root for more information.

 using System.ComponentModel;
-using ManagedCommon;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;

 namespace Microsoft.CmdPal.Core.ViewModels.Messages;

@@ -34,28 +32,12 @@ public interface IContextMenuContext : INotifyPropertyChanged
    /// that have a shortcut key set.</returns>
    public Dictionary<KeyChord, CommandContextItemViewModel> Keybindings()
    {
-        var result = new Dictionary<KeyChord, CommandContextItemViewModel>();
-
-        var menu = MoreCommands;
-        if (menu is null)
-        {
-            return result;
-        }
-
-        foreach (var item in menu)
-        {
-            if (item is CommandContextItemViewModel cmd && cmd.HasRequestedShortcut)
-            {
-                var key = cmd.RequestedShortcut ?? new KeyChord(0, 0, 0);
-                var added = result.TryAdd(key, cmd);
-                if (!added)
-                {
-                    Logger.LogWarning($"Ignoring duplicate keyboard shortcut {KeyChordHelpers.FormatForDebug(key)} on command '{cmd.Title ?? cmd.Name ?? "(unknown)"}'");
-                }
-            }
-        }
-
-        return result;
+        return MoreCommands
+            .OfType<CommandContextItemViewModel>()
+            .Where(c => c.HasRequestedShortcut)
+            .ToDictionary(
+            c => c.RequestedShortcut ?? new KeyChord(0, 0, 0),
+            c => c);
    }
 }

--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/SmallGridPropertiesViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/SmallGridPropertiesViewModel.cs
@@ -1,22 +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 Microsoft.CmdPal.Core.ViewModels.Models;
-using Microsoft.CommandPalette.Extensions;
-
-namespace Microsoft.CmdPal.Core.ViewModels;
-
-public class SmallGridPropertiesViewModel : IGridPropertiesViewModel
-{
-    private readonly ExtensionObject<ISmallGridLayout> _model;
-
-    public SmallGridPropertiesViewModel(ISmallGridLayout smallGridLayout)
-    {
-        _model = new(smallGridLayout);
-    }
-
-    public void InitializeProperties()
-    {
-    }
-}
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/AppStateModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/AppStateModel.cs
@@ -3,12 +3,10 @@
 // See the LICENSE file in the project root for more information.

 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using CommunityToolkit.Mvvm.ComponentModel;
-using ManagedCommon;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.Foundation;

@@ -41,7 +39,7 @@ public partial class AppStateModel : ObservableObject
    {
        if (string.IsNullOrEmpty(FilePath))
        {
-            throw new InvalidOperationException($"You must set a valid {nameof(FilePath)} before calling {nameof(LoadState)}");
+            throw new InvalidOperationException($"You must set a valid {nameof(SettingsModel.FilePath)} before calling {nameof(LoadState)}");
        }

        if (!File.Exists(FilePath))
@@ -79,84 +77,43 @@ public partial class AppStateModel : ObservableObject
        try
        {
            // Serialize the main dictionary to JSON and save it to the file
-            var settingsJson = JsonSerializer.Serialize(model, JsonSerializationContext.Default.AppStateModel!);
+            var settingsJson = JsonSerializer.Serialize(model, JsonSerializationContext.Default.AppStateModel);

-            // validate JSON
-            if (JsonNode.Parse(settingsJson) is not JsonObject newSettings)
+            // Is it valid JSON?
+            if (JsonNode.Parse(settingsJson) is JsonObject newSettings)
            {
-                Logger.LogError("Failed to parse app state as a JsonObject.");
-                return;
-            }
+                // Now, read the existing content from the file
+                var oldContent = File.Exists(FilePath) ? File.ReadAllText(FilePath) : "{}";

-            // read previous settings
-            if (!TryReadSavedState(out var savedSettings))
-            {
-                savedSettings = new JsonObject();
-            }
+                // Is it valid JSON?
+                if (JsonNode.Parse(oldContent) is JsonObject savedSettings)
+                {
+                    foreach (var item in newSettings)
+                    {
+                        savedSettings[item.Key] = item.Value?.DeepClone();
+                    }

-            // merge new settings into old ones
-            foreach (var item in newSettings)
-            {
-                savedSettings[item.Key] = item.Value?.DeepClone();
-            }
+                    var serialized = savedSettings.ToJsonString(JsonSerializationContext.Default.AppStateModel.Options);
+                    File.WriteAllText(FilePath, serialized);

-            var serialized = savedSettings.ToJsonString(JsonSerializationContext.Default.AppStateModel!.Options);
-            File.WriteAllText(FilePath, serialized);
-
-            // TODO: Instead of just raising the event here, we should
-            // have a file change watcher on the settings file, and
-            // reload the settings then
-            model.StateChanged?.Invoke(model, null);
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"Failed to save application state to {FilePath}:", ex);
-        }
-    }
-
-    private static bool TryReadSavedState([NotNullWhen(true)] out JsonObject? savedSettings)
-    {
-        savedSettings = null;
-
-        // read existing content from the file
-        string oldContent;
-        try
-        {
-            if (File.Exists(FilePath))
-            {
-                oldContent = File.ReadAllText(FilePath);
+                    // TODO: Instead of just raising the event here, we should
+                    // have a file change watcher on the settings file, and
+                    // reload the settings then
+                    model.StateChanged?.Invoke(model, null);
+                }
+                else
+                {
+                    Debug.WriteLine("Failed to parse settings file as JsonObject.");
+                }
            }
            else
            {
-                // file doesn't exist (might not have been created yet), so consider this a success
-                // and return empty settings
-                savedSettings = new JsonObject();
-                return true;
+                Debug.WriteLine("Failed to parse settings file as JsonObject.");
            }
        }
        catch (Exception ex)
        {
-            Logger.LogWarning($"Failed to read app state file {FilePath}:\n{ex}");
-            return false;
-        }
-
-        // detect empty file, just for sake of logging
-        if (string.IsNullOrWhiteSpace(oldContent))
-        {
-            Logger.LogInfo($"App state file is empty: {FilePath}");
-            return false;
-        }
-
-        // is it valid JSON?
-        try
-        {
-            savedSettings = JsonNode.Parse(oldContent) as JsonObject;
-            return savedSettings != null;
-        }
-        catch (Exception ex)
-        {
-            Logger.LogWarning($"Failed to parse app state from {FilePath}:\n{ex}");
-            return false;
+            Debug.WriteLine(ex.ToString());
        }
    }

--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Microsoft.CmdPal.UI.ViewModels.csproj
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Microsoft.CmdPal.UI.ViewModels.csproj
@@ -94,4 +94,16 @@
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
  </ItemGroup>
+
+  <!-- Just mark it as AOT compatible. Do not publish with AOT now. We need fully test before we really publish it as AOT enabled-->
+  <!--<PropertyGroup>
+    <SelfContained>true</SelfContained>
+    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
+    <PublishTrimmed>true</PublishTrimmed>
+    <PublishSingleFile>true</PublishSingleFile>
+    --><!-- <DisableRuntimeMarshalling>true</DisableRuntimeMarshalling> --><!--
+    <PublishAot>true</PublishAot>
+	<EnableMsixTooling>true</EnableMsixTooling>
+  </PropertyGroup>-->
+
 </Project>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsModel.cs
@@ -42,8 +42,6 @@ public partial class SettingsModel : ObservableObject

    public bool IgnoreShortcutWhenFullscreen { get; set; }

-    public bool AllowExternalReload { get; set; }
-
    public Dictionary<string, ProviderSettings> ProviderSettings { get; set; } = [];

    public Dictionary<string, CommandAlias> Aliases { get; set; } = [];
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsViewModel.cs
@@ -38,16 +38,6 @@ public partial class SettingsViewModel : INotifyPropertyChanged
        }
    }

-    public bool AllowExternalReload
-    {
-        get => _settings.AllowExternalReload;
-        set
-        {
-            _settings.AllowExternalReload = value;
-            Save();
-        }
-    }
-
    public bool ShowAppDetails
    {
        get => _settings.ShowAppDetails;
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelViewModel.cs
@@ -32,7 +32,6 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
    private string _generatedId = string.Empty;

    private HotkeySettings? _hotkey;
-    private IIconInfo? _initialIcon;

    private CommandAlias? Alias { get; set; }

@@ -58,8 +57,6 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem

    public IIconInfo Icon => _commandItemViewModel.Icon;

-    public IIconInfo InitialIcon => _initialIcon ?? _commandItemViewModel.Icon;
-
    ICommand? ICommandItem.Command => _commandItemViewModel.Command.Model.Unsafe;

    IContextItem?[] ICommandItem.MoreCommands => _commandItemViewModel.MoreCommands
@@ -208,8 +205,6 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
            {
                DisplayTitle = fallback.DisplayTitle;
            }
-
-            UpdateInitialIcon(false);
        }
    }

@@ -226,31 +221,7 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
                FetchAliasFromAliasManager();
                UpdateHotkey();
                UpdateTags();
-                UpdateInitialIcon();
            }
-            else if (e.PropertyName == nameof(CommandItem.Icon))
-            {
-                UpdateInitialIcon();
-            }
-        }
-    }
-
-    private void UpdateInitialIcon(bool raiseNotification = true)
-    {
-        if (_initialIcon != null || !_commandItemViewModel.Icon.IsSet)
-        {
-            return;
-        }
-
-        _initialIcon = _commandItemViewModel.Icon;
-
-        if (raiseNotification)
-        {
-            DoOnUiThread(
-                () =>
-                {
-                    PropChanged?.Invoke(this, new PropChangedEventArgs(nameof(InitialIcon)));
-                });
        }
    }

--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs
+++ b/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).HandleLaunchNonUI(activatedEventArgs);
+        ((MainWindow)AppWindow).HandleLaunch(activatedEventArgs);
    }

    /// <summary>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml.cs
@@ -134,15 +134,6 @@ 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
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContextMenu.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContextMenu.xaml
@@ -15,7 +15,6 @@
    xmlns:ui="using:CommunityToolkit.WinUI"
    xmlns:viewModels="using:Microsoft.CmdPal.UI.ViewModels"
    Background="Transparent"
-    PreviewKeyDown="UserControl_PreviewKeyDown"
    mc:Ignorable="d">

    <UserControl.Resources>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContextMenu.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContextMenu.xaml.cs
@@ -3,7 +3,6 @@
 // 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;
@@ -116,24 +115,6 @@ 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;
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FiltersDropDown.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FiltersDropDown.xaml
@@ -59,7 +59,7 @@
                <Rectangle
                    Height="1"
                    Margin="-16,-12,-12,-12"
-                    Fill="{ThemeResource MenuFlyoutSeparatorBackground}" />
+                    Fill="{ThemeResource MenuFlyoutSeparatorThemeBrush}" />
            </DataTemplate>

        </ResourceDictionary>
@@ -68,14 +68,11 @@
    <ComboBox
        Name="FiltersComboBox"
        x:Uid="FiltersComboBox"
-        MinWidth="200"
        VerticalAlignment="Center"
        ItemTemplateSelector="{StaticResource FilterTemplateSelector}"
        ItemsSource="{x:Bind ViewModel.Filters, Mode=OneWay}"
        PlaceholderText="Filters"
        PreviewKeyDown="FiltersComboBox_PreviewKeyDown"
-        SelectedValue="{x:Bind ViewModel.CurrentFilterId, Mode=OneWay}"
-        SelectedValuePath="Id"
        SelectionChanged="FiltersComboBox_SelectionChanged"
        Style="{StaticResource ComboBoxStyle}"
        Visibility="{x:Bind ViewModel.ShouldShowFilters, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/IconBox.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/IconBox.cs
@@ -2,10 +2,8 @@
 // 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.Core.ViewModels;
 using Microsoft.CmdPal.UI.Deferred;
-using Microsoft.Terminal.UI;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -57,8 +55,6 @@ public partial class IconBox : ContentControl
    {
        TabFocusNavigation = KeyboardNavigationMode.Once;
        IsTabStop = false;
-        HorizontalContentAlignment = HorizontalAlignment.Center;
-        VerticalContentAlignment = VerticalAlignment.Center;
    }

    private static void OnSourcePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -79,8 +75,6 @@ public partial class IconBox : ContentControl
                    IconSourceElement elem = new()
                    {
                        IconSource = fontIco,
-                        HorizontalAlignment = HorizontalAlignment.Center,
-                        VerticalAlignment = VerticalAlignment.Center,
                    };
                    @this.Content = elem;
                    break;
@@ -104,20 +98,14 @@ public partial class IconBox : ContentControl
            else
            {
                // TODO GH #239 switch back when using the new MD text block
-                // Switching back to EnqueueAsync has broken icons in tags (they don't show)
                // _ = @this._queue.EnqueueAsync(() =>
-                @this._queue.TryEnqueue(async void () =>
+                @this._queue.TryEnqueue(new(async () =>
                {
-                    try
+                    var requestedTheme = @this.ActualTheme;
+                    var eventArgs = new SourceRequestedEventArgs(e.NewValue, requestedTheme);
+
+                    if (@this.SourceRequested is not null)
                    {
-                        if (@this.SourceRequested is null)
-                        {
-                            return;
-                        }
-
-                        var requestedTheme = @this.ActualTheme;
-                        var eventArgs = new SourceRequestedEventArgs(e.NewValue, requestedTheme);
-
                        await @this.SourceRequested.InvokeAsync(@this, eventArgs);

                        // After the await:
@@ -142,35 +130,37 @@ public partial class IconBox : ContentControl
                        // So, if the icon we get back was a font icon,
                        // and the glyph for that icon is NOT in the range of
                        // Segoe icons, then let's give the icon some extra space
-                        var iconData = eventArgs.Key switch
-                        {
-                            IconDataViewModel key => key,
-                            IconInfoViewModel info => requestedTheme == ElementTheme.Light ? info.Light : info.Dark,
-                            _ => null,
-                        };
+                        @this.Padding = new Thickness(0);

-                        if (iconData?.Icon is not null && @this.Source is FontIconSource)
+                        IconDataViewModel? iconData = null;
+                        if (eventArgs.Key is IconDataViewModel)
                        {
-                            var iconSize =
-                                !double.IsNaN(@this.Width) ? @this.Width :
-                                !double.IsNaN(@this.Height) ? @this.Height :
-                                @this.ActualWidth > 0 ? @this.ActualWidth :
-                                @this.ActualHeight;
-
-                            @this.Padding = new Thickness(Math.Round(iconSize * -0.2));
+                            iconData = eventArgs.Key as IconDataViewModel;
                        }
-                        else
+                        else if (eventArgs.Key is IconInfoViewModel info)
                        {
-                            @this.Padding = default;
+                            iconData = requestedTheme == ElementTheme.Light ? info.Light : info.Dark;
+                        }
+
+                        if (iconData is not null &&
+                            @this.Source is FontIconSource)
+                        {
+                            if (!string.IsNullOrEmpty(iconData.Icon) && iconData.Icon.Length <= 2)
+                            {
+                                var ch = iconData.Icon[0];
+
+                                // The range of MDL2 Icons isn't explicitly defined, but
+                                // we're using this based off the table on:
+                                // https://docs.microsoft.com/en-us/windows/uwp/design/style/segoe-ui-symbol-font
+                                var isMDL2Icon = ch is >= '\uE700' and <= '\uF8FF';
+                                if (!isMDL2Icon)
+                                {
+                                    @this.Padding = new Thickness(-4);
+                                }
+                            }
                        }
                    }
-                    catch (Exception ex)
-                    {
-                        // Exception from TryEnqueue bypasses the global error handler,
-                        // and crashes the app.
-                        Logger.LogError("Failed to set icon", ex);
-                    }
-                });
+                }));
            }
        }
    }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/SearchBar.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/SearchBar.xaml.cs
@@ -131,11 +131,6 @@ public sealed partial class SearchBar : UserControl,
            WeakReferenceMessenger.Default.Send<OpenContextMenuMessage>(new OpenContextMenuMessage(null, null, null, ContextMenuFilterLocation.Bottom));
            e.Handled = true;
        }
-        else if (ctrlPressed && e.Key == VirtualKey.I)
-        {
-            // Today you learned that Ctrl+I in a TextBox will insert a tab
-            e.Handled = true;
-        }
        else if (e.Key == VirtualKey.Escape)
        {
            if (string.IsNullOrEmpty(FilterBox.Text))
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/FilterTemplateSelector.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/FilterTemplateSelector.cs
@@ -2,7 +2,6 @@
 // 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.Diagnostics.CodeAnalysis;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -15,7 +14,6 @@ internal sealed partial class FilterTemplateSelector : DataTemplateSelector

    public DataTemplate? Separator { get; set; }

-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, "Microsoft.UI.Xaml.Controls.ComboBoxItem", "Microsoft.WinUI")]
    protected override DataTemplate? SelectTemplateCore(object item, DependencyObject dependencyObject)
    {
        DataTemplate? dataTemplate = Default;
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/GridItemTemplateSelector.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/GridItemTemplateSelector.cs
@@ -1,40 +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 Microsoft.CmdPal.Core.ViewModels;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-
-namespace Microsoft.CmdPal.UI;
-
-internal sealed partial class GridItemTemplateSelector : DataTemplateSelector
-{
-    public IGridPropertiesViewModel? GridProperties { get; set; }
-
-    public DataTemplate? Small { get; set; }
-
-    public DataTemplate? Medium { get; set; }
-
-    public DataTemplate? Gallery { get; set; }
-
-    protected override DataTemplate? SelectTemplateCore(object item, DependencyObject dependencyObject)
-    {
-        DataTemplate? dataTemplate = Medium;
-
-        if (GridProperties is SmallGridPropertiesViewModel)
-        {
-            dataTemplate = Small;
-        }
-        else if (GridProperties is MediumGridPropertiesViewModel)
-        {
-            dataTemplate = Medium;
-        }
-        else if (GridProperties is GalleryGridPropertiesViewModel)
-        {
-            dataTemplate = Gallery;
-        }
-
-        return dataTemplate;
-    }
-}
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml
@@ -3,7 +3,6 @@
    x:Class="Microsoft.CmdPal.UI.ListPage"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:cmdpalUI="using:Microsoft.CmdPal.UI"
    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
    xmlns:converters="using:CommunityToolkit.WinUI.Converters"
    xmlns:coreViewModels="using:Microsoft.CmdPal.Core.ViewModels"
@@ -12,11 +11,8 @@
    xmlns:help="using:Microsoft.CmdPal.UI.Helpers"
    xmlns:local="using:Microsoft.CmdPal.UI"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="using:CommunityToolkit.WinUI"
    xmlns:viewModels="using:Microsoft.CmdPal.UI.ViewModels"
-    x:Name="PageRoot"
    Background="Transparent"
-    DataContext="{x:Bind ViewModel, Mode=OneWay}"
    mc:Ignorable="d">

    <Page.Resources>
@@ -27,7 +23,6 @@
            IsSourceGrouped="True"
            Source="{x:Bind ViewModel.Items, Mode=OneWay}" />-->

-        <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
        <converters:StringVisibilityConverter
            x:Key="StringVisibilityConverter"
            EmptyValue="Collapsed"
@@ -44,14 +39,6 @@
                ToolTipService.ToolTip="{x:Bind ToolTip, Mode=OneWay}" />
        </DataTemplate>

-        <cmdpalUI:GridItemTemplateSelector
-            x:Key="GridItemTemplateSelector"
-            x:DataType="coreViewModels:ListItemViewModel"
-            Gallery="{StaticResource GalleryGridItemViewModelTemplate}"
-            GridProperties="{x:Bind ViewModel.GridProperties}"
-            Medium="{StaticResource MediumGridItemViewModelTemplate}"
-            Small="{StaticResource SmallGridItemViewModelTemplate}" />
-
        <!--  https://learn.microsoft.com/windows/apps/design/controls/itemsview#specify-the-look-of-the-items  -->
        <DataTemplate x:Key="ListItemViewModelTemplate" x:DataType="coreViewModels:ListItemViewModel">
            <Grid
@@ -115,145 +102,6 @@
                </ItemsControl>
            </Grid>
        </DataTemplate>
-
-        <!--  Grid item templates for visual grid representation  -->
-        <DataTemplate x:Key="SmallGridItemViewModelTemplate" x:DataType="coreViewModels:ListItemViewModel">
-            <StackPanel
-                Width="60"
-                Height="60"
-                Padding="8,16"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                AutomationProperties.Name="{x:Bind Title}"
-                BorderThickness="0"
-                CornerRadius="8"
-                Orientation="Vertical"
-                ToolTipService.ToolTip="{x:Bind Title}">
-
-                <cpcontrols:IconBox
-                    x:Name="GridIconBorder"
-                    Width="28"
-                    Height="28"
-                    Margin="0"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    Foreground="{ThemeResource TextFillColorPrimary}"
-                    SourceKey="{x:Bind Icon, Mode=OneWay}"
-                    SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
-
-            </StackPanel>
-        </DataTemplate>
-
-        <DataTemplate x:Key="MediumGridItemViewModelTemplate" x:DataType="coreViewModels:ListItemViewModel">
-            <StackPanel
-                Width="100"
-                Height="100"
-                Padding="8,16"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                AutomationProperties.Name="{x:Bind Title}"
-                BorderThickness="0"
-                CornerRadius="8"
-                Orientation="Vertical"
-                ToolTipService.ToolTip="{x:Bind Title}">
-
-                <cpcontrols:IconBox
-                    x:Name="GridIconBorder"
-                    Width="36"
-                    Height="36"
-                    Margin="0"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    CharacterSpacing="12"
-                    FontSize="14"
-                    Foreground="{ThemeResource TextFillColorPrimary}"
-                    SourceKey="{x:Bind Icon, Mode=OneWay}"
-                    SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
-
-                <TextBlock
-                    x:Name="TitleTextBlock"
-                    MaxHeight="40"
-                    Margin="0,8,0,4"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    CharacterSpacing="12"
-                    FontSize="12"
-                    Text="{x:Bind Title}"
-                    TextAlignment="Center"
-                    TextTrimming="WordEllipsis"
-                    TextWrapping="Wrap"
-                    Visibility="{Binding ElementName=PageRoot, Path=DataContext.GridProperties.ShowTitle, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
-            </StackPanel>
-        </DataTemplate>
-
-        <DataTemplate x:Key="GalleryGridItemViewModelTemplate" x:DataType="coreViewModels:ListItemViewModel">
-            <StackPanel
-                Width="160"
-                Margin="4"
-                Padding="0"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                AutomationProperties.Name="{x:Bind Title}"
-                BorderThickness="0"
-                CornerRadius="4"
-                Orientation="Vertical"
-                ToolTipService.ToolTip="{x:Bind Title}">
-
-                <Grid
-                    Width="160"
-                    Height="160"
-                    Margin="0"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    CornerRadius="4">
-                    <Grid.RowDefinitions>
-                        <RowDefinition />
-                    </Grid.RowDefinitions>
-                    <Viewbox
-                        Grid.Row="1"
-                        HorizontalAlignment="Center"
-                        Stretch="UniformToFill"
-                        StretchDirection="Both">
-                        <cpcontrols:IconBox
-                            CornerRadius="4"
-                            Foreground="{ThemeResource TextFillColorPrimary}"
-                            SourceKey="{x:Bind Icon, Mode=OneWay}"
-                            SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
-                    </Viewbox>
-                </Grid>
-
-                <StackPanel Padding="4" Orientation="Vertical">
-                    <TextBlock
-                        x:Name="TitleTextBlock"
-                        MaxWidth="152"
-                        MaxHeight="40"
-                        Margin="0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        CharacterSpacing="12"
-                        FontSize="14"
-                        Foreground="{ThemeResource TextFillColorPrimary}"
-                        Text="{x:Bind Title}"
-                        TextAlignment="Center"
-                        TextTrimming="WordEllipsis"
-                        TextWrapping="NoWrap" />
-                    <TextBlock
-                        x:Name="SubTitleTextBlock"
-                        MaxWidth="152"
-                        MaxHeight="40"
-                        Margin="0,4,0,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        CharacterSpacing="11"
-                        FontSize="11"
-                        Foreground="{ThemeResource TextFillColorTertiary}"
-                        Text="{x:Bind Subtitle}"
-                        TextAlignment="Center"
-                        TextTrimming="WordEllipsis"
-                        TextWrapping="NoWrap" />
-                </StackPanel>
-            </StackPanel>
-        </DataTemplate>
    </Page.Resources>

    <Grid>
@@ -262,49 +110,34 @@
            TargetType="x:Boolean"
            Value="{x:Bind ViewModel.ShowEmptyContent, Mode=OneWay}">
            <controls:Case Value="False">
-                <controls:SwitchPresenter
-                    HorizontalAlignment="Stretch"
-                    TargetType="x:Boolean"
-                    Value="{x:Bind ViewModel.IsGridView, Mode=OneWay}">
-                    <controls:Case Value="False">
-                        <ListView
-                            x:Name="ItemsList"
-                            Padding="0,2,0,0"
-                            ContextCanceled="Items_OnContextCanceled"
-                            ContextRequested="Items_OnContextRequested"
-                            DoubleTapped="Items_DoubleTapped"
-                            IsDoubleTapEnabled="True"
-                            IsItemClickEnabled="True"
-                            ItemClick="Items_ItemClick"
-                            ItemTemplate="{StaticResource ListItemViewModelTemplate}"
-                            ItemsSource="{x:Bind ViewModel.FilteredItems, Mode=OneWay}"
-                            RightTapped="Items_RightTapped"
-                            SelectionChanged="Items_SelectionChanged">
-                            <ListView.ItemContainerTransitions>
-                                <TransitionCollection />
-                            </ListView.ItemContainerTransitions>
-                        </ListView>
-                    </controls:Case>
-                    <controls:Case Value="True">
-                        <GridView
-                            x:Name="ItemsGrid"
-                            Padding="8"
-                            ContextCanceled="Items_OnContextCanceled"
-                            ContextRequested="Items_OnContextRequested"
-                            DoubleTapped="Items_DoubleTapped"
-                            IsDoubleTapEnabled="True"
-                            IsItemClickEnabled="True"
-                            ItemClick="Items_ItemClick"
-                            ItemTemplateSelector="{StaticResource GridItemTemplateSelector}"
-                            ItemsSource="{x:Bind ViewModel.FilteredItems, Mode=OneWay}"
-                            RightTapped="Items_RightTapped"
-                            SelectionChanged="Items_SelectionChanged">
-                            <GridView.ItemContainerTransitions>
-                                <TransitionCollection />
-                            </GridView.ItemContainerTransitions>
-                        </GridView>
-                    </controls:Case>
-                </controls:SwitchPresenter>
+                <ListView
+                    x:Name="ItemsList"
+                    Padding="0,2,0,0"
+                    ContextCanceled="ItemsList_OnContextCanceled"
+                    ContextRequested="ItemsList_OnContextRequested"
+                    DoubleTapped="ItemsList_DoubleTapped"
+                    IsDoubleTapEnabled="True"
+                    IsItemClickEnabled="True"
+                    ItemClick="ItemsList_ItemClick"
+                    ItemTemplate="{StaticResource ListItemViewModelTemplate}"
+                    ItemsSource="{x:Bind ViewModel.FilteredItems, Mode=OneWay}"
+                    SelectionChanged="ItemsList_SelectionChanged">
+                    <ListView.ItemContainerTransitions>
+                        <TransitionCollection />
+                    </ListView.ItemContainerTransitions>
+                    <!--<ListView.GroupStyle>
+                        <GroupStyle HidesIfEmpty="True">
+                            <GroupStyle.HeaderTemplate>
+                                <DataTemplate>
+                                    <TextBlock
+                                        Margin="0,16,0,0"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Text="{Binding Key, Mode=OneWay}" />
+                                </DataTemplate>
+                            </GroupStyle.HeaderTemplate>
+                        </GroupStyle>
+                    </ListView.GroupStyle>-->
+                </ListView>
            </controls:Case>
            <controls:Case Value="True">
                <StackPanel
@@ -337,5 +170,6 @@
                </StackPanel>
            </controls:Case>
        </controls:SwitchPresenter>
+
    </Grid>
 </Page>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml.cs
@@ -13,7 +13,6 @@ using Microsoft.CmdPal.UI.ViewModels;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
@@ -39,21 +38,13 @@ public sealed partial class ListPage : Page,
    public static readonly DependencyProperty ViewModelProperty =
        DependencyProperty.Register(nameof(ViewModel), typeof(ListViewModel), typeof(ListPage), new PropertyMetadata(null, OnViewModelChanged));

-    private ListViewBase ItemView
-    {
-        get
-        {
-            return ViewModel?.IsGridView == true ? ItemsGrid : ItemsList;
-        }
-    }
-
    public ListPage()
    {
        this.InitializeComponent();
        this.NavigationCacheMode = NavigationCacheMode.Disabled;
-        this.ItemView.Loaded += Items_Loaded;
-        this.ItemView.PreviewKeyDown += Items_PreviewKeyDown;
-        this.ItemView.PointerPressed += Items_PointerPressed;
+        this.ItemsList.Loaded += ItemsList_Loaded;
+        this.ItemsList.PreviewKeyDown += ItemsList_PreviewKeyDown;
+        this.ItemsList.PointerPressed += ItemsList_PointerPressed;
    }

    protected override void OnNavigatedTo(NavigationEventArgs e)
@@ -64,11 +55,11 @@ public sealed partial class ListPage : Page,
        }

        if (e.NavigationMode == NavigationMode.Back
-            || (e.NavigationMode == NavigationMode.New && ItemView.Items.Count > 0))
+            || (e.NavigationMode == NavigationMode.New && ItemsList.Items.Count > 0))
        {
            // Upon navigating _back_ to this page, immediately select the
            // first item in the list
-            ItemView.SelectedIndex = 0;
+            ItemsList.SelectedIndex = 0;
        }

        // RegisterAll isn't AOT compatible
@@ -99,6 +90,7 @@ public sealed partial class ListPage : Page,
        {
            ViewModel?.SafeCleanup();
            CleanupHelper.Cleanup(this);
+            Bindings.StopTracking();
        }

        // Clean-up event listeners
@@ -108,7 +100,7 @@ public sealed partial class ListPage : Page,
    }

    [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "VS is too aggressive at pruning methods bound in XAML")]
-    private void Items_ItemClick(object sender, ItemClickEventArgs e)
+    private void ItemsList_ItemClick(object sender, ItemClickEventArgs e)
    {
        if (e.ClickedItem is ListItemViewModel item)
        {
@@ -131,9 +123,9 @@ public sealed partial class ListPage : Page,
        }
    }

-    private void Items_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
+    private void ItemsList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
    {
-        if (ItemView.SelectedItem is ListItemViewModel vm)
+        if (ItemsList.SelectedItem is ListItemViewModel vm)
        {
            var settings = App.Current.Services.GetService<SettingsModel>()!;
            if (!settings.SingleClickActivates)
@@ -144,10 +136,10 @@ public sealed partial class ListPage : Page,
    }

    [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "VS is too aggressive at pruning methods bound in XAML")]
-    private void Items_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    private void ItemsList_SelectionChanged(object sender, SelectionChangedEventArgs e)
    {
        var vm = ViewModel;
-        var li = ItemView.SelectedItem as ListItemViewModel;
+        var li = ItemsList.SelectedItem as ListItemViewModel;
        _ = Task.Run(() =>
        {
            vm?.UpdateSelectedItemCommand.Execute(li);
@@ -162,12 +154,12 @@ public sealed partial class ListPage : Page,
        // here, then in Page_ItemsUpdated trying to select that cached item if
        // it's in the list (otherwise, clear the cache), but that seems
        // aggressively BODGY for something that mostly just works today.
-        if (ItemView.SelectedItem is not null)
+        if (ItemsList.SelectedItem is not null)
        {
-            ItemView.ScrollIntoView(ItemView.SelectedItem);
+            ItemsList.ScrollIntoView(ItemsList.SelectedItem);

            // Automation notification for screen readers
-            var listViewPeer = Microsoft.UI.Xaml.Automation.Peers.ListViewAutomationPeer.CreatePeerForElement(ItemView);
+            var listViewPeer = Microsoft.UI.Xaml.Automation.Peers.ListViewAutomationPeer.CreatePeerForElement(ItemsList);
            if (listViewPeer is not null && li is not null)
            {
                var notificationText = li.Title;
@@ -180,37 +172,10 @@ public sealed partial class ListPage : Page,
        }
    }

-    private void Items_RightTapped(object sender, RightTappedRoutedEventArgs e)
+    private void ItemsList_Loaded(object sender, RoutedEventArgs e)
    {
-        if (e.OriginalSource is FrameworkElement element &&
-            element.DataContext is ListItemViewModel item)
-        {
-            if (ItemView.SelectedItem != item)
-            {
-                ItemView.SelectedItem = item;
-            }
-
-            ViewModel?.UpdateSelectedItemCommand.Execute(item);
-
-            var pos = e.GetPosition(element);
-
-            _ = DispatcherQueue.TryEnqueue(
-                () =>
-                {
-                    WeakReferenceMessenger.Default.Send<OpenContextMenuMessage>(
-                        new OpenContextMenuMessage(
-                            element,
-                            Microsoft.UI.Xaml.Controls.Primitives.FlyoutPlacementMode.BottomEdgeAlignedLeft,
-                            pos,
-                            ContextMenuFilterLocation.Top));
-                });
-        }
-    }
-
-    private void Items_Loaded(object sender, RoutedEventArgs e)
-    {
-        // Find the ScrollViewer in the ItemView (ItemsList or ItemsGrid)
-        var listViewScrollViewer = FindScrollViewer(this.ItemView);
+        // Find the ScrollViewer in the ListView
+        var listViewScrollViewer = FindScrollViewer(this.ItemsList);

        if (listViewScrollViewer is not null)
        {
@@ -242,25 +207,25 @@ public sealed partial class ListPage : Page,
        // And then have these commands manipulate that state being bound to the UI instead
        // We may want to see how other non-list UIs need to behave to make this decision
        // At least it's decoupled from the SearchBox now :)
-        if (ItemView.SelectedIndex < ItemView.Items.Count - 1)
+        if (ItemsList.SelectedIndex < ItemsList.Items.Count - 1)
        {
-            ItemView.SelectedIndex++;
+            ItemsList.SelectedIndex++;
        }
        else
        {
-            ItemView.SelectedIndex = 0;
+            ItemsList.SelectedIndex = 0;
        }
    }

    public void Receive(NavigatePreviousCommand message)
    {
-        if (ItemView.SelectedIndex > 0)
+        if (ItemsList.SelectedIndex > 0)
        {
-            ItemView.SelectedIndex--;
+            ItemsList.SelectedIndex--;
        }
        else
        {
-            ItemView.SelectedIndex = ItemView.Items.Count - 1;
+            ItemsList.SelectedIndex = ItemsList.Items.Count - 1;
        }
    }

@@ -270,7 +235,7 @@ public sealed partial class ListPage : Page,
        {
            ViewModel?.InvokeItemCommand.Execute(null);
        }
-        else if (ItemView.SelectedItem is ListItemViewModel item)
+        else if (ItemsList.SelectedItem is ListItemViewModel item)
        {
            ViewModel?.InvokeItemCommand.Execute(item);
        }
@@ -282,7 +247,7 @@ public sealed partial class ListPage : Page,
        {
            ViewModel?.InvokeSecondaryCommandCommand.Execute(null);
        }
-        else if (ItemView.SelectedItem is ListItemViewModel item)
+        else if (ItemsList.SelectedItem is ListItemViewModel item)
        {
            ViewModel?.InvokeSecondaryCommandCommand.Execute(item);
        }
@@ -318,19 +283,19 @@ public sealed partial class ListPage : Page,
        //
        // It's important to do this here, because once there's no selection
        // (which can happen as the list updates) we won't get an
-        // ItemView_SelectionChanged again to give us another chance to change
+        // ItemsList_SelectionChanged again to give us another chance to change
        // the selection from null -> something. Better to just update the
        // selection once, at the end of all the updating.
-        if (ItemView.SelectedItem is null)
+        if (ItemsList.SelectedItem is null)
        {
-            ItemView.SelectedIndex = 0;
+            ItemsList.SelectedIndex = 0;
        }

        // Always reset the selected item when the top-level list page changes
        // its items
        if (!sender.IsNested)
        {
-            ItemView.SelectedIndex = 0;
+            ItemsList.SelectedIndex = 0;
        }
    }

@@ -339,7 +304,7 @@ public sealed partial class ListPage : Page,
        var prop = e.PropertyName;
        if (prop == nameof(ViewModel.FilteredItems))
        {
-            Debug.WriteLine($"ViewModel.FilteredItems {ItemView.SelectedItem}");
+            Debug.WriteLine($"ViewModel.FilteredItems {ItemsList.SelectedItem}");
        }
    }

@@ -363,12 +328,12 @@ public sealed partial class ListPage : Page,
        return null;
    }

-    private void Items_OnContextRequested(UIElement sender, ContextRequestedEventArgs e)
+    private void ItemsList_OnContextRequested(UIElement sender, ContextRequestedEventArgs e)
    {
        var (item, element) = e.OriginalSource switch
        {
            // caused by keyboard shortcut (e.g. Context menu key or Shift+F10)
-            SelectorItem selectorItem => (ItemView.ItemFromContainer(selectorItem) as ListItemViewModel, selectorItem),
+            ListViewItem listViewItem => (ItemsList.ItemFromContainer(listViewItem) as ListItemViewModel, listViewItem),

            // caused by right-click on the ListViewItem
            FrameworkElement { DataContext: ListItemViewModel itemViewModel } frameworkElement => (itemViewModel, frameworkElement),
@@ -381,9 +346,9 @@ public sealed partial class ListPage : Page,
            return;
        }

-        if (ItemView.SelectedItem != item)
+        if (ItemsList.SelectedItem != item)
        {
-            ItemView.SelectedItem = item;
+            ItemsList.SelectedItem = item;
        }

        ViewModel?.UpdateSelectedItemCommand.Execute(item);
@@ -406,14 +371,14 @@ public sealed partial class ListPage : Page,
        e.Handled = true;
    }

-    private void Items_OnContextCanceled(UIElement sender, RoutedEventArgs e)
+    private void ItemsList_OnContextCanceled(UIElement sender, RoutedEventArgs e)
    {
        _ = DispatcherQueue.TryEnqueue(() => WeakReferenceMessenger.Default.Send<CloseContextMenuMessage>());
    }

-    private void Items_PointerPressed(object sender, PointerRoutedEventArgs e) => _lastInputSource = InputSource.Pointer;
+    private void ItemsList_PointerPressed(object sender, PointerRoutedEventArgs e) => _lastInputSource = InputSource.Pointer;

-    private void Items_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
+    private void ItemsList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
    {
        if (e.Key is VirtualKey.Enter or VirtualKey.Space)
        {
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs
@@ -123,9 +123,6 @@ 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)
@@ -236,6 +233,9 @@ 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,9 +243,6 @@ 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);
        }

@@ -484,13 +481,8 @@ public sealed partial class MainWindow : WindowEx,
        }
    }

-    public void HandleLaunchNonUI(AppActivationArguments? activatedEventArgs)
+    public void HandleLaunch(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);
@@ -521,47 +513,15 @@ public sealed partial class MainWindow : WindowEx,
                            WeakReferenceMessenger.Default.Send<OpenSettingsMessage>(new());
                            return;
                        }
-                        else if (uri.StartsWith("x-cmdpal://reload", StringComparison.OrdinalIgnoreCase))
-                        {
-                            var settings = App.Current.Services.GetService<SettingsModel>();
-                            if (settings?.AllowExternalReload == true)
-                            {
-                                Logger.LogInfo("External Reload triggered");
-                                WeakReferenceMessenger.Default.Send<ReloadCommandsMessage>(new());
-                            }
-                            else
-                            {
-                                Logger.LogInfo("External Reload is disabled");
-                            }
-
-                            return;
-                        }
                    }
                }
            }
        }
        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.
-            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);
-            }
+            Logger.LogError("COM exception when activating the application", ex);
        }

        Summon(string.Empty);
@@ -650,20 +610,6 @@ public sealed partial class MainWindow : WindowEx,
    }

    private void HandleSummon(string commandId)
-    {
-        if (_ignoreHotKeyWhenFullScreen)
-        {
-            // If we're in full screen mode, ignore the hotkey
-            if (WindowHelper.IsWindowFullscreen())
-            {
-                return;
-            }
-        }
-
-        HandleSummonCore(commandId);
-    }
-
-    private void HandleSummonCore(string commandId)
    {
        var isRootHotkey = string.IsNullOrEmpty(commandId);
        PowerToysTelemetry.Log.WriteEvent(new CmdPalHotkeySummoned(isRootHotkey));
@@ -688,6 +634,8 @@ public sealed partial class MainWindow : WindowEx,
        // so that we can bind hotkeys to individual commands
        if (!isVisible || !isRootHotkey)
        {
+            Activate();
+
            Summon(commandId);
        }
        else if (isRootHotkey)
@@ -723,6 +671,15 @@ public sealed partial class MainWindow : WindowEx,
                    var hotkeyIndex = (int)wParam.Value;
                    if (hotkeyIndex < _hotkeys.Count)
                    {
+                        if (_ignoreHotKeyWhenFullScreen)
+                        {
+                            // If we're in full screen mode, ignore the hotkey
+                            if (WindowHelper.IsWindowFullscreen())
+                            {
+                                return (LRESULT)IntPtr.Zero;
+                            }
+                        }
+
                        var hotkey = _hotkeys[hotkeyIndex];
                        HandleSummon(hotkey.CommandId);
                    }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
@@ -39,8 +39,6 @@

  <PropertyGroup Condition="'$(CIBuild)'=='true'">
    <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
-    <AppxBundle>Never</AppxBundle>
-    <AppxPackageTestDir>$(OutputPath)\AppPackages\Microsoft.CmdPal.UI_$(Version)_Test\</AppxPackageTestDir>
  </PropertyGroup>

  <PropertyGroup>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml
@@ -327,6 +327,11 @@
                        x:Name="FiltersDropDown"
                        HorizontalAlignment="Right"
                        CurrentPageViewModel="{x:Bind ViewModel.CurrentPage, Mode=OneWay}" />
+                    <Grid.Transitions>
+                        <TransitionCollection>
+                            <RepositionThemeTransition />
+                        </TransitionCollection>
+                    </Grid.Transitions>
                </Grid>
            </Grid>

--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Program.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Program.cs
@@ -107,33 +107,12 @@ internal sealed class Program
    {
        // Do the redirection on another thread, and use a non-blocking
        // wait method to wait for the redirection to complete.
-        using var redirectSemaphore = new Semaphore(0, 1);
-        var redirectTimeout = TimeSpan.FromSeconds(32);
-
-        _ = Task.Run(() =>
+        var redirectSemaphore = new Semaphore(0, 1);
+        Task.Run(() =>
        {
-            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();
-            }
+            keyInstance.RedirectActivationToAsync(args).AsTask().Wait();
+            redirectSemaphore.Release();
        });
-
        _ = PInvoke.CoWaitForMultipleObjects(
            (uint)CWMO_FLAGS.CWMO_DEFAULT,
            PInvoke.INFINITE,
@@ -145,14 +124,13 @@ 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?.AppWindow is MainWindow mainWindow)
+        if (App.Current is App thisApp)
        {
-            // 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);
+            if (thisApp.AppWindow is not null and
+                MainWindow mainWindow)
+            {
+                uiContext?.Post(_ => mainWindow.HandleLaunch(args), null);
+            }
        }
    }
 }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionPage.xaml
@@ -125,7 +125,7 @@
                                                                Width="20"
                                                                Height="20"
                                                                AutomationProperties.AccessibilityView="Raw"
-                                                                SourceKey="{x:Bind InitialIcon, Mode=OneWay}"
+                                                                SourceKey="{x:Bind Icon, Mode=OneWay}"
                                                                SourceRequested="{x:Bind helpers:IconCacheProvider.SourceRequested}" />
                                                        </cpcontrols:ContentIcon.Content>
                                                    </cpcontrols:ContentIcon>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml
@@ -34,8 +34,6 @@
                  <RepositionThemeTransition IsStaggeringEnabled="False" />
              </StackPanel.ChildrenTransitions>-->

-                    <!--  'Activation' section  -->
-
                    <TextBlock x:Uid="ActivationSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />

                    <controls:SettingsExpander
@@ -68,8 +66,6 @@
                        </ComboBox>
                    </controls:SettingsCard>

-                    <!--  'Behavior' section  -->
-
                    <TextBlock x:Uid="BehaviorSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />

                    <controls:SettingsCard x:Uid="Settings_GeneralPage_ShowAppDetails_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE8A0;}">
@@ -88,16 +84,7 @@
                        <ToggleSwitch IsOn="{x:Bind viewModel.ShowSystemTrayIcon, Mode=TwoWay}" />
                    </controls:SettingsCard>

-                    <!--  'For Developers' section  -->
-
-                    <TextBlock x:Uid="ForDevelopersSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                    <controls:SettingsCard x:Uid="Settings_GeneralPage_AllowExternalReload_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE777;}">
-                        <ToggleSwitch IsOn="{x:Bind viewModel.AllowExternalReload, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <!--  'About' section  -->
-
+                    <!--  Example 'About' section  -->
                    <TextBlock x:Uid="AboutSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />

                    <controls:SettingsExpander x:Uid="Settings_GeneralPage_About_SettingsExpander" HeaderIcon="{ui:BitmapIcon Source=ms-appx:///Assets/StoreLogo.png}">
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml
@@ -24,15 +24,23 @@
            <RowDefinition Height="Auto" />
            <RowDefinition Height="*" />
        </Grid.RowDefinitions>
-        <TitleBar x:Name="TitleBar">
-            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
-            <TitleBar.LeftHeader>
-                <ImageIcon
-                    Height="16"
-                    Margin="16,0,0,0"
-                    Source="ms-appx:///Assets/icon.svg" />
-            </TitleBar.LeftHeader>
-        </TitleBar>
+        <!--  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>
        <NavigationView
            x:Name="NavView"
            Grid.Row="1"
@@ -69,6 +77,7 @@
                    x:Name="NavigationBreadcrumbBar"
                    Grid.Row="0"
                    MaxWidth="1000"
+                    Margin="16,0,0,0"
                    ItemClicked="NavigationBreadcrumbBar_ItemClicked"
                    ItemsSource="{x:Bind BreadCrumbs, Mode=OneWay}">
                    <BreadcrumbBar.ItemTemplate>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml.cs
@@ -31,10 +31,8 @@ public sealed partial class SettingsWindow : WindowEx,
        this.InitializeComponent();
        this.ExtendsContentIntoTitleBar = true;
        this.SetIcon();
-        var title = RS_.GetString("SettingsWindowTitle");
-        this.AppWindow.Title = title;
+        this.AppWindow.Title = RS_.GetString("SettingsWindowTitle");
        this.AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Tall;
-        this.TitleBar.Title = title;
        PositionCentered();

        WeakReferenceMessenger.Default.Register<NavigateToExtensionSettingsMessage>(this);
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
@@ -441,13 +441,4 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
  <data name="NavigationPaneOpened" xml:space="preserve">
    <value>Navigation page opened</value>
  </data>
-  <data name="Settings_GeneralPage_AllowExternalReload_SettingsCard.Header" xml:space="preserve">
-    <value>Enable external reload</value>
-  </data>
-  <data name="Settings_GeneralPage_AllowExternalReload_SettingsCard.Description" xml:space="preserve">
-    <value>Trigger reload of the extension externally with the x-cmdpal://reload command</value>
-  </data>
-  <data name="ForDevelopersSettingsHeader.Text" xml:space="preserve">
-    <value>For Developers</value>
-  </data>
 </root>
--- a/src/modules/cmdpal/Microsoft.Terminal.UI/FontIconGlyphClassifier.cpp
+++ b/src/modules/cmdpal/Microsoft.Terminal.UI/FontIconGlyphClassifier.cpp
@@ -1,177 +0,0 @@
-#include "pch.h"
-#include "FontIconGlyphClassifier.h"
-#include "FontIconGlyphClassifier.g.cpp"
-
-#include <icu.h>
-#include <utility>
-
-namespace winrt::Microsoft::Terminal::UI::implementation
-{
-    namespace
-    {
-        // Check if the code point is in the Private Use Area range used by Fluent UI icons.
-        [[nodiscard]] constexpr bool _isFluentIconPua(const UChar32 cp) noexcept
-        {
-            static constexpr UChar32 _fluentIconsPrivateUseAreaStart = 0xE700;
-            static constexpr UChar32 _fluentIconsPrivateUseAreaEnd = 0xF8FF;
-            return cp >= _fluentIconsPrivateUseAreaStart && cp <= _fluentIconsPrivateUseAreaEnd;
-        }
-
-        // Determine if the given text (as a sequence of UChar code units) is emoji
-        [[nodiscard]] bool _isEmoji(const UChar* p, const int32_t length) noexcept
-        {
-            if (!p || length < 1)
-            {
-                return false;
-            }
-
-            // https://www.unicode.org/reports/tr51/#Emoji_Variation_Selector_Notes
-            constexpr UChar32 vs15CodePoint = 0xFE0E; // Variation Selectors 15: text variation selector
-            constexpr UChar32 vs16CodePoint = 0xFE0F; // Variation Selectors: 16 emoji variation selector
-
-            // Decode the first code point correctly (surrogate-safe)
-            int32_t i0{ 0 };
-            UChar32 first{ 0 };
-            U16_NEXT(p, i0, length, first);
-
-            for (int32_t i = 0; i < length;)
-            {
-                UChar32 cp{ 0 };
-                U16_NEXT(p, i, length, cp);
-
-                if (cp == vs16CodePoint) { return true; }
-                if (cp == vs15CodePoint) { return false; }
-            }
-
-            return !U_IS_SURROGATE(first) && u_hasBinaryProperty(first, UCHAR_EMOJI_PRESENTATION);
-        }
-    }
-
-    bool FontIconGlyphClassifier::IsLikelyToBeEmojiOrSymbolIcon(const hstring& text)
-    {
-        if (text.empty())
-        {
-            return false;
-        }
-
-        if (text.size() == 1 && !IS_HIGH_SURROGATE(text[0]))
-        {
-            // If it's a single code unit, it's definitely either zero or one grapheme clusters.
-            // If it turns out to be illegal Unicode, we don't really care.
-            return true;
-        }
-
-        if (text.size() >= 2 && text[0] <= 0x7F && text[1] <= 0x7F)
-        {
-            // Two adjacent ASCII characters (as seen in most file paths) aren't a single
-            // grapheme cluster.
-            return false;
-        }
-
-        // Use ICU to determine whether text is composed of a single grapheme cluster.
-        int32_t off{ 0 };
-        UErrorCode status{ U_ZERO_ERROR };
-
-        UBreakIterator* const bi{ ubrk_open(UBRK_CHARACTER,
-                                            nullptr,
-                                            reinterpret_cast<const UChar*>(text.data()),
-                                            static_cast<int>(text.size()),
-                                            &status) };
-        if (bi)
-        {
-            if (U_SUCCESS(status))
-            {
-                off = ubrk_next(bi);
-            }
-            ubrk_close(bi);
-        }
-        return std::cmp_equal(off, text.size());
-    }
-
-    FontIconGlyphKind FontIconGlyphClassifier::Classify(hstring const& text) noexcept
-    {
-        if (text.empty())
-        {
-            return FontIconGlyphKind::None;
-        }
-
-        const size_t textSize{ text.size() };
-        const auto* buffer{ reinterpret_cast<const UChar*>(text.c_str()) };
-
-        // Fast path 1: Single UTF-16 code unit (most common case)
-        if (textSize == 1)
-        {
-            const UChar ch{ buffer[0] };
-
-            if (IS_HIGH_SURROGATE(ch))
-            {
-                return FontIconGlyphKind::Invalid;
-            }
-
-            if (_isFluentIconPua(ch))
-            {
-                return FontIconGlyphKind::FluentSymbol;
-            }
-
-            if (_isEmoji(&ch, 1))
-            {
-                return FontIconGlyphKind::Emoji;
-            }
-
-            return FontIconGlyphKind::Other;
-        }
-
-        // Fast path 2: Common file path pattern - two ASCII printable characters
-        if (textSize >= 2 && buffer[0] <= 0x7F && buffer[1] <= 0x7F)
-        {
-            // Definitely multiple graphemes
-            return FontIconGlyphKind::Invalid;
-        }
-
-        // Expensive path: Use ICU to determine grapheme boundaries
-        UErrorCode status{ U_ZERO_ERROR };
-
-        UBreakIterator* bi{ ubrk_open(UBRK_CHARACTER,
-                                      nullptr,
-                                      buffer,
-                                      static_cast<int32_t>(textSize),
-                                      &status) };
-
-        if (U_FAILURE(status) || !bi)
-        {
-            return FontIconGlyphKind::Invalid;
-        }
-
-        const int32_t start{ ubrk_first(bi) };
-        const int32_t end{ ubrk_next(bi) }; // end of first grapheme
-        ubrk_close(bi);
-
-        // No graphemes found
-        if (end == UBRK_DONE || end <= start)
-        {
-            return FontIconGlyphKind::None;
-        }
-
-        // If there's more than one grapheme, it's not a valid icon glyph
-        if (std::cmp_not_equal(end, textSize))
-        {
-            return FontIconGlyphKind::Invalid;
-        }
-
-        // Exactly one grapheme: classify
-        const UChar* grapheme = buffer + start;
-        const int32_t graphemeLength = end - start;
-
-        if (graphemeLength == 1 && _isFluentIconPua(grapheme[0]))
-        {
-            return FontIconGlyphKind::FluentSymbol;
-        }
-
-        if (_isEmoji(grapheme, graphemeLength))
-        {
-            return FontIconGlyphKind::Emoji;
-        }
-
-        return FontIconGlyphKind::Other;
-    }
-}
--- a/src/modules/cmdpal/Microsoft.Terminal.UI/FontIconGlyphClassifier.h
+++ b/src/modules/cmdpal/Microsoft.Terminal.UI/FontIconGlyphClassifier.h
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "FontIconGlyphClassifier.g.h"
-
-namespace winrt::Microsoft::Terminal::UI::implementation
-{
-    struct FontIconGlyphClassifier
-    {
-        [[nodiscard]] static bool IsLikelyToBeEmojiOrSymbolIcon(const winrt::hstring& text);
-
-        [[nodiscard]] static FontIconGlyphKind Classify(winrt::hstring const& text) noexcept;
-    };
-}
-
-namespace winrt::Microsoft::Terminal::UI::factory_implementation
-{
-    BASIC_FACTORY(FontIconGlyphClassifier);
-}
--- a/src/modules/cmdpal/Microsoft.Terminal.UI/FontIconGlyphClassifier.idl
+++ b/src/modules/cmdpal/Microsoft.Terminal.UI/FontIconGlyphClassifier.idl
@@ -1,62 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-namespace Microsoft.Terminal.UI
-{
-    /// <summary>
-    /// Categorizes the type of a single grapheme cluster or input text.
-    /// Used to determine how the input should be handled or rendered (for example,
-    /// whether it should be treated as an emoji, an icon from a symbol font, plain text, etc.).
-    /// </summary>
-    enum FontIconGlyphKind
-    {
-        /// <summary>
-        /// Input is invalid or contains more than one grapheme cluster and therefore cannot be
-        /// treated as a single symbol. Typical for multi-character text like file paths
-        /// or composed strings that include separators.
-        /// </summary>
-        Invalid = -1,
-
-        /// <summary>
-        /// No grapheme present (empty string). Indicates absence of a symbol.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// A single emoji grapheme cluster. This may consist of multiple Unicode code
-        /// points combined into one visible glyph (e.g., emoji with modifiers or ZWJ sequences).
-        /// </summary>
-        Emoji = 1,
-
-        /// <summary>
-        /// A single glyph from the Segoe Fluent Icons / MDL2 Assets Private Use Area (PUA),
-        /// typically in the Unicode range U+E700–U+F8FF. These are font-based icons (Fluent/MDL2).
-        /// </summary>
-        FluentSymbol = 2,
-
-        /// <summary>
-        /// A single non-emoji grapheme that is not a Fluent/MDL2 PUA symbol.
-        /// Covers ordinary characters, letters, numbers, or other single glyph symbols.
-        /// </summary>
-        Other = 3,
-    };
-
-    /// <summary>
-    /// Static utility class for text and icon analysis
-    /// </summary>
-    static runtimeclass FontIconGlyphClassifier
-    {
-        /// <summary>
-        /// Determines if text represents a single grapheme cluster (emoji/symbol icon).
-        /// Uses ICU for Unicode boundary detection to distinguish icons from file paths.
-        /// </summary>
-        /// <param name="text">Text to analyze</param>
-        /// <returns>True if single grapheme cluster, false for multi-character text or paths</returns>
-        static Boolean IsLikelyToBeEmojiOrSymbolIcon(String text);
-
-        /// <summary>
-        /// Classifies the input into a glyph kind suitable for icon or text rendering.
-        /// </summary>
-        static FontIconGlyphKind Classify(String text);
-    };
-}
--- a/src/modules/cmdpal/Microsoft.Terminal.UI/IconPathConverter.cpp
+++ b/src/modules/cmdpal/Microsoft.Terminal.UI/IconPathConverter.cpp
@@ -2,7 +2,7 @@
 #include "IconPathConverter.h"
 #include "IconPathConverter.g.cpp"

- #include "FontIconGlyphClassifier.h"
+// #include "Utils.h"

 #include <Shlobj.h>
 #include <Shlobj_core.h>
@@ -110,7 +110,7 @@ namespace winrt::Microsoft::Terminal::UI::implementation
                if (til::equals_insensitive_ascii(iconUri.Extension(), L".svg"))
                {
                    typename ImageIconSource<TIconSource>::type iconSource;
-                    winrt::Microsoft::UI::Xaml::Media::Imaging::SvgImageSource source{ iconUri };
+                    winrt::Microsoft::UI::Xaml::Media::Imaging::SvgImageSource source{ iconUri };	
                    iconSource.ImageSource(source);
                    return iconSource;
                }
@@ -169,46 +169,41 @@ namespace winrt::Microsoft::Terminal::UI::implementation

            // If we fail to set the icon source using the "icon" as a path,
            // let's try it as a symbol/emoji.
-            if (!iconSource)
+            //
+            // Anything longer than 2 wchar_t's _isn't_ an emoji or symbol, so
+            // don't do this if it's just an invalid path.
+            if (!iconSource && iconPath.size() <= 2)
            {
                try
                {
-                    const auto glyph_kind = FontIconGlyphClassifier::Classify(iconPath);
+                    typename FontIconSource<TIconSource>::type icon;
+                    const auto ch = til::at(iconPath, 0);

-                    winrt::hstring family;
-                    if (glyph_kind == FontIconGlyphKind::Invalid)
+                    // The range of MDL2 Icons isn't explicitly defined, but
+                    // we're using this based off the table on:
+                    // https://docs.microsoft.com/en-us/windows/uwp/design/style/segoe-ui-symbol-font
+                    const auto isMDL2Icon = ch >= L'\uE700' && ch <= L'\uF8FF';
+                    if (isMDL2Icon)
                    {
-                        family = L"Segoe UI";
+                        icon.FontFamily(winrt::Microsoft::UI::Xaml::Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
                    }
                    else if (!fontFamily.empty())
                    {
-                        family = fontFamily;
-                    }
-                    else if (glyph_kind == FontIconGlyphKind::FluentSymbol)
-                    {
-                        family = L"Segoe Fluent Icons, Segoe MDL2 Assets";
-                    }
-                    else if (glyph_kind == FontIconGlyphKind::Emoji)
-                    {
-                        // Emoji and other symbols go in the Segoe UI Emoji font.
-                        // Some emojis (e.g. 2️⃣) would be rendered as emoji glyphs otherwise.
-                        family = L"Segoe UI Emoji, Segoe UI";
+                        icon.FontFamily(winrt::Microsoft::UI::Xaml::Media::FontFamily{ fontFamily });
+
                    }
                    else
                    {
-                        family = L"Segoe UI";
+                        // Note: you _do_ need to manually set the font here.
+                        icon.FontFamily(winrt::Microsoft::UI::Xaml::Media::FontFamily{ L"Segoe UI" });
                    }
-
-                    typename FontIconSource<TIconSource>::type icon;
-                    icon.FontFamily(winrt::Microsoft::UI::Xaml::Media::FontFamily{ family });
                    icon.FontSize(targetSize);
-                    icon.Glyph(glyph_kind == FontIconGlyphKind::Invalid ? L"\u25CC" : iconPath);
+                    icon.Glyph(iconPath);
                    iconSource = icon;
                }
                CATCH_LOG();
            }
        }
-
        if (!iconSource)
        {
            // Set the default IconSource to a BitmapIconSource with a null source
@@ -331,7 +326,7 @@ namespace winrt::Microsoft::Terminal::UI::implementation
    }

    static winrt::Microsoft::UI::Xaml::Media::Imaging::SoftwareBitmapSource _getImageIconSourceForBinary(std::wstring_view iconPathWithoutIndex,
-                                                                                                         int index,
+                                                                                                         int index, 
                                                                                                         int targetSize)
    {
        // Try:
--- a/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
+++ b/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
@@ -3,15 +3,9 @@
  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
  <PropertyGroup>
    <PathToRoot>..\..\..\..\</PathToRoot>
-    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.8.250907003</WasdkNuget>
+    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.7.250513003</WasdkNuget>
  </PropertyGroup>
  <Import Project="$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props')" />
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props')" />
  <PropertyGroup Label="Globals">
    <CppWinRTOptimized>true</CppWinRTOptimized>
    <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -165,9 +159,6 @@
    <ClInclude Include="ResourceString.h">
      <DependentUpon>ResourceString.idl</DependentUpon>
    </ClInclude>
-    <ClInclude Include="FontIconGlyphClassifier.h">
-      <DependentUpon>FontIconGlyphClassifier.idl</DependentUpon>
-    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="init.cpp" />
@@ -187,9 +178,6 @@
      <DependentUpon>ResourceString.idl</DependentUpon>
    </ClCompile>
    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
-    <ClCompile Include="FontIconGlyphClassifier.cpp">
-      <DependentUpon>FontIconGlyphClassifier.idl</DependentUpon>
-    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <Midl Include="Converters.idl" />
@@ -197,7 +185,6 @@
    <Midl Include="RunHistory.idl" />
    <Midl Include="IDirectKeyListener.idl" />
    <Midl Include="ResourceString.idl" />
-    <Midl Include="FontIconGlyphClassifier.idl" />
  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config" />
@@ -206,12 +193,6 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
    <Import Project="$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets')" />
    <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
    <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" />
    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
@@ -222,18 +203,6 @@
    </PropertyGroup>
    <Error Condition="!Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props'))" />
    <Error Condition="!Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
--- a/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config
+++ b/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config
@@ -4,14 +4,4 @@
  <package id="Microsoft.Web.WebView2" version="1.0.2903.40" targetFramework="native" />
  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.8.250907003" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.Base" version="1.8.250831001" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.Foundation" version="1.8.250906002" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.WinUI" version="1.8.250906003" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.Runtime" version="1.8.250907003" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.DWrite" version="1.8.25090401" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.InteractiveExperiences" version="1.8.250906004" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.Widgets" version="1.8.250904007" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK.AI" version="1.8.37" targetFramework="native" />
-  <package id="Microsoft.Windows.SDK.BuildTools.MSIX" version="1.7.20250829.1" targetFramework="native" />
 </packages>
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WebSearch.UnitTests/MockSettingsInterface.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WebSearch.UnitTests/MockSettingsInterface.cs
@@ -2,9 +2,10 @@
 // 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 Microsoft.CmdPal.Ext.WebSearch.Commands;
 using Microsoft.CmdPal.Ext.WebSearch.Helpers;
+using Microsoft.CommandPalette.Extensions.Toolkit;

 namespace Microsoft.CmdPal.Ext.WebSearch.UnitTests;

@@ -12,22 +13,34 @@ public class MockSettingsInterface : ISettingsInterface
 {
    private readonly List<HistoryItem> _historyItems;

-    public event EventHandler HistoryChanged;
-
    public bool GlobalIfURI { get; set; }

-    public int HistoryItemCount { get; set; }
+    public string ShowHistory { get; set; }

-    public IReadOnlyList<HistoryItem> HistoryItems => _historyItems;
-
-    public MockSettingsInterface(int historyItemCount = 0, bool globalIfUri = true, List<HistoryItem> mockHistory = null)
+    public MockSettingsInterface(string showHistory = "none", bool globalIfUri = true, List<HistoryItem> mockHistory = null)
    {
        _historyItems = mockHistory ?? new List<HistoryItem>();
        GlobalIfURI = globalIfUri;
-        HistoryItemCount = historyItemCount;
+        ShowHistory = showHistory;
    }

-    public void AddHistoryItem(HistoryItem historyItem)
+    public List<ListItem> LoadHistory()
+    {
+        var listItems = new List<ListItem>();
+        foreach (var historyItem in _historyItems)
+        {
+            listItems.Add(new ListItem(new SearchWebCommand(historyItem.SearchString, this))
+            {
+                Title = historyItem.SearchString,
+                Subtitle = historyItem.Timestamp.ToString("g", System.Globalization.CultureInfo.InvariantCulture),
+            });
+        }
+
+        listItems.Reverse();
+        return listItems;
+    }
+
+    public void SaveHistory(HistoryItem historyItem)
    {
        if (historyItem is null)
        {
@@ -37,22 +50,19 @@ public class MockSettingsInterface : ISettingsInterface
        _historyItems.Add(historyItem);

        // Simulate the same logic as SettingsManager
-        if (HistoryItemCount > 0)
+        if (int.TryParse(ShowHistory, out var maxHistoryItems) && maxHistoryItems > 0)
        {
-            while (_historyItems.Count > HistoryItemCount)
+            while (_historyItems.Count > maxHistoryItems)
            {
-                _historyItems.RemoveAt(0);
+                _historyItems.RemoveAt(0); // Remove the oldest item
            }
        }
-
-        HistoryChanged?.Invoke(this, EventArgs.Empty);
    }

    // Helper method for testing
    public void ClearHistory()
    {
        _historyItems.Clear();
-        HistoryChanged?.Invoke(this, EventArgs.Empty);
    }

    // Helper method for testing
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WebSearch.UnitTests/QueryTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WebSearch.UnitTests/QueryTests.cs
@@ -45,7 +45,7 @@ public class QueryTests : CommandPaletteUnitTestBase
    }

    [TestMethod]
-    public async Task HistoryReturnsExpectedItems()
+    public async Task LoadHistoryReturnsExpectedItems()
    {
        // Setup
        var mockHistoryItems = new List<HistoryItem>
@@ -54,7 +54,7 @@ public class QueryTests : CommandPaletteUnitTestBase
            new HistoryItem("another search", DateTime.Parse("2024-01-02 13:00:00", CultureInfo.CurrentCulture)),
        };

-        var settings = new MockSettingsInterface(mockHistory: mockHistoryItems, historyItemCount: 5);
+        var settings = new MockSettingsInterface(mockHistory: mockHistoryItems, showHistory: "5");

        var page = new WebSearchListPage(settings);

@@ -77,7 +77,7 @@ public class QueryTests : CommandPaletteUnitTestBase
    }

    [TestMethod]
-    public async Task HistoryExceedingLimitReturnsMaxItems()
+    public async Task LoadHistoryMoreThanLimitation()
    {
        // Setup
        var mockHistoryItems = new List<HistoryItem>
@@ -89,7 +89,7 @@ public class QueryTests : CommandPaletteUnitTestBase
            new HistoryItem("another search4", DateTime.Parse("2024-01-05 13:00:00", CultureInfo.CurrentCulture)),
        };

-        var settings = new MockSettingsInterface(mockHistory: mockHistoryItems, historyItemCount: 5);
+        var settings = new MockSettingsInterface(mockHistory: mockHistoryItems, showHistory: "5");

        var page = new WebSearchListPage(settings);

@@ -109,7 +109,7 @@ public class QueryTests : CommandPaletteUnitTestBase
    }

    [TestMethod]
-    public async Task HistoryWhenSetToNoneReturnEmptyList()
+    public async Task LoadHistoryWithDisableSetting()
    {
        // Setup
        var mockHistoryItems = new List<HistoryItem>
@@ -122,7 +122,7 @@ public class QueryTests : CommandPaletteUnitTestBase
            new HistoryItem("another search5", DateTime.Parse("2024-01-06 13:00:00", CultureInfo.CurrentCulture)),
        };

-        var settings = new MockSettingsInterface(mockHistory: mockHistoryItems, historyItemCount: 0);
+        var settings = new MockSettingsInterface(mockHistory: mockHistoryItems, showHistory: "None");

        var page = new WebSearchListPage(settings);

--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WebSearch.UnitTests/SettingsManagerTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WebSearch.UnitTests/SettingsManagerTests.cs
@@ -1,48 +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.Threading.Tasks;
-
-using Microsoft.CmdPal.Ext.UnitTestBase;
-using Microsoft.CmdPal.Ext.WebSearch.Helpers;
-using Microsoft.CmdPal.Ext.WebSearch.Pages;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.WebSearch.UnitTests;
-
-[TestClass]
-public class SettingsManagerTests : CommandPaletteUnitTestBase
-{
-    [TestMethod]
-    public async Task HistoryChangedEventIsRaisedWhenItemIsAdded()
-    {
-        // Setup
-        var settings = new MockSettingsInterface(historyItemCount: 5);
-        var page = new WebSearchListPage(settings);
-
-        var eventRaised = false;
-
-        try
-        {
-            settings.HistoryChanged += Handler;
-
-            // Act
-            settings.AddHistoryItem(new HistoryItem("test event", DateTime.UtcNow));
-            await Task.Delay(50);
-
-            // Assert
-            Assert.IsTrue(eventRaised, "Expected HistoryChanged to be raised when saving history.");
-        }
-        finally
-        {
-            settings.HistoryChanged -= Handler;
-            page.Dispose();
-        }
-
-        return;
-
-        void Handler(object s, EventArgs e) => eventRaised = true;
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
copilot-swe-agent[bot]	eb199d26f6	Fix PowerToys Run shortcut conflict display when module is disabled Co-authored-by: yeelam-gordon <73506701+yeelam-gordon@users.noreply.github.com>	2025-08-29 08:46:37 +00:00
copilot-swe-agent[bot]	6ffa8d5827	Initial plan	2025-08-29 08:33:59 +00:00