make rot

<!-- Enter a brief description/summary of your PR here. What does it
fix/what does it change/how was it tested (even manually, if necessary)?
-->
## Summary of the Pull Request

- Fix tab navigation issues #41717
- Minor improvement:
  - Show module group only if there are modules to show #41526
  - Add line break in the "no results" message

0.94
<img width="769" height="422" alt="image"
src="https://github.com/user-attachments/assets/111fc200-5811-43aa-9ea0-3f8d80543560"
/>

PR
<img width="812" height="524" alt="image"
src="https://github.com/user-attachments/assets/65070862-ff3f-4294-8aad-2ade4e6d4e90"
/>

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

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

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

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

- Verified that tab navigation is smooth between search groups
- Verified that narrator announces group names
- Tested empty search results page

.github/actions/spell-check/allow/code.txt

@@ -94,6 +94,7 @@ onefuzzingestionpreparationtool
 OTP
 Yubi
 Yubico
+Perplexity
 svgl
 
 # KEYS
@@ -319,4 +320,4 @@ MRUINFO
 REGSTR
 
 # Misc Win32 APIs and PInvokes
-INVOKEIDLIST
+INVOKEIDLIST

.github/actions/spell-check/allow/names.txt

@@ -29,6 +29,8 @@ 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

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

@@ -247,6 +247,7 @@ CONFIGW
 CONFLICTINGMODIFIERKEY
 CONFLICTINGMODIFIERSHORTCUT
 CONOUT
+coreclr
 constexpr
 contentdialog
 contentfiles
@@ -268,6 +269,8 @@ cpcontrols
 cph
 cplusplus
 CPower
+cpptools
+cppvsdbg
 cppwinrt
 createdump
 CREATEPROCESS
@@ -279,6 +282,7 @@ CRH
 critsec
 cropandlock
 Crossdevice
+csdevkit
 CSearch
 CSettings
 cso
@@ -306,6 +310,7 @@ CXVIRTUALSCREEN
 CYSCREEN
 CYSMICON
 CYVIRTUALSCREEN
+Czechia
 cziplib
 Dac
 dacl
@@ -330,6 +335,7 @@ Deact
 debugbreak
 decryptor
 Dedup
+Deduplicator
 Deeplink
 DEFAULTBOOTSTRAPPERINSTALLFOLDER
 DEFAULTCOLOR
@@ -435,6 +441,7 @@ EDITSHORTCUTS
 EDITTEXT
 EFile
 ekus
+emojis
 ENABLEDELAYEDEXPANSION
 ENABLEDPOPUP
 ENABLETAB
@@ -799,6 +806,7 @@ KEYBOARDMANAGEREDITORLIBRARYWRAPPER
 keyboardmanagerstate
 keyboardmanagerui
 keyboardtester
+keycap
 KEYEVENTF
 KEYIMAGE
 keynum
@@ -1447,7 +1455,6 @@ rstringalnum
 rstringalpha
 rstringdigit
 rtb
-RTB
 RTLREADING
 rtm
 runas
@@ -1780,10 +1787,13 @@ UACUI
 UAL
 uap
 UBR
+UBreak
+ubrk
 UCallback
 ucrt
 ucrtd
 uefi
+UError
 uesc
 UFlags
 UHash
@@ -1791,6 +1801,7 @@ UIA
 UIEx
 uild
 uitests
+UITo
 ULONGLONG
 ums
 uncompilable
@@ -1853,6 +1864,7 @@ VFT
 vget
 vgetq
 viewmodels
+virama
 VIRTKEY
 VIRTUALDESK
 VISEGRADRELAY
@@ -2004,6 +2016,7 @@ XButton
 xclip
 xcopy
 XDeployment
+xdf
 XDocument
 XElement
 xfd

.github/copilot-instructions.md

@@ -0,0 +1,43 @@
+# 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?

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

@@ -1,20 +1,38 @@
 name: Manual Batch Issue Deduplication
 
 on:
-  workflow_dispatch: # Only runs when manually triggered
+  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:
-  batch-deduplicate:
+  deduplicate:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        issue: ${{ fromJson(github.event.inputs.issue_numbers) }}
     steps:
-      - name: Batch Deduplicate Issues
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Run GenAI Issue Deduplicator
         uses: pelikhan/action-genai-issue-dedup@v0
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          label-duplicate: "potential duplicate"
-          comment-duplicate: true
-          close-duplicate: false
-          batch-size: 100 
-          since: '2019-05-05T00:00:00Z' # Process issues dating back to 2019
-          duplicate-comment-template: "This issue appears to be a duplicate of #{duplicate_issue_number}."
-          # Add other action-specific inputs if needed
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          github_issue: ${{ matrix.issue }}
+          label_as_duplicate: ${{ github.event.inputs.label_as_duplicate }}
+          

.vscode/launch.json

@@ -0,0 +1,43 @@
+{
+    "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
+        }
+    ]
+}

PowerToys.sln

@@ -262,7 +262,6 @@ 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
@@ -282,6 +281,7 @@ 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,6 +793,10 @@ 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}"
@@ -2695,22 +2699,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
-		{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
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Debug|x64.Build.0 = Debug|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Release|ARM64.ActiveCfg = Release|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Release|ARM64.Build.0 = Release|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Release|x64.ActiveCfg = Release|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Release|x64.Build.0 = Release|x64
-		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Debug|ARM64.Build.0 = Debug|ARM64
-		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Debug|x64.ActiveCfg = Debug|x64
-		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Debug|x64.Build.0 = Debug|x64
-		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|ARM64.ActiveCfg = Release|ARM64
-		{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
@@ -2727,14 +2715,22 @@ Global
 		{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
+		{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
+		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Debug|x64.Build.0 = Debug|x64
+		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Release|ARM64.ActiveCfg = Release|ARM64
+		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Release|ARM64.Build.0 = Release|ARM64
+		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Release|x64.ActiveCfg = Release|x64
+		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Release|x64.Build.0 = Release|x64
+		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Debug|ARM64.Build.0 = Debug|ARM64
+		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Debug|x64.ActiveCfg = Debug|x64
+		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Debug|x64.Build.0 = Debug|x64
+		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|ARM64.ActiveCfg = Release|ARM64
+		{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
 		{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
@@ -2887,6 +2883,14 @@ 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
@@ -3194,10 +3198,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}
-		{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}
+		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1} = {2C318EC3-BA86-4372-B1BC-DB0F33C208B2}
+		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9} = {68328142-5B31-4715-BCBB-7B6345EE0971}
 		{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}
@@ -3233,6 +3237,8 @@ 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}

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):
-   ```
-   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.sln
+   ```pwsh
+   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.sln /tl /p:NuGetInteractive="true"
    ```
 4. This process should complete in approximately 13-14 minutes for a full build
 

doc/devdocs/development/dev-with-vscode.md

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

doc/thirdPartyRunPlugins.md

@@ -73,4 +73,5 @@ 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. |

src/common/ManagedCommon/RotSingletonHost.cs

@@ -0,0 +1,225 @@
+// 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.Runtime.InteropServices;
+using System.Threading;
+
+#nullable enable
+#pragma warning disable IL2050 // Suppress COM interop trimming warnings for ROT hosting P/Invokes (desktop only scenario)
+
+namespace ManagedCommon
+{
+    /// <summary>
+    /// Generic helper to host a single COM-visible automation object in the Running Object Table (ROT)
+    /// without registry/CLSID class factory registration. Used for lightweight cross-process automation.
+    /// Pattern: create instance -> register with moniker -> wait until Stop.
+    /// Threading: spins up a dedicated STA thread so objects needing STA semantics are safe.
+    /// </summary>
+    public sealed class RotSingletonHost : IDisposable
+    {
+        private readonly Lock _sync = new();
+        private readonly Func<object> _factory;
+        private readonly string _monikerName;
+        private readonly string _threadName;
+        private readonly ManualResetEvent _shutdown = new(false);
+
+        private Thread? _thread;
+        private int _rotCookie;
+        private object? _instance; // keep alive
+        private IMoniker? _moniker;
+        private bool _disposed;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RotSingletonHost"/> class.
+        /// </summary>
+        /// <param name="monikerName">Moniker name (logical unique id), e.g. "Awake.Automation".</param>
+        /// <param name="factory">Factory that creates the object to expose. Should return a COM-visible object.</param>
+        /// <param name="threadName">Optional thread name for diagnostics.</param>
+        public RotSingletonHost(string monikerName, Func<object> factory, string? threadName = null)
+        {
+            _monikerName = string.IsNullOrWhiteSpace(monikerName) ? throw new ArgumentException("Moniker required", nameof(monikerName)) : monikerName;
+            _factory = factory ?? throw new ArgumentNullException(nameof(factory));
+            _threadName = threadName ?? $"RotHost:{_monikerName}";
+        }
+
+        public bool IsRunning => _thread != null;
+
+        public string MonikerName => _monikerName;
+
+        public void Start()
+        {
+            lock (_sync)
+            {
+                if (_disposed)
+                {
+                    ObjectDisposedException.ThrowIf(_disposed, this);
+                }
+
+                if (_thread != null)
+                {
+                    return; // already running
+                }
+
+                _thread = new Thread(ThreadMain)
+                {
+                    IsBackground = true,
+                    Name = _threadName,
+                };
+                _thread.SetApartmentState(ApartmentState.STA);
+                _thread.Start();
+                Logger.LogInfo($"ROT host starting for moniker '{_monikerName}'");
+            }
+        }
+
+        public void Stop()
+        {
+            lock (_sync)
+            {
+                if (_thread == null)
+                {
+                    return;
+                }
+
+                _shutdown.Set();
+            }
+
+            _thread?.Join(3000);
+            _thread = null;
+            _shutdown.Reset();
+        }
+
+        private void ThreadMain()
+        {
+            int hr = Ole32.CoInitializeEx(IntPtr.Zero, Ole32.CoinitApartmentThreaded);
+            if (hr < 0)
+            {
+                Logger.LogError($"CoInitializeEx failed: 0x{hr:X8}");
+                return;
+            }
+
+            try
+            {
+                hr = Ole32.GetRunningObjectTable(0, out var rot);
+                if (hr < 0 || rot == null)
+                {
+                    Logger.LogError($"GetRunningObjectTable failed: 0x{hr:X8}");
+                    return;
+                }
+
+                hr = Ole32.CreateItemMoniker("!", _monikerName, out _moniker);
+                if (hr < 0 || _moniker == null)
+                {
+                    Logger.LogError($"CreateItemMoniker failed: 0x{hr:X8}");
+                    return;
+                }
+
+                _instance = _factory();
+                var unk = Marshal.GetIUnknownForObject(_instance);
+                try
+                {
+                    hr = rot.Register(0x1 /* ROTFLAGS_REGISTRATIONKEEPSALIVE */, _instance, _moniker, out _rotCookie);
+                    if (hr < 0)
+                    {
+                        Logger.LogError($"IRunningObjectTable.Register failed: 0x{hr:X8}");
+                        return;
+                    }
+                }
+                finally
+                {
+                    Marshal.Release(unk);
+                }
+
+                Logger.LogInfo($"ROT registered: '{_monikerName}'");
+                WaitHandle.WaitAny(new WaitHandle[] { _shutdown });
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError($"ROT host exception: {ex}");
+            }
+            finally
+            {
+                try
+                {
+                    if (_rotCookie != 0 && Ole32.GetRunningObjectTable(0, out var rot2) == 0 && rot2 != null)
+                    {
+                        rot2.Revoke(_rotCookie);
+                        _rotCookie = 0;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Logger.LogWarning($"Exception revoking ROT registration: {ex.Message}");
+                }
+
+                Ole32.CoUninitialize();
+                Logger.LogInfo($"ROT host stopped: '{_monikerName}'");
+            }
+        }
+
+        public void Dispose()
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            Stop();
+            _disposed = true;
+        }
+
+        private static class Ole32
+        {
+            internal const int CoinitApartmentThreaded = 0x2;
+
+#pragma warning disable IL2050 // Suppress trimming warnings for COM interop P/Invokes; ROT hosting not used in trimmed scenarios.
+            [DllImport("ole32.dll")]
+            internal static extern int CoInitializeEx(IntPtr pvReserved, int dwCoInit);
+
+            [DllImport("ole32.dll")]
+            internal static extern void CoUninitialize();
+
+            [DllImport("ole32.dll")]
+            internal static extern int GetRunningObjectTable(int reserved, out IRunningObjectTable? prot);
+
+            [DllImport("ole32.dll")]
+            internal static extern int CreateItemMoniker([MarshalAs(UnmanagedType.LPWStr)] string lpszDelim, [MarshalAs(UnmanagedType.LPWStr)] string lpszItem, out IMoniker? ppmk);
+#pragma warning restore IL2050
+        }
+
+        [ComImport]
+        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+        [Guid("00000010-0000-0000-C000-000000000046")]
+        private interface IRunningObjectTable
+        {
+            int Register(int grfFlags, [MarshalAs(UnmanagedType.IUnknown)] object punkObject, IMoniker pmkObjectName, out int pdwRegister);
+
+            int Revoke(int dwRegister);
+
+            void IsRunning(IMoniker pmkObjectName);
+
+            int GetObject(IMoniker pmkObjectName, [MarshalAs(UnmanagedType.IUnknown)] out object? ppunkObject);
+
+            void NoteChangeTime(int dwRegister, ref FileTime pfiletime);
+
+            int GetTimeOfLastChange(IMoniker pmkObjectName, ref FileTime pfiletime);
+
+            int EnumRunning(out object ppenumMoniker);
+        }
+
+        [ComImport]
+        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+        [Guid("0000000f-0000-0000-C000-000000000046")]
+        private interface IMoniker
+        {
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct FileTime
+        {
+            public uint DwLowDateTime;
+            public uint DwHighDateTime;
+        }
+    }
+}

src/common/UITestAutomation/ModuleConfigData.cs

@@ -33,6 +33,7 @@ namespace Microsoft.PowerToys.UITest
         Workspaces,
         PowerRename,
         CommandPalette,
+        ScreenRuler,
     }
 
     /// <summary>
@@ -104,6 +105,7 @@ 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"),
             };
         }
 

src/common/UITestAutomation/UITestBase.cs

@@ -4,6 +4,7 @@
 
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.IO;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -94,6 +95,7 @@ namespace Microsoft.PowerToys.UITest
                 {
                     Task.Delay(1000).Wait();
                     AddScreenShotsToTestResultsDirectory();
+                    AddLogFilesToTestResultsDirectory();
                 }
             }
 
@@ -598,6 +600,92 @@ 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>

src/common/common.instructions.md

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

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;$(SolutionDir)x64\$(Configuration)\WinUI3Apps\PowerToys.Settings.UI.Lib.dll&quot; $(GeneratedDSCModule) $(GeneratedDSCManifest)" />
+        <Exec Command="&quot;$(OutDir)$(AssemblyName).exe&quot; &quot;..\..\..\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="$(SolutionDir)" />
+      <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="..\..\..\" />
     </Target>
 
 </Project>

src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/MainWindow.xaml

@@ -5,6 +5,7 @@
     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"
@@ -250,6 +251,7 @@
             <ToggleButton
                 Name="btnBounds"
                 x:Uid="BtnBounds"
+                AutomationProperties.AutomationId="Button_Bounds"
                 Click="BoundsTool_Click"
                 Content="&#xEF20;"
                 KeyboardAcceleratorPlacementMode="Auto"
@@ -267,6 +269,7 @@
             <ToggleButton
                 Name="btnSpacing"
                 x:Uid="BtnSpacing"
+                AutomationProperties.AutomationId="Button_Spacing"
                 Click="MeasureTool_Click"
                 Style="{StaticResource ToggleButtonRadioButtonStyle}">
                 <ToolTipService.ToolTip>
@@ -284,6 +287,7 @@
             <ToggleButton
                 Name="btnHorizontalSpacing"
                 x:Uid="BtnHorizontalSpacing"
+                AutomationProperties.AutomationId="Button_SpacingHorizontal"
                 Click="HorizontalMeasureTool_Click"
                 Style="{StaticResource ToggleButtonRadioButtonStyle}">
                 <ToolTipService.ToolTip>
@@ -304,6 +308,7 @@
             <ToggleButton
                 Name="btnVerticalSpacing"
                 x:Uid="BtnVerticalSpacing"
+                AutomationProperties.AutomationId="Button_SpacingVertical"
                 Click="VerticalMeasureTool_Click"
                 Style="{StaticResource ToggleButtonRadioButtonStyle}">
                 <ToolTipService.ToolTip>
@@ -324,6 +329,7 @@
             <AppBarSeparator />
             <Button
                 x:Uid="BtnClosePanel"
+                AutomationProperties.AutomationId="Button_Close"
                 Click="ClosePanelTool_Click"
                 Content="&#xE8BB;"
                 Foreground="{StaticResource CloseButtonBackgroundPointerOver}">

src/modules/MeasureTool/Tests/ScreenRuler.UITests/Package.appxmanifest

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

src/modules/MeasureTool/Tests/ScreenRuler.UITests/ScreenRuler.UITests.csproj

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

src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestBounds.cs

@@ -0,0 +1,27 @@
+// 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);
+        }
+    }
+}

src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestHelper.cs

@@ -0,0 +1,466 @@
+// 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}'");
+        }
+    }
+}

src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestShortcutActivation.cs

@@ -0,0 +1,72 @@
+// 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);
+        }
+    }
+}

src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestSpacing.cs

@@ -0,0 +1,27 @@
+// 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);
+        }
+    }
+}

src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestSpacingHorizontal.cs

@@ -0,0 +1,27 @@
+// 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);
+        }
+    }
+}

src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestSpacingVertical.cs

@@ -0,0 +1,27 @@
+// 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);
+        }
+    }
+}

src/modules/MeasureTool/Tests/ScreenRuler.UITests/app.manifest

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

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>("Find My Mouse");
+            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             Assert.IsNotNull(foundCustom);
 
             if (CheckAnimationEnable(ref foundCustom))
             {
-                foundCustom = this.Find<Custom>("Find My Mouse");
+                foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             }
 
             if (foundCustom != null)
             {
-                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).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<TextBlock>("Excluded apps");
+                var excludedApps = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseExcludedApps));
                 if (excludedApps != null)
                 {
                     excludedApps.Click();
@@ -115,23 +115,23 @@ namespace MouseUtils.UITests
             settings.BackgroundColor = "FF0000";
             settings.SpotlightColor = "0000FF";
 
-            var foundCustom = this.Find<Custom>("Find My Mouse");
+            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             Assert.IsNotNull(foundCustom);
 
             if (CheckAnimationEnable(ref foundCustom))
             {
-                foundCustom = this.Find<Custom>("Find My Mouse");
+                foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             }
 
             if (foundCustom != null)
             {
-                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).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<TextBlock>("Excluded apps");
+                var excludedApps = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseExcludedApps));
                 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>("Find My Mouse");
+            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
 
             Assert.IsNotNull(foundCustom);
 
             if (CheckAnimationEnable(ref foundCustom))
             {
-                foundCustom = this.Find<Custom>("Find My Mouse");
+                foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             }
 
             if (foundCustom != null)
             {
-                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
 
-                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
 
-                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
                 SetFindMyMouseActivationMethod(ref foundCustom, "Press Left Control twice");
                 Assert.IsNotNull(foundCustom);
                 SetFindMyMouseAppearanceBehavior(ref foundCustom, ref settings);
 
-                var excludedApps = foundCustom.Find<TextBlock>("Excluded apps");
+                var excludedApps = foundCustom.Find<Group>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseExcludedApps));
                 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>("Enable Find My Mouse").Toggle(false);
+            foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).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>("Enable Find My Mouse").Toggle(true);
+            foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).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>("Find My Mouse");
+            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
 
             Assert.IsNotNull(foundCustom);
 
             if (CheckAnimationEnable(ref foundCustom))
             {
-                foundCustom = this.Find<Custom>("Find My Mouse");
+                foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             }
 
             if (foundCustom != null)
             {
-                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
 
-                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
 
-                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
                 SetFindMyMouseActivationMethod(ref foundCustom, "Press Left Control twice");
                 Assert.IsNotNull(foundCustom);
                 SetFindMyMouseAppearanceBehavior(ref foundCustom, ref settings);
 
-                var excludedApps = foundCustom.Find<TextBlock>("Excluded apps");
+                var excludedApps = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseExcludedApps));
                 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>("Enable Find My Mouse").Toggle(false);
+            foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).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>("Enable Find My Mouse").Toggle(true);
+            foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).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>("Find My Mouse");
+            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             if (foundCustom != null)
             {
-                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
 
-                // foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+                // foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).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<TextBlock>("Excluded apps");
+                var excludedApps = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseExcludedApps));
                 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>("Enable Find My Mouse").Toggle(false);
+            foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
             Task.Delay(2000).Wait();
             Session.SendKey(Key.LCtrl, 0, 0);
             Task.Delay(100).Wait();
@@ -382,9 +382,6 @@ 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)
@@ -427,7 +424,7 @@ namespace MouseUtils.UITests
         private void SetFindMyMouseActivationMethod(ref Custom? foundCustom, string method)
         {
             Assert.IsNotNull(foundCustom);
-            var groupActivation = foundCustom.Find<TextBlock>("Activation method");
+            var groupActivation = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseActivationMethod));
             if (groupActivation != null)
             {
                 groupActivation.Click();
@@ -456,17 +453,17 @@ namespace MouseUtils.UITests
         private void SetFindMyMouseAppearanceBehavior(ref Custom foundCustom, ref FindMyMouseSettings settings)
         {
             Assert.IsNotNull(foundCustom);
-            var groupAppearanceBehavior = foundCustom.Find<TextBlock>("Appearance & behavior");
+            var groupAppearanceBehavior = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseAppearanceBehavior));
             if (groupAppearanceBehavior != null)
             {
                 // groupAppearanceBehavior.Click();
-                if (foundCustom.FindAll<Slider>("Overlay opacity (%)").Count == 0)
+                if (foundCustom.FindAll(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseOverlayOpacity)).Count == 0)
                 {
                     groupAppearanceBehavior.Click();
                 }
 
                 // Set the BackGround color
-                var backgroundColor = foundCustom.Find<Group>("Background color");
+                var backgroundColor = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseBackgroundColor));
                 Assert.IsNotNull(backgroundColor);
 
                 var button = backgroundColor.Find<Button>(By.XPath(".//Button"));
@@ -505,7 +502,7 @@ namespace MouseUtils.UITests
                 button.Click();
 
                 // Set the Spotlight color
-                var spotlightColor = foundCustom.Find<Group>("Spotlight color");
+                var spotlightColor = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseSpotlightColor));
                 Assert.IsNotNull(spotlightColor);
 
                 var spotlightColorButton = spotlightColor.Find<Button>(By.XPath(".//Button"));
@@ -545,7 +542,7 @@ namespace MouseUtils.UITests
                 spotlightColorButton.Click(false, 500, 1500);
 
                 // Set the overlay opacity to overlayOpacity%
-                var overlayOpacitySlider = foundCustom.Find<Slider>("Overlay opacity (%)");
+                var overlayOpacitySlider = foundCustom.Find<Slider>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseOverlayOpacity));
                 Assert.IsNotNull(overlayOpacitySlider);
                 Assert.IsNotNull(settings.OverlayOpacity);
                 int overlayOpacityValue = int.Parse(settings.OverlayOpacity, CultureInfo.InvariantCulture);
@@ -554,7 +551,7 @@ namespace MouseUtils.UITests
                 Task.Delay(1000).Wait();
 
                 // Set the Fade Initial zoom to 0
-                var spotlightInitialZoomSlider = foundCustom.Find<Slider>("Spotlight initial zoom");
+                var spotlightInitialZoomSlider = foundCustom.Find<Slider>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseSpotlightZoom));
                 Assert.IsNotNull(spotlightInitialZoomSlider);
                 Task.Delay(1000).Wait();
                 spotlightInitialZoomSlider.QuickSetValue(int.Parse(settings.InitialZoom, CultureInfo.InvariantCulture));
@@ -562,7 +559,8 @@ namespace MouseUtils.UITests
                 Task.Delay(1000).Wait();
 
                 //// Change the edit value
-                var spotlightRadiusEdit = foundCustom.Find<TextBox>("Spotlight radius (px) Minimum5");
+                var spotlightRadius = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseSpotlightRadius));
+                var spotlightRadiusEdit = spotlightRadius.Find<TextBox>(By.AccessibilityId("InputBox"));
                 Assert.IsNotNull(spotlightRadiusEdit);
                 Task.Delay(1000).Wait();
                 spotlightRadiusEdit.SetText(settings.Radius);
@@ -570,11 +568,12 @@ namespace MouseUtils.UITests
                 Task.Delay(1000).Wait();
 
                 // Set the duration to 0 ms
-                var spotlightAnimationDuration = foundCustom.Find<TextBox>("Animation duration (ms) Minimum0");
-                Assert.IsNotNull(spotlightAnimationDuration);
+                var spotlightAnimationDuration = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseAnimationDuration));
+                var spotlightAnimationDurationEdit = spotlightAnimationDuration.Find<TextBox>(By.AccessibilityId("InputBox"));
+                Assert.IsNotNull(spotlightAnimationDurationEdit);
                 Task.Delay(1000).Wait();
-                spotlightAnimationDuration.SetText(settings.AnimationDuration);
-                Assert.AreEqual(settings.AnimationDuration, spotlightAnimationDuration.Text);
+                spotlightAnimationDurationEdit.SetText(settings.AnimationDuration);
+                Assert.AreEqual(settings.AnimationDuration, spotlightAnimationDurationEdit.Text);
                 Task.Delay(1000).Wait();
 
                 // groupAppearanceBehavior.Click();
@@ -622,19 +621,19 @@ namespace MouseUtils.UITests
             this.Session.SetMainWindowSize(WindowSize.Large);
 
             // Goto Hosts File Editor setting page
-            if (this.FindAll<NavigationViewItem>("Mouse utilities", 10000).Count == 0)
+            if (this.FindAll(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Count == 0)
             {
                 // Expand Advanced list-group if needed
-                this.Find<NavigationViewItem>("Input / Output").Click();
+                this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.InputOutputNavItem)).Click();
             }
 
             if (reload)
             {
-                this.Find<NavigationViewItem>("Keyboard Manager").Click();
+                this.Find<NavigationViewItem>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.KeyboardManagerNavItem)).Click();
             }
 
             Task.Delay(1000).Wait();
-            this.Find<NavigationViewItem>("Mouse utilities").Click();
+            this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Click();
         }
     }
 }

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>("Find My Mouse");
+            var foundCustom0 = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             if (foundCustom0 != null)
             {
-                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+                foundCustom0.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
             }
             else
             {
@@ -42,11 +42,11 @@ namespace MouseUtils.UITests
             settings.FadeDelay = "0";
             settings.FadeDuration = "90";
 
-            var foundCustom = this.Find<Custom>("Mouse Highlighter");
+            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighter));
             if (foundCustom != null)
             {
-                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(true);
-                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(false);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).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>("Enable Mouse Highlighter").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).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>("Enable Mouse Highlighter").Toggle(false);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).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>("Enable Mouse Highlighter").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).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>("Find My Mouse");
+            var foundCustom0 = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             if (foundCustom0 != null)
             {
-                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+                foundCustom0.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
             }
             else
             {
@@ -161,11 +161,11 @@ namespace MouseUtils.UITests
             settings.FadeDelay = "0";
             settings.FadeDuration = "90";
 
-            var foundCustom = this.Find<Custom>("Mouse Highlighter");
+            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighter));
             if (foundCustom != null)
             {
-                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(true);
-                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(false);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).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>("Enable Mouse Highlighter").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).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<TextBlock>("Appearance & behavior");
+            var groupAppearanceBehavior = foundCustom.Find<Group>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterAppearanceBehavior));
             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<TextBlock>("Appearance & behavior");
+            var groupAppearanceBehavior = foundCustom.Find<Group>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterAppearanceBehavior));
             if (groupAppearanceBehavior != null)
             {
                 // groupAppearanceBehavior.Click();
@@ -477,7 +477,7 @@ namespace MouseUtils.UITests
             }
             else
             {
-                Assert.Fail("Appearance & behavior group not found.");
+                Assert.Fail("MouseHighlighter Appearance & behavior group not found.");
             }
         }
 
@@ -485,14 +485,14 @@ namespace MouseUtils.UITests
         {
             this.Session.SetMainWindowSize(WindowSize.Large);
 
-            // Goto Hosts File Editor setting page
-            if (this.FindAll<NavigationViewItem>("Mouse utilities").Count == 0)
+            // Goto Mouse utilities setting page
+            if (this.FindAll(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Count == 0)
             {
-                // Expand Advanced list-group if needed
-                this.Find<NavigationViewItem>("Input / Output").Click();
+                // Expand Input / Output list-group if needed
+                this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.InputOutputNavItem)).Click();
             }
 
-            this.Find<NavigationViewItem>("Mouse utilities").Click();
+            this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Click();
         }
     }
 }

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>("Find My Mouse");
+            var foundCustom0 = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             if (foundCustom0 != null)
             {
-                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
-                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+                foundCustom0.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
+                foundCustom0.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
             }
             else
             {
@@ -45,10 +45,10 @@ namespace MouseUtils.UITests
                 Session.PerformMouseAction(MouseActionType.ScrollDown);
             }
 
-            var foundCustom = this.Find<Custom>("Mouse Jump");
+            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseJump));
             if (foundCustom != null)
             {
-                foundCustom.Find<ToggleSwitch>("Enable Mouse Jump").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseJumpToggle)).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>("Enable Mouse Jump").Toggle(false);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseJumpToggle)).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>("Find My Mouse");
+            var foundCustom0 = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             if (foundCustom0 != null)
             {
-                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
-                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+                foundCustom0.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
+                foundCustom0.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
             }
             else
             {
@@ -124,10 +124,10 @@ namespace MouseUtils.UITests
                 Session.PerformMouseAction(MouseActionType.ScrollDown);
             }
 
-            var foundCustom = this.Find<Custom>("Mouse Jump");
+            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseJump));
             if (foundCustom != null)
             {
-                foundCustom.Find<ToggleSwitch>("Enable Mouse Jump").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseJumpToggle)).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 Hosts File Editor setting page
-            if (this.FindAll<NavigationViewItem>("Mouse utilities").Count == 0)
+            // Goto Mouse utilities setting page
+            if (this.FindAll(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Count == 0)
             {
-                // Expand Advanced list-group if needed
-                this.Find<NavigationViewItem>("Input / Output").ClickCenter();
+                // Expand Input / Output list-group if needed
+                this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.InputOutputNavItem)).Click();
                 Task.Delay(2000).Wait();
             }
 
-            // Goto Hosts File Editor setting page
-            if (this.FindAll<NavigationViewItem>("Mouse utilities").Count == 0)
+            // Goto Mouse utilities setting page
+            if (this.FindAll(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Count == 0)
             {
                 RestartScopeExe();
                 Session.SetMainWindowSize(WindowSize.Large);
                 Task.Delay(1000).Wait();
 
-                // Expand Advanced list-group if needed
-                this.Find<NavigationViewItem>("Input / Output").ClickCenter();
+                // Expand Input / Output list-group if needed
+                this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.InputOutputNavItem)).Click();
                 Task.Delay(2000).Wait();
             }
 
@@ -243,7 +243,7 @@ namespace MouseUtils.UITests
             }
             else
             {
-                this.Find<NavigationViewItem>("Mouse utilities").Click();
+                this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Click();
             }
         }
     }

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<TextBlock>("Appearance & behavior");
+            var groupAppearanceBehavior = foundCustom.Find<Group>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MousePointerCrosshairsAppearanceBehavior));
             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<TextBlock>("Appearance & behavior");
+            var groupAppearanceBehavior = foundCustom.Find<Group>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MousePointerCrosshairsAppearanceBehavior));
             if (groupAppearanceBehavior != null)
             {
                 // groupAppearanceBehavior.Click();
@@ -337,7 +337,7 @@ namespace MouseUtils.UITests
             }
             else
             {
-                Assert.Fail("Appearance & behavior group not found.");
+                Assert.Fail("MousePointerCrosshairs Appearance & behavior group not found.");
             }
         }
 
@@ -371,8 +371,16 @@ namespace MouseUtils.UITests
 
         public Custom? FindMouseUtilElement(MouseUtilsSettings.MouseUtils element)
         {
-            var elementName = MouseUtilsSettings.GetMouseUtilUIName(element);
-            var foundCustom = this.Find<Custom>(elementName);
+            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));
             for (int i = 0; i < 20; i++)
             {
                 if (foundCustom != null)
@@ -381,7 +389,7 @@ namespace MouseUtils.UITests
                 }
 
                 Session.PerformMouseAction(MouseActionType.ScrollDown);
-                foundCustom = this.Find<Custom>(elementName);
+                foundCustom = this.Find<Custom>(By.AccessibilityId(accessibilityId));
             }
 
             return foundCustom;
@@ -391,14 +399,14 @@ namespace MouseUtils.UITests
         {
             Session.SetMainWindowSize(WindowSize.Large);
 
-            // Goto Hosts File Editor setting page
-            if (this.FindAll<NavigationViewItem>("Mouse utilities").Count == 0)
+            // Goto Mouse utilities setting page
+            if (this.FindAll(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Count == 0)
             {
-                // Expand Advanced list-group if needed
-                this.Find<NavigationViewItem>("Input / Output").Click();
+                // Expand Input / Output list-group if needed
+                this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.InputOutputNavItem)).Click();
             }
 
-            this.Find<NavigationViewItem>("Mouse utilities").Click();
+            this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Click();
         }
     }
 }

src/modules/MouseUtils/MouseUtils.UITests/util/MouseUtilsSettings.cs

@@ -11,6 +11,48 @@ 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
         {

src/modules/awake/Awake/AwakeAutomation.cs

@@ -0,0 +1,33 @@
+// 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.Runtime.InteropServices;
+using ManagedCommon;
+
+namespace Awake
+{
+    /// <summary>
+    /// Automation object exposed via the Running Object Table. Intentionally minimal; methods may expand in future.
+    /// </summary>
+    [ComVisible(true)]
+    [ClassInterface(ClassInterfaceType.None)]
+    [Guid("4F1C3769-8D28-4A2D-8A6A-AB2F4C0F5F11")]
+    public sealed class AwakeAutomation : IAwakeAutomation
+    {
+        public string Ping() => "pong";
+
+        public void SetIndefinite() => Logger.LogInfo("Automation: SetIndefinite");
+
+        public void SetTimed(int seconds) => Logger.LogInfo($"Automation: SetTimed {seconds}s");
+
+        public void SetExpirable(int minutes) => Logger.LogInfo($"Automation: SetExpirable {minutes}m");
+
+        public void SetPassive() => Logger.LogInfo("Automation: SetPassive");
+
+        public void Cancel() => Logger.LogInfo("Automation: Cancel");
+
+        public string GetStatusJson() => "{\"ok\":true}";
+    }
+}

src/modules/awake/Awake/IAwakeAutomation.cs

@@ -0,0 +1,31 @@
+// 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.Runtime.InteropServices;
+
+namespace Awake
+{
+    /// <summary>
+    /// COM automation interface exposed via ROT for controlling Awake.
+    /// </summary>
+    [ComVisible(true)]
+    [Guid("5CA92C1D-9D7E-4F6D-9B06-5B7B28BF4E21")]
+    public interface IAwakeAutomation
+    {
+        string Ping();
+
+        void SetIndefinite();
+
+        void SetTimed(int seconds);
+
+        void SetExpirable(int minutes);
+
+        void SetPassive();
+
+        void Cancel();
+
+        string GetStatusJson();
+    }
+}

src/modules/awake/Awake/Program.cs

@@ -96,6 +96,12 @@ namespace Awake
                     Logger.LogInfo($"OS: {Environment.OSVersion}");
                     Logger.LogInfo($"OS Build: {Manager.GetOperatingSystemBuild()}");
 
+                    // Start background COM automation host (ROT) so any startup path exposes the automation surface.
+                    // Uses default moniker; could be extended with a --rotname parameter if needed later.
+                    var rotHost = new RotSingletonHost("Awake.Automation", () => new AwakeAutomation(), "AwakeAutomationRotThread");
+                    rotHost.Start();
+                    AppDomain.CurrentDomain.ProcessExit += (_, _) => rotHost.Stop();
+
                     TaskScheduler.UnobservedTaskException += (sender, args) =>
                     {
                         Trace.WriteLine($"Task scheduler error: {args.Exception.Message}"); // somebody forgot to check!

src/modules/awake/scripts/AwakeRotMini.ps1

@@ -0,0 +1,131 @@
+<#
+  AwakeRotMini.ps1  —  Minimal ROT client for the Awake COM automation object.
+
+  Supported actions:
+    ping            -> Calls Ping(), prints  PING=pong
+    status          -> Calls GetStatusJson(), prints JSON
+    cancel          -> Calls Cancel(), prints CANCEL_OK
+    timed:<m>       -> Calls SetTimed(<m * 60 seconds>), prints TIMED_OK  (minutes input)
+
+  Assumptions:
+    - Server registered object in ROT via CreateItemMoniker("!", logicalName)
+    - We only need late binding (IDispatch InvokeMember) – no type library.
+
+  Exit codes:
+    0 = success
+    2 = object not found in ROT
+    4 = call/parse error
+
+  NOTE: This script intentionally stays dependency‑light and fast to start.
+#>
+param(
+  [string]$MonikerName = 'Awake.Automation',
+  [string]$Action = 'ping'
+)
+
+# ---------------------------------------------------------------------------
+# Inline C# (single public class) – handles:
+#   * ROT lookup via CreateItemMoniker("!", logicalName)
+#   * Late bound InvokeMember calls
+#   * Lightweight action dispatch
+# ---------------------------------------------------------------------------
+if (-not ('AwakeRotMiniClient' -as [type])) {
+  $code = @'
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.ComTypes;
+
+public static class AwakeRotMiniClient
+{
+    // P/Invoke -------------------------------------------------------------
+    [DllImport("ole32.dll")] private static extern int GetRunningObjectTable(int reserved, out IRunningObjectTable rot);
+    [DllImport("ole32.dll")] private static extern int CreateBindCtx(int reserved, out IBindCtx ctx);
+    [DllImport("ole32.dll", CharSet = CharSet.Unicode)] private static extern int CreateItemMoniker(string delimiter, string item, out IMoniker mk);
+
+    // Internal helpers -----------------------------------------------------
+    private static void Open(out IRunningObjectTable rot, out IBindCtx ctx)
+    {
+        GetRunningObjectTable(0, out rot);
+        CreateBindCtx(0, out ctx);
+    }
+
+    private static object BindLogical(string logical)
+    {
+        Open(out var rot, out var ctx);
+        if (CreateItemMoniker("!", logical, out var mk) == 0)
+        {
+            try
+            {
+                rot.GetObject(mk, out var obj);
+                return obj;
+            }
+            catch
+            {
+                // Swallow – treated as not found below.
+            }
+        }
+        return null;
+    }
+
+    private static object Call(object obj, string name, params object[] args)
+    {
+        var t = obj.GetType(); // System.__ComObject
+        return t.InvokeMember(
+            name,
+            System.Reflection.BindingFlags.InvokeMethod |
+            System.Reflection.BindingFlags.Public |
+            System.Reflection.BindingFlags.Instance,
+            null,
+            obj,
+            (args == null || args.Length == 0) ? null : args);
+    }
+
+    // Public entry ---------------------------------------------------------
+    public static string Exec(string logical, string action)
+    {
+        var obj = BindLogical(logical);
+        if (obj == null)
+            return "__NOT_FOUND__";
+
+        if (string.IsNullOrEmpty(action) || action == "ping")
+        {
+            try { return "PING=" + Call(obj, "Ping"); } catch (Exception ex) { return Err(ex); }
+        }
+        try
+        {
+            if (action == "status")
+                return (string)Call(obj, "GetStatusJson");
+            if (action == "cancel")
+            {
+                Call(obj, "Cancel");
+                return "CANCEL_OK";
+            }
+            if (action.StartsWith("timed:", StringComparison.OrdinalIgnoreCase))
+            {
+                var slice = action.Substring(6);
+                if (!int.TryParse(slice, out var minutes) || minutes < 0)
+                    return "__ERR=Format:Invalid minutes";
+                Call(obj, "SetTimed", minutes * 60);
+                return "TIMED_OK";
+            }
+            return "UNKNOWN_ACTION";
+        }
+        catch (Exception ex)
+        {
+            return Err(ex);
+        }
+    }
+
+    private static string Err(Exception ex) => "__ERR=" + ex.GetType().Name + ":" + ex.Message;
+}
+'@
+  Add-Type -TypeDefinition $code -ErrorAction Stop | Out-Null
+}
+
+$result = [AwakeRotMiniClient]::Exec($MonikerName, $Action)
+
+switch ($result) {
+  '__NOT_FOUND__' { exit 2 }
+  { $_ -like '__ERR=*' } { $host.UI.WriteErrorLine($result); exit 4 }
+  default { Write-Output $result; exit 0 }
+}

src/modules/awake/scripts/AwakeRotTest.ps1

@@ -0,0 +1,187 @@
+<#
+Minimal ROT test script for the runtime‑registered Awake automation object.
+
+Usage:
+  .\AwakeRotTest.ps1 [-MonikerName Awake.Automation] -Action <action>
+
+Actions:
+    ping            -> PING=pong
+    status          -> Returns JSON from GetStatusJson (placeholder now)
+    cancel          -> Calls Cancel
+    timed:<m>       -> Calls SetTimed(int minutes)
+    pingdbg         -> Diagnostic: shows type info and invocation paths
+
+Exit codes:
+  0 = success
+  2 = moniker not found
+  3 = (reserved for bind failure – not currently used)
+  4 = method invocation failure
+
+Notes:
+  - The automation object is registered with display name pattern: !<MonikerName>
+  - We late-bind via IDispatch InvokeMember because the object is surfaced as System.__ComObject.
+  - Keep this script self‑contained; avoid multiple Add-Type blocks to prevent type cache issues.
+#>
+param(
+  [string]$MonikerName = 'Awake.Automation',
+  [string]$Action
+)
+
+# ----------------------------
+# Constants (exit codes)
+# ----------------------------
+Set-Variable -Name EXIT_OK -Value 0 -Option Constant
+Set-Variable -Name EXIT_NOT_FOUND -Value 2 -Option Constant
+Set-Variable -Name EXIT_CALL_FAIL -Value 4 -Option Constant
+
+Write-Host '[AwakeRotTest] Start' -ForegroundColor Cyan
+
+# ----------------------------
+# C# helper (enumerate + bind + invoke)
+# ----------------------------
+if (-not ('AwakeRot.Client' -as [type])) {
+  $code = @'
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.ComTypes;
+using System.Collections.Generic;
+using System.Text;
+
+public static class AwakeRotClient
+{
+    [DllImport("ole32.dll")] private static extern int GetRunningObjectTable(int reserved, out IRunningObjectTable rot);
+    [DllImport("ole32.dll")] private static extern int CreateBindCtx(int reserved, out IBindCtx ctx);
+
+    private static (IRunningObjectTable rot, IBindCtx ctx) Open()
+    {
+        GetRunningObjectTable(0, out var rot);
+        CreateBindCtx(0, out var ctx);
+        return (rot, ctx);
+    }
+
+    // (Enumeration removed for simplification – list action no longer supported.)
+
+    // Direct bind using CreateItemMoniker fast-path (avoids full enumeration).
+    [DllImport("ole32.dll", CharSet = CharSet.Unicode)] private static extern int CreateItemMoniker(string lpszDelim, string lpszItem, out IMoniker ppmk);
+
+    private static object Bind(string display)
+    {
+        var (rot, ctx) = Open();
+        if (display.Length > 1 && display[0] == '!')
+        {
+            string logical = display.Substring(1);
+            if (CreateItemMoniker("!", logical, out var mk) == 0 && mk != null)
+            {
+                try
+                {
+                    rot.GetObject(mk, out var directObj);
+                    return directObj; // may be null if not found
+                }
+                catch { return null; }
+            }
+        }
+        return null; // No fallback enumeration (intentionally removed for simplicity/perf determinism)
+    }
+
+    // Strong-typed interface (early binding) – mirrors server's IAwakeAutomation definition.
+    // GUIDs copied from IAwakeAutomation / AwakeAutomation server code.
+    [ComImport]
+    [Guid("5CA92C1D-9D7E-4F6D-9B06-5B7B28BF4E21")] // interface GUID
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    private interface IAwakeAutomation
+    {
+        [PreserveSig] string Ping();
+        void SetIndefinite();
+        void SetTimed(int seconds);
+        void SetExpirable(int minutes);
+        void SetPassive();
+        void Cancel();
+        [PreserveSig] string GetStatusJson();
+    }
+
+    // Fallback late-binding helper (kept for diagnostic / if cast fails)
+    private static object CallLate(object obj, string name, params object[] args)
+    {
+        var t = obj.GetType();
+        return t.InvokeMember(
+            name,
+            System.Reflection.BindingFlags.InvokeMethod |
+            System.Reflection.BindingFlags.Public |
+            System.Reflection.BindingFlags.Instance,
+            binder: null,
+            target: obj,
+            args: (args == null || args.Length == 0) ? null : args);
+    }
+
+    public static string Exec(string logical, string action)
+    {
+        string display = "!" + logical;
+        var obj = Bind(display);
+        if (obj == null)
+            return "__NOT_FOUND__";
+
+        var t = obj.GetType();
+        try
+        {
+            // Try strong-typed cast first.
+            IAwakeAutomation api = obj as IAwakeAutomation;
+            bool typed = api != null;
+
+            if (action == "pingdbg")
+            {
+                var sb = new StringBuilder();
+                sb.AppendLine("TYPE=" + t.FullName);
+                sb.AppendLine("StrongTypedCast=" + typed);
+                if (typed)
+                {
+                    try { sb.AppendLine("TypedPing=" + api.Ping()); } catch (Exception ex) { sb.AppendLine("TypedPingErr=" + ex.Message); }
+                }
+                else
+                {
+                    try { sb.AppendLine("LatePing=" + CallLate(obj, "Ping")); } catch (Exception ex) { sb.AppendLine("LatePingErr=" + ex.Message); }
+                }
+                return sb.ToString();
+            }
+
+            if (string.IsNullOrEmpty(action) || action == "demo")
+            {
+                var ping = typed ? api.Ping() : (string)CallLate(obj, "Ping");
+                return $"DEMO Ping={ping}";
+            }
+            if (action == "ping") return "PING=" + (typed ? api.Ping() : (string)CallLate(obj, "Ping"));
+            if (action == "status") return typed ? api.GetStatusJson() : (string)CallLate(obj, "GetStatusJson");
+            if (action == "cancel") { if (typed) api.Cancel(); else CallLate(obj, "Cancel"); return "CANCEL_OK"; }
+            if (action != null && action.StartsWith("timed:"))
+            {
+                var m = int.Parse(action.Substring(6));
+                // NOTE: Server SetTimed expects seconds (per interface). Action timed:<m> originally treated value as minutes -> semantic mismatch.
+                // For now keep behavior (treat number as minutes -> convert to seconds for strong typed call) to avoid breaking existing usage.
+                if (typed) api.SetTimed(m * 60); else CallLate(obj, "SetTimed", m * 60);
+                return "TIMED_OK";
+            }
+            return "UNKNOWN_ACTION";
+        }
+        catch (Exception ex)
+        {
+            return "__CALL_ERROR__" + ex.GetType().Name + ":" + ex.Message;
+        }
+    }
+}
+'@
+
+  Add-Type -TypeDefinition $code -ErrorAction Stop | Out-Null
+}
+
+# Quick list fast-path
+if ($Action -eq 'list') {
+  [AwakeRotClient]::List() | ForEach-Object { $_ }
+  exit $EXIT_OK
+}
+
+$result = [AwakeRotClient]::Exec($MonikerName, $Action)
+
+switch ($result) {
+  '__NOT_FOUND__' { Write-Host "Moniker !$MonikerName not found." -ForegroundColor Red; [Environment]::Exit($EXIT_NOT_FOUND) }
+  { $_ -like '__CALL_ERROR__*' } { Write-Host "Call failed: $result" -ForegroundColor Red; [Environment]::Exit($EXIT_CALL_FAIL) }
+  default { Write-Host $result -ForegroundColor Green; [Environment]::Exit($EXIT_OK) }
+}

src/modules/cmdpal/Microsoft.CmdPal.Common/Commands/ConfirmableCommand.cs

@@ -0,0 +1,155 @@
+// 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();
+        }
+    }
+}

src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/WellKnownKeyChords.cs

@@ -0,0 +1,51 @@
+// 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);
+}

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

@@ -0,0 +1,34 @@
+// 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;
+    }
+}

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

@@ -0,0 +1,10 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CmdPal.Core.ViewModels;
+
+public interface IGridPropertiesViewModel
+{
+    void InitializeProperties();
+}

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

@@ -45,6 +45,10 @@ 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; }
@@ -516,6 +520,13 @@ 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));
 
@@ -537,9 +548,27 @@ 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 = this._model.Unsafe;
+        var model = _model.Unsafe;
         if (model is null)
         {
             return;
@@ -583,7 +612,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
     {
         base.FetchProperty(propertyName);
 
-        var model = this._model.Unsafe;
+        var model = _model.Unsafe;
         if (model is null)
         {
             return; // throw?
@@ -591,14 +620,20 @@ 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):
-                this.ShowDetails = model.ShowDetails;
+                ShowDetails = model.ShowDetails;
                 break;
             case nameof(PlaceholderText):
-                this._modelPlaceholderText = model.PlaceholderText;
+                _modelPlaceholderText = model.PlaceholderText;
                 break;
             case nameof(SearchText):
-                this.SearchText = model.SearchText;
+                SearchText = model.SearchText;
                 break;
             case nameof(EmptyContent):
                 EmptyContent = new(new(model.EmptyContent), PageContext);

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

@@ -0,0 +1,31 @@
+// 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;
+    }
+}

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

@@ -0,0 +1,22 @@
+// 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()
+    {
+    }
+}

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

@@ -42,6 +42,8 @@ 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; } = [];

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

@@ -38,6 +38,16 @@ public partial class SettingsViewModel : INotifyPropertyChanged
         }
     }
 
+    public bool AllowExternalReload
+    {
+        get => _settings.AllowExternalReload;
+        set
+        {
+            _settings.AllowExternalReload = value;
+            Save();
+        }
+    }
+
     public bool ShowAppDetails
     {
         get => _settings.ShowAppDetails;

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/IconBox.cs

@@ -2,8 +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 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;
@@ -55,6 +57,8 @@ public partial class IconBox : ContentControl
     {
         TabFocusNavigation = KeyboardNavigationMode.Once;
         IsTabStop = false;
+        HorizontalContentAlignment = HorizontalAlignment.Center;
+        VerticalContentAlignment = VerticalAlignment.Center;
     }
 
     private static void OnSourcePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -75,6 +79,8 @@ public partial class IconBox : ContentControl
                     IconSourceElement elem = new()
                     {
                         IconSource = fontIco,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center,
                     };
                     @this.Content = elem;
                     break;
@@ -98,14 +104,20 @@ 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(new(async () =>
+                @this._queue.TryEnqueue(async void () =>
                 {
-                    var requestedTheme = @this.ActualTheme;
-                    var eventArgs = new SourceRequestedEventArgs(e.NewValue, requestedTheme);
-
-                    if (@this.SourceRequested is not null)
+                    try
                     {
+                        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:
@@ -130,37 +142,35 @@ 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
-                        @this.Padding = new Thickness(0);
-
-                        IconDataViewModel? iconData = null;
-                        if (eventArgs.Key is IconDataViewModel)
+                        var iconData = eventArgs.Key switch
                         {
-                            iconData = eventArgs.Key as IconDataViewModel;
+                            IconDataViewModel key => key,
+                            IconInfoViewModel info => requestedTheme == ElementTheme.Light ? info.Light : info.Dark,
+                            _ => null,
+                        };
+
+                        if (iconData?.Icon is not null && @this.Source is FontIconSource)
+                        {
+                            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));
                         }
-                        else if (eventArgs.Key is IconInfoViewModel info)
+                        else
                         {
-                            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);
-                                }
-                            }
+                            @this.Padding = default;
                         }
                     }
-                }));
+                    catch (Exception ex)
+                    {
+                        // Exception from TryEnqueue bypasses the global error handler,
+                        // and crashes the app.
+                        Logger.LogError("Failed to set icon", ex);
+                    }
+                });
             }
         }
     }

src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/GridItemTemplateSelector.cs

@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using 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;
+    }
+}

src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml

@@ -3,6 +3,7 @@
     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"
@@ -11,8 +12,11 @@
     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>
@@ -23,6 +27,7 @@
             IsSourceGrouped="True"
             Source="{x:Bind ViewModel.Items, Mode=OneWay}" />-->
 
+        <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
         <converters:StringVisibilityConverter
             x:Key="StringVisibilityConverter"
             EmptyValue="Collapsed"
@@ -39,6 +44,14 @@
                 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
@@ -102,6 +115,145 @@
                 </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>
@@ -110,66 +262,50 @@
             TargetType="x:Boolean"
             Value="{x:Bind ViewModel.ShowEmptyContent, Mode=OneWay}">
             <controls:Case Value="False">
-                <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
-                    Margin="24"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    Orientation="Vertical"
-                    Spacing="4">
-                    <cpcontrols:IconBox
-                        x:Name="IconBorder"
-                        Width="48"
-                        Height="48"
-                        Margin="8"
-                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        SourceKey="{x:Bind ViewModel.EmptyContent.Icon, Mode=OneWay}"
-                        SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
-                    <TextBlock
-                        Margin="0,4,0,0"
-                        HorizontalAlignment="Center"
-                        FontWeight="SemiBold"
-                        Text="{x:Bind ViewModel.EmptyContent.Title, Mode=OneWay}"
-                        TextAlignment="Center"
-                        TextWrapping="Wrap" />
-                    <TextBlock
-                        HorizontalAlignment="Center"
-                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        Text="{x:Bind ViewModel.EmptyContent.Subtitle, Mode=OneWay}"
-                        TextAlignment="Center"
-                        TextWrapping="Wrap" />
-                </StackPanel>
+                <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>
             </controls:Case>
         </controls:SwitchPresenter>
-
     </Grid>
 </Page>

src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml.cs

@@ -13,6 +13,7 @@ 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;
@@ -38,13 +39,21 @@ 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.ItemsList.Loaded += ItemsList_Loaded;
-        this.ItemsList.PreviewKeyDown += ItemsList_PreviewKeyDown;
-        this.ItemsList.PointerPressed += ItemsList_PointerPressed;
+        this.ItemView.Loaded += Items_Loaded;
+        this.ItemView.PreviewKeyDown += Items_PreviewKeyDown;
+        this.ItemView.PointerPressed += Items_PointerPressed;
     }
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
@@ -55,11 +64,11 @@ public sealed partial class ListPage : Page,
         }
 
         if (e.NavigationMode == NavigationMode.Back
-            || (e.NavigationMode == NavigationMode.New && ItemsList.Items.Count > 0))
+            || (e.NavigationMode == NavigationMode.New && ItemView.Items.Count > 0))
         {
             // Upon navigating _back_ to this page, immediately select the
             // first item in the list
-            ItemsList.SelectedIndex = 0;
+            ItemView.SelectedIndex = 0;
         }
 
         // RegisterAll isn't AOT compatible
@@ -90,7 +99,6 @@ public sealed partial class ListPage : Page,
         {
             ViewModel?.SafeCleanup();
             CleanupHelper.Cleanup(this);
-            Bindings.StopTracking();
         }
 
         // Clean-up event listeners
@@ -100,7 +108,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 ItemsList_ItemClick(object sender, ItemClickEventArgs e)
+    private void Items_ItemClick(object sender, ItemClickEventArgs e)
     {
         if (e.ClickedItem is ListItemViewModel item)
         {
@@ -123,9 +131,9 @@ public sealed partial class ListPage : Page,
         }
     }
 
-    private void ItemsList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
+    private void Items_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
     {
-        if (ItemsList.SelectedItem is ListItemViewModel vm)
+        if (ItemView.SelectedItem is ListItemViewModel vm)
         {
             var settings = App.Current.Services.GetService<SettingsModel>()!;
             if (!settings.SingleClickActivates)
@@ -136,10 +144,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 ItemsList_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    private void Items_SelectionChanged(object sender, SelectionChangedEventArgs e)
     {
         var vm = ViewModel;
-        var li = ItemsList.SelectedItem as ListItemViewModel;
+        var li = ItemView.SelectedItem as ListItemViewModel;
         _ = Task.Run(() =>
         {
             vm?.UpdateSelectedItemCommand.Execute(li);
@@ -154,12 +162,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 (ItemsList.SelectedItem is not null)
+        if (ItemView.SelectedItem is not null)
         {
-            ItemsList.ScrollIntoView(ItemsList.SelectedItem);
+            ItemView.ScrollIntoView(ItemView.SelectedItem);
 
             // Automation notification for screen readers
-            var listViewPeer = Microsoft.UI.Xaml.Automation.Peers.ListViewAutomationPeer.CreatePeerForElement(ItemsList);
+            var listViewPeer = Microsoft.UI.Xaml.Automation.Peers.ListViewAutomationPeer.CreatePeerForElement(ItemView);
             if (listViewPeer is not null && li is not null)
             {
                 var notificationText = li.Title;
@@ -172,10 +180,37 @@ public sealed partial class ListPage : Page,
         }
     }
 
-    private void ItemsList_Loaded(object sender, RoutedEventArgs e)
+    private void Items_RightTapped(object sender, RightTappedRoutedEventArgs e)
     {
-        // Find the ScrollViewer in the ListView
-        var listViewScrollViewer = FindScrollViewer(this.ItemsList);
+        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);
 
         if (listViewScrollViewer is not null)
         {
@@ -207,25 +242,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 (ItemsList.SelectedIndex < ItemsList.Items.Count - 1)
+        if (ItemView.SelectedIndex < ItemView.Items.Count - 1)
         {
-            ItemsList.SelectedIndex++;
+            ItemView.SelectedIndex++;
         }
         else
         {
-            ItemsList.SelectedIndex = 0;
+            ItemView.SelectedIndex = 0;
         }
     }
 
     public void Receive(NavigatePreviousCommand message)
     {
-        if (ItemsList.SelectedIndex > 0)
+        if (ItemView.SelectedIndex > 0)
         {
-            ItemsList.SelectedIndex--;
+            ItemView.SelectedIndex--;
         }
         else
         {
-            ItemsList.SelectedIndex = ItemsList.Items.Count - 1;
+            ItemView.SelectedIndex = ItemView.Items.Count - 1;
         }
     }
 
@@ -235,7 +270,7 @@ public sealed partial class ListPage : Page,
         {
             ViewModel?.InvokeItemCommand.Execute(null);
         }
-        else if (ItemsList.SelectedItem is ListItemViewModel item)
+        else if (ItemView.SelectedItem is ListItemViewModel item)
         {
             ViewModel?.InvokeItemCommand.Execute(item);
         }
@@ -247,7 +282,7 @@ public sealed partial class ListPage : Page,
         {
             ViewModel?.InvokeSecondaryCommandCommand.Execute(null);
         }
-        else if (ItemsList.SelectedItem is ListItemViewModel item)
+        else if (ItemView.SelectedItem is ListItemViewModel item)
         {
             ViewModel?.InvokeSecondaryCommandCommand.Execute(item);
         }
@@ -283,19 +318,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
-        // ItemsList_SelectionChanged again to give us another chance to change
+        // ItemView_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 (ItemsList.SelectedItem is null)
+        if (ItemView.SelectedItem is null)
         {
-            ItemsList.SelectedIndex = 0;
+            ItemView.SelectedIndex = 0;
         }
 
         // Always reset the selected item when the top-level list page changes
         // its items
         if (!sender.IsNested)
         {
-            ItemsList.SelectedIndex = 0;
+            ItemView.SelectedIndex = 0;
         }
     }
 
@@ -304,7 +339,7 @@ public sealed partial class ListPage : Page,
         var prop = e.PropertyName;
         if (prop == nameof(ViewModel.FilteredItems))
         {
-            Debug.WriteLine($"ViewModel.FilteredItems {ItemsList.SelectedItem}");
+            Debug.WriteLine($"ViewModel.FilteredItems {ItemView.SelectedItem}");
         }
     }
 
@@ -328,12 +363,12 @@ public sealed partial class ListPage : Page,
         return null;
     }
 
-    private void ItemsList_OnContextRequested(UIElement sender, ContextRequestedEventArgs e)
+    private void Items_OnContextRequested(UIElement sender, ContextRequestedEventArgs e)
     {
         var (item, element) = e.OriginalSource switch
         {
             // caused by keyboard shortcut (e.g. Context menu key or Shift+F10)
-            ListViewItem listViewItem => (ItemsList.ItemFromContainer(listViewItem) as ListItemViewModel, listViewItem),
+            SelectorItem selectorItem => (ItemView.ItemFromContainer(selectorItem) as ListItemViewModel, selectorItem),
 
             // caused by right-click on the ListViewItem
             FrameworkElement { DataContext: ListItemViewModel itemViewModel } frameworkElement => (itemViewModel, frameworkElement),
@@ -346,9 +381,9 @@ public sealed partial class ListPage : Page,
             return;
         }
 
-        if (ItemsList.SelectedItem != item)
+        if (ItemView.SelectedItem != item)
         {
-            ItemsList.SelectedItem = item;
+            ItemView.SelectedItem = item;
         }
 
         ViewModel?.UpdateSelectedItemCommand.Execute(item);
@@ -371,14 +406,14 @@ public sealed partial class ListPage : Page,
         e.Handled = true;
     }
 
-    private void ItemsList_OnContextCanceled(UIElement sender, RoutedEventArgs e)
+    private void Items_OnContextCanceled(UIElement sender, RoutedEventArgs e)
     {
         _ = DispatcherQueue.TryEnqueue(() => WeakReferenceMessenger.Default.Send<CloseContextMenuMessage>());
     }
 
-    private void ItemsList_PointerPressed(object sender, PointerRoutedEventArgs e) => _lastInputSource = InputSource.Pointer;
+    private void Items_PointerPressed(object sender, PointerRoutedEventArgs e) => _lastInputSource = InputSource.Pointer;
 
-    private void ItemsList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
+    private void Items_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
     {
         if (e.Key is VirtualKey.Enter or VirtualKey.Space)
         {

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

@@ -521,6 +521,21 @@ 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;
+                        }
                     }
                 }
             }

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

@@ -34,6 +34,8 @@
                   <RepositionThemeTransition IsStaggeringEnabled="False" />
               </StackPanel.ChildrenTransitions>-->
 
+                    <!--  'Activation' section  -->
+
                     <TextBlock x:Uid="ActivationSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
                     <controls:SettingsExpander
@@ -66,6 +68,8 @@
                         </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;}">
@@ -84,7 +88,16 @@
                         <ToggleSwitch IsOn="{x:Bind viewModel.ShowSystemTrayIcon, Mode=TwoWay}" />
                     </controls:SettingsCard>
 
-                    <!--  Example 'About' section  -->
+                    <!--  '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  -->
+
                     <TextBlock x:Uid="AboutSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
                     <controls:SettingsExpander x:Uid="Settings_GeneralPage_About_SettingsExpander" HeaderIcon="{ui:BitmapIcon Source=ms-appx:///Assets/StoreLogo.png}">

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

@@ -441,4 +441,13 @@ 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>

src/modules/cmdpal/Microsoft.Terminal.UI/FontIconGlyphClassifier.cpp

@@ -0,0 +1,177 @@
+#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;
+    }
+}

src/modules/cmdpal/Microsoft.Terminal.UI/FontIconGlyphClassifier.h

@@ -0,0 +1,18 @@
+#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);
+}

src/modules/cmdpal/Microsoft.Terminal.UI/FontIconGlyphClassifier.idl

@@ -0,0 +1,62 @@
+// 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);
+    };
+}

src/modules/cmdpal/Microsoft.Terminal.UI/IconPathConverter.cpp

@@ -2,7 +2,7 @@
 #include "IconPathConverter.h"
 #include "IconPathConverter.g.cpp"
 
-// #include "Utils.h"
+ #include "FontIconGlyphClassifier.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,41 +169,46 @@ 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.
-            //
-            // 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)
+            if (!iconSource)
             {
                 try
                 {
-                    typename FontIconSource<TIconSource>::type icon;
-                    const auto ch = til::at(iconPath, 0);
+                    const auto glyph_kind = FontIconGlyphClassifier::Classify(iconPath);
 
-                    // 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)
+                    winrt::hstring family;
+                    if (glyph_kind == FontIconGlyphKind::Invalid)
                     {
-                        icon.FontFamily(winrt::Microsoft::UI::Xaml::Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
+                        family = L"Segoe UI";
                     }
                     else if (!fontFamily.empty())
                     {
-                        icon.FontFamily(winrt::Microsoft::UI::Xaml::Media::FontFamily{ fontFamily });
-
+                        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";
                     }
                     else
                     {
-                        // Note: you _do_ need to manually set the font here.
-                        icon.FontFamily(winrt::Microsoft::UI::Xaml::Media::FontFamily{ L"Segoe UI" });
+                        family = L"Segoe UI";
                     }
+
+                    typename FontIconSource<TIconSource>::type icon;
+                    icon.FontFamily(winrt::Microsoft::UI::Xaml::Media::FontFamily{ family });
                     icon.FontSize(targetSize);
-                    icon.Glyph(iconPath);
+                    icon.Glyph(glyph_kind == FontIconGlyphKind::Invalid ? L"\u25CC" : iconPath);
                     iconSource = icon;
                 }
                 CATCH_LOG();
             }
         }
+
         if (!iconSource)
         {
             // Set the default IconSource to a BitmapIconSource with a null source
@@ -326,7 +331,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:

src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj

@@ -159,6 +159,9 @@
     <ClInclude Include="ResourceString.h">
       <DependentUpon>ResourceString.idl</DependentUpon>
     </ClInclude>
+    <ClInclude Include="FontIconGlyphClassifier.h">
+      <DependentUpon>FontIconGlyphClassifier.idl</DependentUpon>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="init.cpp" />
@@ -178,6 +181,9 @@
       <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" />
@@ -185,6 +191,7 @@
     <Midl Include="RunHistory.idl" />
     <Midl Include="IDirectKeyListener.idl" />
     <Midl Include="ResourceString.idl" />
+    <Midl Include="FontIconGlyphClassifier.idl" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

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

@@ -2,10 +2,9 @@
 // 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;
 
@@ -13,34 +12,22 @@ public class MockSettingsInterface : ISettingsInterface
 {
     private readonly List<HistoryItem> _historyItems;
 
+    public event EventHandler HistoryChanged;
+
     public bool GlobalIfURI { get; set; }
 
-    public uint HistoryItemCount { get; set; }
+    public int HistoryItemCount { get; set; }
 
-    public MockSettingsInterface(uint historyItemCount = 0, bool globalIfUri = true, List<HistoryItem> mockHistory = null)
+    public IReadOnlyList<HistoryItem> HistoryItems => _historyItems;
+
+    public MockSettingsInterface(int historyItemCount = 0, bool globalIfUri = true, List<HistoryItem> mockHistory = null)
     {
         _historyItems = mockHistory ?? new List<HistoryItem>();
         GlobalIfURI = globalIfUri;
         HistoryItemCount = historyItemCount;
     }
 
-    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)
+    public void AddHistoryItem(HistoryItem historyItem)
     {
         if (historyItem is null)
         {
@@ -54,15 +41,18 @@ public class MockSettingsInterface : ISettingsInterface
         {
             while (_historyItems.Count > HistoryItemCount)
             {
-                _historyItems.RemoveAt(0); // Remove the oldest item
+                _historyItems.RemoveAt(0);
             }
         }
+
+        HistoryChanged?.Invoke(this, EventArgs.Empty);
     }
 
     // Helper method for testing
     public void ClearHistory()
     {
         _historyItems.Clear();
+        HistoryChanged?.Invoke(this, EventArgs.Empty);
     }
 
     // Helper method for testing

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

@@ -45,7 +45,7 @@ public class QueryTests : CommandPaletteUnitTestBase
     }
 
     [TestMethod]
-    public async Task LoadHistoryReturnsExpectedItems()
+    public async Task HistoryReturnsExpectedItems()
     {
         // Setup
         var mockHistoryItems = new List<HistoryItem>
@@ -77,7 +77,7 @@ public class QueryTests : CommandPaletteUnitTestBase
     }
 
     [TestMethod]
-    public async Task LoadHistoryMoreThanLimitation()
+    public async Task HistoryExceedingLimitReturnsMaxItems()
     {
         // Setup
         var mockHistoryItems = new List<HistoryItem>
@@ -109,7 +109,7 @@ public class QueryTests : CommandPaletteUnitTestBase
     }
 
     [TestMethod]
-    public async Task LoadHistoryWithDisableSetting()
+    public async Task HistoryWhenSetToNoneReturnEmptyList()
     {
         // Setup
         var mockHistoryItems = new List<HistoryItem>

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

@@ -0,0 +1,48 @@
+// 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;
+    }
+}

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

@@ -133,17 +133,13 @@ internal sealed partial class AppListItem : ListItem
 
         newCommands.Add(new Separator());
 
-        // 0x50 = P
-        // Full key chord would be Ctrl+P
-        var pinKeyChord = KeyChordHelpers.FromModifiers(true, false, false, false, 0x50, 0);
-
         if (isPinned)
         {
             newCommands.Add(
                 new CommandContextItem(
                     new UnpinAppCommand(this.AppIdentifier))
                 {
-                    RequestedShortcut = pinKeyChord,
+                    RequestedShortcut = KeyChords.TogglePin,
                 });
         }
         else
@@ -152,7 +148,7 @@ internal sealed partial class AppListItem : ListItem
                 new CommandContextItem(
                     new PinAppCommand(this.AppIdentifier))
                 {
-                    RequestedShortcut = pinKeyChord,
+                    RequestedShortcut = KeyChords.TogglePin,
                 });
         }
 

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

@@ -0,0 +1,23 @@
+// 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.Common.Helpers;
+using Microsoft.CommandPalette.Extensions;
+
+namespace Microsoft.CmdPal.Ext.Apps;
+
+internal static class KeyChords
+{
+    internal static KeyChord OpenFileLocation { get; } = WellKnownKeyChords.OpenFileLocation;
+
+    internal static KeyChord CopyFilePath { get; } = WellKnownKeyChords.CopyFilePath;
+
+    internal static KeyChord OpenInConsole { get; } = WellKnownKeyChords.OpenInConsole;
+
+    internal static KeyChord RunAsAdministrator { get; } = WellKnownKeyChords.RunAsAdministrator;
+
+    internal static KeyChord RunAsDifferentUser { get; } = WellKnownKeyChords.RunAsDifferentUser;
+
+    internal static KeyChord TogglePin { get; } = WellKnownKeyChords.TogglePin;
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Microsoft.CmdPal.Ext.Apps.csproj

@@ -25,6 +25,7 @@
 
     <ProjectReference Include="..\..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
     <ProjectReference Include="..\..\..\..\common\ManagedCsWin32\ManagedCsWin32.csproj" />
+    <ProjectReference Include="..\..\Microsoft.CmdPal.Common\Microsoft.CmdPal.Common.csproj" />
     <!-- CmdPal Toolkit reference now included via Common.ExtDependencies.props -->
   </ItemGroup>
 

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

@@ -87,7 +87,7 @@ public class UWPApplication : IUWPApplication
                 new CommandContextItem(
                     new RunAsAdminCommand(UniqueIdentifier, string.Empty, true))
                 {
-                    RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.Enter),
+                    RequestedShortcut = KeyChords.RunAsAdministrator,
                 });
 
             // We don't add context menu to 'run as different user', because UWP applications normally installed per user and not for all users.
@@ -97,7 +97,7 @@ public class UWPApplication : IUWPApplication
             new CommandContextItem(
                 new CopyTextCommand(Location) { Name = Resources.copy_path })
             {
-                RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.C),
+                RequestedShortcut = KeyChords.CopyFilePath,
             });
 
         commands.Add(
@@ -107,14 +107,14 @@ public class UWPApplication : IUWPApplication
                     Name = Resources.open_containing_folder,
                 })
             {
-                RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.E),
+                RequestedShortcut = KeyChords.OpenFileLocation,
             });
 
         commands.Add(
         new CommandContextItem(
             new OpenInConsoleCommand(Package.Location))
         {
-            RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.R),
+            RequestedShortcut = KeyChords.OpenInConsole,
         });
 
         commands.Add(

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

@@ -191,32 +191,32 @@ public class Win32Program : IProgram
             commands.Add(new CommandContextItem(
                     new RunAsAdminCommand(!string.IsNullOrEmpty(LnkFilePath) ? LnkFilePath : FullPath, ParentDirectory, false))
             {
-                RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.Enter),
+                RequestedShortcut = KeyChords.RunAsAdministrator,
             });
 
             commands.Add(new CommandContextItem(
                     new RunAsUserCommand(!string.IsNullOrEmpty(LnkFilePath) ? LnkFilePath : FullPath, ParentDirectory))
             {
-                RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.U),
+                RequestedShortcut = KeyChords.RunAsDifferentUser,
             });
         }
 
         commands.Add(new CommandContextItem(
                     new CopyTextCommand(FullPath) { Name = Resources.copy_path })
         {
-            RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.C),
+            RequestedShortcut = KeyChords.CopyFilePath,
         });
 
         commands.Add(new CommandContextItem(
                     new OpenPathCommand(ParentDirectory))
         {
-            RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.E),
+            RequestedShortcut = KeyChords.OpenFileLocation,
         });
 
         commands.Add(new CommandContextItem(
                     new OpenInConsoleCommand(ParentDirectory))
         {
-            RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.R),
+            RequestedShortcut = KeyChords.OpenInConsole,
         });
 
         if (AppType == ApplicationType.ShortcutApplication || AppType == ApplicationType.ApprefApplication || AppType == ApplicationType.Win32Application)

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/ClipboardHistoryCommandsProvider.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 Microsoft.CmdPal.Ext.ClipboardHistory.Helpers;
 using Microsoft.CmdPal.Ext.ClipboardHistory.Pages;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -11,19 +12,25 @@ namespace Microsoft.CmdPal.Ext.ClipboardHistory;
 public partial class ClipboardHistoryCommandsProvider : CommandProvider
 {
     private readonly ListItem _clipboardHistoryListItem;
+    private readonly SettingsManager _settingsManager = new();
 
     public ClipboardHistoryCommandsProvider()
     {
-        _clipboardHistoryListItem = new ListItem(new ClipboardHistoryListPage())
+        _clipboardHistoryListItem = new ListItem(new ClipboardHistoryListPage(_settingsManager))
         {
             Title = Properties.Resources.list_item_title,
             Subtitle = Properties.Resources.list_item_subtitle,
             Icon = Icons.ClipboardListIcon,
+            MoreCommands = [
+                new CommandContextItem(_settingsManager.Settings.SettingsPage),
+            ],
         };
 
         DisplayName = Properties.Resources.provider_display_name;
         Icon = Icons.ClipboardListIcon;
         Id = "Windows.ClipboardHistory";
+
+        Settings = _settingsManager.Settings;
     }
 
     public override IListItem[] TopLevelCommands()

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Commands/DeleteItemCommand.cs

@@ -0,0 +1,31 @@
+// 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.Ext.ClipboardHistory.Models;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+using Windows.ApplicationModel.DataTransfer;
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Commands;
+
+internal sealed partial class DeleteItemCommand : InvokableCommand
+{
+    private readonly ClipboardItem _clipboardItem;
+
+    internal DeleteItemCommand(ClipboardItem clipboardItem)
+    {
+        _clipboardItem = clipboardItem;
+        Name = Properties.Resources.delete_command_name;
+        Icon = Icons.DeleteIcon;
+    }
+
+    public override CommandResult Invoke()
+    {
+        Clipboard.DeleteItemFromHistory(_clipboardItem.Item);
+        return CommandResult.ShowToast(new ToastArgs
+        {
+            Message = Properties.Resources.delete_toast_text,
+            Result = CommandResult.KeepOpen(),
+        });
+    }
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Commands/PasteCommand.cs

@@ -4,6 +4,7 @@
 
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.Common.Messages;
+using Microsoft.CmdPal.Ext.ClipboardHistory.Helpers;
 using Microsoft.CmdPal.Ext.ClipboardHistory.Models;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.ApplicationModel.DataTransfer;
@@ -14,11 +15,13 @@ internal sealed partial class PasteCommand : InvokableCommand
 {
     private readonly ClipboardItem _clipboardItem;
     private readonly ClipboardFormat _clipboardFormat;
+    private readonly ISettingOptions _settings;
 
-    internal PasteCommand(ClipboardItem clipboardItem, ClipboardFormat clipboardFormat)
+    internal PasteCommand(ClipboardItem clipboardItem, ClipboardFormat clipboardFormat, ISettingOptions settings)
     {
         _clipboardItem = clipboardItem;
         _clipboardFormat = clipboardFormat;
+        _settings = settings;
         Name = Properties.Resources.paste_command_name;
         Icon = Icons.PasteIcon;
     }
@@ -39,7 +42,11 @@ internal sealed partial class PasteCommand : InvokableCommand
 
         ClipboardHelper.SendPasteKeyCombination();
 
-        Clipboard.DeleteItemFromHistory(_clipboardItem.Item);
+        if (!_settings.KeepAfterPaste)
+        {
+            Clipboard.DeleteItemFromHistory(_clipboardItem.Item);
+        }
+
         return CommandResult.ShowToast(Properties.Resources.paste_toast_text);
     }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/ISettingOptions.cs

@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Helpers;
+
+public interface ISettingOptions
+{
+    bool KeepAfterPaste { get; }
+
+    bool DeleteFromHistoryRequiresConfirmation { get; }
+}

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

@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.IO;
+using Microsoft.CmdPal.Ext.ClipboardHistory.Properties;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Helpers;
+
+internal sealed class SettingsManager : JsonSettingsManager, ISettingOptions
+{
+    private const string Namespace = "clipboardHistory";
+
+    private static string Namespaced(string propertyName) => $"{Namespace}.{propertyName}";
+
+    private readonly ToggleSetting _keepAfterPaste = new(
+        Namespaced(nameof(KeepAfterPaste)),
+        Resources.settings_keep_after_paste_title!,
+        Resources.settings_keep_after_paste_description!,
+        false);
+
+    private readonly ToggleSetting _confirmDelete = new(
+        Namespaced(nameof(DeleteFromHistoryRequiresConfirmation)),
+        Resources.settings_confirm_delete_title!,
+        Resources.settings_confirm_delete_description!,
+        true);
+
+    public bool KeepAfterPaste => _keepAfterPaste.Value;
+
+    public bool DeleteFromHistoryRequiresConfirmation => _confirmDelete.Value;
+
+    private static string SettingsJsonPath()
+    {
+        var directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
+        Directory.CreateDirectory(directory);
+
+        // now, the state is just next to the exe
+        return Path.Combine(directory, "settings.json");
+    }
+
+    public SettingsManager()
+    {
+        FilePath = SettingsJsonPath();
+
+        Settings.Add(_keepAfterPaste);
+        Settings.Add(_confirmDelete);
+
+        // Load settings from file upon initialization
+        LoadSettings();
+
+        Settings.SettingsChanged += (_, _) => SaveSettings();
+    }
+}

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

@@ -14,5 +14,7 @@ internal sealed class Icons
 
     internal static IconInfo PasteIcon { get; } = new("\uE77F");
 
+    internal static IconInfo DeleteIcon { get; } = new("\uE74D");
+
     internal static IconInfo ClipboardListIcon { get; } = IconHelpers.FromRelativePath("Assets\\ClipboardHistory.svg");
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/KeyChords.cs

@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+using Windows.System;
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory;
+
+internal static class KeyChords
+{
+    internal static KeyChord DeleteEntry { get; } = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.Delete);
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Models/ClipboardItem.cs

@@ -7,7 +7,9 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
+using Microsoft.CmdPal.Common.Commands;
 using Microsoft.CmdPal.Ext.ClipboardHistory.Commands;
+using Microsoft.CmdPal.Ext.ClipboardHistory.Helpers;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Storage.Streams;
@@ -16,9 +18,11 @@ namespace Microsoft.CmdPal.Ext.ClipboardHistory.Models;
 
 public class ClipboardItem
 {
-    public string? Content { get; set; }
+    public string? Content { get; init; }
 
-    public required ClipboardHistoryItem Item { get; set; }
+    public required ClipboardHistoryItem Item { get; init; }
+
+    public required ISettingOptions Settings { get; init; }
 
     public DateTimeOffset Timestamp => Item?.Timestamp ?? DateTimeOffset.MinValue;
 
@@ -87,6 +91,19 @@ public class ClipboardItem
             Data = new DetailsLink(Item.Timestamp.DateTime.ToString(DateTimeFormatInfo.CurrentInfo)),
         });
 
+        var deleteConfirmationCommand = new ConfirmableCommand()
+        {
+            Command = new DeleteItemCommand(this),
+            ConfirmationTitle = Properties.Resources.delete_confirmation_title!,
+            ConfirmationMessage = Properties.Resources.delete_confirmation_message!,
+            IsConfirmationRequired = () => Settings.DeleteFromHistoryRequiresConfirmation,
+        };
+        var deleteContextMenuItem = new CommandContextItem(deleteConfirmationCommand)
+        {
+            IsCritical = true,
+            RequestedShortcut = KeyChords.DeleteEntry,
+        };
+
         if (IsImage)
         {
             var iconData = new IconData(ImageData);
@@ -103,7 +120,9 @@ public class ClipboardItem
                     Metadata = metadata.ToArray(),
                 },
                 MoreCommands = [
-                    new CommandContextItem(new PasteCommand(this, ClipboardFormat.Image))
+                    new CommandContextItem(new PasteCommand(this, ClipboardFormat.Image, Settings)),
+                    new Separator(),
+                    deleteContextMenuItem,
                 ],
             };
         }
@@ -126,8 +145,10 @@ public class ClipboardItem
                     Metadata = metadata.ToArray(),
                 },
                 MoreCommands = [
-                                new CommandContextItem(new PasteCommand(this, ClipboardFormat.Text)),
-                            ],
+                    new CommandContextItem(new PasteCommand(this, ClipboardFormat.Text, Settings)),
+                    new Separator(),
+                    deleteContextMenuItem,
+                ],
             };
         }
         else

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Pages/ClipboardHistoryListPage.cs

@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CmdPal.Ext.ClipboardHistory.Helpers;
 using Microsoft.CmdPal.Ext.ClipboardHistory.Models;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -17,11 +18,15 @@ namespace Microsoft.CmdPal.Ext.ClipboardHistory.Pages;
 
 internal sealed partial class ClipboardHistoryListPage : ListPage
 {
+    private readonly SettingsManager _settingsManager;
     private readonly ObservableCollection<ClipboardItem> clipboardHistory;
     private readonly string _defaultIconPath;
 
-    public ClipboardHistoryListPage()
+    public ClipboardHistoryListPage(SettingsManager settingsManager)
     {
+        ArgumentNullException.ThrowIfNull(settingsManager);
+
+        _settingsManager = settingsManager;
         clipboardHistory = [];
         _defaultIconPath = string.Empty;
         Icon = Icons.ClipboardListIcon;
@@ -84,11 +89,11 @@ internal sealed partial class ClipboardHistoryListPage : ListPage
                 if (item.Content.Contains(StandardDataFormats.Text))
                 {
                     var text = await item.Content.GetTextAsync();
-                    items.Add(new ClipboardItem { Content = text, Item = item });
+                    items.Add(new ClipboardItem { Settings = _settingsManager, Content = text, Item = item });
                 }
                 else if (item.Content.Contains(StandardDataFormats.Bitmap))
                 {
-                    items.Add(new ClipboardItem { Item = item });
+                    items.Add(new ClipboardItem { Settings = _settingsManager, Item = item });
                 }
             }
 

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

@@ -96,6 +96,42 @@ namespace Microsoft.CmdPal.Ext.ClipboardHistory.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Delete.
+        /// </summary>
+        public static string delete_command_name {
+            get {
+                return ResourceManager.GetString("delete_command_name", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Are you sure you want to delete this item from clipboard history? This action cannot be undone..
+        /// </summary>
+        public static string delete_confirmation_message {
+            get {
+                return ResourceManager.GetString("delete_confirmation_message", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Delete item?.
+        /// </summary>
+        public static string delete_confirmation_title {
+            get {
+                return ResourceManager.GetString("delete_confirmation_title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Deleted from clipboard history.
+        /// </summary>
+        public static string delete_toast_text {
+            get {
+                return ResourceManager.GetString("delete_toast_text", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Copy, paste, and search items on the clipboard.
         /// </summary>
@@ -140,5 +176,41 @@ namespace Microsoft.CmdPal.Ext.ClipboardHistory.Properties {
                 return ResourceManager.GetString("provider_display_name", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to .
+        /// </summary>
+        public static string settings_confirm_delete_description {
+            get {
+                return ResourceManager.GetString("settings_confirm_delete_description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Show a confirmation dialog when manually deleting an item.
+        /// </summary>
+        public static string settings_confirm_delete_title {
+            get {
+                return ResourceManager.GetString("settings_confirm_delete_title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to .
+        /// </summary>
+        public static string settings_keep_after_paste_description {
+            get {
+                return ResourceManager.GetString("settings_keep_after_paste_description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Keep items in clipboard history after pasting.
+        /// </summary>
+        public static string settings_keep_after_paste_title {
+            get {
+                return ResourceManager.GetString("settings_keep_after_paste_title", resourceCulture);
+            }
+        }
     }
 }

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

@@ -144,4 +144,28 @@
   <data name="clipboard_failed_to_load" xml:space="preserve">
     <value>Loading clipboard history failed</value>
   </data>
+  <data name="delete_command_name" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="delete_toast_text" xml:space="preserve">
+    <value>Deleted from clipboard history</value>
+  </data>
+  <data name="settings_keep_after_paste_description" xml:space="preserve">
+    <value />
+  </data>
+  <data name="settings_keep_after_paste_title" xml:space="preserve">
+    <value>Keep items in clipboard history after pasting</value>
+  </data>
+  <data name="settings_confirm_delete_title" xml:space="preserve">
+    <value>Show a confirmation dialog when manually deleting an item</value>
+  </data>
+  <data name="settings_confirm_delete_description" xml:space="preserve">
+    <value />
+  </data>
+  <data name="delete_confirmation_title" xml:space="preserve">
+    <value>Delete item?</value>
+  </data>
+  <data name="delete_confirmation_message" xml:space="preserve">
+    <value>Are you sure you want to delete this item from clipboard history? This action cannot be undone.</value>
+  </data>
 </root>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Data/IndexerListItem.cs

@@ -91,9 +91,9 @@ internal sealed partial class IndexerListItem : ListItem
         }
 
         commands.Add(new CommandContextItem(new OpenWithCommand(fullPath)));
-        commands.Add(new CommandContextItem(new ShowFileInFolderCommand(fullPath) { Name = Resources.Indexer_Command_ShowInFolder }));
-        commands.Add(new CommandContextItem(new CopyPathCommand(fullPath) { Name = Resources.Indexer_Command_CopyPath }));
-        commands.Add(new CommandContextItem(new OpenInConsoleCommand(fullPath)));
+        commands.Add(new CommandContextItem(new ShowFileInFolderCommand(fullPath) { Name = Resources.Indexer_Command_ShowInFolder }) { RequestedShortcut = KeyChords.OpenFileLocation });
+        commands.Add(new CommandContextItem(new CopyPathCommand(fullPath) { Name = Resources.Indexer_Command_CopyPath }) { RequestedShortcut = KeyChords.CopyFilePath });
+        commands.Add(new CommandContextItem(new OpenInConsoleCommand(fullPath)) { RequestedShortcut = KeyChords.OpenInConsole });
         commands.Add(new CommandContextItem(new OpenPropertiesCommand(fullPath)));
 
         if (IsActionsFeatureEnabled && ApiInformation.IsApiContractPresent("Windows.AI.Actions.ActionsContract", 4))

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/KeyChords.cs

@@ -0,0 +1,17 @@
+// 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.Common.Helpers;
+using Microsoft.CommandPalette.Extensions;
+
+namespace Microsoft.CmdPal.Ext.Indexer;
+
+internal static class KeyChords
+{
+    internal static KeyChord OpenFileLocation { get; } = WellKnownKeyChords.OpenFileLocation;
+
+    internal static KeyChord CopyFilePath { get; } = WellKnownKeyChords.CopyFilePath;
+
+    internal static KeyChord OpenInConsole { get; } = WellKnownKeyChords.OpenInConsole;
+}

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

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

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

@@ -0,0 +1,119 @@
+// 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.IO;
+using System.Text.Json;
+using System.Threading;
+using ManagedCommon;
+
+namespace Microsoft.CmdPal.Ext.WebSearch.Helpers;
+
+internal sealed class HistoryStore
+{
+    private readonly string _filePath;
+    private readonly List<HistoryItem> _items = [];
+    private readonly Lock _lock = new();
+
+    private int _capacity;
+
+    public event EventHandler? Changed;
+
+    public HistoryStore(string filePath, int capacity)
+    {
+        ArgumentNullException.ThrowIfNull(filePath);
+        ArgumentOutOfRangeException.ThrowIfNegative(capacity);
+
+        _filePath = filePath;
+        _capacity = capacity;
+
+        _items.AddRange(LoadFromDiskSafe());
+        TrimNoLock();
+    }
+
+    public IReadOnlyList<HistoryItem> HistoryItems
+    {
+        get
+        {
+            lock (_lock)
+            {
+                return [.. _items];
+            }
+        }
+    }
+
+    public void Add(HistoryItem item)
+    {
+        ArgumentNullException.ThrowIfNull(item);
+
+        lock (_lock)
+        {
+            _items.Add(item);
+            _ = TrimNoLock();
+            SaveNoLock();
+        }
+
+        Changed?.Invoke(this, EventArgs.Empty);
+    }
+
+    public void SetCapacity(int capacity)
+    {
+        ArgumentOutOfRangeException.ThrowIfNegative(capacity);
+
+        bool trimmed;
+        lock (_lock)
+        {
+            _capacity = capacity;
+            trimmed = TrimNoLock();
+            if (trimmed)
+            {
+                SaveNoLock();
+            }
+        }
+
+        if (trimmed)
+        {
+            Changed?.Invoke(this, EventArgs.Empty);
+        }
+    }
+
+    private bool TrimNoLock()
+    {
+        var max = _capacity;
+        if (_items.Count > max)
+        {
+            _items.RemoveRange(0, _items.Count - max);
+            return true;
+        }
+
+        return false;
+    }
+
+    private List<HistoryItem> LoadFromDiskSafe()
+    {
+        try
+        {
+            if (!File.Exists(_filePath))
+            {
+                return [];
+            }
+
+            var fileContent = File.ReadAllText(_filePath);
+            var historyItems = JsonSerializer.Deserialize<List<HistoryItem>>(fileContent, WebSearchJsonSerializationContext.Default.ListHistoryItem) ?? [];
+            return historyItems;
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError("Unable to load history", ex);
+            return [];
+        }
+    }
+
+    private void SaveNoLock()
+    {
+        var json = JsonSerializer.Serialize(_items, WebSearchJsonSerializationContext.Default.ListHistoryItem);
+        File.WriteAllText(_filePath, json);
+    }
+}

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

@@ -2,6 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.Collections.Generic;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 
@@ -9,11 +10,13 @@ namespace Microsoft.CmdPal.Ext.WebSearch.Helpers;
 
 public interface ISettingsInterface
 {
+    event EventHandler? HistoryChanged;
+
     public bool GlobalIfURI { get; }
 
-    public uint HistoryItemCount { get; }
+    public int HistoryItemCount { get; }
 
-    public List<ListItem> LoadHistory();
+    public IReadOnlyList<HistoryItem> HistoryItems { get; }
 
-    public void SaveHistory(HistoryItem historyItem);
+    public void AddHistoryItem(HistoryItem historyItem);
 }

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

@@ -4,11 +4,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
-using System.Linq;
-using System.Text.Json;
-using Microsoft.CmdPal.Ext.WebSearch.Commands;
+using ManagedCommon;
 using Microsoft.CmdPal.Ext.WebSearch.Properties;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 
@@ -17,10 +14,16 @@ namespace Microsoft.CmdPal.Ext.WebSearch.Helpers;
 public class SettingsManager : JsonSettingsManager, ISettingsInterface
 {
     private const string HistoryItemCountLegacySettingsKey = "ShowHistory";
-    private readonly string _historyPath;
-
     private static readonly string _namespace = "websearch";
 
+    public event EventHandler? HistoryChanged
+    {
+        add => _history.Changed += value;
+        remove => _history.Changed -= value;
+    }
+
+    private readonly HistoryStore _history;
+
     private static string Namespaced(string propertyName) => $"{_namespace}.{propertyName}";
 
     private static readonly List<ChoiceSetSetting.Choice> _choices =
@@ -46,9 +49,26 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
 
     public bool GlobalIfURI => _globalIfURI.Value;
 
-    public uint HistoryItemCount => uint.TryParse(_historyItemCount.Value, out var value) ? value : 0;
+    public int HistoryItemCount => int.TryParse(_historyItemCount.Value, out var value) && value >= 0 ? value : 0;
 
-    internal static string SettingsJsonPath()
+    public IReadOnlyList<HistoryItem> HistoryItems => _history.HistoryItems;
+
+    public SettingsManager()
+    {
+        FilePath = SettingsJsonPath();
+
+        Settings.Add(_globalIfURI);
+        Settings.Add(_historyItemCount);
+
+        LoadSettings();
+
+        // Initialize history store after loading settings to get the correct capacity
+        _history = new HistoryStore(HistoryStateJsonPath(), HistoryItemCount);
+
+        Settings.SettingsChanged += (_, _) => SaveSettings();
+    }
+
+    private static string SettingsJsonPath()
     {
         var directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
         Directory.CreateDirectory(directory);
@@ -57,7 +77,7 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
         return Path.Combine(directory, "settings.json");
     }
 
-    internal static string HistoryStateJsonPath()
+    private static string HistoryStateJsonPath()
     {
         var directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
         Directory.CreateDirectory(directory);
@@ -66,156 +86,30 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
         return Path.Combine(directory, "websearch_history.json");
     }
 
-    public void SaveHistory(HistoryItem historyItem)
+    public void AddHistoryItem(HistoryItem historyItem)
     {
-        if (historyItem is null)
-        {
-            return;
-        }
-
         try
         {
-            List<HistoryItem> historyItems;
-
-            // Check if the file exists and load existing history
-            if (File.Exists(_historyPath))
-            {
-                var existingContent = File.ReadAllText(_historyPath);
-                historyItems = JsonSerializer.Deserialize<List<HistoryItem>>(existingContent, WebSearchJsonSerializationContext.Default.ListHistoryItem) ?? [];
-            }
-            else
-            {
-                historyItems = [];
-            }
-
-            // Add the new history item
-            historyItems.Add(historyItem);
-
-            // Determine the maximum number of items to keep based on HistoryItemCount
-            if (HistoryItemCount > 0)
-            {
-                // Keep only the most recent `maxHistoryItems` items
-                while (historyItems.Count > HistoryItemCount)
-                {
-                    historyItems.RemoveAt(0); // Remove the oldest item
-                }
-            }
-
-            // Serialize the updated list back to JSON and save it
-            var historyJson = JsonSerializer.Serialize(historyItems, WebSearchJsonSerializationContext.Default.ListHistoryItem);
-            File.WriteAllText(_historyPath, historyJson);
+            _history.Add(historyItem);
         }
         catch (Exception ex)
         {
+            Logger.LogError("Failed to add item to the search history", ex);
             ExtensionHost.LogMessage(new LogMessage() { Message = ex.ToString() });
         }
     }
 
-    public List<ListItem> LoadHistory()
-    {
-        try
-        {
-            if (!File.Exists(_historyPath))
-            {
-                return [];
-            }
-
-            // Read and deserialize JSON into a list of HistoryItem objects
-            var fileContent = File.ReadAllText(_historyPath);
-            var historyItems = JsonSerializer.Deserialize<List<HistoryItem>>(fileContent, WebSearchJsonSerializationContext.Default.ListHistoryItem) ?? [];
-
-            // Convert each HistoryItem to a ListItem
-            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", CultureInfo.InvariantCulture), // Ensures consistent formatting
-                });
-            }
-
-            listItems.Reverse();
-            return listItems;
-        }
-        catch (Exception ex)
-        {
-            ExtensionHost.LogMessage(new LogMessage() { Message = ex.ToString() });
-            return [];
-        }
-    }
-
-    public SettingsManager()
-    {
-        FilePath = SettingsJsonPath();
-        _historyPath = HistoryStateJsonPath();
-
-        Settings.Add(_globalIfURI);
-        Settings.Add(_historyItemCount);
-
-        // Load settings from file upon initialization
-        LoadSettings();
-
-        Settings.SettingsChanged += (s, a) => this.SaveSettings();
-    }
-
-    private void ClearHistory()
-    {
-        try
-        {
-            if (File.Exists(_historyPath))
-            {
-                // Delete the history file
-                File.Delete(_historyPath);
-
-                // Log that the history was successfully cleared
-                ExtensionHost.LogMessage(new LogMessage() { Message = "History cleared successfully." });
-            }
-            else
-            {
-                // Log that there was no history file to delete
-                ExtensionHost.LogMessage(new LogMessage() { Message = "No history file found to clear." });
-            }
-        }
-        catch (Exception ex)
-        {
-            // Log any exception that occurs
-            ExtensionHost.LogMessage(new LogMessage() { Message = $"Failed to clear history: {ex}" });
-        }
-    }
-
     public override void SaveSettings()
     {
         base.SaveSettings();
+
         try
         {
-            if (HistoryItemCount == 0)
-            {
-                ClearHistory();
-            }
-            else if (HistoryItemCount > 0)
-            {
-                // Trim the history file if there are more items than the new limit
-                if (File.Exists(_historyPath))
-                {
-                    var existingContent = File.ReadAllText(_historyPath);
-                    var historyItems = JsonSerializer.Deserialize<List<HistoryItem>>(existingContent, WebSearchJsonSerializationContext.Default.ListHistoryItem) ?? [];
-
-                    // Check if trimming is needed
-                    if (historyItems.Count > HistoryItemCount)
-                    {
-                        // Trim the list to keep only the most recent `HistoryItemCount` items
-                        historyItems = historyItems.Skip((int)(historyItems.Count - HistoryItemCount)).ToList();
-
-                        // Save the trimmed history back to the file
-                        var trimmedHistoryJson = JsonSerializer.Serialize(historyItems, WebSearchJsonSerializationContext.Default.ListHistoryItem);
-                        File.WriteAllText(_historyPath, trimmedHistoryJson);
-                    }
-                }
-            }
+            _history.SetCapacity(HistoryItemCount);
         }
         catch (Exception ex)
         {
+            Logger.LogError("Failed to save the search history", ex);
             ExtensionHost.LogMessage(new LogMessage() { Message = ex.ToString() });
         }
     }

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

@@ -5,8 +5,8 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Text;
+using System.Threading;
 using Microsoft.CmdPal.Ext.WebSearch.Commands;
 using Microsoft.CmdPal.Ext.WebSearch.Helpers;
 using Microsoft.CmdPal.Ext.WebSearch.Properties;
@@ -16,31 +16,30 @@ using BrowserInfo = Microsoft.CmdPal.Ext.WebSearch.Helpers.DefaultBrowserInfo;
 
 namespace Microsoft.CmdPal.Ext.WebSearch.Pages;
 
-internal sealed partial class WebSearchListPage : DynamicListPage
+internal sealed partial class WebSearchListPage : DynamicListPage, IDisposable
 {
-    private readonly string _iconPath = string.Empty;
-    private readonly List<ListItem>? _historyItems;
+    private readonly IconInfo _newSearchIcon = new(string.Empty);
     private readonly ISettingsInterface _settingsManager;
+    private readonly Lock _sync = new();
     private static readonly CompositeFormat PluginInBrowserName = System.Text.CompositeFormat.Parse(Properties.Resources.plugin_in_browser_name);
     private static readonly CompositeFormat PluginOpen = System.Text.CompositeFormat.Parse(Properties.Resources.plugin_open);
-    private List<ListItem> _allItems;
+    private IListItem[] _allItems = [];
+    private List<ListItem> _historyItems = [];
 
     public WebSearchListPage(ISettingsInterface settingsManager)
     {
+        ArgumentNullException.ThrowIfNull(settingsManager);
+
         Name = Resources.command_item_title;
         Title = Resources.command_item_title;
         Icon = IconHelpers.FromRelativePath("Assets\\WebSearch.png");
-        _allItems = [];
         Id = "com.microsoft.cmdpal.websearch";
+
         _settingsManager = settingsManager;
-        _historyItems = _settingsManager.HistoryItemCount != 0 ? _settingsManager.LoadHistory() : null;
-        if (_historyItems is not null)
-        {
-            _allItems.AddRange(_historyItems);
-        }
+        _settingsManager.HistoryChanged += SettingsManagerOnHistoryChanged;
 
         // It just looks viewer to have string twice on the page, and default placeholder is good enough
-        PlaceholderText = _allItems.Count > 0 ? Resources.plugin_description : string.Empty;
+        PlaceholderText = _allItems.Length > 0 ? Resources.plugin_description : string.Empty;
 
         EmptyContent = new CommandItem(new NoOpCommand())
         {
@@ -48,45 +47,102 @@ internal sealed partial class WebSearchListPage : DynamicListPage
             Title = Properties.Resources.plugin_description,
             Subtitle = string.Format(CultureInfo.CurrentCulture, PluginInBrowserName, BrowserInfo.Name ?? BrowserInfo.MSEdgeName),
         };
+
+        UpdateHistory();
+        RequeryAndUpdateItems(SearchText);
     }
 
-    public List<ListItem> Query(string query)
+    private void SettingsManagerOnHistoryChanged(object? sender, EventArgs e)
     {
-        ArgumentNullException.ThrowIfNull(query);
-        IEnumerable<ListItem>? filteredHistoryItems = null;
+        UpdateHistory();
+        RequeryAndUpdateItems(SearchText);
+    }
 
-        if (_historyItems is not null)
+    private void UpdateHistory()
+    {
+        List<ListItem> history = [];
+
+        if (_settingsManager.HistoryItemCount > 0)
         {
-            filteredHistoryItems = _settingsManager.HistoryItemCount != 0 ? ListHelpers.FilterList(_historyItems, query).OfType<ListItem>() : null;
+            var items = _settingsManager.HistoryItems;
+            for (var index = items.Count - 1; index >= 0; index--)
+            {
+                var historyItem = items[index];
+                history.Add(new ListItem(new SearchWebCommand(historyItem.SearchString, _settingsManager))
+                {
+                    Title = historyItem.SearchString,
+                    Subtitle = historyItem.Timestamp.ToString("g", CultureInfo.InvariantCulture),
+                });
+            }
         }
 
-        var results = new List<ListItem>();
+        lock (_sync)
+        {
+            _historyItems = history;
+        }
+    }
+
+    private static IListItem[] Query(string query, List<ListItem> historySnapshot, ISettingsInterface settingsManager, IconInfo newSearchIcon)
+    {
+        ArgumentNullException.ThrowIfNull(query);
+
+        var filteredHistoryItems = settingsManager.HistoryItemCount > 0
+            ? ListHelpers.FilterList(historySnapshot, query)
+            : [];
+
+        var results = new List<IListItem>();
 
         if (!string.IsNullOrEmpty(query))
         {
             var searchTerm = query;
-            var result = new ListItem(new SearchWebCommand(searchTerm, _settingsManager))
+            var result = new ListItem(new SearchWebCommand(searchTerm, settingsManager))
             {
                 Title = searchTerm,
                 Subtitle = string.Format(CultureInfo.CurrentCulture, PluginOpen, BrowserInfo.Name ?? BrowserInfo.MSEdgeName),
-                Icon = new IconInfo(_iconPath),
+                Icon = newSearchIcon,
             };
             results.Add(result);
         }
 
-        if (filteredHistoryItems is not null)
+        results.AddRange(filteredHistoryItems);
+
+        return [.. results];
+    }
+
+    private void RequeryAndUpdateItems(string search)
+    {
+        List<ListItem> historySnapshot;
+        lock (_sync)
         {
-            results.AddRange(filteredHistoryItems);
+            historySnapshot = _historyItems;
         }
 
-        return results;
+        var items = Query(search ?? string.Empty, historySnapshot, _settingsManager, _newSearchIcon);
+
+        lock (_sync)
+        {
+            _allItems = items;
+        }
+
+        RaiseItemsChanged();
     }
 
     public override void UpdateSearchText(string oldSearch, string newSearch)
     {
-        _allItems = [.. Query(newSearch)];
-        RaiseItemsChanged(0);
+        RequeryAndUpdateItems(newSearch);
     }
 
-    public override IListItem[] GetItems() => [.. _allItems];
+    public override IListItem[] GetItems()
+    {
+        lock (_sync)
+        {
+            return _allItems;
+        }
+    }
+
+    public void Dispose()
+    {
+        _settingsManager.HistoryChanged -= SettingsManagerOnHistoryChanged;
+        GC.SuppressFinalize(this);
+    }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/WebSearchCommandsProvider.cs

@@ -2,6 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using Microsoft.CmdPal.Ext.WebSearch.Commands;
 using Microsoft.CmdPal.Ext.WebSearch.Helpers;
 using Microsoft.CmdPal.Ext.WebSearch.Properties;
@@ -15,6 +16,9 @@ public partial class WebSearchCommandsProvider : CommandProvider
     private readonly SettingsManager _settingsManager = new();
     private readonly FallbackExecuteSearchItem _fallbackItem;
     private readonly FallbackOpenURLItem _openUrlFallbackItem;
+    private readonly WebSearchTopLevelCommandItem _webSearchTopLevelItem;
+    private readonly ICommandItem[] _topLevelItems;
+    private readonly IFallbackCommandItem[] _fallbackCommands;
 
     public WebSearchCommandsProvider()
     {
@@ -25,18 +29,27 @@ public partial class WebSearchCommandsProvider : CommandProvider
 
         _fallbackItem = new FallbackExecuteSearchItem(_settingsManager);
         _openUrlFallbackItem = new FallbackOpenURLItem(_settingsManager);
-    }
 
-    public override ICommandItem[] TopLevelCommands()
-    {
-        return [new WebSearchTopLevelCommandItem(_settingsManager)
+        _webSearchTopLevelItem = new WebSearchTopLevelCommandItem(_settingsManager)
         {
-            MoreCommands = [
+            MoreCommands =
+            [
                 new CommandContextItem(Settings!.SettingsPage),
             ],
-        }
-        ];
+        };
+        _topLevelItems = [_webSearchTopLevelItem];
+        _fallbackCommands = [_openUrlFallbackItem, _fallbackItem];
     }
 
-    public override IFallbackCommandItem[]? FallbackCommands() => [_openUrlFallbackItem, _fallbackItem];
+    public override ICommandItem[] TopLevelCommands() => _topLevelItems;
+
+    public override IFallbackCommandItem[]? FallbackCommands() => _fallbackCommands;
+
+    public override void Dispose()
+    {
+        _webSearchTopLevelItem?.Dispose();
+
+        base.Dispose();
+        GC.SuppressFinalize(this);
+    }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/WebSearchTopLevelCommandItem.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.IO;
 using Microsoft.CmdPal.Ext.WebSearch.Commands;
 using Microsoft.CmdPal.Ext.WebSearch.Helpers;
 using Microsoft.CmdPal.Ext.WebSearch.Pages;
@@ -13,7 +12,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.WebSearch;
 
-public partial class WebSearchTopLevelCommandItem : CommandItem, IFallbackHandler
+public partial class WebSearchTopLevelCommandItem : CommandItem, IFallbackHandler, IDisposable
 {
     private readonly SettingsManager _settingsManager;
 
@@ -27,17 +26,29 @@ public partial class WebSearchTopLevelCommandItem : CommandItem, IFallbackHandle
 
     private void SetDefaultTitle() => Title = Resources.command_item_title;
 
+    private void ReplaceCommand(ICommand newCommand)
+    {
+        (Command as IDisposable)?.Dispose();
+        Command = newCommand;
+    }
+
     public void UpdateQuery(string query)
     {
         if (string.IsNullOrEmpty(query))
         {
             SetDefaultTitle();
-            Command = new WebSearchListPage(_settingsManager);
+            ReplaceCommand(new WebSearchListPage(_settingsManager));
         }
         else
         {
             Title = query;
-            Command = new SearchWebCommand(query, _settingsManager);
+            ReplaceCommand(new SearchWebCommand(query, _settingsManager));
         }
     }
+
+    public void Dispose()
+    {
+        (Command as IDisposable)?.Dispose();
+        GC.SuppressFinalize(this);
+    }
 }

src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleGalleryListPage.cs

@@ -0,0 +1,66 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace SamplePagesExtension;
+
+internal sealed partial class SampleGalleryListPage : ListPage
+{
+    public SampleGalleryListPage()
+    {
+        Icon = new IconInfo("\uE7C5");
+        Name = "Sample Gallery List Page";
+        GridProperties = new GalleryGridLayout();
+    }
+
+    public override IListItem[] GetItems()
+    {
+        return [
+            new ListItem(new NoOpCommand())
+            {
+                Title = "Sample Title",
+                Subtitle = "I don't do anything",
+                Icon = IconHelpers.FromRelativePath("Assets/Images/RedRectangle.png"),
+            },
+            new ListItem(new NoOpCommand())
+            {
+                Title = "Another Title",
+                Subtitle = "I don't do anything",
+                Icon = IconHelpers.FromRelativePath("Assets/Images/Swirls.png"),
+            },
+            new ListItem(new NoOpCommand())
+            {
+                Title = "More Titles",
+                Subtitle = "I don't do anything",
+                Icon = IconHelpers.FromRelativePath("Assets/Images/Win-Digital.png"),
+            },
+            new ListItem(new NoOpCommand())
+            {
+                Title = "Stop With The Titles",
+                Subtitle = "I don't do anything",
+                Icon = IconHelpers.FromRelativePath("Assets/Images/RedRectangle.png"),
+            },
+            new ListItem(new NoOpCommand())
+            {
+                Title = "Another Title",
+                Subtitle = "I don't do anything",
+                Icon = IconHelpers.FromRelativePath("Assets/Images/Space.png"),
+            },
+            new ListItem(new NoOpCommand())
+            {
+                Title = "More Titles",
+                Subtitle = "I don't do anything",
+                Icon = IconHelpers.FromRelativePath("Assets/Images/Swirls.png"),
+            },
+            new ListItem(new NoOpCommand())
+            {
+                Title = "Stop With The Titles",
+                Subtitle = "I don't do anything",
+                Icon = IconHelpers.FromRelativePath("Assets/Images/Win-Digital.png"),
+            },
+        ];
+    }
+}

src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleIconPage.cs

@@ -0,0 +1,189 @@
+// 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.Linq;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace SamplePagesExtension.Pages;
+
+internal sealed partial class SampleIconPage : ListPage
+{
+    private readonly IListItem[] _items =
+    [
+        /*
+         * Quick intro to Unicode in source code:
+         * - Every character has a code point (e.g., U+0041 = 'A').
+         * - Code points up to U+FFFF use \u1234 (4 hex digits and lowercase u).
+         * - Code points above that (up to U+10FFFF) use \U12345678 (8 hex digits and capital letter U).
+         * - If your source file is UTF-8, you can type the character directly, but it may not display properly in editors,
+         *   and it's harder to see the actual code point.
+         * - Some symbols (like many emojis) are built from multiple code points
+         *   joined together (e.g., 👋🏻 = U+1F44B + U+1F3FB).
+         *
+         * Examples:
+         *   😍 = "😍" or "\U0001F60D"
+         *   👋🏻 = "👋🏻" or "\U0001F44B\U0001F3FB"
+         *   🧙‍♂️ = "🧙‍♂️" or "\U0001F9D9\u200D\u2642\U0000FE0F"   (male mage)
+         *   🧙🏿‍♀️ = "🧙🏿‍♀️" or "\U0001F9D9\U0001F3FF\u200D\u2640\U0000FE0F" (dark-skinned woman mage)
+         *
+         */
+
+        // Emoji Smiling Face with Heart-Eyes
+        // Unicode: \U0001F60D
+        BuildIconItem("😍", "Standard emoji icon", "Basic emoji character rendered as an icon"),
+
+        // Emoji Smiling Face with Heart-Eyes
+        // Unicode: \U0001F60D\U0001F643\U0001F622
+        BuildIconItem("😍🙃😢", "Multiple emojis", "Use of multiple emojis for icon is not allowed"),
+
+        // Emoji Smiling Face with Sunglasses
+        // Unicode: \U0001F60E
+        BuildIconItem("\U0001F60E", "Unicode escape sequence emoji", "Emoji defined using Unicode escape sequence notation"),
+
+        // Segoe Fluent Icons font icon
+        // Unicode: \uE8D4
+        BuildIconItem("\uE8D4", "Segoe Fluent icon demonstration", "Segoe Fluent/MDL2 icon from system font\nWorks as an icon but won't display properly in button text"),
+
+        // Extended pictographic symbol for keyboard
+        BuildIconItem("\u2328", "Extended pictographic symbol", "Pictographic symbol representing a keyboard"),
+
+        // Capital letter A
+        BuildIconItem("A", "Simple text character as icon", "Basic letter character used as an icon demonstration"),
+
+        // Letter 1
+        // Unicode: \U00000031
+        BuildIconItem("1", "Simple text character as icon", "Basic letter character used as an icon demonstration"),
+
+        // Emoji Keycap Digit Two ... 2️⃣
+        // Unicode: \U00000032\U000020E3
+        // This is a sequence of three code points: the digit '2' (U+0032), and a combining enclosing keycap (U+20E3). No variation selector is used here.
+        BuildIconItem("\U00000032\U000020E3", "Emoji without variation selector", "Emoji character doesn't have VS16 variation selector to render as text"),
+
+        // Emoji Keycap Digit Three ... 3️⃣
+        // Unicode: \U00000033\U0000FE0F\U000020E3
+        // This is a sequence of three code points: the digit '3' (U+0033), a variation selector (U+FE0F) to specify emoji presentation, and a combining enclosing keycap (U+20E3).
+        BuildIconItem("3️⃣", "Emoji with variation selector", "Emoji character using a variation selector to specify emoji presentation"),
+
+        // Symbol #
+        // Unicode: \u0023
+        BuildIconItem("#", "Simple text character as icon", "Basic letter character used as an icon demonstration"),
+
+        // Symbol # keycap
+        // Unicode: \u0023\ufe0f\u20e3
+        // Sequence of 3 code points: symbol #, a variation selector (U+FE0F) to specify emoji presentation, and a combining enclosing keycap (U+20E3).
+        BuildIconItem("\u0023\ufe0f\u20e3", "Simple text character as icon", "Basic letter character used as an icon demonstration"),
+
+        // Capital letter WM
+        // This is two characters, which is not a valid icon representation. It will be replaced by a placeholder signalizing an invalid icon.
+        BuildIconItem("WM", "Invalid icon representation", "String with multiple characters that does not correspond to a valid single icon"),
+
+        // Emoji Mage
+        // Unicode: \U0001F9D9
+        BuildIconItem("🧙", "Single code-point emoji example", "Simple emoji character using a single Unicode code point"),
+
+        // Emoji Male Mage (Mage with gender modifier)
+        // Unicode: \U0001F9D9\u200D\u2642\uFE0F
+        BuildIconItem("🧙‍♂️", "Complex emoji with gender modifier", "Composite emoji using Zero-Width Joiner (ZWJ) sequence for male variant"),
+
+        // Emoji Woman Mage (Mage with gender modifier)
+        // Unicode: \U0001F9D9\u200D\u2640\uFE0F
+        BuildIconItem("\U0001F9D9\u200D\u2640\uFE0F", "Complex emoji with gender modifier", "Composite emoji using Zero-Width Joiner (ZWJ) sequence for female variant"),
+
+        // Emoji Waving Hand
+        // Unicode: \U0001F44B
+        BuildIconItem("👋", "Basic hand gesture emoji", "Standard emoji character representing a waving hand"),
+
+        // Emoji Waving Hand + Light Skin Tone
+        // Unicode: \U0001F44B\U0001F3FB
+        BuildIconItem("👋🏻", "Emoji with light skin tone modifier", "Emoji enhanced with Unicode skin tone modifier (light)"),
+
+        // Emoji Waving Hand + Dark Skin Tone
+        // Unicode: \U0001F44B\U0001F3FF
+        BuildIconItem("\U0001F44B\U0001F3FF", "Emoji with dark skin tone modifier", "Emoji enhanced with Unicode skin tone modifier (dark)"),
+
+        // Flag of Czechia (Czech Republic)
+        // Unicode: \U0001F1E8\U0001F1FF
+        BuildIconItem("\U0001F1E8\U0001F1FF", "Flag emoji using regional indicators", "Emoji flag constructed from regional indicator symbols for Czechia"),
+
+        // Use of ZWJ without emojis
+        // KA (\u0995) + VIRAMA (\u09CD) + ZWJ (\u200D) - shows the half-form KA
+        // Unicode: \u0995\u09CD\u200D
+        BuildIconItem("\u0995\u09CD\u200D", "Use of ZWJ in non-emoji context", "Shows the half-form KA"),
+
+        // Use of ZWJ without emojis
+        // KA (\u0995) + VIRAMA (\u09CD) + Shows full KA with an explicit virama mark (not half-form).
+        // Unicode: \u0995\u09CD
+        BuildIconItem("\u0995\u09CD", "Use of ZWJ in non-emoji context", "Shows full KA with an explicit virama mark"),
+
+        // mahjong tile red dragon (using Unicode escape sequence)
+        // https://en.wikipedia.org/wiki/Mahjong_Tiles_(Unicode_block)
+        // Unicode: \U0001F004
+        BuildIconItem("\U0001F004", "Mahjong tile emoji (red dragon)", "Mahjong tile red dragon emoji character using Unicode escape sequence"),
+
+        // mahjong tile green dragon (non-emoji)
+        // https://en.wikipedia.org/wiki/Mahjong_Tiles_(Unicode_block)
+        // Unicode: \U0001F005
+        BuildIconItem("\U0001F005", "Mahjong tile non-emoji (green dragon)", "Mahjong tile character that is not classified as an emoji"),
+
+        // Play, PlayPause, Stop
+        BuildIconItem("\u25B6", "Play symbol (standalone)", "Play symbol"),
+        BuildIconItem("\u25B6\uFE0E", "Play symbol + VS15 (request text)", "Play symbol with variation specifier requesting rendering as text"),
+        BuildIconItem("\u25B6\uFE0F", "Play symbol + VS16 (request emoji)", "Play symbol with variation specifier requesting rendering as emoji "),
+        BuildIconItem("⏯️", "Play/Pause keycap emoji", "Play/Pause keycap emoji doesn't have plain text variant"),
+        BuildIconItem("⏸️", "Pause keycap emoji", "Pause keycap emoji doesn't have plain text variant"),
+
+        // Copyright and emoji copyright:
+        BuildIconItem("\u00a9", "Copyright symbol (standalone)", "Copyright symbol that is not classified as an emoji"),
+        BuildIconItem("\u00a9\uFE0E", "Copyright symbol + VS15 (request text)", "Copyright symbol that is not classified as an emoji"),
+        BuildIconItem("\u00a9\uFE0F", "Copyright symbol + VS16 (request emoji)", "Copyright symbol that is not classified as an emoji"),
+
+        // Tag flags
+        BuildIconItem("🏳️", "White Flag", "White Flag"),
+        BuildIconItem("\U0001F3F4\u200D\u2620\uFE0F", "Pirate Flag", "Pirate Flag"),
+    ];
+
+    public SampleIconPage()
+    {
+        Icon = new IconInfo("\uE8BA");
+        Name = "Sample Icon Page";
+        ShowDetails = true;
+    }
+
+    public override IListItem[] GetItems() => _items;
+
+    private static ListItem BuildIconItem(string icon, string title, string description)
+    {
+        var iconInfo = new IconInfo(icon);
+
+        return new ListItem(new CopyTextCommand(icon) { Name = "Action with " + icon })
+        {
+            Title = title,
+            Subtitle = description,
+            Icon = iconInfo,
+            Tags = [
+                new Tag("Tag") { Icon = iconInfo },
+            ],
+            Details = new Details
+            {
+                HeroImage = iconInfo,
+                Title = title,
+                Body = description,
+                Metadata = [
+                    new DetailsElement
+                    {
+                        Key = "Unicode Code Points",
+                        Data = new DetailsTags
+                        {
+                            Tags = icon.EnumerateRunes()
+                                .Select(rune => rune.Value <= 0xFFFF ? $"\\u{rune.Value:X4}" : $"\\U{rune.Value:X8}")
+                                .Select(t => new Tag(t))
+                                .ToArray<ITag>(),
+                        },
+                    }
+                ],
+            },
+        };
+    }
+}

src/modules/cmdpal/ext/SamplePagesExtension/SamplesListPage.cs

@@ -4,6 +4,7 @@
 
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using SamplePagesExtension.Pages;
 
 namespace SamplePagesExtension;
 
@@ -32,11 +33,21 @@ public partial class SamplesListPage : ListPage
             Title = "Dynamic List Page Command",
             Subtitle = "Changes the list of items in response to the typed query",
         },
+        new ListItem(new SampleGalleryListPage())
+        {
+            Title = "Gallery List Page Command",
+            Subtitle = "Displays items as a gallery",
+        },
         new ListItem(new OnLoadPage())
         {
             Title = "Demo of OnLoad/OnUnload",
             Subtitle = "Changes the list of items every time the page is opened / closed",
         },
+        new ListItem(new SampleIconPage())
+        {
+            Title = "Sample Icon Page",
+            Subtitle = "A demo of using icons in various ways",
+        },
 
         // Content pages
         new ListItem(new SampleContentPage())

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

@@ -0,0 +1,32 @@
+// 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.CommandPalette.Extensions.Toolkit;
+
+public partial class GalleryGridLayout : BaseObservable, IGalleryGridLayout
+{
+    public virtual bool ShowTitle
+    {
+        get => field;
+        set
+        {
+            field = value;
+            OnPropertyChanged(nameof(ShowTitle));
+        }
+    }
+
+    = true;
+
+    public virtual bool ShowSubtitle
+    {
+        get => field;
+        set
+        {
+            field = value;
+            OnPropertyChanged(nameof(ShowSubtitle));
+        }
+    }
+
+    = true;
+}

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

@@ -0,0 +1,20 @@
+// 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.CommandPalette.Extensions.Toolkit;
+
+public partial class MediumGridLayout : BaseObservable, IMediumGridLayout
+{
+    public virtual bool ShowTitle
+    {
+        get => field;
+        set
+        {
+            field = value;
+            OnPropertyChanged(nameof(ShowTitle));
+        }
+    }
+
+    = true;
+}

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

@@ -0,0 +1,9 @@
+// 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.CommandPalette.Extensions.Toolkit;
+
+public partial class SmallGridLayout : BaseObservable, ISmallGridLayout
+{
+}

src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.idl

@@ -273,10 +273,26 @@ namespace Microsoft.CommandPalette.Extensions
         String Section { get; };
         String TextToSuggest { get; };
     }
+
+    [uuid("50C6F080-1CBE-4CE4-B92F-DA2F116ED524")]
+    [contract(Microsoft.CommandPalette.Extensions.ExtensionsContract, 1)]
+    interface IGridProperties requires INotifyPropChanged { }
+
+    [uuid("05914D59-6ECB-4992-9CF2-5982B5120A26")]
+    [contract(Microsoft.CommandPalette.Extensions.ExtensionsContract, 1)]
+    interface ISmallGridLayout requires IGridProperties { }
     
     [contract(Microsoft.CommandPalette.Extensions.ExtensionsContract, 1)]
-    interface IGridProperties  {
-        Windows.Foundation.Size TileSize { get; };
+    interface IMediumGridLayout requires IGridProperties
+    {
+        Boolean ShowTitle { get; };
+    }
+    
+    [contract(Microsoft.CommandPalette.Extensions.ExtensionsContract, 1)]
+    interface IGalleryGridLayout requires IGridProperties
+    {
+        Boolean ShowTitle { get; };
+        Boolean ShowSubtitle { get; };
     }
     
     [contract(Microsoft.CommandPalette.Extensions.ExtensionsContract, 1)]

src/modules/poweraccent/PowerAccent.Core/Languages.cs

@@ -781,14 +781,14 @@ namespace PowerAccent.Core
         {
             return letter switch
             {
-                LetterKey.VK_A => new[] { "â" },
-                LetterKey.VK_E => new[] { "ê" },
-                LetterKey.VK_I => new[] { "î" },
-                LetterKey.VK_O => new[] { "ô" },
+                LetterKey.VK_A => new[] { "â", "ä", "à", "á" },
+                LetterKey.VK_E => new[] { "ê", "ë", "è", "é" },
+                LetterKey.VK_I => new[] { "î", "ï", "ì", "í" },
+                LetterKey.VK_O => new[] { "ô", "ö", "ò", "ó" },
                 LetterKey.VK_P => new[] { "£" },
-                LetterKey.VK_U => new[] { "û" },
-                LetterKey.VK_Y => new[] { "ŷ" },
-                LetterKey.VK_W => new[] { "ŵ" },
+                LetterKey.VK_U => new[] { "û", "ü", "ù", "ú" },
+                LetterKey.VK_Y => new[] { "ŷ", "ÿ", "ỳ", "ý" },
+                LetterKey.VK_W => new[] { "ŵ", "ẅ", "ẁ", "ẃ" },
                 _ => Array.Empty<string>(),
             };
         }

src/runner/runner.instructions.md

@@ -0,0 +1,17 @@
+---
+applyTo: "**/*.cpp,**/*.c,**/*.h,**/*.hpp,**/*.rc"
+---
+# Runner – tray / host process guidance
+
+Scope
+- Module bootstrap, hotkey management, settings bridge, update/elevation handling.
+
+Guidelines
+- If IPC/JSON contracts change, mirror updates in `src/settings-ui/**`.
+- Keep module discovery in `src/runner/main.cpp` in sync when adding/removing modules.
+- Keep startup lean: avoid blocking/network calls in early init path.
+- Preserve GPO & elevation behaviors; confirm no regression in policy handling.
+- Ask before modifying update workflow or elevation logic.
+
+Acceptance
+- Stable startup, consistent contracts, no unnecessary logging noise.

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

@@ -161,6 +161,9 @@
 		<Page Update="SettingsXAML\Controls\KeyVisual\KeyCharPresenter.xaml">
 			<Generator>MSBuild:Compile</Generator>
 		</Page>
+		<Page Update="SettingsXAML\Controls\GPOInfoControl.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
 		<Page Update="SettingsXAML\Controls\Dashboard\ShortcutConflictControl.xaml">
 			<Generator>MSBuild:Compile</Generator>
 		</Page>

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls">
+    <Style TargetType="local:GPOInfoControl">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="local:GPOInfoControl">
+                    <StackPanel Orientation="Vertical">
+                        <ContentPresenter Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+                        <InfoBar
+                            x:Uid="GPO_SettingIsManaged"
+                            Margin="0,4,0,0"
+                            IsClosable="False"
+                            IsOpen="{TemplateBinding ShowWarning}"
+                            IsTabStop="{TemplateBinding ShowWarning}"
+                            Severity="Informational">
+                            <InfoBar.IconSource>
+                                <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                            </InfoBar.IconSource>
+                        </InfoBar>
+                    </StackPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>

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

@@ -0,0 +1,49 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Documents;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+
+namespace Microsoft.PowerToys.Settings.UI.Controls;
+
+public sealed partial class GPOInfoControl : ContentControl
+{
+    public static readonly DependencyProperty ShowWarningProperty =
+      DependencyProperty.Register(
+          nameof(ShowWarning),
+          typeof(bool),
+          typeof(GPOInfoControl),
+          new PropertyMetadata(false, OnShowWarningPropertyChanged));
+
+    public bool ShowWarning
+    {
+        get => (bool)GetValue(ShowWarningProperty);
+        set => SetValue(ShowWarningProperty, value);
+    }
+
+    private static void OnShowWarningPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is GPOInfoControl gpoInfoControl)
+        {
+            if (gpoInfoControl.ShowWarning)
+            {
+                gpoInfoControl.IsEnabled = false;
+            }
+        }
+    }
+
+    public GPOInfoControl()
+    {
+        DefaultStyleKey = typeof(GPOInfoControl);
+    }
+}