dev

Bug: If light switch is transitioning while the computer is offline,
Light Switch will not clear the manual override at the boundary.
Fix: Ensure the "Clear override" logic checks if we are at or past a
boundary point.

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

@@ -94,6 +94,7 @@ ASSOCSTR
 ASYNCWINDOWPLACEMENT
 ASYNCWINDOWPOS
 atl
+ATX
 ATRIOX
 aumid
 Authenticode
@@ -113,6 +114,7 @@ azman
 bbwe
 BCIE
 bck
+backticks
 BESTEFFORT
 bezelled
 bhid
@@ -268,6 +270,7 @@ countof
 covrun
 cpcontrols
 cph
+cppcoreguidelines
 cplusplus
 CPower
 cpptools
@@ -513,6 +516,7 @@ FARPROC
 fdx
 fesf
 FFFF
+Figma
 FILEEXPLORER
 fileexploreraddons
 fileexplorerpreview
@@ -747,7 +751,7 @@ INITDIALOG
 INITGUID
 INITTOLOGFONTSTRUCT
 INLINEPREFIX
-Inlines
+inlines
 INPC
 inproc
 INPUTHARDWARE

.github/copilot-instructions.md

@@ -1,43 +1,59 @@
-# PowerToys – Copilot guide (concise)
+---
+description: PowerToys AI contributor guidance.
+applyTo: pullRequests
+---
+
+# 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)
+# 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)
+# 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.
+  - One terminal per operation (build -> test). Do not switch or 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).
+  - Use scripts to build, synchronously block and wait in foreground for completion: `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. Read the errors log in the build folder (such as `build.*.*.errors.log`) and surface problems.
+  - Do not start tests or launch Runner until the previous step succeeded.
+- Tests (fast and targeted):
+  - Find the test project by product code prefix (for example FancyZones, AdvancedPaste). Look for a sibling folder or one to two 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 or adjust tests when changing behavior; if skipped, state why (for example comment-only or string rename).
 
-Pull requests (expectations)
-- Atomic: one logical change; no drive‑by refactors.
-- Describe: problem / approach / risk / test evidence.
+# 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
+# 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.
+- Cross-module impact (shared enum or struct) not clear.
+- Security, elevation, or 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`.
+# Logging (use existing stacks)
+- C++ logging lives in `src/common/logger/**` (`Logger::info`, `Logger::warn`, `Logger::error`, `Logger::debug`). Keep hot paths quiet (hooks, tight loops).
+- C# logging goes through `ManagedCommon.Logger` (`LogInfo`, `LogWarning`, `LogError`, `LogDebug`, `LogTrace`). Some UIs use injected `ILogger` via `LoggerInstance.Logger`.
 
-Docs to consult
+# 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`
+- `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?
+# Language style rules
+- Always enforce repo analyzers: root `.editorconfig` plus any `stylecop.json`.
+- C# code follows StyleCop.Analyzers and Microsoft.CodeAnalysis.NetAnalyzers.
+- C++ code honors `.clang-format` plus `.clang-tidy` (modernize/cppcoreguidelines/readability).
+- Markdown files wrap at 80 characters and use ATX headers with fenced code blocks that include language tags.
+- YAML files indent two spaces and add comments for complex settings while keeping keys clear.
+- PowerShell scripts use Verb-Noun names and prefer single-quoted literals while documenting parameters and satisfying PSScriptAnalyzer.
+
+# Done checklist (self review before finishing)
+- Build clean? Tests updated or passed? No unintended formatting? Any new dependency? Documented skips?

.github/prompts/create-commit-title.prompt.md

@@ -0,0 +1,16 @@
+---
+mode: 'agent'
+model: GPT-5-Codex (Preview)
+description: 'Generate an 80-character git commit title for the local diff.'
+---
+
+**Goal:** Provide a ready-to-paste git commit title (<= 80 characters) that captures the most important local changes since `HEAD`.
+
+**Workflow:**
+1. Run a single command to view the local diff since the last commit:
+   ```@terminal
+   git diff HEAD
+   ```
+2. From that diff, identify the dominant area (reference key paths like `src/modules/*`, `doc/devdocs/**`, etc.), the type of change (bug fix, docs update, config tweak), and any notable impact.
+3. Draft a concise, imperative commit title summarizing the dominant change. Keep it plain ASCII, <= 80 characters, and avoid trailing punctuation. Mention the primary component when obvious (for example `FancyZones:` or `Docs:`).
+4. Respond with only the final commit title on a single line so it can be pasted directly into `git commit`.

.github/prompts/create-pr-summary.prompt.md

@@ -0,0 +1,22 @@
+---
+mode: 'agent'
+model: GPT-5-Codex (Preview)
+description: 'Generate a PowerToys-ready pull request description from the local diff.'
+---
+
+**Goal:** Produce a ready-to-paste PR title and description that follows PowerToys conventions by comparing the current branch against a user-selected target branch.
+
+**Repo guardrails:**
+- Treat `.github/pull_request_template.md` as the single source of truth; load it at runtime instead of embedding hardcoded content in this prompt.
+- Preserve section order from the template but only surface checklist lines that are relevant for the detected changes, filling them with `[x]`/`[ ]` as appropriate.
+- Cite touched paths with inline backticks, matching the guidance in `.github/copilot-instructions.md`.
+- Call out test coverage explicitly: list automated tests run (unit/UI) or state why they are not applicable.
+
+**Workflow:**
+1. Determine the target branch from user context; default to `main` when no branch is supplied.
+2. Run `git status --short` once to surface uncommitted files that may influence the summary.
+3. Run `git diff <target-branch>...HEAD` a single time to review the detailed changes. Only when confidence stays low dig deeper with focused calls such as `git diff <target-branch>...HEAD -- <path>`.
+4. From the diff, capture impacted areas, key file changes, behavioral risks, migrations, and noteworthy edge cases.
+5. Confirm validation: list tests executed with results or state why tests were skipped in line with repo guidance.
+6. Load `.github/pull_request_template.md`, mirror its section order, and populate it with the gathered facts. Include only relevant checklist entries, marking them `[x]/[ ]` and noting any intentional omissions as "N/A".
+7. Present the filled template inside a fenced ```markdown code block with no extra commentary so it is ready to paste into a PR, clearly flagging any placeholders that still need user input.

.github/prompts/fix-spelling.prompt.md

@@ -0,0 +1,22 @@
+---
+mode: 'agent'
+model: GPT-5-Codex (Preview)
+description: 'Resolve Code scanning / check-spelling comments on the active PR.'
+---
+
+**Goal:** Clear every outstanding GitHub pull request comment created by the `Code scanning / check-spelling` workflow by explicitly allowing intentional terms.
+
+**Guardrails:**
+- Update only discussion threads authored by `github-actions` or `github-actions[bot]` that mention `Code scanning results / check-spelling`.
+- Resolve findings solely by editing `.github/actions/spell-check/expect.txt`; reuse existing entries.
+- Leave all other files and topics untouched.
+
+**Prerequisites:**
+- Install GitHub CLI if it is not present: `winget install GitHub.cli`.
+- Run `gh auth login` once before the first CLI use.
+
+**Workflow:**
+1. Determine the active pull request with a single `gh pr view --json number` call (default to the current branch).
+2. Fetch all PR discussion data once via `gh pr view --json comments,reviews` and filter to check-spelling comments authored by `github-actions` or `github-actions[bot]` that are not minimized; when several remain, process only the most recent comment body.
+3. For each flagged token, review `.github/actions/spell-check/expect.txt` for an equivalent term (for example an existing lowercase variant); when found, reuse that normalized term rather than adding a new entry, even if the flagged token differs only by casing. Only add a new entry after confirming no equivalent already exists.
+4. Add any remaining missing token to `.github/actions/spell-check/expect.txt`, keeping surrounding formatting intact.

.pipelines/v2/release.yml

@@ -73,10 +73,11 @@ extends:
             parameters:
               pool:
                 name: SHINE-INT-L
-                ${{ if eq(parameters.useVSPreview, true) }}:
-                  demands: ImageOverride -equals SHINE-VS17-Preview
-                ${{ else }}:
-                  image: SHINE-VS17-Latest
+                demands:
+                  # Our INT agents have a large disk mounted at P:\
+                  - WorkFolder -equals P:\_work
+                  - ${{ if eq(parameters.useVSPreview, true) }}:
+                    - ImageOverride -equals SHINE-VS17-Preview
                 os: windows
               variables:
                 IsPipeline: 1 # The installer uses this to detect whether it should pick up localizations

Cpp.Build.props

@@ -1,6 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0"
   xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Hybrid CRT configuration -->
+  <PropertyGroup Condition="'$(HybridCrtConfiguration)'==''">
+    <HybridCrtConfiguration>$(Configuration)</HybridCrtConfiguration>
+  </PropertyGroup>
+
+  <!-- Skip Hybrid CRT for AppContainer/UWP projects as they require MultiThreadedDLL -->
+  <PropertyGroup Condition="'$(AppContainerApplication)'=='true' and '$(_VC_Target_Library_Platform)'!='Desktop'">
+    <HybridCrtConfiguration></HybridCrtConfiguration>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup Condition="'$(HybridCrtConfiguration)'=='Debug'">
+    <ClCompile>
+      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
+           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
+           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
+           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
+      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(HybridCrtConfiguration)'=='Release'">
+    <ClCompile>
+      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
+           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
+           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
+           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
+      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <!-- AppContainer/UWP projects must use MultiThreadedDLL -->
+  <ItemDefinitionGroup Condition="'$(AppContainerApplication)'=='true' and '$(_VC_Target_Library_Platform)'!='Desktop' And '$(Configuration)'=='Debug'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(AppContainerApplication)'=='true' and '$(_VC_Target_Library_Platform)'!='Desktop' And '$(Configuration)'=='Release'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
 
   <!-- Project configurations -->
   <ItemGroup Label="ProjectConfigurations">
@@ -73,7 +123,6 @@
     <ClCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -83,7 +132,6 @@
     <ClCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>

PowerToys.sln

@@ -74,6 +74,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRename.UnitTests", "sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModuleTemplateCompileTest", "tools\project_template\ModuleTemplate\ModuleTemplateCompileTest.vcxproj", "{64A80062-4D8B-4229-8A38-DFA1D7497749}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ptcli", "tools\ptcli\ptcli.csproj", "{2589570C-B068-41CA-A554-BDCAE6FC4CAC}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManager", "src\modules\keyboardmanager\dll\KeyboardManager.vcxproj", "{89F34AF7-1C34-4A72-AA6E-534BCF972BD9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "imageresizer", "imageresizer", "{6C7F47CC-2151-44A3-A546-41C70025132C}"
@@ -926,6 +928,14 @@ Global
 		{64A80062-4D8B-4229-8A38-DFA1D7497749}.Release|ARM64.Build.0 = Release|ARM64
 		{64A80062-4D8B-4229-8A38-DFA1D7497749}.Release|x64.ActiveCfg = Release|x64
 		{64A80062-4D8B-4229-8A38-DFA1D7497749}.Release|x64.Build.0 = Release|x64
+		{2589570C-B068-41CA-A554-BDCAE6FC4CAC}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{2589570C-B068-41CA-A554-BDCAE6FC4CAC}.Debug|ARM64.Build.0 = Debug|ARM64
+		{2589570C-B068-41CA-A554-BDCAE6FC4CAC}.Debug|x64.ActiveCfg = Debug|x64
+		{2589570C-B068-41CA-A554-BDCAE6FC4CAC}.Debug|x64.Build.0 = Debug|x64
+		{2589570C-B068-41CA-A554-BDCAE6FC4CAC}.Release|ARM64.ActiveCfg = Release|ARM64
+		{2589570C-B068-41CA-A554-BDCAE6FC4CAC}.Release|ARM64.Build.0 = Release|ARM64
+		{2589570C-B068-41CA-A554-BDCAE6FC4CAC}.Release|x64.ActiveCfg = Release|x64
+		{2589570C-B068-41CA-A554-BDCAE6FC4CAC}.Release|x64.Build.0 = Release|x64
 		{89F34AF7-1C34-4A72-AA6E-534BCF972BD9}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{89F34AF7-1C34-4A72-AA6E-534BCF972BD9}.Debug|ARM64.Build.0 = Debug|ARM64
 		{89F34AF7-1C34-4A72-AA6E-534BCF972BD9}.Debug|x64.ActiveCfg = Debug|x64

README.md

@@ -48,7 +48,7 @@ Before you begin, make sure your device meets the system requirements:
 
 Choose one of the installation methods below:
 
-<details>
+<details open>
 <summary>Download .exe from GitHub</summary>
 
 Go to the [PowerToys GitHub releases][github-release-link], click Assets to reveal the downloads, and choose the installer that matches your architecture and install scope. For most devices, that's the x64 per-user installer.
@@ -56,17 +56,17 @@ Go to the [PowerToys GitHub releases][github-release-link], click Assets to reve
 <!-- items that need to be updated release to release -->
 [github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.96%22
 [github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.95%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.0/PowerToysUserSetup-0.95.0-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.0/PowerToysUserSetup-0.95.0-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.0/PowerToysSetup-0.95.0-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.0/PowerToysSetup-0.95.0-arm64.exe
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysUserSetup-0.95.1-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysUserSetup-0.95.1-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysSetup-0.95.1-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysSetup-0.95.1-arm64.exe
  
 |  Description   | Filename |
 |----------------|----------|
-| Per user - x64       | [PowerToysUserSetup-0.95.0-x64.exe][ptUserX64] |
-| Per user - ARM64     | [PowerToysUserSetup-0.95.0-arm64.exe][ptUserArm64] |
-| Machine wide - x64   | [PowerToysSetup-0.95.0-x64.exe][ptMachineX64] |
-| Machine wide - ARM64 | [PowerToysSetup-0.95.0-arm64.exe][ptMachineArm64] |
+| Per user - x64       | [PowerToysUserSetup-0.95.1-x64.exe][ptUserX64] |
+| Per user - ARM64     | [PowerToysUserSetup-0.95.1-arm64.exe][ptUserArm64] |
+| Machine wide - x64   | [PowerToysSetup-0.95.1-x64.exe][ptMachineX64] |
+| Machine wide - ARM64 | [PowerToysSetup-0.95.1-arm64.exe][ptMachineArm64] |
 
 </details>
 
@@ -281,4 +281,4 @@ The application logs basic diagnostic data (telemetry). For more privacy informa
 [roadmap]: https://github.com/microsoft/PowerToys/wiki/Roadmap
 [privacy-link]: http://go.microsoft.com/fwlink/?LinkId=521839 
 [loc-bug]: https://github.com/microsoft/PowerToys/issues/new?assignees=&labels=&template=translation_issue.md&title= 
-[usingPowerToys-docs-link]: https://aka.ms/powertoys-docs
+[usingPowerToys-docs-link]: https://aka.ms/powertoys-docs

installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj

@@ -38,7 +38,6 @@
     <OutDir Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup\</OutDir>
     <IntDir Condition=" '$(PerUser)' != 'true' ">$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\MachineSetup\obj\</IntDir>
     <IntDir Condition=" '$(PerUser)' == 'true' ">$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\UserSetup\obj\</IntDir>
-    <!-- The CMD script below checks this value, and it is **CASE SENSITIVE** -->
     <NormalizedPerUserValue>false</NormalizedPerUserValue>
     <NormalizedPerUserValue Condition=" '$(PerUser)' == 'true' ">true</NormalizedPerUserValue>
   </PropertyGroup>
@@ -115,7 +114,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -128,7 +126,6 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     </ClCompile>
     <Link>

installer/PowerToysSetupVNext/Directory.Build.props

@@ -1,4 +1,5 @@
 <Project>
+  <Import Project="..\..\Directory.Build.props" Condition="Exists('..\..\Directory.Build.props')" />
   <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
   <PropertyGroup>
     <!-- Set BaseIntermediateOutputPath for each project to avoid conflicts -->
@@ -8,4 +9,4 @@
     <!-- Set MSBuildProjectExtensionsPath to use the BaseIntermediateOutputPath -->
     <MSBuildProjectExtensionsPath Condition="'$(BaseIntermediateOutputPath)' != ''">$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
   </PropertyGroup>
-</Project>
+</Project>

installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunction.vcxproj

@@ -1,30 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-
   <PropertyGroup Label="Globals">
     <ProjectGuid>{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}</ProjectGuid>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
     <TargetName>SilentFilesInUseBAFunction</TargetName>
     <ProjectName>PowerToysSetupCustomActionsVNext</ProjectName>
     <ProjectModuleDefinitionFile>bafunctions.def</ProjectModuleDefinitionFile>
@@ -33,7 +10,6 @@
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   
-  <!-- Configuration-specific property groups -->
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -65,7 +41,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ClCompile Include="SilentFilesInUseBAFunctions.cpp" />
+    <ClCompile Include="SilentFilesInUseBAFunctions.cpp">
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
+    </ClCompile>
     <ClCompile Include="bafunctions.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
       <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
@@ -92,31 +71,5 @@
     </Link>
   </ItemDefinitionGroup>
 
-  <!-- C++ source compile-specific things for Debug/Release configurations -->
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunctions.cpp

@@ -18,7 +18,6 @@ public: // IBootstrapperApplication
 
         BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "*** CUSTOM BA FUNCTION SYSTEM ACTIVE *** Running detect begin BA function. fCached=%d, registrationType=%d, cPackages=%u, fCancel=%d", fCached, registrationType, cPackages, *pfCancel);
 
-    LExit:
         return hr;
     }
 
@@ -32,12 +31,6 @@ public: // IBAFunctions
 
         BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "*** CUSTOM BA FUNCTION SYSTEM ACTIVE *** Running plan begin BA function. cPackages=%u, fCancel=%d", cPackages, *pfCancel);
 
-        //-------------------------------------------------------------------------------------------------
-        // YOUR CODE GOES HERE
-        // BalExitOnFailure(hr, "Change this message to represent real error handling.");
-        //-------------------------------------------------------------------------------------------------
-
-    LExit:
         return hr;
     }
 
@@ -63,6 +56,7 @@ public: // IBAFunctions
         )
     {
         HRESULT hr = S_OK;
+        UNREFERENCED_PARAMETER(source);
 
         BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "*** CUSTOM BA FUNCTION CALLED *** Running OnExecuteFilesInUse BA function. packageId=%ls, cFiles=%u, recommendation=%d", wzPackageId, cFiles, nRecommendation);
         

pt-cli-plan.md

@@ -0,0 +1,59 @@
+# PowerToys CLI Implementation Plan
+
+## Goal
+- Deliver the `ptcli` command-line experience described in `pt-cli.md`, with `Runner` acting as the single broker for module commands.
+- Provide a maintainable architecture where modules self-describe commands, and CLI clients consume a uniform JSON/NamedPipe protocol.
+
+## Workstreams
+
+### 1. Broker Foundation (Runner)
+- **Command Registry**: Implement `IModuleCommandProvider` registration on module load and persist `CommandDescriptor` metadata (schema, elevation flag, long-running hints, docs).
+- **IPC Host**: Stand up the `\\.\pipe\PowerToys.Runner.CLI` NamedPipe server; define request/response DTOs with versioning (`v` field, correlation IDs).
+- **Dispatch Pipeline**: Validate module/action, apply schema validation, enforce elevation policy, and invoke `ExecuteAsync`.
+- **Response Envelope**: Normalize `status` (`ok|error|accepted`), payload, and error block (`code/message/details`). Emit diagnostic logging (caller, command, latency, result).
+
+### 2. CLI Thin Client (`ptcli`)
+- **Argument Parsing**: Support `ptcli -m <module> <action> [--arg value]`, plus `--list-modules`, `--list-commands`.
+- **Transport**: Serialize requests to JSON, connect to the pipe with timeout handling, and deserialize responses.
+- **Output UX**: Map standard errors to friendly text, show structured results, and support optional `--json` passthrough.
+- **Async Jobs**: Handle `status=accepted` by printing job IDs, exposing `ptcli job status <id>` and `ptcli job cancel <id>` commands (polling via Runner endpoints).
+
+### 3. Module Onboarding
+- **Awake**: Implement `IModuleCommandProvider` returning `set/start/stop/list` commands. Adapt current APIs or legacy triggers inside `ExecuteAsync`.
+- **Workspaces**: Provide `list/apply/delete` commands; wrap existing workspace manager calls. Ensure long-running operations flag `LongRunning=true`.
+- **Legacy Adapters**: For modules still using raw events/pipes, add Runner-side shims that translate command invocations while longer-term refactors are scheduled.
+
+### 4. Capability Discovery & Help
+- **Describe APIs**: Expose Runner endpoints for `modules`, `commands`, parameter schemas, and elevation requirements.
+- **CLI Help**: Use discovery data to render `ptcli help`, module-specific usage, and argument hints without duplicating metadata.
+
+### 5. Reliability, Security, Observability
+- **Security**: Configure pipe DACL to restrict access to the interactive user; enforce argument length/type limits.
+- **Concurrency**: Process each request on a dedicated task; delegate concurrency limits to modules. Provide cancellation tokens from Runner.
+- **Tracing**: Emit structured logs/ETW for requests, errors, and long-running progress notifications.
+- **Error Catalog**: Implement standardized error codes (`E_MODULE_NOT_FOUND`, `E_ARGS_INVALID`, `E_NEEDS_ELEVATION`, `E_TIMEOUT`, etc.) and map module exceptions accordingly.
+
+### 6. Elevation & Policies
+- **Elevation Flow**: Detect when commands require elevation; if Runner is not elevated, return `E_NEEDS_ELEVATION` with actionable hints. Integrate with existing elevated Runner helper when available.
+- **Policy Hooks**: Add optional checks for policy/experiment gates before command execution.
+
+### 7. Progress & Notifications
+- **Progress Channel**: Support incremental JSON progress messages over the same pipe or via job polling endpoints.
+- **Timeouts/Retry**: Implement configurable `timeoutMs` handling and `E_BUSY_RETRY` responses for transient module lock scenarios.
+
+### 8. Incremental Rollout Strategy
+- **Phase 1**: Ship Runner pipe host + CLI client with two flagship commands (Awake.Set, Workspaces.List); document manual enablement.
+- **Phase 2**: Migrate additional modules through adapters; add help/describe surfaces and job management.
+- **Phase 3**: Enforce schema validation, finalize error catalog, and wire observability dashboards.
+- **Phase 4**: Deprecate direct module NamedPipe/event entry points once CLI parity is achieved.
+
+### 9. Documentation & Maintenance
+- **User Docs**: Populate `pt-cli.md` with usage examples, elevation guidance, and troubleshooting mapped to error codes.
+- **Developer Guide**: Add module author instructions for implementing `IModuleCommandProvider`, including schema examples and best practices.
+- **Release Checklist**: Track new commands per release, update discovery metadata, and ensure CLI integration tests cover regression cases.
+
+## Open Questions
+- What tooling will maintain JSON schemas (hand-authored vs. source-generated)?
+- Should progress streaming use duplex pipe messages or a per-job polling API?
+- How will elevated Runner lifecycle be managed (reuse existing helper vs. new broker)?
+- Which modules are in-scope for the first public preview, and what is the rollout schedule?

pt-cli.md

@@ -0,0 +1,358 @@
+选 Runner 作为唯一的 Server/Broker，ptcli 只是瘦客户端。
+
+
+模块通过各自的 ModuleInterface 向 Runner 注册“可被调用的命令/参数模式”。
+
+
+ptcli → Runner 用 统一的 IPC（建议 NamedPipe + JSON-RPC/自定义轻量 JSON 协议）。
+
+
+Runner 再把请求转发到对应模块（可以是直接调用模块公开的接口，或转译为该模块现有的触发机制，如 Event/NamedPipe）。
+
+
+对“历史遗留的 event handle/pipe 触发点”，短期由 Runner 做兼容层；长期逐步统一为“命令接口”。
+
+
+这样你能得到：能力发现、参数校验、权限/提权、错误码一致、可观察性一致、向后兼容。
+
+
+
+组件与职责
+
+
+ptcli（瘦客户端）
+
+
+
+
+解析命令行：ptcli -m awake set --duration 1h / ptcli -m workspace list
+
+
+将其映射为通用消息（JSON）发给 Runner。
+
+
+处理同步/异步返回、展示统一错误码与人类可读信息。
+
+
+最多内置“列出模块/命令的帮助”这类“离线功能”，但真正的能力发现来自 Runner。
+
+
+
+
+Runner（统一 Server/Broker）
+
+
+
+
+启动时建立 NamedPipe 服务端：\\.\pipe\PowerToys.Runner.CLI（示例）。
+
+
+维护 Command Registry：每个模块在加载/初始化时注册自己的命令（名称、参数 schema、是否需要提权、是否长任务、超时时间建议、描述文案等）。
+
+
+收到请求后：
+
+
+校验模块是否存在、命令是否存在、参数是否通过 schema 验证。
+
+
+如需提权且当前 Runner 权限不足：按策略返回“需要提权”的标准错误，或通过你们现有的提权助手启动“Elevated Runner”做代办。
+
+
+转发给目标模块（优先调用模块公开的“命令接口方法”；若模块尚未改造，由 Runner 适配为该模块现有触发（Event/NamedPipe））。
+
+
+汇总返回值，统一封装标准响应（状态、数据、错误码、诊断信息）。
+
+
+
+
+
+
+Module（实现者）
+
+
+
+
+实现 IModuleCommandProvider（示例命名）：
+
+
+IEnumerable<CommandDescriptor> DescribeCommands() 暴露命令元数据；
+
+
+Task<CommandResult> ExecuteAsync(CommandInvocation ctx) 执行命令；
+
+
+可标注“需要前台 UI”、“需要管理员”、“可能长时间运行（支持取消/进度）”等。
+
+
+
+
+现有“事件/NamedPipe 触发路径”的模块：短期由 Runner 适配；长期建议模块直接实现上面的 ExecuteAsync，统一语义与可观测性。
+
+
+
+协议与数据结构（建议）
+请求（ptcli→Runner）
+{
+  "v": 1,
+  "correlationId": "uuid",
+  "command": {
+    "module": "awake",
+    "action": "set",               // 例如 set/start/stop/list 等
+    "args": { "duration": "1h" }   // 按模块定义的 schema
+  },
+  "options": {
+    "timeoutMs": 20000,
+    "wantProgress": false
+  }
+}
+
+响应（Runner→ptcli）
+{
+  "v": 1,
+  "correlationId": "uuid",
+  "status": "ok",                   // ok | error | accepted (异步)
+  "result": { /* 模块返回的结构化数据 */ },
+  "error": {                        // 仅当 status=error
+    "code": "E_NEEDS_ELEVATION",    // 标准化错误码
+    "message": "Awake requires elevation",
+    "details": { "hint": "rerun with --elevated" }
+  }
+}
+
+进度/异步（可选）
+
+
+长任务时，status="accepted" 并返回 jobId；ptcli 可 ptcli job status <jobId> 轮询，或 Runner 通过同管道 增量推送 progress（JSON lines）。
+
+
+取消：ptcli 发送 { action: "cancel", jobId: "..." }，Runner 调用模块 CancellationToken。
+
+
+
+命令发现与帮助
+
+
+ptcli -m list：列出模块（Runner 直接返回 registry）。
+
+
+ptcli -m awake -h：DescribeCommands() 中的 Awake 条目返回所有 action、参数与示例。
+
+
+参数 schema：用简化 JSON Schema（或手写约束）即可，让 ptcli 能本地提示，也让 Runner 能服务器端校验。
+
+
+
+示例映射
+Awake
+
+
+ptcli -m awake set --duration 1h
+→ Awake.Set(duration=1h)
+→ Runner 调用 AwakeModule.ExecuteAsync("set", args)
+→ 结果：{ "effectiveUntil": "2025-10-30T18:00:00+08:00" }
+
+
+ptcli -m awake stop
+→ Awake.Stop()（幂等）
+
+
+Workspaces
+
+
+ptcli -m workspace list
+→ Workspaces.List() 返回 { "items": [{ "id": "...", "name": "...", "monitors": 2, "windows": 14 }] }
+
+
+ptcli -m workspace apply --id 123 --strict
+→ Workspaces.Apply(id=123, strict=true) 支持进度与失败报告（缺失进程、权限不足等）。
+
+
+
+Runner vs 直接敲模块事件/NamedPipe
+直接敲模块（如你举的 EventWaitHandle）优点
+
+
+省一跳，模块自己掌控。
+
+
+对少数“拍一下就够”的快捷触发点，写起来快。
+
+
+缺点（关键）
+
+
+入口分散：每个模块各有各的触发名、参数约定、错误语义。
+
+
+能力发现困难：ptcli 无法统一列出“模块能干啥、参数是什么”。
+
+
+权限与多实例问题：有的模块需要管理员/前台，有的在用户会话，有的在服务；直接对模块打洞容易踩坑。
+
+
+审计/可观察性差：难以统一日志/遥测/超时/取消。
+
+
+演进成本高：接口一旦铺散，很难回收。
+
+
+走 Runner Proxy（推荐）
+
+
+统一注册：模块只跟 Runner 说“我能做哪些命令、参数是什么”。
+
+
+统一协议：ptcli 只会说一种“通用 JSON 命令”。
+
+
+统一安全/提权/会话：Runner 最懂自己所在的权限/桌面会话，可决定是否需要跳 Elevation/切用户会话。
+
+
+兼容旧触发：Runner 内部去“Set 事件/写管道”，外部对 ptcli 完全透明。
+
+
+可测试/可监控：所有调用都经由同一 Broker，便于打点、限流、诊断。
+
+
+
+结论：把直接事件/管道触发视为“模块侧 private API”，只由 Runner 调用。ptcli 与普通用户两边都只看得到 Runner 的“公共命令接口”。
+
+
+Runner 怎么“轻量 Server”
+
+
+进程：沿用现有 Runner，不另起新守护；新增一个 CommandRouter 子系统即可。
+
+
+IPC：NamedPipeServerStream + StreamJsonRpc（或你们已有的 JSON 框架）；单管道多请求（长度前缀 + correlationId）。
+
+
+并发：每请求一个 Task，模块执行受自身并发控制。
+
+
+安全：给管道设定 DACL，仅允许同一交互式用户（或受信 SID）连接；参数白名单与长度限制防注入。
+
+
+错误码：统一枚举（像 HTTP 状态一样）：
+
+
+E_MODULE_NOT_FOUND / E_COMMAND_NOT_FOUND / E_ARGS_INVALID
+
+
+E_NEEDS_ELEVATION / E_ACCESS_DENIED
+
+
+E_BUSY_RETRY / E_TIMEOUT / E_INTERNAL
+
+
+
+
+
+最小可行落地（增量实施顺序）
+
+
+在 Runner 加一个 Pipe + CommandRouter，硬编码两个演示命令：
+
+
+Awake.Set(duration)（直接调用 Awake 的现有 API）
+
+
+Workspaces.List()（调用 Workspace 管理器）
+
+
+
+
+写 ptcli：只做 JSON 打包、发管道、打印结果。
+
+
+给两个模块各加 IModuleCommandProvider，从 Runner 注册。
+
+
+把 1~2 个“历史事件触发点”接入 Router（Runner 内部去 Set Event），对外暴露为 Module.Action。
+
+
+扩展：help/describe、Job/进度、取消、提权路径、返回码规范化。
+
+
+
+简短示例（C#，仅示意；注释英文）
+Runner – 接口定义
+public record CommandDescriptor(
+    string Module, string Action, string Description,
+    IReadOnlyDictionary<string, ParamSpec> Params,
+    bool RequiresElevation = false, bool LongRunning = false);
+
+public interface IModuleCommandProvider
+{
+    IEnumerable<CommandDescriptor> DescribeCommands();
+    Task<CommandResult> ExecuteAsync(CommandInvocation ctx, CancellationToken ct);
+}
+
+public record CommandInvocation(string Action, IReadOnlyDictionary<string, object?> Args);
+public record CommandResult(bool Ok, object? Data = null, string? ErrorCode = null, string? ErrorMessage = null);
+
+Runner – 注册与路由（伪码）
+// On module load:
+registry.Register(provider.DescribeCommands(), provider);
+
+// On request:
+var cmd = request.Command; // module, action, args
+var provider = registry.Resolve(cmd.Module, cmd.Action);
+ValidateArgs(cmd.Args, provider.Schema);
+if (provider.RequiresElevation && !IsElevated())
+    return Error("E_NEEDS_ELEVATION", "Elevation required.");
+return await provider.ExecuteAsync(new CommandInvocation(cmd.Action, cmd.Args), ct);
+
+ptcli – 调用（伪码）
+// Build request from CLI args
+var req = new { v = 1, correlationId = Guid.NewGuid(), command = new { module, action, args } };
+using var client = new NamedPipeClientStream(".", "PowerToys.Runner.CLI", PipeDirection.InOut);
+await client.ConnectAsync(timeout);
+await WriteJsonAsync(client, req);
+var resp = await ReadJsonAsync(client);
+Render(resp);
+return resp.status == "ok" ? 0 : 1;
+
+
+兼容性与演进策略
+
+
+不强行改造所有模块：Runner 先用“适配器”把旧事件/管道触发包起来，CLI 立即可用；后续模块逐步实现 IModuleCommandProvider。
+
+
+版本化：请求/响应带 v，便于以后扩展字段。
+
+
+可观测性：Runner 统一日志：调用者、命令、耗时、结果码；必要时加 ETW/Trace。
+
+
+权限：Runner 决策提权路径；ptcli 接到 E_NEEDS_ELEVATION 时，可提示 --elevated 或弹系统 UAC（按你们策略）。
+
+
+并行/队列：对长任务（如 workspace apply）可按模块内队列执行，避免竞态；CLI 侧提供 job status/cancel。
+
+
+
+你关心的具体问题直答
+
+
+“由 moduleinterface 做统一入口管理是个好主意吗？”
+好，但入口管理应驻留在 Runner。模块通过 ModuleInterface 报告命令与执行入口，Runner 统一对外暴露。
+
+
+“ptcli 直接找模块执行，还是让 Runner 派发？”
+让 Runner 派发。这样获得统一发现、权限、错误、日志与演进空间。
+
+
+“现在很多模块用 named pipe/event 触发，这算绕过 Runner 吗？”
+目前你看到的例子确实是“模块直连触发”。建议以后仅 Runner 使用这些内部触发（做兼容/过渡），对外统一成命令。
+
+
+“Runner 起一个 light-weight server 吗？”
+对。就在 Runner 里加一个轻量 NamedPipe JSON-RPC 服务，不必单独再起一个服务进程。
+
+
+
+要的话，我可以按上面的协议给你一版 ptcli（C#）与 Runner 侧 CommandRouter 的“最小可用代码骨架”，再加上 Awake/Workspaces 的两个真实命令适配示例。

src/PackageIdentity/AppxManifest.xml

@@ -36,7 +36,7 @@
   </Capabilities>
 
   <Applications>
-    <Application Id="PowerToys.OCR" Executable="PowerToys.PowerOCR.exe" uap10:TrustLevel="mediumIL" uap10:RuntimeBehavior="win32App">
+    <Application Id="PowerToys.OCR" Executable="PowerToys.PowerOCR.exe" EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements
         DisplayName="PowerToys.OCR"
         Description="PowerToys OCR Module"
@@ -45,7 +45,7 @@
         Square44x44Logo="Images\Square44x44Logo.png">
       </uap:VisualElements>
     </Application>
-    <Application Id="PowerToys.SettingsUI" Executable="PowerToys.Settings.exe" uap10:TrustLevel="mediumIL" uap10:RuntimeBehavior="win32App">
+    <Application Id="PowerToys.SettingsUI" Executable="WinUI3Apps\PowerToys.Settings.exe" EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements
         DisplayName="PowerToys.SettingsUI"
         Description="PowerToys Settings UI"
@@ -54,7 +54,7 @@
         Square44x44Logo="Images\Square44x44Logo.png">
       </uap:VisualElements>
     </Application>
-    <Application Id="PowerToys.ImageResizerUI" Executable="WinUI3Apps\PowerToys.ImageResizer.exe" uap10:TrustLevel="mediumIL" uap10:RuntimeBehavior="win32App">
+    <Application Id="PowerToys.ImageResizerUI" Executable="WinUI3Apps\PowerToys.ImageResizer.exe" EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements
         DisplayName="PowerToys.ImageResizer"
         Description="PowerToys Image Resizer UI"

src/PackageIdentity/PackageIdentity.vcxproj

@@ -17,7 +17,7 @@
       <CIBuildParam Condition="'$(CIBuild)' != 'true'"></CIBuildParam>
     </PropertyGroup>
     
-  <Exec Command="powershell -NonInteractive -ExecutionPolicy Bypass -File &quot;$(MSBuildThisFileDirectory)BuildSparsePackage.ps1&quot; -Platform $(Platform) -Configuration $(Configuration) $(NoSignParam) $(CIBuildParam)" 
+  <Exec Command="pwsh -NonInteractive -ExecutionPolicy Bypass -File &quot;$(MSBuildThisFileDirectory)BuildSparsePackage.ps1&quot; -Platform $(Platform) -Configuration $(Configuration) $(NoSignParam) $(CIBuildParam)" 
           ContinueOnError="false"
           WorkingDirectory="$(MSBuildThisFileDirectory)" />
   </Target>

src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj

@@ -9,12 +9,6 @@
     <RootNamespace>CalculatorEngineCommon</RootNamespace>
     <AppxPackage>false</AppxPackage>
   </PropertyGroup>
-  <!-- BEGIN common.build.pre.props -->
-  <PropertyGroup Label="Configuration">
-    <EnableHybridCRT>true</EnableHybridCRT>
-    <UseCrtSDKReferenceStaticWarning Condition="'$(EnableHybridCRT)'=='true'">false</UseCrtSDKReferenceStaticWarning>
-  </PropertyGroup>
-  <!-- END common.build.pre.props -->
   <!-- BEGIN cppwinrt.build.pre.props -->
   <PropertyGroup Label="Globals">
     <CppWinRTEnabled>true</CppWinRTEnabled>
@@ -25,11 +19,9 @@
   </PropertyGroup>
   <PropertyGroup>
     <MinimalCoreWin>true</MinimalCoreWin>
-    <AppContainerApplication>true</AppContainerApplication>
+    <AppContainerApplication>false</AppContainerApplication>
     <WindowsStoreApp>true</WindowsStoreApp>
     <ApplicationType>Windows Store</ApplicationType>
-    <UseCrtSDKReference Condition="'$(EnableHybridCRT)'=='true'">false</UseCrtSDKReference>
-    <!-- The SDK reference breaks the Hybrid CRT -->
   </PropertyGroup>
   <PropertyGroup>
     <!-- We have to use the Desktop platform for Hybrid CRT to work. -->
@@ -148,43 +140,5 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-  </Target>
-  <!-- BEGIN common.build.post.props -->
-  <!--
-    The Hybrid CRT model statically links the runtime and STL and dynamically
-    links the UCRT instead of the VC++ CRT. The UCRT ships with Windows.
-    WinAppSDK asserts that this is "supported according to the CRT maintainer."
-
-    This must come before Microsoft.Cpp.targets because it manipulates ClCompile.RuntimeLibrary.
-  -->
-  <ItemDefinitionGroup Condition="'$(EnableHybridCRT)'=='true' and '$(Configuration)'=='Debug'">
-    <ClCompile>
-      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(EnableHybridCRT)'=='true' and ('$(Configuration)'=='Release' or '$(Configuration)'=='AuditMode')">
-    <ClCompile>
-      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <!-- END common.build.post.props -->
+  </Target>  <!-- END common.build.post.props -->
 </Project>

src/common/ManagedCommon/Logger.cs

@@ -130,7 +130,7 @@ namespace ManagedCommon
                 {
                     exMessage +=
                         "Inner exception: " + Environment.NewLine +
-                        ex.InnerException.GetType() + " (" + ex.HResult + "): " + ex.InnerException.Message + Environment.NewLine;
+                        ex.InnerException.GetType() + " (" + ex.InnerException.HResult + "): " + ex.InnerException.Message + Environment.NewLine;
                 }
 
                 exMessage +=

src/common/interop/PowerToys.Interop.vcxproj

@@ -63,14 +63,12 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
     <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <UseDebugLibraries>true</UseDebugLibraries>
       <LinkIncremental>true</LinkIncremental>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
     <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <UseDebugLibraries>false</UseDebugLibraries>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <LinkIncremental>false</LinkIncremental>

src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj

@@ -46,16 +46,6 @@
   <PropertyGroup>
     <TargetName>notifications</TargetName>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>

src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj

@@ -82,8 +82,6 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">MultiThreadedDebug</RuntimeLibrary>
-      <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
@@ -95,8 +93,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MultiThreaded</RuntimeLibrary>
-      <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

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

@@ -20,7 +20,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <TitleBar x:Name="titleBar">
+        <TitleBar x:Name="titleBar" IsTabStop="False">
             <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
             <TitleBar.LeftHeader>
                 <ImageIcon

src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj

@@ -39,7 +39,6 @@
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
     <ClCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <UseDebugLibraries>true</UseDebugLibraries>
       <LinkIncremental>true</LinkIncremental>
     </ClCompile>
@@ -49,7 +48,6 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <UseDebugLibraries>false</UseDebugLibraries>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <LinkIncremental>false</LinkIncremental>

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

@@ -20,7 +20,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <TitleBar x:Name="titleBar">
+        <TitleBar x:Name="titleBar" IsTabStop="False">
             <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
             <TitleBar.LeftHeader>
                 <ImageIcon

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

@@ -20,7 +20,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <TitleBar x:Name="titleBar">
+        <TitleBar x:Name="titleBar" IsTabStop="False">
             <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
             <TitleBar.LeftHeader>
                 <ImageIcon

src/modules/LightSwitch/LightSwitchModuleInterface/ThemeHelper.cpp

@@ -3,6 +3,26 @@
 #include "ThemeHelper.h"
 
 // Controls changing the themes.
+static void ResetColorPrevalence()
+{
+    HKEY hKey;
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_SET_VALUE,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        DWORD value = 0; // back to default value
+        RegSetValueEx(hKey, L"ColorPrevalence", 0, REG_DWORD, reinterpret_cast<const BYTE*>(&value), sizeof(value));
+        RegCloseKey(hKey);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, reinterpret_cast<LPARAM>(L"ImmersiveColorSet"), SMTO_ABORTIFHUNG, 5000, nullptr);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_THEMECHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_DWMCOLORIZATIONCOLORCHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);
+    }
+}
 
 void SetAppsTheme(bool mode)
 {
@@ -36,6 +56,11 @@ void SetSystemTheme(bool mode)
         RegSetValueEx(hKey, L"SystemUsesLightTheme", 0, REG_DWORD, reinterpret_cast<const BYTE*>(&value), sizeof(value));
         RegCloseKey(hKey);
 
+        if (mode) // if are changing to light mode
+        {
+            ResetColorPrevalence();
+        }
+
         SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, reinterpret_cast<LPARAM>(L"ImmersiveColorSet"), SMTO_ABORTIFHUNG, 5000, nullptr);
 
         SendMessageTimeout(HWND_BROADCAST, WM_THEMECHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);

src/modules/LightSwitch/LightSwitchModuleInterface/dllmain.cpp

@@ -47,6 +47,7 @@ const static wchar_t* MODULE_DESC = L"This is a module that allows you to contro
 
 enum class ScheduleMode
 {
+    Off,
     FixedHours,
     SunsetToSunrise,
     // add more later
@@ -59,8 +60,9 @@ inline std::wstring ToString(ScheduleMode mode)
     case ScheduleMode::SunsetToSunrise:
         return L"SunsetToSunrise";
     case ScheduleMode::FixedHours:
-    default:
         return L"FixedHours";
+    default:
+        return L"Off";
     }
 }
 
@@ -68,7 +70,9 @@ inline ScheduleMode FromString(const std::wstring& str)
 {
     if (str == L"SunsetToSunrise")
         return ScheduleMode::SunsetToSunrise;
-    return ScheduleMode::FixedHours;
+    if (str == L"FixedHours")
+        return ScheduleMode::FixedHours;
+    return ScheduleMode::Off;
 }
 
 // These are the properties shown in the Settings page.
@@ -76,7 +80,7 @@ struct ModuleSettings
 {
     bool m_changeSystem = true;
     bool m_changeApps = true;
-    ScheduleMode m_scheduleMode = ScheduleMode::FixedHours;
+    ScheduleMode m_scheduleMode = ScheduleMode::Off;
     int m_lightTime = 480;
     int m_darkTime = 1200;
     int m_sunrise_offset = 0;
@@ -161,7 +165,8 @@ public:
             L"scheduleMode",
             L"Theme schedule mode",
             ToString(g_settings.m_scheduleMode),
-            { { L"FixedHours", L"Set hours manually" },
+            { { L"Off", L"Disable the schedule" },
+              { L"FixedHours", L"Set hours manually" },
               { L"SunsetToSunrise", L"Use sunrise/sunset times" } });
 
         // Integer spinners
@@ -284,9 +289,20 @@ public:
                 g_settings.m_changeApps = *v;
             }
 
+            auto previousMode = g_settings.m_scheduleMode;
+
             if (auto v = values.get_string_value(L"scheduleMode"))
             {
-                g_settings.m_scheduleMode = FromString(*v);
+                auto newMode = FromString(*v);
+                if (newMode != g_settings.m_scheduleMode)
+                {
+                    Logger::info(L"[LightSwitchInterface] Schedule mode changed from {} to {}",
+                                 ToString(g_settings.m_scheduleMode),
+                                 ToString(newMode));
+                    g_settings.m_scheduleMode = newMode;
+
+                    start_service_if_needed();
+                }
             }
 
             if (auto v = values.get_int_value(L"lightTime"))
@@ -304,7 +320,7 @@ public:
                 g_settings.m_sunrise_offset = *v;
             }
 
-            if (auto v = values.get_int_value(L"m_sunset_offset"))
+            if (auto v = values.get_int_value(L"sunset_offset"))
             {
                 g_settings.m_sunset_offset = *v;
             }
@@ -326,6 +342,47 @@ public:
         }
     }
 
+    virtual void start_service_if_needed()
+    {
+        if (!m_process || WaitForSingleObject(m_process, 0) != WAIT_TIMEOUT)
+        {
+            Logger::info(L"[LightSwitchInterface] Starting LightSwitchService due to active schedule mode.");
+            enable();
+        }
+        else
+        {
+            Logger::debug(L"[LightSwitchInterface] Service already running, skipping start.");
+        }
+    }
+
+    /*virtual void stop_worker_only()
+    {
+        if (m_process)
+        {
+            Logger::info(L"[LightSwitchInterface] Stopping LightSwitchService (worker only).");
+            constexpr DWORD timeout_ms = 1500;
+            DWORD result = WaitForSingleObject(m_process, timeout_ms);
+
+            if (result == WAIT_TIMEOUT)
+            {
+                Logger::warn("Light Switch: Process didn't exit in time. Forcing termination.");
+                TerminateProcess(m_process, 0);
+            }
+
+            CloseHandle(m_process);
+            m_process = nullptr;
+        }
+    }*/
+
+    /*virtual void stop_service_if_running()
+    {
+        if (m_process)
+        {
+            Logger::info(L"[LightSwitchInterface] Stopping LightSwitchService due to schedule OFF.");
+            stop_worker_only();
+        }
+    }*/
+
     virtual void enable()
     {
         m_enabled = true;
@@ -413,6 +470,12 @@ public:
         return m_enabled;
     }
 
+    // Returns whether the PowerToys should be enabled by default
+    virtual bool is_enabled_by_default() const override
+    {
+        return false;
+    }
+
     void parse_hotkey(PowerToysSettings::PowerToyValues& settings)
     {
         auto settingsObject = settings.get_raw_json();
@@ -471,6 +534,15 @@ public:
                     SetAppsTheme(!GetCurrentAppsTheme());
                 }
 
+                if (!m_manual_override_event_handle)
+                {
+                    m_manual_override_event_handle = OpenEventW(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
+                    if (!m_manual_override_event_handle)
+                    {
+                        m_manual_override_event_handle = CreateEventW(nullptr, TRUE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
+                    }
+                }
+
                 if (m_manual_override_event_handle)
                 {
                     SetEvent(m_manual_override_event_handle);

src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <windows.h>
 #include <tchar.h>
 #include "ThemeScheduler.h"
 #include "ThemeHelper.h"
@@ -11,11 +11,15 @@
 #include <logger/logger_settings.h>
 #include <logger/logger.h>
 #include <utils/logger_helper.h>
+#include <LightSwitchServiceObserver.h>
 
 SERVICE_STATUS g_ServiceStatus = {};
 SERVICE_STATUS_HANDLE g_StatusHandle = nullptr;
 HANDLE g_ServiceStopEvent = nullptr;
-static int g_lastUpdatedDay = -1;
+extern int g_lastUpdatedDay = -1;
+static ScheduleMode prevMode = ScheduleMode::Off;
+static std::wstring prevLat, prevLon;
+static int prevMinutes = -1;
 
 VOID WINAPI ServiceMain(DWORD argc, LPTSTR* argv);
 VOID WINAPI ServiceCtrlHandler(DWORD dwCtrl);
@@ -146,7 +150,6 @@ static void update_sun_times(auto& settings)
         std::wstring wmsg(e.what(), e.what() + strlen(e.what()));
         Logger::error(L"[LightSwitchService] Exception during sun time update: {}", wmsg);
     }
-    
 }
 
 DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
@@ -159,25 +162,18 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
     Logger::info(L"[LightSwitchService] Worker thread starting...");
     Logger::info(L"[LightSwitchService] Parent PID: {}", parentPid);
 
-    // Initialize settings system
     LightSwitchSettings::instance().InitFileWatcher();
 
-    // Open the manual override event created by the module interface
+    LightSwitchServiceObserver observer({ SettingId::LightTime,
+                                          SettingId::DarkTime,
+                                          SettingId::ScheduleMode,
+                                          SettingId::Sunrise_Offset,
+                                          SettingId::Sunset_Offset });
+
     HANDLE hManualOverride = OpenEventW(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
 
     auto applyTheme = [](int nowMinutes, int lightMinutes, int darkMinutes, const auto& settings) {
-        bool isLightActive = false;
-
-        if (lightMinutes < darkMinutes)
-        {
-            // Normal case: sunrise < sunset
-            isLightActive = (nowMinutes >= lightMinutes && nowMinutes < darkMinutes);
-        }
-        else
-        {
-            // Wraparound case: e.g. light at 21:00, dark at 06:00
-            isLightActive = (nowMinutes >= lightMinutes || nowMinutes < darkMinutes);
-        }
+        bool isLightActive = (lightMinutes < darkMinutes) ? (nowMinutes >= lightMinutes && nowMinutes < darkMinutes) : (nowMinutes >= lightMinutes || nowMinutes < darkMinutes);
 
         bool isSystemCurrentlyLight = GetCurrentSystemTheme();
         bool isAppsCurrentlyLight = GetCurrentAppsTheme();
@@ -185,110 +181,297 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
         if (isLightActive)
         {
             if (settings.changeSystem && !isSystemCurrentlyLight)
+            {
                 SetSystemTheme(true);
+                Logger::info(L"[LightSwitchService] Changing system theme to light mode.");
+            }
             if (settings.changeApps && !isAppsCurrentlyLight)
+            {
                 SetAppsTheme(true);
+                Logger::info(L"[LightSwitchService] Changing apps theme to light mode.");
+            }
         }
         else
         {
             if (settings.changeSystem && isSystemCurrentlyLight)
+            {
                 SetSystemTheme(false);
+                Logger::info(L"[LightSwitchService] Changing system theme to dark mode.");
+            }
             if (settings.changeApps && isAppsCurrentlyLight)
+            {
                 SetAppsTheme(false);
+                Logger::info(L"[LightSwitchService] Changing apps theme to dark mode.");
+            }
         }
     };
 
-    // --- At service start: immediately honor the schedule ---
+    LightSwitchSettings::instance().LoadSettings();
+    auto& settings = LightSwitchSettings::instance().settings();
+
+    SYSTEMTIME st;
+    GetLocalTime(&st);
+    int nowMinutes = st.wHour * 60 + st.wMinute;
+
+    if (settings.scheduleMode != ScheduleMode::Off)
     {
-        SYSTEMTIME st;
-        GetLocalTime(&st);
-        int nowMinutes = st.wHour * 60 + st.wMinute;
-
-        LightSwitchSettings::instance().LoadSettings();
-        const auto& settings = LightSwitchSettings::instance().settings();
-
-        applyTheme(nowMinutes, settings.lightTime + settings.sunrise_offset, settings.darkTime + settings.sunset_offset, settings);
+        applyTheme(nowMinutes,
+                   settings.lightTime + settings.sunrise_offset,
+                   settings.darkTime + settings.sunset_offset,
+                   settings);
+        Logger::trace(L"[LightSwitchService] Initialized g_lastUpdatedDay = {}", g_lastUpdatedDay);
+    }
+    else
+    {
+        Logger::info(L"[LightSwitchService] Schedule mode is OFF - ticker suspended, waiting for manual action or mode change.");
     }
 
-    // --- Main loop: wakes once per minute or stop/parent death ---
+    g_lastUpdatedDay = st.wDay;
+    ULONGLONG lastSettingsReload = 0;
+
     for (;;)
     {
         HANDLE waits[2] = { g_ServiceStopEvent, hParent };
         DWORD count = hParent ? 2 : 1;
+        bool skipRest = false;
 
-        SYSTEMTIME st;
-        GetLocalTime(&st);
-        int nowMinutes = st.wHour * 60 + st.wMinute;
-
-        LightSwitchSettings::instance().LoadSettings();
         const auto& settings = LightSwitchSettings::instance().settings();
 
-        // Refresh suntimes at day boundary
-        if (g_lastUpdatedDay != st.wDay)
+        bool scheduleJustEnabled = (prevMode == ScheduleMode::Off && settings.scheduleMode != ScheduleMode::Off);
+        prevMode = settings.scheduleMode;
+
+        // ─── Handle "Schedule Off" Mode ─────────────────────────────────────────────
+        if (settings.scheduleMode == ScheduleMode::Off)
         {
-            update_sun_times(settings);
-            g_lastUpdatedDay = st.wDay;
+            Logger::info(L"[LightSwitchService] Schedule mode OFF - suspending scheduler but keeping service alive.");
 
-            Logger::info(L"[LightSwitchService] Recalculated sun times at new day boundary.");
-        }
+            if (!hManualOverride)
+                hManualOverride = OpenEventW(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
 
-        wchar_t msg[160];
-        swprintf_s(msg,
-                   L"[LightSwitchService] now=%02d:%02d | light=%02d:%02d | dark=%02d:%02d",
-                   st.wHour,
-                   st.wMinute,
-                   settings.lightTime / 60,
-                   settings.lightTime % 60,
-                   settings.darkTime / 60,
-                   settings.darkTime % 60);
-        Logger::info(msg);
+            HANDLE waitsOff[4];
+            DWORD countOff = 0;
+            waitsOff[countOff++] = g_ServiceStopEvent;
+            if (hParent)
+                waitsOff[countOff++] = hParent;
+            if (hManualOverride)
+                waitsOff[countOff++] = hManualOverride;
+            waitsOff[countOff++] = LightSwitchSettings::instance().GetSettingsChangedEvent();
 
-        // --- Manual override check ---
-        bool manualOverrideActive = false;
-        if (hManualOverride)
-        {
-            manualOverrideActive = (WaitForSingleObject(hManualOverride, 0) == WAIT_OBJECT_0);
-        }
-
-        if (manualOverrideActive)
-        {
-            // Did we hit a scheduled boundary? (reset override at boundary)
-            if (nowMinutes == (settings.lightTime + settings.sunrise_offset) % 1440 ||
-                nowMinutes == (settings.darkTime + settings.sunset_offset) % 1440)
+            for (;;)
             {
-                ResetEvent(hManualOverride);
-                Logger::info(L"[LightSwitchService] Manual override cleared at boundary\n");
+                DWORD wait = WaitForMultipleObjects(countOff, waitsOff, FALSE, INFINITE);
+
+                if (wait == WAIT_OBJECT_0)
+                {
+                    Logger::info(L"[LightSwitchService] Stop event triggered - exiting worker loop.");
+                    goto cleanup;
+                }
+                if (hParent && wait == WAIT_OBJECT_0 + 1)
+                {
+                    Logger::info(L"[LightSwitchService] Parent exited - stopping service.");
+                    goto cleanup;
+                }
+
+                if (wait == WAIT_OBJECT_0 + (hParent ? 2 : 1))
+                {
+                    Logger::info(L"[LightSwitchService] Manual override received while schedule OFF.");
+                    ResetEvent(hManualOverride);
+                    continue;
+                }
+
+                if (wait == WAIT_OBJECT_0 + (hParent ? 3 : 2))
+                {
+                    Logger::trace(L"[LightSwitchService] Settings change event triggered, reloading settings...");
+                    ResetEvent(LightSwitchSettings::instance().GetSettingsChangedEvent());
+                    LightSwitchSettings::instance().LoadSettings();
+                    const auto& newSettings = LightSwitchSettings::instance().settings();
+                    lastSettingsReload = GetTickCount64();
+
+                    if (newSettings.scheduleMode != ScheduleMode::Off)
+                    {
+                        Logger::info(L"[LightSwitchService] Schedule re-enabled, resuming normal loop.");
+                        break;
+                    }
+                }
+            }
+
+            continue;
+        }
+
+        // ─── Normal Schedule Loop ───────────────────────────────────────────────────
+        ULONGLONG nowTick = GetTickCount64();
+        bool recentSettingsReload = (nowTick - lastSettingsReload < 5000);
+
+        if (g_lastUpdatedDay != -1)
+        {
+            bool manualOverrideActive = (hManualOverride && WaitForSingleObject(hManualOverride, 0) == WAIT_OBJECT_0);
+
+            if (settings.scheduleMode != ScheduleMode::Off && !recentSettingsReload && !scheduleJustEnabled)
+            {
+                Logger::debug(L"[LightSwitchService] Checking if manual override is active...");
+                bool manualOverrideActive = (hManualOverride && WaitForSingleObject(hManualOverride, 0) == WAIT_OBJECT_0);
+                Logger::debug(L"[LightSwitchService] Manual override active = {}", manualOverrideActive);
+
+                if (!manualOverrideActive)
+                {
+                    bool currentSystemTheme = GetCurrentSystemTheme();
+                    bool currentAppsTheme = GetCurrentAppsTheme();
+
+                    SYSTEMTIME st;
+                    GetLocalTime(&st);
+                    int nowMinutes = st.wHour * 60 + st.wMinute;
+
+                    bool shouldBeLight = (settings.lightTime < settings.darkTime) ? (nowMinutes >= settings.lightTime && nowMinutes < settings.darkTime) : (nowMinutes >= settings.lightTime || nowMinutes < settings.darkTime);
+
+                    Logger::debug(L"[LightSwitchService] shouldBeLight = {}", shouldBeLight);
+
+                    if ((settings.changeSystem && (currentSystemTheme != shouldBeLight)) ||
+                        (settings.changeApps && (currentAppsTheme != shouldBeLight)))
+                    {
+                        Logger::debug(L"[LightSwitchService] External theme change detected - enabling manual override");
+
+                        if (!hManualOverride)
+                        {
+                            hManualOverride = OpenEventW(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
+                            if (!hManualOverride)
+                                hManualOverride = CreateEventW(nullptr, TRUE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
+                        }
+
+                        if (hManualOverride)
+                        {
+                            SetEvent(hManualOverride);
+                            Logger::info(L"[LightSwitchService] Detected manual theme change outside of LightSwitch. Triggering manual override.");
+                            skipRest = true;
+                        }
+                    }
+                }
             }
             else
             {
-                Logger::info(L"[LightSwitchService] Skipping schedule due to manual override\n");
-                goto sleep_until_next_minute;
+                Logger::debug(L"[LightSwitchService] Skipping external-change detection (schedule off, recent reload, or just enabled).");
             }
         }
 
-        // Apply theme logic (only runs if no manual override or override just cleared)
-        applyTheme(nowMinutes, settings.lightTime + settings.sunrise_offset, settings.darkTime + settings.sunset_offset, settings);
+        // ─── Apply Schedule Logic ───────────────────────────────────────────────────
+        if (!skipRest)
+        {
+            bool modeChangedToSunset = (prevMode != settings.scheduleMode &&
+                                        settings.scheduleMode == ScheduleMode::SunsetToSunrise);
+            bool coordsChanged = (prevLat != settings.latitude || prevLon != settings.longitude);
 
-    sleep_until_next_minute:
+            if ((modeChangedToSunset || coordsChanged) && settings.scheduleMode == ScheduleMode::SunsetToSunrise)
+            {
+                Logger::info(L"[LightSwitchService] Mode or coordinates changed, recalculating sun times.");
+                update_sun_times(settings);
+                SYSTEMTIME st;
+                GetLocalTime(&st);
+                g_lastUpdatedDay = st.wDay;
+                prevMode = settings.scheduleMode;
+                prevLat = settings.latitude;
+                prevLon = settings.longitude;
+            }
+
+            SYSTEMTIME st;
+            GetLocalTime(&st);
+            int nowMinutes = st.wHour * 60 + st.wMinute;
+
+            if ((g_lastUpdatedDay != st.wDay) && (settings.scheduleMode == ScheduleMode::SunsetToSunrise))
+            {
+                update_sun_times(settings);
+                g_lastUpdatedDay = st.wDay;
+                prevMinutes = -1;
+                Logger::info(L"[LightSwitchService] Recalculated sun times at new day boundary.");
+            }
+
+            LightSwitchSettings::instance().LoadSettings();
+            const auto& currentSettings = LightSwitchSettings::instance().settings();
+
+            wchar_t msg[160];
+            swprintf_s(msg,
+                       L"[LightSwitchService] now=%02d:%02d | light=%02d:%02d | dark=%02d:%02d | mode=%d",
+                       st.wHour,
+                       st.wMinute,
+                       currentSettings.lightTime / 60,
+                       currentSettings.lightTime % 60,
+                       currentSettings.darkTime / 60,
+                       currentSettings.darkTime % 60,
+                       static_cast<int>(currentSettings.scheduleMode));
+            Logger::info(msg);
+
+            bool manualOverrideActive = false;
+            if (hManualOverride)
+                manualOverrideActive = (WaitForSingleObject(hManualOverride, 0) == WAIT_OBJECT_0);
+
+            if (manualOverrideActive)
+            {
+                int lightBoundary = (currentSettings.lightTime + currentSettings.sunrise_offset) % 1440;
+                int darkBoundary = (currentSettings.darkTime + currentSettings.sunset_offset) % 1440;
+
+                bool crossedLight = false;
+                bool crossedDark = false;
+
+                if (prevMinutes != -1)
+                {
+                    if (nowMinutes < prevMinutes)
+                    {
+                        crossedLight = (prevMinutes <= lightBoundary || nowMinutes >= lightBoundary);
+                        crossedDark = (prevMinutes <= darkBoundary || nowMinutes >= darkBoundary);
+                    }
+                    else
+                    {
+                        crossedLight = (prevMinutes < lightBoundary && nowMinutes >= lightBoundary);
+                        crossedDark = (prevMinutes < darkBoundary && nowMinutes >= darkBoundary);
+                    }
+                }
+
+                Logger::debug(L"[LightSwitchService] prevMinutes={} nowMinutes={} light={} dark={}",
+                              prevMinutes,
+                              nowMinutes,
+                              lightBoundary,
+                              darkBoundary);
+
+                if (crossedLight || crossedDark)
+                {
+                    ResetEvent(hManualOverride);
+                    Logger::info(L"[LightSwitchService] Manual override cleared after crossing schedule boundary.");
+                }
+                else
+                {
+                    Logger::info(L"[LightSwitchService] Skipping schedule due to manual override");
+                    skipRest = true;
+                }
+            }
+
+            if (!skipRest)
+                applyTheme(nowMinutes,
+                           currentSettings.lightTime + currentSettings.sunrise_offset,
+                           currentSettings.darkTime + currentSettings.sunset_offset,
+                           currentSettings);
+        }
+
+        // ─── Wait For Next Minute Tick Or Stop Event ────────────────────────────────
+        SYSTEMTIME st;
         GetLocalTime(&st);
         int msToNextMinute = (60 - st.wSecond) * 1000 - st.wMilliseconds;
         if (msToNextMinute < 50)
             msToNextMinute = 50;
 
+       prevMinutes = nowMinutes;
+
         DWORD wait = WaitForMultipleObjects(count, waits, FALSE, msToNextMinute);
         if (wait == WAIT_OBJECT_0)
         {
-            Logger::info(L"[LightSwitchService] Stop event triggered <EFBFBD> exiting worker loop.");
+            Logger::info(L"[LightSwitchService] Stop event triggered - exiting worker loop.");
             break;
         }
-        if (hParent && wait == WAIT_OBJECT_0 + 1) // parent process exited
+        if (hParent && wait == WAIT_OBJECT_0 + 1)
         {
-            Logger::info(L"[LightSwitchService] Parent process exited <EFBFBD> stopping service.");
+            Logger::info(L"[LightSwitchService] Parent process exited - stopping service.");
             break;
         }
-
     }
 
+cleanup:
     if (hManualOverride)
         CloseHandle(hManualOverride);
     if (hParent)
@@ -297,6 +480,54 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
     return 0;
 }
 
+void ApplyThemeNow()
+{
+    LightSwitchSettings::instance().LoadSettings();
+    const auto& settings = LightSwitchSettings::instance().settings();
+
+    SYSTEMTIME st;
+    GetLocalTime(&st);
+    int nowMinutes = st.wHour * 60 + st.wMinute;
+
+    bool shouldBeLight = false;
+    if (settings.lightTime < settings.darkTime)
+        shouldBeLight = (nowMinutes >= settings.lightTime && nowMinutes < settings.darkTime);
+    else
+        shouldBeLight = (nowMinutes >= settings.lightTime || nowMinutes < settings.darkTime);
+
+    bool isSystemCurrentlyLight = GetCurrentSystemTheme();
+    bool isAppsCurrentlyLight = GetCurrentAppsTheme();
+
+    Logger::info(L"[LightSwitchService] Applying (if needed) theme immediately due to schedule change.");
+
+    if (shouldBeLight)
+    {
+        if (settings.changeSystem && !isSystemCurrentlyLight)
+        {
+            SetSystemTheme(true);
+            Logger::info(L"[LightSwitchService] Changing system theme to light mode.");
+        }
+        if (settings.changeApps && !isAppsCurrentlyLight)
+        {
+            SetAppsTheme(true);
+            Logger::info(L"[LightSwitchService] Changing apps theme to light mode.");
+        }
+    }
+    else
+    {
+        if (settings.changeSystem && isSystemCurrentlyLight)
+        {
+            SetSystemTheme(false);
+            Logger::info(L"[LightSwitchService] Changing system theme to dark mode.");
+        }
+        if (settings.changeApps && isAppsCurrentlyLight)
+        {
+            SetAppsTheme(false);
+            Logger::info(L"[LightSwitchService] Changing apps theme to dark mode.");
+        }
+    }
+}
+
 int APIENTRY wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
 {
     if (powertoys_gpo::getConfiguredLightSwitchEnabledValue() == powertoys_gpo::gpo_rule_configured_disabled)

src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj

@@ -74,6 +74,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="LightSwitchService.cpp" />
+    <ClCompile Include="LightSwitchServiceObserver.cpp" />
     <ClCompile Include="LightSwitchSettings.cpp" />
     <ClCompile Include="SettingsConstants.cpp" />
     <ClCompile Include="ThemeHelper.cpp" />
@@ -84,6 +85,7 @@
     <ResourceCompile Include="LightSwitchService.rc" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="LightSwitchServiceObserver.h" />
     <ClInclude Include="LightSwitchSettings.h" />
     <ClInclude Include="SettingsConstants.h" />
     <ClInclude Include="SettingsObserver.h" />

src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj.filters

@@ -33,6 +33,9 @@
     <ClCompile Include="WinHookEventIDs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="LightSwitchServiceObserver.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ThemeScheduler.h">
@@ -53,6 +56,9 @@
     <ClInclude Include="WinHookEventIDs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="LightSwitchServiceObserver.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />

src/modules/LightSwitch/LightSwitchService/LightSwitchServiceObserver.cpp

@@ -0,0 +1,29 @@
+#include "LightSwitchServiceObserver.h"
+#include <logger.h>
+#include "LightSwitchSettings.h"
+
+// These are defined elsewhere in your service module (ServiceWorkerThread.cpp)
+extern int g_lastUpdatedDay;
+void ApplyThemeNow();
+
+void LightSwitchServiceObserver::SettingsUpdate(SettingId id)
+{
+    Logger::info(L"[LightSwitchService] Setting changed: {}", static_cast<int>(id));
+    g_lastUpdatedDay = -1;
+    ApplyThemeNow();
+}
+
+bool LightSwitchServiceObserver::WantsToBeNotified(SettingId id) const noexcept
+{
+    switch (id)
+    {
+    case SettingId::LightTime:
+    case SettingId::DarkTime:
+    case SettingId::ScheduleMode:
+    case SettingId::Sunrise_Offset:
+    case SettingId::Sunset_Offset:
+        return true;
+    default:
+        return false;
+    }
+}

src/modules/LightSwitch/LightSwitchService/LightSwitchServiceObserver.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include "SettingsObserver.h"
+
+// The LightSwitchServiceObserver reacts when LightSwitchSettings changes.
+class LightSwitchServiceObserver : public SettingsObserver
+{
+public:
+    explicit LightSwitchServiceObserver(std::unordered_set<SettingId> observedSettings) :
+        SettingsObserver(std::move(observedSettings))
+    {
+    }
+
+    void SettingsUpdate(SettingId id) override;
+    bool WantsToBeNotified(SettingId id) const noexcept override;
+};

src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp

@@ -6,6 +6,7 @@
 #include <filesystem>
 #include <fstream>
 #include <WinHookEventIDs.h>
+#include <logger.h>
 
 using namespace std;
 
@@ -27,10 +28,21 @@ std::wstring LightSwitchSettings::GetSettingsFileName()
 
 void LightSwitchSettings::InitFileWatcher()
 {
-    const std::wstring& settingsFileName = GetSettingsFileName();
-    m_settingsFileWatcher = std::make_unique<FileWatcher>(settingsFileName, [&]() {
-        PostMessageW(HWND_BROADCAST, WM_PRIV_SETTINGS_CHANGED, NULL, NULL);
-    });
+    if (!m_settingsChangedEvent)
+    {
+        m_settingsChangedEvent = CreateEventW(nullptr, TRUE, FALSE, nullptr);
+    }
+
+    if (!m_settingsFileWatcher)
+    {
+        m_settingsFileWatcher = std::make_unique<FileWatcher>(
+            GetSettingsFileName(),
+            [this]() {
+                Logger::info(L"[LightSwitchSettings] Settings file changed, signaling event.");
+                LoadSettings();
+                SetEvent(m_settingsChangedEvent);
+            });
+    }
 }
 
 void LightSwitchSettings::AddObserver(SettingsObserver& observer)
@@ -54,6 +66,11 @@ void LightSwitchSettings::NotifyObservers(SettingId id) const
     }
 }
 
+HANDLE LightSwitchSettings::GetSettingsChangedEvent() const
+{
+    return m_settingsChangedEvent;
+}
+
 void LightSwitchSettings::LoadSettings()
 {
     try

src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.h

@@ -14,6 +14,7 @@ class SettingsObserver;
 
 enum class ScheduleMode
 {
+    Off,
     FixedHours,
     SunsetToSunrise
     // Add more in the future
@@ -28,7 +29,7 @@ inline std::wstring ToString(ScheduleMode mode)
     case ScheduleMode::SunsetToSunrise:
         return L"SunsetToSunrise";
     default:
-        return L"FixedHours";
+        return L"Off";
     }
 }
 
@@ -36,8 +37,10 @@ inline ScheduleMode FromString(const std::wstring& str)
 {
     if (str == L"SunsetToSunrise")
         return ScheduleMode::SunsetToSunrise;
-    else
+    if (str == L"FixedHours")
         return ScheduleMode::FixedHours;
+    else
+        return ScheduleMode::Off;
 }
 
 struct LightSwitchConfig
@@ -76,6 +79,8 @@ public:
 
     void LoadSettings();
 
+    HANDLE GetSettingsChangedEvent() const;
+
 private:
     LightSwitchSettings();
     ~LightSwitchSettings() = default;
@@ -85,4 +90,6 @@ private:
     std::unordered_set<SettingsObserver*> m_observers;
 
     void NotifyObservers(SettingId id) const;
+
+    HANDLE m_settingsChangedEvent = nullptr;
 };

src/modules/LightSwitch/LightSwitchService/SettingsObserver.h

@@ -2,6 +2,7 @@
 
 #include <unordered_set>
 #include "SettingsConstants.h"
+#include "LightSwitchSettings.h"
 
 class LightSwitchSettings;
 
@@ -22,7 +23,7 @@ public:
     // Override this in your class to respond to updates
     virtual void SettingsUpdate(SettingId type) {}
 
-    bool WantsToBeNotified(SettingId type) const noexcept
+    virtual bool WantsToBeNotified(SettingId type) const noexcept
     {
         return m_observedSettings.contains(type);
     }

src/modules/LightSwitch/LightSwitchService/ThemeHelper.cpp

@@ -1,8 +1,32 @@
 #include <windows.h>
+#include <logger/logger_settings.h>
+#include <logger/logger.h>
+#include <utils/logger_helper.h>
 #include "ThemeHelper.h"
 
 // Controls changing the themes.
 
+static void ResetColorPrevalence()
+{
+    HKEY hKey;
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_SET_VALUE,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        DWORD value = 0; // back to default value
+        RegSetValueEx(hKey, L"ColorPrevalence", 0, REG_DWORD, reinterpret_cast<const BYTE*>(&value), sizeof(value));
+        RegCloseKey(hKey);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, reinterpret_cast<LPARAM>(L"ImmersiveColorSet"), SMTO_ABORTIFHUNG, 5000, nullptr);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_THEMECHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_DWMCOLORIZATIONCOLORCHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);
+    }
+}
+
 void SetAppsTheme(bool mode)
 {
     HKEY hKey;
@@ -35,6 +59,12 @@ void SetSystemTheme(bool mode)
         RegSetValueEx(hKey, L"SystemUsesLightTheme", 0, REG_DWORD, reinterpret_cast<const BYTE*>(&value), sizeof(value));
         RegCloseKey(hKey);
 
+        if (mode) // if are changing to light mode 
+        {
+            ResetColorPrevalence();
+            Logger::info(L"[LightSwitchService] Reset ColorPrevalence to default when switching to light mode.");
+        }
+
         SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, reinterpret_cast<LPARAM>(L"ImmersiveColorSet"), SMTO_ABORTIFHUNG, 5000, nullptr);
 
         SendMessageTimeout(HWND_BROADCAST, WM_THEMECHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);

src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp

@@ -189,7 +189,7 @@ bool SuperSonar<D>::Initialize(HINSTANCE hinst)
         return false;
     }
 
-    DWORD exStyle = WS_EX_TOOLWINDOW | Shim()->GetExtendedStyle();
+    DWORD exStyle = WS_EX_TRANSPARENT | WS_EX_LAYERED | WS_EX_TOOLWINDOW | Shim()->GetExtendedStyle();
     HWND created = CreateWindowExW(exStyle, className, windowTitle, WS_POPUP, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, m_hwndOwner, nullptr, hinst, this);
     if (!created)
     {

src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj

@@ -64,7 +64,6 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>
@@ -82,7 +81,6 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>

src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj

@@ -48,7 +48,6 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>
@@ -66,7 +65,6 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>

src/modules/MouseUtils/MouseJump/MouseJump.vcxproj

@@ -48,7 +48,6 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>
@@ -66,7 +65,6 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>

src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj

@@ -49,7 +49,6 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>
@@ -67,7 +66,6 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>

src/modules/MouseUtils/MousePointerCrosshairs/dllmain.cpp

@@ -14,6 +14,9 @@ extern void InclusiveCrosshairsRequestUpdatePosition();
 extern void InclusiveCrosshairsEnsureOn();
 extern void InclusiveCrosshairsEnsureOff();
 extern void InclusiveCrosshairsSetExternalControl(bool enabled);
+extern void InclusiveCrosshairsSetOrientation(CrosshairsOrientation orientation);
+extern bool InclusiveCrosshairsIsEnabled();
+extern void InclusiveCrosshairsSwitch();
 
 // Non-Localizable strings
 namespace
@@ -244,12 +247,19 @@ public:
             return false;
         }
 
-        if (hotkeyId == 0)
+        if (hotkeyId == 0) // Crosshairs activation
         {
+            // If gliding cursor is active, cancel it and activate crosshairs
+            if (m_glideState.load() != 0)
+            {
+                CancelGliding(true /*activateCrosshairs*/);
+                return true;
+            }
+            // Otherwise, normal crosshairs toggle
             InclusiveCrosshairsSwitch();
             return true;
         }
-        if (hotkeyId == 1)
+        if (hotkeyId == 1) // Gliding cursor activation
         {
             HandleGlidingHotkey();
             return true;
@@ -268,25 +278,44 @@ private:
         SendInput(2, inputs, sizeof(INPUT));
     }
 
-    // Cancel gliding without performing the final click (Escape handling)
-    void CancelGliding()
+    // Cancel gliding with option to activate crosshairs in user's preferred orientation
+    void CancelGliding(bool activateCrosshairs)
     {
         int state = m_glideState.load();
         if (state == 0)
         {
             return; // nothing to cancel
         }
+        
+        // Stop all gliding operations
         StopXTimer();
         StopYTimer();
         m_glideState = 0;
-        InclusiveCrosshairsEnsureOff();
+        UninstallKeyboardHook();
+        
+        // Reset crosshairs control and restore user settings
         InclusiveCrosshairsSetExternalControl(false);
+        InclusiveCrosshairsSetOrientation(m_inclusiveCrosshairsSettings.crosshairsOrientation);
+        
+        if (activateCrosshairs)
+        {
+            // User is switching to crosshairs mode - enable with their settings
+            InclusiveCrosshairsEnsureOn();
+        }
+        else
+        {
+            // User canceled (Escape) - turn off crosshairs completely
+            InclusiveCrosshairsEnsureOff();
+        }
+        
+        // Reset gliding state
         if (auto s = m_state)
         {
             s->xFraction = 0.0;
             s->yFraction = 0.0;
         }
-        Logger::debug("Gliding cursor cancelled via Escape key");
+        
+        Logger::debug("Gliding cursor cancelled (activateCrosshairs={})", activateCrosshairs ? 1 : 0);
     }
 
     // Stateless helpers operating on shared State
@@ -425,21 +454,22 @@ private:
         {
             return;
         }
-        // Simulate the AHK state machine
+        
         int state = m_glideState.load();
         switch (state)
         {
-        case 0:
+        case 0: // Starting gliding
         {
-            // For detect for cancel key
+            // Install keyboard hook for Escape cancellation
             InstallKeyboardHook();
-            // Ensure crosshairs on (do not toggle off if already on)
-            InclusiveCrosshairsEnsureOn();
-            // Disable internal mouse hook so we control position updates explicitly
+            
+            // Force crosshairs visible in BOTH orientation for gliding, regardless of user setting
+            // Set external control before enabling to prevent internal movement hook from attaching
             InclusiveCrosshairsSetExternalControl(true);
-            // Override crosshairs to show both for Gliding Cursor
             InclusiveCrosshairsSetOrientation(CrosshairsOrientation::Both);
+            InclusiveCrosshairsEnsureOn(); // Always ensure they are visible
 
+            // Initialize gliding state
             s->currentXPos = 0;
             s->currentXSpeed = s->fastHSpeed;
             s->xFraction = 0.0;
@@ -447,20 +477,17 @@ private:
             int y = GetSystemMetrics(SM_CYVIRTUALSCREEN) / 2;
             SetCursorPos(0, y);
             InclusiveCrosshairsRequestUpdatePosition();
+            
             m_glideState = 1;
             StartXTimer();
             break;
         }
-        case 1:
-        {
-            // Slow horizontal
+        case 1: // Slow horizontal
             s->currentXSpeed = s->slowHSpeed;
             m_glideState = 2;
             break;
-        }
-        case 2:
+        case 2: // Switch to vertical fast
         {
-            // Stop horizontal, start vertical (fast)
             StopXTimer();
             s->currentYSpeed = s->fastVSpeed;
             s->currentYPos = 0;
@@ -471,33 +498,37 @@ private:
             StartYTimer();
             break;
         }
-        case 3:
-        {
-            // Slow vertical
+        case 3: // Slow vertical
             s->currentYSpeed = s->slowVSpeed;
             m_glideState = 4;
             break;
-        }
-        case 4:
+        case 4: // Finalize (click and end)
         default:
         {
-            UninstallKeyboardHook();
-            // Stop vertical, click, turn crosshairs off, re-enable internal tracking, reset state
+            // Complete the gliding sequence
             StopYTimer();
             m_glideState = 0;
             LeftClick();
-            InclusiveCrosshairsEnsureOff();
+            
+            // Restore normal crosshairs operation and turn them off
             InclusiveCrosshairsSetExternalControl(false);
-            // Restore original crosshairs orientation setting
             InclusiveCrosshairsSetOrientation(m_inclusiveCrosshairsSettings.crosshairsOrientation);
-            s->xFraction = 0.0;
-            s->yFraction = 0.0;
+            InclusiveCrosshairsEnsureOff();
+            
+            UninstallKeyboardHook();
+            
+            // Reset state
+            if (auto sp = m_state)
+            {
+                sp->xFraction = 0.0;
+                sp->yFraction = 0.0;
+            }
             break;
         }
         }
     }
 
-    // Low-level keyboard hook procedures
+    // Low-level keyboard hook for Escape cancellation
     static LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
     {
         if (nCode == HC_ACTION)
@@ -509,14 +540,11 @@ private:
                 {
                     if (inst->m_enabled && inst->m_glideState.load() != 0)
                     {
-                        inst->UninstallKeyboardHook();
-                        inst->CancelGliding();
+                        inst->CancelGliding(false); // Escape cancels without activating crosshairs
                     }
                 }
             }
         }
-
-        // Do not swallow Escape; pass it through
         return CallNextHookEx(nullptr, nCode, wParam, lParam);
     }
 

src/modules/MouseWithoutBorders/App/Class/Common.VK.cs

@@ -112,6 +112,7 @@ namespace MouseWithoutBorders
         internal const int WM_RBUTTONDBLCLK = 0x206;
         internal const int WM_MBUTTONDBLCLK = 0x209;
         internal const int WM_MOUSEWHEEL = 0x020A;
+        internal const int WM_MOUSEHWHEEL = 0x020E;
 
         internal const int WM_KEYDOWN = 0x100;
         internal const int WM_KEYUP = 0x101;

src/modules/MouseWithoutBorders/App/Class/InputSimulation.cs

@@ -204,6 +204,9 @@ namespace MouseWithoutBorders.Class
                 case Common.WM_MOUSEWHEEL:
                     mouse_input.mi.dwFlags |= (int)NativeMethods.MOUSEEVENTF.WHEEL;
                     break;
+                case Common.WM_MOUSEHWHEEL:
+                    mouse_input.mi.dwFlags |= (int)NativeMethods.MOUSEEVENTF.HWHEEL;
+                    break;
                 case Common.WM_XBUTTONUP:
                     mouse_input.mi.dwFlags |= (int)NativeMethods.MOUSEEVENTF.XUP;
                     break;

src/modules/MouseWithoutBorders/App/Class/NativeMethods.cs

@@ -556,6 +556,7 @@ namespace MouseWithoutBorders.Class
             XDOWN = 0x0080,
             XUP = 0x0100,
             WHEEL = 0x0800,
+            HWHEEL = 0x1000,
             VIRTUALDESK = 0x4000,
             ABSOLUTE = 0x8000,
         }

src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj

@@ -67,8 +67,6 @@
       <EnableUAC>false</EnableUAC>
       <ModuleDefinitionFile>dll.def</ModuleDefinitionFile>
       <AdditionalDependencies>runtimeobject.lib;$(CoreLibraryDependencies)</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
     </Link>
     <PreBuildEvent>
       <Command>del $(OutDir)\NewPlusPackage.msix /q
@@ -100,8 +98,6 @@ MakeAppx.exe pack /d . /p $(OutDir)NewPlusPackage.msix /nv</Command>
       <EnableUAC>false</EnableUAC>
       <ModuleDefinitionFile>dll.def</ModuleDefinitionFile>
       <AdditionalDependencies>runtimeobject.lib;$(CoreLibraryDependencies)</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
     </Link>
     <PreBuildEvent>
       <Command>del $(OutDir)\NewPlusPackage.msix /q

src/modules/Workspaces/WorkspacesLauncher/WorkspacesLauncher.vcxproj

@@ -29,7 +29,6 @@
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -40,7 +39,6 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization>MaxSpeed</Optimization>
       <SDLCheck>false</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>

src/modules/Workspaces/WorkspacesModuleInterface/dllmain.cpp

@@ -9,6 +9,7 @@
 #include <common/utils/logger_helper.h>
 #include <common/utils/resources.h>
 #include <common/utils/winapi_error.h>
+#include <common/utils/json.h>
 
 #include <WorkspacesLib/trace.h>
 #include <WorkspacesLib/WorkspacesData.h>
@@ -17,6 +18,9 @@
 
 #include "resource.h"
 #include <common/utils/EventWaiter.h>
+#include <algorithm>
+#include <cwctype>
+#include <memory>
 
 // Non-localizable
 const std::wstring workspacesLauncherPath = L"PowerToys.WorkspacesLauncher.exe";
@@ -69,6 +73,8 @@ public:
         return app_key.c_str();
     }
 
+    pt::cli::IModuleCommandProvider* command_provider() override;
+
     virtual std::optional<HotkeyEx> GetHotkeyEx() override
     {
         return m_hotkey;
@@ -359,9 +365,85 @@ private:
         .modifiersMask = MOD_CONTROL | MOD_WIN,
         .vkCode = 0xC0, // VK_OEM_3 key; usually `~
     };
+
+    std::unique_ptr<pt::cli::IModuleCommandProvider> m_cliProvider;
+
+    pt::cli::CommandResult HandleList(const json::JsonObject& args) const;
 };
 
+class WorkspacesCommandProvider final : public pt::cli::IModuleCommandProvider
+{
+public:
+    explicit WorkspacesCommandProvider(const WorkspacesModuleInterface& owner) :
+        m_owner(owner)
+    {
+    }
+
+    std::wstring ModuleKey() const override
+    {
+        return L"workspaces";
+    }
+
+    std::vector<pt::cli::CommandDescriptor> DescribeCommands() const override
+    {
+        pt::cli::CommandDescriptor listDescriptor;
+        listDescriptor.action = L"list";
+        listDescriptor.description = L"List configured workspaces.";
+        return { std::move(listDescriptor) };
+    }
+
+    pt::cli::CommandResult Execute(const pt::cli::CommandInvocation& invocation) override
+    {
+        std::wstring action = invocation.action;
+        std::transform(action.begin(), action.end(), action.begin(), [](wchar_t ch) {
+            return static_cast<wchar_t>(std::towlower(ch));
+        });
+
+        if (action == L"list")
+        {
+            return m_owner.HandleList(invocation.args);
+        }
+
+        return pt::cli::CommandResult::Error(L"E_COMMAND_NOT_FOUND", L"Unsupported Workspaces command.");
+    }
+
+private:
+    const WorkspacesModuleInterface& m_owner;
+};
+
+pt::cli::IModuleCommandProvider* WorkspacesModuleInterface::command_provider()
+{
+    if (!m_cliProvider)
+    {
+        m_cliProvider = std::make_unique<WorkspacesCommandProvider>(*this);
+    }
+
+    return m_cliProvider.get();
+}
+
+pt::cli::CommandResult WorkspacesModuleInterface::HandleList(const json::JsonObject& args) const
+{
+    UNREFERENCED_PARAMETER(args);
+
+    json::JsonObject payload = json::JsonObject();
+    auto workspacesPath = WorkspacesData::WorkspacesFile();
+    payload.SetNamedValue(L"path", json::value(workspacesPath));
+
+    auto stored = json::from_file(workspacesPath);
+    if (stored.has_value())
+    {
+        payload.SetNamedValue(L"data", json::value(*stored));
+    }
+    else
+    {
+        payload.SetNamedValue(L"data", json::value(json::JsonObject()));
+    }
+
+    return pt::cli::CommandResult::Success(std::move(payload));
+}
+
 extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
 {
     return new WorkspacesModuleInterface();
 }
+

src/modules/Workspaces/WorkspacesSnapshotTool/WorkspacesSnapshotTool.vcxproj

@@ -29,7 +29,6 @@
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -40,7 +39,6 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization>MaxSpeed</Optimization>
       <SDLCheck>false</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>

src/modules/Workspaces/WorkspacesWindowArranger/WorkspacesWindowArranger.vcxproj

@@ -29,7 +29,6 @@
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -40,7 +39,6 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization>MaxSpeed</Optimization>
       <SDLCheck>false</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>

src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj

@@ -81,7 +81,6 @@
       <Optimization>MaxSpeed</Optimization>
       <PreprocessorDefinitions>__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x602;NDEBUG;_WIN32_WINNT=0x602;_WIN32_WINDOWS=0x501;WIN32;_WINDOWS;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     </ClCompile>
     <ResourceCompile>
@@ -103,7 +102,6 @@
       <Optimization>MaxSpeed</Optimization>
       <PreprocessorDefinitions>__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x602;NDEBUG;_WIN32_WINNT=0x602;_WIN32_WINDOWS=0x501;WIN32;_WINDOWS;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     </ClCompile>
     <ResourceCompile>
@@ -126,7 +124,6 @@
       <Optimization>MaxSpeed</Optimization>
       <PreprocessorDefinitions>__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x602;NDEBUG;_WIN32_WINNT=0x602;_WIN32_WINDOWS=0x501;WIN32;_WINDOWS;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     </ClCompile>
     <ResourceCompile>
@@ -148,7 +145,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x0602;_DEBUG;_WIN32_WINNT=0x602.MSVC6;_WIN32_WINDOWS=0x600;WIN32;_WINDOWS;_WIN32_WINNT=0x602;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;_M_IX86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -169,7 +165,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x0602;_DEBUG;_WIN32_WINNT=0x602.MSVC6;_WIN32_WINDOWS=0x600;WIN32;_WINDOWS;_WIN32_WINNT=0x602;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;_M_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -191,7 +186,6 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x0602;_DEBUG;_WIN32_WINNT=0x602.MSVC6;_WIN32_WINDOWS=0x600;WIN32;_WINDOWS;_WIN32_WINNT=0x602;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;_M_ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj

@@ -29,7 +29,6 @@
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -40,7 +39,6 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization>MaxSpeed</Optimization>
       <SDLCheck>false</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>

src/modules/awake/AwakeModuleInterface/dllmain.cpp

@@ -13,7 +13,13 @@
 #include <common/utils/resources.h>
 #include <common/utils/os-detect.h>
 #include <common/utils/winapi_error.h>
+#include <common/utils/json.h>
 
+#include <algorithm>
+#include <limits>
+#include <memory>
+#include <cwctype>
+#include <optional>
 #include <filesystem>
 #include <set>
 
@@ -37,6 +43,105 @@ BOOL APIENTRY DllMain(HMODULE /*hModule*/, DWORD ul_reason_for_call, LPVOID /*lp
 const static wchar_t* MODULE_NAME = L"Awake";
 const static wchar_t* MODULE_DESC = L"A module that keeps your computer awake on-demand.";
 
+namespace
+{
+    std::wstring to_lower_copy(std::wstring value)
+    {
+        std::transform(value.begin(), value.end(), value.begin(), [](wchar_t ch) {
+            return static_cast<wchar_t>(std::towlower(ch));
+        });
+        return value;
+    }
+
+    std::wstring mode_to_string(int mode)
+    {
+        switch (mode)
+        {
+        case 0:
+            return L"passive";
+        case 1:
+            return L"indefinite";
+        case 2:
+            return L"timed";
+        case 3:
+            return L"expirable";
+        default:
+            return L"unknown";
+        }
+    }
+
+    std::optional<uint32_t> parse_duration_string(const std::wstring& raw)
+    {
+        if (raw.empty())
+        {
+            return std::nullopt;
+        }
+
+        std::wstring value = raw;
+        double multiplier = 1.0;
+
+        wchar_t suffix = value.back();
+        if (!iswdigit(suffix))
+        {
+            value.pop_back();
+            if (suffix == L'h' || suffix == L'H')
+            {
+                multiplier = 60.0;
+            }
+            else if (suffix == L'm' || suffix == L'M')
+            {
+                multiplier = 1.0;
+            }
+            else
+            {
+                return std::nullopt;
+            }
+        }
+
+        try
+        {
+            double numeric = std::stod(value);
+            if (numeric < 0)
+            {
+                return std::nullopt;
+            }
+
+            double totalMinutes = numeric * multiplier;
+            if (totalMinutes < 0 || totalMinutes > static_cast<double>(std::numeric_limits<uint32_t>::max()))
+            {
+                return std::nullopt;
+            }
+
+            return static_cast<uint32_t>(totalMinutes);
+        }
+        catch (...)
+        {
+            return std::nullopt;
+        }
+    }
+
+    std::optional<uint32_t> extract_duration_minutes(const json::JsonObject& args)
+    {
+        if (args.HasKey(L"durationMinutes"))
+        {
+            auto value = args.GetNamedNumber(L"durationMinutes");
+            if (value < 0)
+            {
+                return std::nullopt;
+            }
+            return static_cast<uint32_t>(value);
+        }
+
+        if (args.HasKey(L"duration"))
+        {
+            auto asString = args.GetNamedString(L"duration");
+            return parse_duration_string(asString.c_str());
+        }
+
+        return std::nullopt;
+    }
+}
+
 class Awake : public PowertoyModuleIface
 {
     std::wstring app_name;
@@ -45,6 +150,7 @@ class Awake : public PowertoyModuleIface
 private:
     bool m_enabled = false;
     PROCESS_INFORMATION p_info = {};
+    std::unique_ptr<pt::cli::IModuleCommandProvider> m_cliProvider;
 
     bool is_process_running()
     {
@@ -176,9 +282,167 @@ public:
     {
         return m_enabled;
     }
+
+    pt::cli::IModuleCommandProvider* command_provider() override;
+
+    pt::cli::CommandResult HandleStatus() const;
+    pt::cli::CommandResult HandleSet(const json::JsonObject& args);
 };
 
+class AwakeCommandProvider final : public pt::cli::IModuleCommandProvider
+{
+public:
+    explicit AwakeCommandProvider(Awake& owner) :
+        m_owner(owner)
+    {
+    }
+
+    std::wstring ModuleKey() const override
+    {
+        return L"awake";
+    }
+
+    std::vector<pt::cli::CommandDescriptor> DescribeCommands() const override
+    {
+        std::vector<pt::cli::CommandParameter> setParameters{
+            { L"mode", false, L"Awake mode: passive | indefinite | timed." },
+            { L"durationMinutes", false, L"Total duration in minutes for timed mode." },
+            { L"duration", false, L"Duration with unit (e.g. 30m, 2h) for timed mode." },
+            { L"displayOn", false, L"Whether to keep the display active (true/false)." },
+        };
+
+        pt::cli::CommandDescriptor setDescriptor;
+        setDescriptor.action = L"set";
+        setDescriptor.description = L"Configure the Awake module.";
+        setDescriptor.parameters = std::move(setParameters);
+
+        pt::cli::CommandDescriptor statusDescriptor;
+        statusDescriptor.action = L"status";
+        statusDescriptor.description = L"Inspect the current Awake mode.";
+
+        return { std::move(setDescriptor), std::move(statusDescriptor) };
+    }
+
+    pt::cli::CommandResult Execute(const pt::cli::CommandInvocation& invocation) override
+    {
+        auto action = to_lower_copy(invocation.action);
+        if (action == L"set")
+        {
+            return m_owner.HandleSet(invocation.args);
+        }
+
+        if (action == L"status")
+        {
+            return m_owner.HandleStatus();
+        }
+
+        return pt::cli::CommandResult::Error(L"E_COMMAND_NOT_FOUND", L"Unsupported Awake action.");
+    }
+
+private:
+    Awake& m_owner;
+};
+
+pt::cli::IModuleCommandProvider* Awake::command_provider()
+{
+    if (!m_cliProvider)
+    {
+        m_cliProvider = std::make_unique<AwakeCommandProvider>(*this);
+    }
+
+    return m_cliProvider.get();
+}
+
+pt::cli::CommandResult Awake::HandleStatus() const
+{
+    auto settings = PTSettingsHelper::load_module_settings(app_key);
+    json::JsonObject payload = json::JsonObject();
+
+    if (!settings.HasKey(L"properties"))
+    {
+        payload.SetNamedValue(L"mode", json::value(L"unknown"));
+        payload.SetNamedValue(L"keepDisplayOn", json::value(false));
+        return pt::cli::CommandResult::Success(std::move(payload));
+    }
+
+    auto properties = settings.GetNamedObject(L"properties");
+
+    const auto modeValue = static_cast<int>(properties.GetNamedNumber(L"mode", 0));
+    payload.SetNamedValue(L"mode", json::value(mode_to_string(modeValue)));
+    payload.SetNamedValue(L"modeValue", json::value(modeValue));
+    payload.SetNamedValue(L"keepDisplayOn", json::value(properties.GetNamedBoolean(L"keepDisplayOn", false)));
+    payload.SetNamedValue(L"intervalHours", json::value(static_cast<uint32_t>(properties.GetNamedNumber(L"intervalHours", 0))));
+    payload.SetNamedValue(L"intervalMinutes", json::value(static_cast<uint32_t>(properties.GetNamedNumber(L"intervalMinutes", 0))));
+
+    if (properties.HasKey(L"expirationDateTime"))
+    {
+        payload.SetNamedValue(L"expirationDateTime", json::value(properties.GetNamedString(L"expirationDateTime")));
+    }
+
+    return pt::cli::CommandResult::Success(std::move(payload));
+}
+
+pt::cli::CommandResult Awake::HandleSet(const json::JsonObject& args)
+{
+    std::wstring requestedMode = L"indefinite";
+    if (args.HasKey(L"mode"))
+    {
+        requestedMode = to_lower_copy(std::wstring(args.GetNamedString(L"mode").c_str()));
+    }
+
+    auto settings = PTSettingsHelper::load_module_settings(app_key);
+    json::JsonObject properties = settings.HasKey(L"properties") ? settings.GetNamedObject(L"properties") : json::JsonObject();
+
+    const bool keepDisplayOn = args.GetNamedBoolean(L"displayOn", properties.GetNamedBoolean(L"keepDisplayOn", false));
+
+    int modeValue = 1; // default to indefinite
+    if (requestedMode == L"passive")
+    {
+        modeValue = 0;
+    }
+    else if (requestedMode == L"indefinite" || requestedMode.empty())
+    {
+        modeValue = 1;
+    }
+    else if (requestedMode == L"timed")
+    {
+        modeValue = 2;
+    }
+    else
+    {
+        return pt::cli::CommandResult::Error(L"E_ARGS_INVALID", L"Unsupported mode. Use passive, indefinite, or timed.");
+    }
+
+    properties.SetNamedValue(L"keepDisplayOn", json::value(keepDisplayOn));
+    properties.SetNamedValue(L"mode", json::value(modeValue));
+
+    if (modeValue == 2)
+    {
+        auto durationMinutes = extract_duration_minutes(args);
+        if (!durationMinutes.has_value() || durationMinutes.value() == 0)
+        {
+            return pt::cli::CommandResult::Error(L"E_ARGS_INVALID", L"Timed mode requires a non-zero duration.");
+        }
+
+        const uint32_t totalMinutes = durationMinutes.value();
+        const uint32_t hours = totalMinutes / 60;
+        const uint32_t minutes = totalMinutes % 60;
+        properties.SetNamedValue(L"intervalHours", json::value(hours));
+        properties.SetNamedValue(L"intervalMinutes", json::value(minutes));
+    }
+    else
+    {
+        properties.SetNamedValue(L"intervalHours", json::value(0));
+        properties.SetNamedValue(L"intervalMinutes", json::value(0));
+    }
+
+    settings.SetNamedValue(L"properties", json::value(properties));
+    PTSettingsHelper::save_module_settings(app_key, settings);
+
+    return HandleStatus();
+}
+
 extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
 {
     return new Awake();
-}
+}

src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj

@@ -141,43 +141,4 @@
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
-
-  <!-- BEGIN common.build.post.props -->
-  <!--
-    The Hybrid CRT model statically links the runtime and STL and dynamically
-    links the UCRT instead of the VC++ CRT. The UCRT ships with Windows.
-    WinAppSDK asserts that this is "supported according to the CRT maintainer."
-
-    This must come before Microsoft.Cpp.targets because it manipulates ClCompile.RuntimeLibrary.
-  -->
-  <ItemDefinitionGroup Condition="'$(EnableHybridCRT)'=='true' and '$(Configuration)'=='Debug'">
-    <ClCompile>
-      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(EnableHybridCRT)'=='true' and ('$(Configuration)'=='Release' or '$(Configuration)'=='AuditMode')">
-    <ClCompile>
-      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <!-- END common.build.post.props -->
-
 </Project>

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

@@ -306,6 +306,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
                 Command.PropertyChanged -= Command_PropertyChanged;
                 Command = new(model.Command, PageContext);
                 Command.InitializeProperties();
+                Command.PropertyChanged += Command_PropertyChanged;
 
                 // Extensions based on Command Palette SDK < 0.3 CommandItem class won't notify when Title changes because Command
                 // or Command.Name change. This is a workaround to ensure that the Title is always up-to-date for extensions with old SDK.

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

@@ -97,6 +97,17 @@ public partial class ListViewModel : PageViewModel, IDisposable
         EmptyContent = new(new(null), PageContext);
     }
 
+    private void FiltersPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(FiltersViewModel.Filters))
+        {
+            var filtersViewModel = sender as FiltersViewModel;
+            var hasFilters = filtersViewModel?.Filters.Length > 0;
+            HasFilters = hasFilters;
+            UpdateProperty(nameof(HasFilters));
+        }
+    }
+
     // TODO: Does this need to hop to a _different_ thread, so that we don't block the extension while we're fetching?
     private void Model_ItemsChanged(object sender, IItemsChangedEventArgs args) => FetchItems();
 
@@ -586,8 +597,11 @@ public partial class ListViewModel : PageViewModel, IDisposable
         EmptyContent = new(new(model.EmptyContent), PageContext);
         EmptyContent.SlowInitializeProperties();
 
+        Filters?.PropertyChanged -= FiltersPropertyChanged;
         Filters = new(new(model.Filters), PageContext);
-        Filters.InitializeProperties();
+        Filters?.PropertyChanged += FiltersPropertyChanged;
+
+        Filters?.InitializeProperties();
         UpdateProperty(nameof(Filters));
 
         FetchItems();
@@ -686,8 +700,10 @@ public partial class ListViewModel : PageViewModel, IDisposable
                 EmptyContent.SlowInitializeProperties();
                 break;
             case nameof(Filters):
+                Filters?.PropertyChanged -= FiltersPropertyChanged;
                 Filters = new(new(model.Filters), PageContext);
-                Filters.InitializeProperties();
+                Filters?.PropertyChanged += FiltersPropertyChanged;
+                Filters?.InitializeProperties();
                 break;
             case nameof(IsLoading):
                 UpdateEmptyContent();
@@ -757,6 +773,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
             FilteredItems.Clear();
         }
 
+        Filters?.PropertyChanged -= FiltersPropertyChanged;
         Filters?.SafeCleanup();
 
         var model = _model.Unsafe;

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePageDownCommand.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.Core.ViewModels.Messages;
+
+/// <summary>
+/// Used to navigate down one page in the page when pressing the PageDown key in the SearchBox.
+/// </summary>
+public record NavigatePageDownCommand
+{
+}

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePageUpCommand.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.Core.ViewModels.Messages;
+
+/// <summary>
+/// Used to navigate up one page in the page when pressing the PageUp key in the SearchBox.
+/// </summary>
+public record NavigatePageUpCommand
+{
+}

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

@@ -68,7 +68,9 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
     // `IsLoading` property as a combo of this value and `IsInitialized`
     public bool ModelIsLoading { get; protected set; } = true;
 
-    public bool HasSearchBox { get; protected set; }
+    public bool HasSearchBox { get; protected set; } = true;
+
+    public bool HasFilters { get; protected set; }
 
     public IconInfoViewModel Icon { get; protected set; }
 

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ShellViewModel.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.ComponentModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
@@ -48,6 +49,9 @@ public partial class ShellViewModel : ObservableObject,
             var oldValue = _currentPage;
             if (SetProperty(ref _currentPage, value))
             {
+                oldValue.PropertyChanged -= CurrentPage_PropertyChanged;
+                value.PropertyChanged += CurrentPage_PropertyChanged;
+
                 if (oldValue is IDisposable disposable)
                 {
                     try
@@ -63,6 +67,14 @@ public partial class ShellViewModel : ObservableObject,
         }
     }
 
+    private void CurrentPage_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(PageViewModel.HasSearchBox))
+        {
+            IsSearchBoxVisible = CurrentPage.HasSearchBox;
+        }
+    }
+
     private IPage? _rootPage;
 
     private bool _isNested;

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Messages/ReloadFinishedMessage.cs

@@ -0,0 +1,7 @@
+// 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.UI.ViewModels.Messages;
+
+public record ReloadFinishedMessage();

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

@@ -410,5 +410,23 @@ namespace Microsoft.CmdPal.UI.ViewModels.Properties {
                 return ResourceManager.GetString("builtin_reload_subtitle", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to {0} extensions found.
+        /// </summary>
+        public static string builtin_settings_extension_n_extensions_found {
+            get {
+                return ResourceManager.GetString("builtin_settings_extension_n_extensions_found", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to {0} extensions installed.
+        /// </summary>
+        public static string builtin_settings_extension_n_extensions_installed {
+            get {
+                return ResourceManager.GetString("builtin_settings_extension_n_extensions_installed", resourceCulture);
+            }
+        }
     }
 }

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

@@ -236,4 +236,10 @@
   <data name="builtin_home_name" xml:space="preserve">
     <value>Home</value>
   </data>
+  <data name="builtin_settings_extension_n_extensions_found" xml:space="preserve">
+    <value>{0} extensions found</value>
+  </data>
+  <data name="builtin_settings_extension_n_extensions_installed" xml:space="preserve">
+    <value>{0} extensions installed</value>
+  </data>
 </root>

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

@@ -0,0 +1,144 @@
+// 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.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Globalization;
+using System.Text;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
+
+using Microsoft.CmdPal.Core.ViewModels.Messages;
+using Microsoft.CmdPal.UI.ViewModels.Messages;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.UI.ViewModels;
+
+/// <summary>
+/// Provides filtering over the list of provider settings view models.
+/// Intended to be used by the UI to bind a TextBox (SearchText) and an ItemsRepeater (FilteredProviders).
+/// </summary>
+public partial class SettingsExtensionsViewModel : ObservableObject
+{
+    private static readonly CompositeFormat LabelNumberExtensionFound
+        = CompositeFormat.Parse(Properties.Resources.builtin_settings_extension_n_extensions_found!);
+
+    private static readonly CompositeFormat LabelNumberExtensionInstalled
+        = CompositeFormat.Parse(Properties.Resources.builtin_settings_extension_n_extensions_installed!);
+
+    private readonly ObservableCollection<ProviderSettingsViewModel> _source;
+    private readonly TaskScheduler _uiScheduler;
+
+    public ObservableCollection<ProviderSettingsViewModel> FilteredProviders { get; } = [];
+
+    private string _searchText = string.Empty;
+
+    public string SearchText
+    {
+        get => _searchText;
+        set
+        {
+            if (_searchText != value)
+            {
+                _searchText = value;
+                OnPropertyChanged();
+                ApplyFilter();
+            }
+        }
+    }
+
+    public string ItemCounterText
+    {
+        get
+        {
+            var hasQuery = !string.IsNullOrWhiteSpace(_searchText);
+            var count = hasQuery ? FilteredProviders.Count : _source.Count;
+            var format = hasQuery ? LabelNumberExtensionFound : LabelNumberExtensionInstalled;
+            return string.Format(CultureInfo.CurrentCulture, format, count);
+        }
+    }
+
+    public bool ShowManualReloadOverlay
+    {
+        get;
+        private set
+        {
+            if (field != value)
+            {
+                field = value;
+                OnPropertyChanged();
+            }
+        }
+    }
+
+    public bool ShowNoResultsPanel => !string.IsNullOrWhiteSpace(_searchText) && FilteredProviders.Count == 0;
+
+    public bool HasResults => !ShowNoResultsPanel;
+
+    public IRelayCommand ReloadExtensionsCommand { get; }
+
+    public SettingsExtensionsViewModel(ObservableCollection<ProviderSettingsViewModel> source, TaskScheduler uiScheduler)
+    {
+        _source = source;
+        _uiScheduler = uiScheduler;
+        _source.CollectionChanged += Source_CollectionChanged;
+        ApplyFilter();
+
+        ReloadExtensionsCommand = new RelayCommand(ReloadExtensions);
+
+        WeakReferenceMessenger.Default.Register<ReloadFinishedMessage>(this, (_, _) =>
+        {
+            Task.Factory.StartNew(() => ShowManualReloadOverlay = false, CancellationToken.None, TaskCreationOptions.None, _uiScheduler);
+        });
+    }
+
+    private void Source_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+    {
+        ApplyFilter();
+    }
+
+    private void ApplyFilter()
+    {
+        var query = _searchText;
+        var filtered = ListHelpers.FilterList(_source, query, Matches);
+        ListHelpers.InPlaceUpdateList(FilteredProviders, filtered);
+        OnPropertyChanged(nameof(ItemCounterText));
+        OnPropertyChanged(nameof(HasResults));
+        OnPropertyChanged(nameof(ShowNoResultsPanel));
+    }
+
+    private static int Matches(string query, ProviderSettingsViewModel item)
+    {
+        if (string.IsNullOrWhiteSpace(query))
+        {
+            return 100;
+        }
+
+        return Contains(item.DisplayName, query)
+               || Contains(item.ExtensionName, query)
+               || Contains(item.ExtensionSubtext, query)
+            ? 100
+            : 0;
+    }
+
+    private static bool Contains(string? haystack, string needle)
+    {
+        return !string.IsNullOrEmpty(haystack) && haystack.Contains(needle, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [RelayCommand]
+    private void OpenStoreWithExtension(string? query)
+    {
+        const string extensionsAssocUri = "ms-windows-store://assoc/?Tags=AppExtension-com.microsoft.commandpalette";
+        ShellHelpers.OpenInShell(extensionsAssocUri);
+    }
+
+    private void ReloadExtensions()
+    {
+        ShowManualReloadOverlay = true;
+        WeakReferenceMessenger.Default.Send<ClearSearchMessage>();
+        WeakReferenceMessenger.Default.Send<ReloadCommandsMessage>();
+    }
+}

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

@@ -54,6 +54,8 @@ public partial class SettingsModel : ObservableObject
 
     public bool DisableAnimations { get; set; } = true;
 
+    public WindowPosition? LastWindowPosition { get; set; }
+
     // END SETTINGS
     ///////////////////////////////////////////////////////////////////////////
 
@@ -191,6 +193,7 @@ public partial class SettingsModel : ObservableObject
 [JsonSerializable(typeof(bool))]
 [JsonSerializable(typeof(HistoryItem))]
 [JsonSerializable(typeof(SettingsModel))]
+[JsonSerializable(typeof(WindowPosition))]
 [JsonSerializable(typeof(AppStateModel))]
 [JsonSerializable(typeof(RecentCommandsManager))]
 [JsonSerializable(typeof(List<string>), TypeInfoPropertyName = "StringList")]
@@ -208,4 +211,5 @@ public enum MonitorBehavior
     ToPrimary = 1,
     ToFocusedWindow = 2,
     InPlace = 3,
+    ToLast = 4,
 }

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

@@ -140,6 +140,8 @@ public partial class SettingsViewModel : INotifyPropertyChanged
 
     public ObservableCollection<ProviderSettingsViewModel> CommandProviders { get; } = [];
 
+    public SettingsExtensionsViewModel Extensions { get; }
+
     public SettingsViewModel(SettingsModel settings, IServiceProvider serviceProvider, TaskScheduler scheduler)
     {
         _settings = settings;
@@ -155,6 +157,8 @@ public partial class SettingsViewModel : INotifyPropertyChanged
             var settingsModel = new ProviderSettingsViewModel(item, providerSettings, _serviceProvider);
             CommandProviders.Add(settingsModel);
         }
+
+        Extensions = new SettingsExtensionsViewModel(CommandProviders, scheduler);
     }
 
     private IEnumerable<CommandProviderWrapper> GetCommandProviders()

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

@@ -259,6 +259,9 @@ public partial class TopLevelCommandManager : ObservableObject,
 
         IsLoading = false;
 
+        // Send on the current thread; receivers should marshal to UI if needed
+        WeakReferenceMessenger.Default.Send<ReloadFinishedMessage>();
+
         return true;
     }
 

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

@@ -219,7 +219,7 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
         {
             PropChanged?.Invoke(this, new PropChangedEventArgs(e.PropertyName));
 
-            if (e.PropertyName == "IsInitialized")
+            if (e.PropertyName is "IsInitialized" or nameof(CommandItemViewModel.Command))
             {
                 GenerateId();
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/WindowPosition.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 System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.CmdPal.UI.ViewModels;
+
+public sealed class WindowPosition
+{
+    public int X { get; set; }
+
+    public int Y { get; set; }
+
+    public int Width { get; set; }
+
+    public int Height { get; set; }
+}

src/modules/cmdpal/Microsoft.CmdPal.UI/Assets/StoreLogo.dark.svg

@@ -0,0 +1,100 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_125_2801)">
+<g clip-path="url(#clip1_125_2801)">
+<path d="M0 5C0 4.44771 0.447715 4 1 4H22C22.5523 4 23 4.44772 23 5V18.5C23 20.9853 20.9853 23 18.5 23H4.5C2.01472 23 0 20.9853 0 18.5V5Z" fill="url(#paint0_linear_125_2801)"/>
+<mask id="mask0_125_2801" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="4" width="23" height="19">
+<path d="M0 5C0 4.44771 0.447715 4 1 4H22C22.5523 4 23 4.44772 23 5V18.5C23 20.9853 20.9853 23 18.5 23H4.5C2.01472 23 0 20.9853 0 18.5V5Z" fill="url(#paint1_linear_125_2801)"/>
+</mask>
+<g mask="url(#mask0_125_2801)">
+<g filter="url(#filter0_dd_125_2801)">
+<path d="M6 5V1H17V5" stroke="url(#paint2_linear_125_2801)" stroke-width="2" stroke-linecap="round"/>
+</g>
+</g>
+<rect x="6" y="8" width="11" height="11" rx="1" fill="white" fill-opacity="0.5"/>
+<g filter="url(#filter1_d_125_2801)">
+<path d="M11 9H7V13H11V9Z" fill="#F25022"/>
+<path d="M16 9H12V13H16V9Z" fill="#7FBA00"/>
+<path d="M16 14H12V18H16V14Z" fill="#FFB900"/>
+<path d="M11 14H7V18H11V14Z" fill="#00A4EF"/>
+</g>
+<path d="M6 5V2C6 1.44772 6.44772 1 7 1H16C16.5523 1 17 1.44772 17 2V5" stroke="url(#paint3_linear_125_2801)" stroke-width="2" stroke-linecap="round"/>
+<rect x="7" width="9" height="2" fill="url(#paint4_linear_125_2801)"/>
+<mask id="mask1_125_2801" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="7" y="0" width="9" height="2">
+<rect x="7" width="9" height="2" fill="url(#paint5_linear_125_2801)"/>
+</mask>
+<g mask="url(#mask1_125_2801)">
+<g filter="url(#filter2_dd_125_2801)">
+</g>
+</g>
+</g>
+</g>
+<defs>
+<filter id="filter0_dd_125_2801" x="3.5" y="-1" width="16" height="9" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.25"/>
+<feGaussianBlur stdDeviation="0.25"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_125_2801"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.5"/>
+<feGaussianBlur stdDeviation="0.75"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_125_2801" result="effect2_dropShadow_125_2801"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_125_2801" result="shape"/>
+</filter>
+<filter id="filter1_d_125_2801" x="6" y="8.25" width="11" height="11" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.25"/>
+<feGaussianBlur stdDeviation="0.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_125_2801"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_125_2801" result="shape"/>
+</filter>
+<filter id="filter2_dd_125_2801" x="3.5" y="-2.5" width="16" height="8" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-1"/>
+<feGaussianBlur stdDeviation="0.25"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_125_2801"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-1"/>
+<feGaussianBlur stdDeviation="0.75"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_125_2801" result="effect2_dropShadow_125_2801"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_125_2801" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_125_2801" x1="5.22727" y1="1.19318" x2="9.5894" y2="22.315" gradientUnits="userSpaceOnUse">
+<stop offset="0.270833" stop-color="white"/>
+<stop offset="1" stop-color="#DFDFDF"/>
+</linearGradient>
+<linearGradient id="paint1_linear_125_2801" x1="11.5" y1="4" x2="15.4941" y2="23.743" gradientUnits="userSpaceOnUse">
+<stop stop-color="#0078D4"/>
+<stop offset="1" stop-color="#114A8B"/>
+</linearGradient>
+<linearGradient id="paint2_linear_125_2801" x1="11.5" y1="1" x2="11.8823" y2="5.29249" gradientUnits="userSpaceOnUse">
+<stop stop-color="#28AFEA"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint3_linear_125_2801" x1="11.5" y1="1" x2="11.7158" y2="4.23049" gradientUnits="userSpaceOnUse">
+<stop stop-color="#30DAFF"/>
+<stop offset="1" stop-color="#0094D4"/>
+</linearGradient>
+<linearGradient id="paint4_linear_125_2801" x1="11" y1="5.23303e-08" x2="11" y2="2" gradientUnits="userSpaceOnUse">
+<stop stop-color="#22BCFF"/>
+<stop offset="1" stop-color="#0088F0"/>
+</linearGradient>
+<linearGradient id="paint5_linear_125_2801" x1="11" y1="5.23303e-08" x2="11" y2="2" gradientUnits="userSpaceOnUse">
+<stop stop-color="#28AFEA"/>
+<stop offset="1" stop-color="#3CCBF4"/>
+</linearGradient>
+<clipPath id="clip0_125_2801">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+<clipPath id="clip1_125_2801">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>

src/modules/cmdpal/Microsoft.CmdPal.UI/Assets/StoreLogo.light.svg

@@ -0,0 +1,100 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_125_2875)">
+<g clip-path="url(#clip1_125_2875)">
+<path d="M0 5C0 4.44771 0.447715 4 1 4H22C22.5523 4 23 4.44772 23 5V18.5C23 20.9853 20.9853 23 18.5 23H4.5C2.01472 23 0 20.9853 0 18.5V5Z" fill="url(#paint0_linear_125_2875)"/>
+<mask id="mask0_125_2875" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="4" width="23" height="19">
+<path d="M0 5C0 4.44771 0.447715 4 1 4H22C22.5523 4 23 4.44772 23 5V18.5C23 20.9853 20.9853 23 18.5 23H4.5C2.01472 23 0 20.9853 0 18.5V5Z" fill="url(#paint1_linear_125_2875)"/>
+</mask>
+<g mask="url(#mask0_125_2875)">
+<g filter="url(#filter0_dd_125_2875)">
+<path d="M6 5V1H17V5" stroke="url(#paint2_linear_125_2875)" stroke-width="2" stroke-linecap="round"/>
+</g>
+</g>
+<rect x="6" y="8" width="11" height="11" rx="1" fill="#243A5F" fill-opacity="0.5"/>
+<g filter="url(#filter1_d_125_2875)">
+<path d="M11 9H7V13H11V9Z" fill="#F25022"/>
+<path d="M16 9H12V13H16V9Z" fill="#7FBA00"/>
+<path d="M16 14H12V18H16V14Z" fill="#FFB900"/>
+<path d="M11 14H7V18H11V14Z" fill="#00A4EF"/>
+</g>
+<path d="M6 5V2C6 1.44772 6.44772 1 7 1H16C16.5523 1 17 1.44772 17 2V5" stroke="url(#paint3_linear_125_2875)" stroke-width="2" stroke-linecap="round"/>
+<rect x="7" width="9" height="2" fill="url(#paint4_linear_125_2875)"/>
+<mask id="mask1_125_2875" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="7" y="0" width="9" height="2">
+<rect x="7" width="9" height="2" fill="url(#paint5_linear_125_2875)"/>
+</mask>
+<g mask="url(#mask1_125_2875)">
+<g filter="url(#filter2_dd_125_2875)">
+</g>
+</g>
+</g>
+</g>
+<defs>
+<filter id="filter0_dd_125_2875" x="3.5" y="-1" width="16" height="9" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.25"/>
+<feGaussianBlur stdDeviation="0.25"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_125_2875"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.5"/>
+<feGaussianBlur stdDeviation="0.75"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_125_2875" result="effect2_dropShadow_125_2875"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_125_2875" result="shape"/>
+</filter>
+<filter id="filter1_d_125_2875" x="6" y="8.25" width="11" height="11" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.25"/>
+<feGaussianBlur stdDeviation="0.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_125_2875"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_125_2875" result="shape"/>
+</filter>
+<filter id="filter2_dd_125_2875" x="3.5" y="-2.5" width="16" height="8" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-1"/>
+<feGaussianBlur stdDeviation="0.25"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_125_2875"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-1"/>
+<feGaussianBlur stdDeviation="0.75"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_125_2875" result="effect2_dropShadow_125_2875"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_125_2875" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_125_2875" x1="11.5" y1="4" x2="15.4941" y2="23.743" gradientUnits="userSpaceOnUse">
+<stop stop-color="#0669BC"/>
+<stop offset="1" stop-color="#243A5F"/>
+</linearGradient>
+<linearGradient id="paint1_linear_125_2875" x1="11.5" y1="4" x2="15.4941" y2="23.743" gradientUnits="userSpaceOnUse">
+<stop stop-color="#0078D4"/>
+<stop offset="1" stop-color="#114A8B"/>
+</linearGradient>
+<linearGradient id="paint2_linear_125_2875" x1="11.5" y1="1" x2="11.8823" y2="5.29249" gradientUnits="userSpaceOnUse">
+<stop stop-color="#28AFEA"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint3_linear_125_2875" x1="11.5" y1="1" x2="11.7158" y2="4.23049" gradientUnits="userSpaceOnUse">
+<stop stop-color="#30DAFF"/>
+<stop offset="1" stop-color="#0094D4"/>
+</linearGradient>
+<linearGradient id="paint4_linear_125_2875" x1="11" y1="5.23303e-08" x2="11" y2="2" gradientUnits="userSpaceOnUse">
+<stop stop-color="#22BCFF"/>
+<stop offset="1" stop-color="#0088F0"/>
+</linearGradient>
+<linearGradient id="paint5_linear_125_2875" x1="11" y1="5.23303e-08" x2="11" y2="2" gradientUnits="userSpaceOnUse">
+<stop stop-color="#28AFEA"/>
+<stop offset="1" stop-color="#3CCBF4"/>
+</linearGradient>
+<clipPath id="clip0_125_2875">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+<clipPath id="clip1_125_2875">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>

src/modules/cmdpal/Microsoft.CmdPal.UI/Assets/WinGetLogo.svg

@@ -0,0 +1,97 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_125_2968)">
+<path d="M3 1.5C3 0.671573 3.67157 0 4.5 0H19.5C20.3284 0 21 0.671573 21 1.5V16.5C21 17.3284 20.3284 18 19.5 18H4.5C3.67157 18 3 17.3284 3 16.5V1.5Z" fill="#9C640A"/>
+<mask id="mask0_125_2968" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="3" y="0" width="18" height="18">
+<path d="M3 1.5C3 0.671573 3.67157 0 4.5 0H19.5C20.3284 0 21 0.671573 21 1.5V16.5C21 17.3284 20.3284 18 19.5 18H4.5C3.67157 18 3 17.3284 3 16.5V1.5Z" fill="#9C640A"/>
+</mask>
+<g mask="url(#mask0_125_2968)">
+<g filter="url(#filter0_dd_125_2968)">
+<path d="M1.5 4.5C1.5 3.67157 2.17157 3 3 3H21C21.8284 3 22.5 3.67157 22.5 4.5V19.5C22.5 20.3284 21.8284 21 21 21H3C2.17157 21 1.5 20.3284 1.5 19.5V4.5Z" fill="#BC822A"/>
+</g>
+</g>
+<path d="M1.5 4.5C1.5 3.67157 2.17157 3 3 3H21C21.8284 3 22.5 3.67157 22.5 4.5V19.5C22.5 20.3284 21.8284 21 21 21H3C2.17157 21 1.5 20.3284 1.5 19.5V4.5Z" fill="#BC822A"/>
+<mask id="mask1_125_2968" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="1" y="3" width="22" height="18">
+<path d="M1.5 4.5C1.5 3.67157 2.17157 3 3 3H21C21.8284 3 22.5 3.67157 22.5 4.5V19.5C22.5 20.3284 21.8284 21 21 21H3C2.17157 21 1.5 20.3284 1.5 19.5V4.5Z" fill="#BC822A"/>
+</mask>
+<g mask="url(#mask1_125_2968)">
+<g filter="url(#filter1_dd_125_2968)">
+<path d="M0 7.5C0 6.67157 0.671573 6 1.5 6H22.5C23.3284 6 24 6.67157 24 7.5V22.5C24 23.3284 23.3284 24 22.5 24H1.5C0.671573 24 0 23.3284 0 22.5V7.5Z" fill="#D9D9D9"/>
+<path d="M0 7.5C0 6.67157 0.671573 6 1.5 6H22.5C23.3284 6 24 6.67157 24 7.5V22.5C24 23.3284 23.3284 24 22.5 24H1.5C0.671573 24 0 23.3284 0 22.5V7.5Z" fill="url(#paint0_linear_125_2968)"/>
+<path d="M0 7.5C0 6.67157 0.671573 6 1.5 6H22.5C23.3284 6 24 6.67157 24 7.5V22.5C24 23.3284 23.3284 24 22.5 24H1.5C0.671573 24 0 23.3284 0 22.5V7.5Z" fill="url(#paint1_linear_125_2968)"/>
+</g>
+</g>
+<path d="M0 7.5C0 6.67157 0.671573 6 1.5 6H22.5C23.3284 6 24 6.67157 24 7.5V22.5C24 23.3284 23.3284 24 22.5 24H1.5C0.671573 24 0 23.3284 0 22.5V7.5Z" fill="#D9D9D9"/>
+<path d="M0 7.5C0 6.67157 0.671573 6 1.5 6H22.5C23.3284 6 24 6.67157 24 7.5V22.5C24 23.3284 23.3284 24 22.5 24H1.5C0.671573 24 0 23.3284 0 22.5V7.5Z" fill="url(#paint2_linear_125_2968)"/>
+<path d="M0 7.5C0 6.67157 0.671573 6 1.5 6H22.5C23.3284 6 24 6.67157 24 7.5V22.5C24 23.3284 23.3284 24 22.5 24H1.5C0.671573 24 0 23.3284 0 22.5V7.5Z" fill="url(#paint3_linear_125_2968)"/>
+<g filter="url(#filter2_dd_125_2968)">
+<path d="M12 9C12.8284 9 13.5 9.67157 13.5 10.5V15.8789L14.6895 14.6895C15.2752 14.1037 16.2248 14.1037 16.8105 14.6895C17.3963 15.2752 17.3963 16.2248 16.8105 16.8105L13.0605 20.5605C12.4748 21.1463 11.5252 21.1463 10.9395 20.5605L7.18945 16.8105C6.60367 16.2248 6.60367 15.2752 7.18945 14.6895C7.77524 14.1037 8.72476 14.1037 9.31055 14.6895L10.5 15.8789V10.5C10.5 9.67157 11.1716 9 12 9Z" fill="url(#paint4_linear_125_2968)"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_dd_125_2968" x="0.5" y="1.505" width="23" height="20" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-0.495"/>
+<feGaussianBlur stdDeviation="0.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.32 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_125_2968"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-0.105"/>
+<feGaussianBlur stdDeviation="0.05"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_125_2968" result="effect2_dropShadow_125_2968"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_125_2968" result="shape"/>
+</filter>
+<filter id="filter1_dd_125_2968" x="-1" y="4.505" width="26" height="20" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-0.495"/>
+<feGaussianBlur stdDeviation="0.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.32 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_125_2968"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-0.105"/>
+<feGaussianBlur stdDeviation="0.05"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_125_2968" result="effect2_dropShadow_125_2968"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_125_2968" result="shape"/>
+</filter>
+<filter id="filter2_dd_125_2968" x="5.75" y="8.5" width="12.5" height="14" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.5"/>
+<feGaussianBlur stdDeviation="0.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.32 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_125_2968"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.1"/>
+<feGaussianBlur stdDeviation="0.05"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.24 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_125_2968" result="effect2_dropShadow_125_2968"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_125_2968" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_125_2968" x1="0" y1="6" x2="17.28" y2="29.04" gradientUnits="userSpaceOnUse">
+<stop stop-color="#DEB678"/>
+<stop offset="1" stop-color="#C59141"/>
+</linearGradient>
+<linearGradient id="paint1_linear_125_2968" x1="6.75" y1="3.75" x2="14.25" y2="26.25" gradientUnits="userSpaceOnUse">
+<stop stop-color="#DEB678"/>
+<stop offset="1" stop-color="#B57F2D"/>
+</linearGradient>
+<linearGradient id="paint2_linear_125_2968" x1="0" y1="6" x2="17.28" y2="29.04" gradientUnits="userSpaceOnUse">
+<stop stop-color="#DEB678"/>
+<stop offset="1" stop-color="#C59141"/>
+</linearGradient>
+<linearGradient id="paint3_linear_125_2968" x1="6.75" y1="3.75" x2="14.25" y2="26.25" gradientUnits="userSpaceOnUse">
+<stop stop-color="#DEB678"/>
+<stop offset="1" stop-color="#B57F2D"/>
+</linearGradient>
+<linearGradient id="paint4_linear_125_2968" x1="9.13631" y1="7.22729" x2="12.8104" y2="20.0865" gradientUnits="userSpaceOnUse">
+<stop offset="0.270833" stop-color="white"/>
+<stop offset="1" stop-color="#F0F0F0"/>
+</linearGradient>
+<clipPath id="clip0_125_2968">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>

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

@@ -77,7 +77,7 @@
         SelectedValue="{x:Bind ViewModel.CurrentFilter, Mode=OneWay}"
         SelectionChanged="FiltersComboBox_SelectionChanged"
         Style="{StaticResource ComboBoxStyle}"
-        Visibility="{x:Bind ViewModel.ShouldShowFilters, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+        Visibility="{x:Bind ViewModel.ShouldShowFilters, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}, FallbackValue=Collapsed}">
         <ComboBox.ItemContainerStyle>
             <Style BasedOn="{StaticResource DefaultComboBoxItemStyle}" TargetType="ComboBoxItem">
                 <Setter Property="MinHeight" Value="0" />

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

@@ -216,6 +216,16 @@ public sealed partial class SearchBar : UserControl,
 
             e.Handled = true;
         }
+        else if (e.Key == VirtualKey.PageDown)
+        {
+            WeakReferenceMessenger.Default.Send<NavigatePageDownCommand>();
+            e.Handled = true;
+        }
+        else if (e.Key == VirtualKey.PageUp)
+        {
+            WeakReferenceMessenger.Default.Send<NavigatePageUpCommand>();
+            e.Handled = true;
+        }
 
         if (InSuggestion)
         {

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

@@ -18,6 +18,7 @@ using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
+using Windows.Foundation;
 using Windows.System;
 
 namespace Microsoft.CmdPal.UI;
@@ -25,6 +26,8 @@ namespace Microsoft.CmdPal.UI;
 public sealed partial class ListPage : Page,
     IRecipient<NavigateNextCommand>,
     IRecipient<NavigatePreviousCommand>,
+    IRecipient<NavigatePageDownCommand>,
+    IRecipient<NavigatePageUpCommand>,
     IRecipient<ActivateSelectedListItemMessage>,
     IRecipient<ActivateSecondaryCommandMessage>
 {
@@ -82,6 +85,8 @@ public sealed partial class ListPage : Page,
         // RegisterAll isn't AOT compatible
         WeakReferenceMessenger.Default.Register<NavigateNextCommand>(this);
         WeakReferenceMessenger.Default.Register<NavigatePreviousCommand>(this);
+        WeakReferenceMessenger.Default.Register<NavigatePageDownCommand>(this);
+        WeakReferenceMessenger.Default.Register<NavigatePageUpCommand>(this);
         WeakReferenceMessenger.Default.Register<ActivateSelectedListItemMessage>(this);
         WeakReferenceMessenger.Default.Register<ActivateSecondaryCommandMessage>(this);
 
@@ -94,6 +99,8 @@ public sealed partial class ListPage : Page,
 
         WeakReferenceMessenger.Default.Unregister<NavigateNextCommand>(this);
         WeakReferenceMessenger.Default.Unregister<NavigatePreviousCommand>(this);
+        WeakReferenceMessenger.Default.Unregister<NavigatePageDownCommand>(this);
+        WeakReferenceMessenger.Default.Unregister<NavigatePageUpCommand>(this);
         WeakReferenceMessenger.Default.Unregister<ActivateSelectedListItemMessage>(this);
         WeakReferenceMessenger.Default.Unregister<ActivateSecondaryCommandMessage>(this);
 
@@ -181,9 +188,9 @@ public sealed partial class ListPage : Page,
                 var notificationText = li.Title;
 
                 UIHelper.AnnounceActionForAccessibility(
-                     ItemsList,
-                     notificationText,
-                     "CommandPaletteSelectedItemChanged");
+                    ItemsList,
+                    notificationText,
+                    "CommandPaletteSelectedItemChanged");
             }
         }
     }
@@ -296,6 +303,142 @@ public sealed partial class ListPage : Page,
         }
     }
 
+    public void Receive(NavigatePageDownCommand message)
+    {
+        var indexes = CalculateTargetIndexPageUpDownScrollTo(true);
+        if (indexes is null)
+        {
+            return;
+        }
+
+        if (indexes.Value.CurrentIndex != indexes.Value.TargetIndex)
+        {
+            ItemView.SelectedIndex = indexes.Value.TargetIndex;
+            ItemView.ScrollIntoView(ItemView.SelectedItem);
+        }
+    }
+
+    public void Receive(NavigatePageUpCommand message)
+    {
+        var indexes = CalculateTargetIndexPageUpDownScrollTo(false);
+        if (indexes is null)
+        {
+            return;
+        }
+
+        if (indexes.Value.CurrentIndex != indexes.Value.TargetIndex)
+        {
+            ItemView.SelectedIndex = indexes.Value.TargetIndex;
+            ItemView.ScrollIntoView(ItemView.SelectedItem);
+        }
+    }
+
+    /// <summary>
+    /// Calculates the item index to target when performing a page up or page down
+    /// navigation. The calculation attempts to estimate how many items fit into
+    /// the visible viewport by measuring actual container heights currently visible
+    /// within the internal ScrollViewer. If measurements are not available a
+    /// fallback estimate is used.
+    /// </summary>
+    /// <param name="isPageDown">True to calculate a page-down target, false for page-up.</param>
+    /// <returns>
+    /// A tuple containing the current index and the calculated target index, or null
+    /// if a valid calculation could not be performed (for example, missing ScrollViewer).
+    /// </returns>
+    private (int CurrentIndex, int TargetIndex)? CalculateTargetIndexPageUpDownScrollTo(bool isPageDown)
+    {
+        var scroll = FindScrollViewer(ItemView);
+        if (scroll is null)
+        {
+            return null;
+        }
+
+        var viewportHeight = scroll.ViewportHeight;
+        if (viewportHeight <= 0)
+        {
+            return null;
+        }
+
+        var currentIndex = ItemView.SelectedIndex < 0 ? 0 : ItemView.SelectedIndex;
+        var itemCount = ItemView.Items.Count;
+
+        // Compute visible item heights within the ScrollViewer viewport
+        const int firstVisibleIndexNotFound = -1;
+        var firstVisibleIndex = firstVisibleIndexNotFound;
+        var visibleHeights = new List<double>(itemCount);
+
+        for (var i = 0; i < itemCount; i++)
+        {
+            if (ItemView.ContainerFromIndex(i) is FrameworkElement container)
+            {
+                try
+                {
+                    var transform = container.TransformToVisual(scroll);
+                    var topLeft = transform.TransformPoint(new Point(0, 0));
+                    var bottom = topLeft.Y + container.ActualHeight;
+
+                    // If any part of the container is inside the viewport, consider it visible
+                    if (topLeft.Y >= 0 && bottom <= viewportHeight)
+                    {
+                        if (firstVisibleIndex == firstVisibleIndexNotFound)
+                        {
+                            firstVisibleIndex = i;
+                        }
+
+                        visibleHeights.Add(container.ActualHeight > 0 ? container.ActualHeight : 0);
+                    }
+                }
+                catch
+                {
+                    // ignore transform errors and continue
+                }
+            }
+        }
+
+        var itemsPerPage = 0;
+
+        // Calculate how many items fit in the viewport based on their actual heights
+        if (visibleHeights.Count > 0)
+        {
+            double accumulated = 0;
+            for (var i = 0; i < visibleHeights.Count; i++)
+            {
+                accumulated += visibleHeights[i] <= 0 ? 1 : visibleHeights[i];
+                itemsPerPage++;
+                if (accumulated >= viewportHeight)
+                {
+                    break;
+                }
+            }
+        }
+        else
+        {
+            // fallback: estimate using first measured container height
+            double itemHeight = 0;
+            for (var i = currentIndex; i < itemCount; i++)
+            {
+                if (ItemView.ContainerFromIndex(i) is FrameworkElement { ActualHeight: > 0 } c)
+                {
+                    itemHeight = c.ActualHeight;
+                    break;
+                }
+            }
+
+            if (itemHeight <= 0)
+            {
+                itemHeight = 1;
+            }
+
+            itemsPerPage = Math.Max(1, (int)Math.Floor(viewportHeight / itemHeight));
+        }
+
+        var targetIndex = isPageDown
+                              ? Math.Min(itemCount - 1, currentIndex + Math.Max(1, itemsPerPage))
+                              : Math.Max(0, currentIndex - Math.Max(1, itemsPerPage));
+
+        return (currentIndex, targetIndex);
+    }
+
     private static void OnViewModelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
         if (d is ListPage @this)
@@ -351,11 +494,11 @@ public sealed partial class ListPage : Page,
         }
     }
 
-    private ScrollViewer? FindScrollViewer(DependencyObject parent)
+    private static ScrollViewer? FindScrollViewer(DependencyObject parent)
     {
-        if (parent is ScrollViewer)
+        if (parent is ScrollViewer viewer)
         {
-            return (ScrollViewer)parent;
+            return viewer;
         }
 
         for (var i = 0; i < VisualTreeHelper.GetChildrenCount(parent); i++)

src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/WindowExtensions.cs

@@ -22,7 +22,7 @@ internal static class WindowExtensions
         appWindow.SetIcon(@"Assets\icon.ico");
     }
 
-    private static HWND GetWindowHwnd(this Window window)
+    public static HWND GetWindowHwnd(this Window window)
     {
         return window is null
             ? throw new ArgumentNullException(nameof(window))

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

@@ -0,0 +1,89 @@
+// 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.UI.Helpers;
+using Microsoft.UI.Xaml;
+using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.Graphics.Dwm;
+using Windows.Win32.UI.WindowsAndMessaging;
+
+namespace Microsoft.CmdPal.UI;
+
+/// <summary>
+/// Provides behavior to control taskbar and Alt+Tab presence by assigning a hidden owner
+/// and toggling extended window styles for a target window.
+/// </summary>
+internal sealed class HiddenOwnerWindowBehavior
+{
+    private HWND _hiddenOwnerHwnd;
+    private Window? _hiddenWindow;
+
+    /// <summary>
+    /// Shows or hides a window in the taskbar (and Alt+Tab) by updating ownership and extended window styles.
+    /// </summary>
+    /// <param name="target">The <see cref="Microsoft.UI.Xaml.Window"/> to update.</param>
+    /// <param name="isVisibleInTaskbar"> True to show the window in the taskbar (and Alt+Tab); false to hide it from both. </param>
+    /// <remarks>
+    /// When hiding the window, a hidden owner is assigned and <see cref="WINDOW_EX_STYLE.WS_EX_TOOLWINDOW"/>
+    /// is enabled to keep it out of the taskbar and Alt+Tab. When showing, the owner is cleared and
+    /// <see cref="WINDOW_EX_STYLE.WS_EX_APPWINDOW"/> is enabled to ensure taskbar presence. Since tool
+    /// windows use smaller corner radii, the normal rounded corners are enforced via
+    /// <see cref="DWM_WINDOW_CORNER_PREFERENCE.DWMWCP_ROUND"/>.
+    /// </remarks>
+    /// <seealso href="https://learn.microsoft.com/en-us/windows/win32/shell/taskbar#managing-taskbar-buttons" />
+    public void ShowInTaskbar(Window target, bool isVisibleInTaskbar)
+    {
+        /*
+         * There are the three main ways to control whether a window appears on the taskbar:
+         * https://learn.microsoft.com/en-us/windows/win32/shell/taskbar#managing-taskbar-buttons
+         *
+         * 1. Set the window's owner. Owned windows do not appear on the taskbar:
+         *    Turns out this is the most reliable way to hide a window from the taskbar and ALT+TAB. WinForms and WPF uses this method
+         *    to back their ShowInTaskbar property as well.
+         *
+         * 2. Use the WS_EX_TOOLWINDOW extended window style:
+         *    This mostly works, with some reports that it silently fails in some cases. The biggest issue
+         *    is that for certain Windows settings (like Multitasking -> Show taskbar buttons on all displays = On all desktops),
+         *    the taskbar button is always shown even for tool windows.
+         *
+         * 3. Using ITaskbarList:
+         *    This is what AppWindow.IsShownInSwitchers uses, but it's COM-based and more complex, and can
+         *    fail if Explorer isn't running or responding. It could be a good backup, if needed.
+         */
+
+        var visibleHwnd = target.GetWindowHwnd();
+
+        if (isVisibleInTaskbar)
+        {
+            // remove any owner window
+            PInvoke.SetWindowLongPtr(visibleHwnd, WINDOW_LONG_PTR_INDEX.GWLP_HWNDPARENT, HWND.Null);
+        }
+        else
+        {
+            // Set the hidden window as the owner of the target window
+            var hiddenHwnd = EnsureHiddenOwner();
+            PInvoke.SetWindowLongPtr(visibleHwnd, WINDOW_LONG_PTR_INDEX.GWLP_HWNDPARENT, hiddenHwnd);
+        }
+
+        // Tool windows don't show up in ALT+TAB, and don't show up in the taskbar
+        // Tool window and app window styles are mutually exclusive, change both just to be safe
+        target.ToggleExtendedWindowStyle(WINDOW_EX_STYLE.WS_EX_TOOLWINDOW, !isVisibleInTaskbar);
+        target.ToggleExtendedWindowStyle(WINDOW_EX_STYLE.WS_EX_APPWINDOW, isVisibleInTaskbar);
+
+        // Since tool windows have smaller corner radii, we need to force the normal ones
+        target.SetCornerPreference(DWM_WINDOW_CORNER_PREFERENCE.DWMWCP_ROUND);
+    }
+
+    private HWND EnsureHiddenOwner()
+    {
+        if (_hiddenOwnerHwnd.IsNull)
+        {
+            _hiddenWindow = new Window();
+            _hiddenOwnerHwnd = _hiddenWindow.GetWindowHwnd();
+        }
+
+        return _hiddenOwnerHwnd;
+    }
+}

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

@@ -57,14 +57,18 @@ public sealed partial class MainWindow : WindowEx,
     private readonly List<TopLevelHotkey> _hotkeys = [];
     private readonly KeyboardListener _keyboardListener;
     private readonly LocalKeyboardListener _localKeyboardListener;
+    private readonly HiddenOwnerWindowBehavior _hiddenOwnerBehavior = new();
     private bool _ignoreHotKeyWhenFullScreen = true;
 
     private DesktopAcrylicController? _acrylicController;
     private SystemBackdropConfiguration? _configurationSource;
 
+    private WindowPosition _currentWindowPosition = new();
+
     public MainWindow()
     {
         InitializeComponent();
+        HideWindow();
 
         _hwnd = new HWND(WinRT.Interop.WindowNative.GetWindowHandle(this).ToInt32());
 
@@ -73,6 +77,8 @@ public sealed partial class MainWindow : WindowEx,
             CommandPaletteHost.SetHostHwnd((ulong)_hwnd.Value);
         }
 
+        _hiddenOwnerBehavior.ShowInTaskbar(this, Debugger.IsAttached);
+
         _keyboardListener = new KeyboardListener();
         _keyboardListener.Start();
 
@@ -80,7 +86,9 @@ public sealed partial class MainWindow : WindowEx,
 
         this.SetIcon();
         AppWindow.Title = RS_.GetString("AppName");
-        PositionCentered();
+        RestoreWindowPosition();
+        UpdateWindowPositionInMemory();
+
         SetAcrylic();
 
         WeakReferenceMessenger.Default.Register<DismissMessage>(this);
@@ -126,16 +134,6 @@ public sealed partial class MainWindow : WindowEx,
 
         // Force window to be created, and then cloaked. This will offset initial animation when the window is shown.
         HideWindow();
-
-        ApplyWindowStyle();
-    }
-
-    private void ApplyWindowStyle()
-    {
-        // Tool windows don't show up in ALT+TAB, and don't show up in the taskbar
-        // Since tool windows have smaller corner radii, we need to force the normal ones
-        this.ToggleExtendedWindowStyle(WINDOW_EX_STYLE.WS_EX_TOOLWINDOW, !Debugger.IsAttached);
-        this.SetCornerPreference(DWM_WINDOW_CORNER_PREFERENCE.DWMWCP_ROUND);
     }
 
     private static void LocalKeyboardListener_OnKeyPressed(object? sender, LocalKeyboardListenerKeyPressedEventArgs e)
@@ -161,6 +159,39 @@ public sealed partial class MainWindow : WindowEx,
         PositionCentered(displayArea);
     }
 
+    private void RestoreWindowPosition()
+    {
+        var settings = App.Current.Services.GetService<SettingsModel>();
+        if (settings?.LastWindowPosition is not WindowPosition savedPosition)
+        {
+            PositionCentered();
+            return;
+        }
+
+        if (savedPosition.Width <= 0 || savedPosition.Height <= 0)
+        {
+            PositionCentered();
+            return;
+        }
+
+        AppWindow.Resize(new SizeInt32 { Width = savedPosition.Width, Height = savedPosition.Height });
+
+        var savedRect = new RectInt32(savedPosition.X, savedPosition.Y, savedPosition.Width, savedPosition.Height);
+        var displayArea = DisplayArea.GetFromRect(savedRect, DisplayAreaFallback.Nearest);
+        var workArea = displayArea.WorkArea;
+
+        var maxX = workArea.X + Math.Max(0, workArea.Width - savedPosition.Width);
+        var maxY = workArea.Y + Math.Max(0, workArea.Height - savedPosition.Height);
+
+        var targetPoint = new PointInt32
+        {
+            X = Math.Clamp(savedPosition.X, workArea.X, maxX),
+            Y = Math.Clamp(savedPosition.Y, workArea.Y, maxY),
+        };
+
+        AppWindow.Move(targetPoint);
+    }
+
     private void PositionCentered(DisplayArea displayArea)
     {
         if (displayArea is not null)
@@ -175,6 +206,17 @@ public sealed partial class MainWindow : WindowEx,
         }
     }
 
+    private void UpdateWindowPositionInMemory()
+    {
+        _currentWindowPosition = new WindowPosition
+        {
+            X = AppWindow.Position.X,
+            Y = AppWindow.Position.Y,
+            Width = AppWindow.Size.Width,
+            Height = AppWindow.Size.Height,
+        };
+    }
+
     private void HotReloadSettings()
     {
         var settings = App.Current.Services.GetService<SettingsModel>()!;
@@ -257,14 +299,22 @@ public sealed partial class MainWindow : WindowEx,
             PInvoke.ShowWindow(hwnd, SHOW_WINDOW_CMD.SW_RESTORE);
         }
 
-        var display = GetScreen(hwnd, target);
-        PositionCentered(display);
+        if (target == MonitorBehavior.ToLast)
+        {
+            AppWindow.Resize(new SizeInt32 { Width = _currentWindowPosition.Width, Height = _currentWindowPosition.Height });
+            AppWindow.Move(new PointInt32 { X = _currentWindowPosition.X, Y = _currentWindowPosition.Y });
+        }
+        else
+        {
+            var display = GetScreen(hwnd, target);
+            PositionCentered(display);
+        }
 
         // Check if the debugger is attached. If it is, we don't want to apply the tool window style,
         // because that would make it hard to debug the app
         if (Debugger.IsAttached)
         {
-            ApplyWindowStyle();
+            _hiddenOwnerBehavior.ShowInTaskbar(this, true);
         }
 
         // Just to be sure, SHOW our hwnd.
@@ -419,6 +469,22 @@ public sealed partial class MainWindow : WindowEx,
     internal void MainWindow_Closed(object sender, WindowEventArgs args)
     {
         var serviceProvider = App.Current.Services;
+        UpdateWindowPositionInMemory();
+
+        var settings = serviceProvider.GetService<SettingsModel>();
+        if (settings is not null)
+        {
+            settings.LastWindowPosition = new WindowPosition
+            {
+                X = _currentWindowPosition.X,
+                Y = _currentWindowPosition.Y,
+                Width = _currentWindowPosition.Width,
+                Height = _currentWindowPosition.Height,
+            };
+
+            SettingsModel.SaveSettings(settings);
+        }
+
         var extensionService = serviceProvider.GetService<IExtensionService>()!;
         extensionService.SignalStopExtensionsAsync();
 
@@ -490,6 +556,9 @@ public sealed partial class MainWindow : WindowEx,
     {
         if (args.WindowActivationState == WindowActivationState.Deactivated)
         {
+            // Save the current window position before hiding the window
+            UpdateWindowPositionInMemory();
+
             // If there's a debugger attached...
             if (System.Diagnostics.Debugger.IsAttached)
             {

src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj

@@ -181,6 +181,15 @@
     <Content Update="..\Microsoft.CmdPal.UI.ViewModels\Assets\template.zip">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Update="Assets\StoreLogo.dark.svg">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\StoreLogo.light.svg">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\WinGetLogo.svg">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>

src/modules/cmdpal/Microsoft.CmdPal.UI/NativeMethods.txt

@@ -58,4 +58,9 @@ GetModuleHandle
 
 GetWindowLong
 SetWindowLong
-WINDOW_EX_STYLE
+WINDOW_EX_STYLE
+CreateWindowEx
+WNDCLASSEXW
+RegisterClassEx
+GetStockObject
+GetModuleHandle

src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs

@@ -48,7 +48,8 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
     IRecipient<ShowConfirmationMessage>,
     IRecipient<ShowToastMessage>,
     IRecipient<NavigateToPageMessage>,
-    INotifyPropertyChanged
+    INotifyPropertyChanged,
+    IDisposable
 {
     private readonly DispatcherQueue _queue = DispatcherQueue.GetForCurrentThread();
 
@@ -65,6 +66,9 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
 
     private SettingsWindow? _settingsWindow;
 
+    private CancellationTokenSource? _focusAfterLoadedCts;
+    private WeakReference<Page>? _lastNavigatedPageRef;
+
     public ShellViewModel ViewModel { get; private set; } = App.Current.Services.GetService<ShellViewModel>()!;
 
     public event PropertyChangedEventHandler? PropertyChanged;
@@ -447,7 +451,15 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
     {
         while (RootFrame.CanGoBack)
         {
-            GoBack(withAnimation, focusSearch);
+            // don't focus on each step, just at the end
+            GoBack(withAnimation, focusSearch: false);
+        }
+
+        // focus search box, even if we were already home
+        if (focusSearch)
+        {
+            SearchBox.Focus(Microsoft.UI.Xaml.FocusState.Programmatic);
+            SearchBox.SelectSearch();
         }
     }
 
@@ -488,6 +500,7 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
 
         if (e.Content is Page element)
         {
+            _lastNavigatedPageRef = new WeakReference<Page>(element);
             element.Loaded += FocusAfterLoaded;
         }
     }
@@ -497,6 +510,18 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
         var page = (Page)sender;
         page.Loaded -= FocusAfterLoaded;
 
+        // Only handle focus for the latest navigated page
+        if (_lastNavigatedPageRef is null || !_lastNavigatedPageRef.TryGetTarget(out var last) || !ReferenceEquals(page, last))
+        {
+            return;
+        }
+
+        // Cancel any previous pending focus work
+        _focusAfterLoadedCts?.Cancel();
+        _focusAfterLoadedCts?.Dispose();
+        _focusAfterLoadedCts = new CancellationTokenSource();
+        var token = _focusAfterLoadedCts.Token;
+
         AnnounceNavigationToPage(page);
 
         var shouldSearchBoxBeVisible = ViewModel.CurrentPage?.HasSearchBox ?? false;
@@ -509,34 +534,57 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
         }
         else
         {
-            _ = Task.Run(async () =>
-            {
-                await page.DispatcherQueue.EnqueueAsync(async () =>
+            _ = Task.Run(
+                async () =>
                 {
-                    // I hate this so much, but it can take a while for the page to be ready to accept focus;
-                    // focusing page with MarkdownTextBlock takes up to 5 attempts (* 100ms delay between attempts)
-                    for (var i = 0; i < 10; i++)
+                    if (token.IsCancellationRequested)
                     {
-                        if (FocusManager.FindFirstFocusableElement(page) is FrameworkElement frameworkElement)
-                        {
-                            var set = frameworkElement.Focus(FocusState.Programmatic);
-                            if (set)
-                            {
-                                break;
-                            }
-                        }
-
-                        await Task.Delay(100);
+                        return;
                     }
 
-                    // Update the search box visibility based on the current page:
-                    // - We do this here after navigation so the focus is not jumping around too much,
-                    //   it messes with screen readers if we do it too early
-                    // - Since this should hide the search box on content pages, it's not a problem if we
-                    //   wait for the code above to finish trying to focus the content
-                    ViewModel.IsSearchBoxVisible = ViewModel.CurrentPage?.HasSearchBox ?? false;
-                });
-            });
+                    try
+                    {
+                        await page.DispatcherQueue.EnqueueAsync(
+                            async () =>
+                            {
+                                // I hate this so much, but it can take a while for the page to be ready to accept focus;
+                                // focusing page with MarkdownTextBlock takes up to 5 attempts (* 100ms delay between attempts)
+                                for (var i = 0; i < 10; i++)
+                                {
+                                    token.ThrowIfCancellationRequested();
+
+                                    if (FocusManager.FindFirstFocusableElement(page) is FrameworkElement frameworkElement)
+                                    {
+                                        var set = frameworkElement.Focus(FocusState.Programmatic);
+                                        if (set)
+                                        {
+                                            break;
+                                        }
+                                    }
+
+                                    await Task.Delay(100, token);
+                                }
+
+                                token.ThrowIfCancellationRequested();
+
+                                // Update the search box visibility based on the current page:
+                                // - We do this here after navigation so the focus is not jumping around too much,
+                                //   it messes with screen readers if we do it too early
+                                // - Since this should hide the search box on content pages, it's not a problem if we
+                                //   wait for the code above to finish trying to focus the content
+                                ViewModel.IsSearchBoxVisible = ViewModel.CurrentPage?.HasSearchBox ?? false;
+                            });
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        // Swallow cancellation - another FocusAfterLoaded invocation superseded this one
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.LogError("Error during FocusAfterLoaded async focus work", ex);
+                    }
+                },
+                token);
         }
     }
 
@@ -591,24 +639,31 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
                          InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.RightWindows).HasFlag(CoreVirtualKeyStates.Down);
 
         var onlyAlt = altPressed && !ctrlPressed && !shiftPressed && !winPressed;
-        if (e.Key == VirtualKey.Left && onlyAlt)
+        var onlyCtrl = !altPressed && ctrlPressed && !shiftPressed && !winPressed;
+        switch (e.Key)
         {
-            WeakReferenceMessenger.Default.Send<NavigateBackMessage>(new());
-            e.Handled = true;
-        }
-        else if (e.Key == VirtualKey.Home && onlyAlt)
-        {
-            WeakReferenceMessenger.Default.Send<GoHomeMessage>(new(WithAnimation: false));
-            e.Handled = true;
-        }
-        else
-        {
-            // The CommandBar is responsible for handling all the item keybindings,
-            // since the bound context item may need to then show another
-            // context menu
-            TryCommandKeybindingMessage msg = new(ctrlPressed, altPressed, shiftPressed, winPressed, e.Key);
-            WeakReferenceMessenger.Default.Send(msg);
-            e.Handled = msg.Handled;
+            case VirtualKey.Left when onlyAlt: // Alt+Left arrow
+                WeakReferenceMessenger.Default.Send<NavigateBackMessage>(new());
+                e.Handled = true;
+                break;
+            case VirtualKey.Home when onlyAlt: // Alt+Home
+                WeakReferenceMessenger.Default.Send<GoHomeMessage>(new(WithAnimation: false));
+                e.Handled = true;
+                break;
+            case (VirtualKey)188 when onlyCtrl: // Ctrl+,
+                WeakReferenceMessenger.Default.Send<OpenSettingsMessage>(new());
+                e.Handled = true;
+                break;
+            default:
+            {
+                // The CommandBar is responsible for handling all the item keybindings,
+                // since the bound context item may need to then show another
+                // context menu
+                TryCommandKeybindingMessage msg = new(ctrlPressed, altPressed, shiftPressed, winPressed, e.Key);
+                WeakReferenceMessenger.Default.Send(msg);
+                e.Handled = msg.Handled;
+                break;
+            }
         }
     }
 
@@ -658,4 +713,11 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
             Logger.LogError("Error handling mouse button press event", ex);
         }
     }
+
+    public void Dispose()
+    {
+        _focusAfterLoadedCts?.Cancel();
+        _focusAfterLoadedCts?.Dispose();
+        _focusAfterLoadedCts = null;
+    }
 }

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

@@ -14,18 +14,204 @@
     xmlns:viewModels="using:Microsoft.CmdPal.UI.ViewModels"
     mc:Ignorable="d">
 
+    <Page.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <!--  ControlFillColorQuarternaryBrush does not exist (yet) in WinUI, only in Windows Visual Library (Figma)  -->
+                <ResourceDictionary x:Key="Default">
+                    <LinearGradientBrush x:Key="CardGradient2Brush" StartPoint="0,0" EndPoint="0.5, 1">
+                        <GradientStop Offset="0" Color="#38C8AEC4" />
+                        <GradientStop Offset="1" Color="#383286EE" />
+                    </LinearGradientBrush>
+                    <ImageSource x:Key="StoreLogo">ms-appx:///Assets/StoreLogo.dark.svg</ImageSource>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Light">
+                    <LinearGradientBrush x:Key="CardGradient2Brush" StartPoint="0,0" EndPoint="1, 1">
+                        <!--<GradientStop Offset="0" Color="#E6F0FC" />
+                <GradientStop Offset="0.4" Color="#E6F0FC" />
+                <GradientStop Offset="1" Color="#F0F0F7" />-->
+                        <GradientStop Offset="0.0" Color="#FFF6F9FF" />
+                        <!--  Light cool white  -->
+                        <GradientStop Offset="0.4" Color="#FFEFF5FF" />
+                        <!--  Hinted lavender/blue  -->
+                        <GradientStop Offset="0.7" Color="#FFF7FAFD" />
+                        <!--  Very soft neutral white  -->
+                        <GradientStop Offset="1.0" Color="#FFF5F8FA" />
+                        <!--  Slight bluish-gray tint  -->
+                        <!--  Faint peach glow  -->
+                        <!--  Soft peach  -->
+                    </LinearGradientBrush>
+                    <ImageSource x:Key="StoreLogo">ms-appx:///Assets/StoreLogo.light.svg</ImageSource>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="HighContrast">
+                    <SolidColorBrush x:Key="CardGradient2Brush" Color="Transparent" />
+                    <SolidColorBrush x:Key="CardGradient1Brush" Color="Transparent" />
+                    <ImageSource x:Key="StoreLogo">ms-appx:///Assets/StoreLogo.dark.svg</ImageSource>
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+            <converters:BoolNegationConverter x:Key="InvertedBoolConverter" />
+            <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+        </ResourceDictionary>
+    </Page.Resources>
+
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <ScrollViewer Grid.Row="1">
+
+        <ScrollViewer x:Name="RootScrollViewer" Grid.Row="1">
             <Grid Padding="16">
                 <StackPanel
                     MaxWidth="1000"
                     HorizontalAlignment="Stretch"
                     Spacing="{StaticResource SettingsCardSpacing}">
-                    <ItemsRepeater ItemsSource="{x:Bind viewModel.CommandProviders, Mode=OneWay}" Layout="{StaticResource VerticalStackLayout}">
+                    <!--  Banner  -->
+                    <Grid
+                        Padding="16"
+                        Background="{ThemeResource CardGradient2Brush}"
+                        BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                        BorderThickness="1"
+                        CornerRadius="8">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <StackPanel x:Name="BannerDescriptionPanel" Orientation="Vertical">
+                            <TextBlock x:Uid="Settings_ExtensionsPage_Banner_Header" FontWeight="SemiBold" />
+                            <TextBlock
+                                x:Uid="Settings_ExtensionsPage_Banner_Description"
+                                Grid.Row="1"
+                                MaxWidth="520"
+                                HorizontalAlignment="Left"
+                                TextWrapping="Wrap" />
+                            <HyperlinkButton
+                                x:Uid="Settings_ExtensionsPage_Banner_Hyperlink"
+                                Padding="0"
+                                Content="Learn how to create your own extensions"
+                                NavigateUri="https://learn.microsoft.com/windows/powertoys/command-palette/overview" />
+                        </StackPanel>
+                        <StackPanel
+                            x:Name="ButtonPanel"
+                            Grid.Column="1"
+                            Orientation="Horizontal"
+                            Spacing="8">
+                            <Button x:Uid="Settings_ExtensionsPage_FindExtensions_MicrosoftStore" Command="{x:Bind viewModel.Extensions.OpenStoreWithExtensionCommand}">
+                                <StackPanel Orientation="Horizontal" Spacing="8">
+                                    <Viewbox Width="16">
+                                        <Image AutomationProperties.AccessibilityView="Raw" Source="{ThemeResource StoreLogo}" />
+                                    </Viewbox>
+                                    <TextBlock Text="Microsoft Store" />
+                                </StackPanel>
+                            </Button>
+                            <!--<Button x:Uid="Settings_ExtensionsPage_FindExtensions_WinGet" Command="{x:Bind viewModel.Extensions.OpenStoreWithExtensionCommand}">
+                                <StackPanel Orientation="Horizontal" Spacing="8">
+                                    <Viewbox Width="16">
+                                        <Image AutomationProperties.AccessibilityView="Raw" Source="ms-appx:///Assets/WinGet.svg" />
+                                    </Viewbox>
+                                    <TextBlock Text="WinGet" />
+                                </StackPanel>
+                            </Button>-->
+                        </StackPanel>
+                    </Grid>
+
+                    <!--  Search  -->
+                    <Grid Padding="0,24,0,8" ColumnSpacing="8">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" MaxWidth="320" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <AutoSuggestBox
+                            x:Name="SearchBox"
+                            x:Uid="Settings_ExtensionsPage_SearchBox_Placeholder"
+                            HorizontalAlignment="Stretch"
+                            Text="{x:Bind viewModel.Extensions.SearchText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                            <AutoSuggestBox.QueryIcon>
+                                <SymbolIcon Symbol="Find" />
+                            </AutoSuggestBox.QueryIcon>
+                            <AutoSuggestBox.KeyboardAccelerators>
+                                <KeyboardAccelerator
+                                    Key="F"
+                                    Invoked="OnFindInvoked"
+                                    Modifiers="Control" />
+                            </AutoSuggestBox.KeyboardAccelerators>
+                        </AutoSuggestBox>
+
+                        <StackPanel
+                            Grid.Column="1"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Orientation="Horizontal"
+                            Spacing="8">
+                            <TextBlock
+                                x:Name="ItemCounterTextBlock"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource BodyTextBlockStyle}"
+                                Text="{x:Bind viewModel.Extensions.ItemCounterText, Mode=OneWay}" />
+                            <StackPanel
+                                VerticalAlignment="Center"
+                                Orientation="Horizontal"
+                                Spacing="8"
+                                Visibility="{x:Bind viewModel.Extensions.ShowManualReloadOverlay, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                                <ProgressRing
+                                    Width="16"
+                                    Height="16"
+                                    IsActive="True" />
+                                <TextBlock
+                                    x:Uid="Settings_ExtensionsPage_Reloading_Text"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource BodyTextBlockStyle}" />
+                            </StackPanel>
+                            <Button
+                                x:Name="MoreButton"
+                                x:Uid="Settings_ExtensionsPage_More_Button"
+                                Style="{StaticResource SubtleButtonStyle}">
+                                <Button.Flyout>
+                                    <MenuFlyout Placement="BottomEdgeAlignedRight">
+                                        <MenuFlyoutItem x:Uid="Settings_ExtensionsPage_More_Reload_MenuFlyoutItem" Command="{x:Bind viewModel.Extensions.ReloadExtensionsCommand}">
+                                            <MenuFlyoutItem.Icon>
+                                                <FontIcon Glyph="&#xE777;" />
+                                            </MenuFlyoutItem.Icon>
+                                        </MenuFlyoutItem>
+                                    </MenuFlyout>
+                                </Button.Flyout>
+                                <FontIcon
+                                    AutomationProperties.AccessibilityView="Raw"
+                                    FontSize="16"
+                                    Glyph="&#xE712;" />
+                            </Button>
+                        </StackPanel>
+                    </Grid>
+
+                    <!--  Empty state when no results match the current search  -->
+                    <Grid
+                        x:Name="NoResultsPanel"
+                        Padding="48"
+                        x:Load="{x:Bind viewModel.Extensions.ShowNoResultsPanel, Mode=OneWay}"
+                        CornerRadius="4">
+                        <StackPanel
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Spacing="8">
+                            <TextBlock
+                                x:Uid="Settings_ExtensionsPage_NoResults_Primary"
+                                Style="{StaticResource BodyStrongTextBlockStyle}"
+                                TextAlignment="Center" />
+                            <TextBlock
+                                x:Uid="Settings_ExtensionsPage_NoResults_Secondary"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                TextAlignment="Center" />
+                        </StackPanel>
+                    </Grid>
+                    <ItemsRepeater
+                        x:Name="ProvidersRepeater"
+                        x:Load="{x:Bind viewModel.Extensions.HasResults, Mode=OneWay}"
+                        ItemsSource="{x:Bind viewModel.Extensions.FilteredProviders, Mode=OneWay}"
+                        Layout="{StaticResource VerticalStackLayout}">
                         <ItemsRepeater.ItemTemplate>
                             <DataTemplate x:DataType="viewModels:ProviderSettingsViewModel">
                                 <controls:SettingsCard
@@ -54,5 +240,25 @@
                 </StackPanel>
             </Grid>
         </ScrollViewer>
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="LayoutVisualStates">
+                <VisualState x:Name="WideLayout">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="720" />
+                    </VisualState.StateTriggers>
+                </VisualState>
+                <VisualState x:Name="NarrowLayout">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="0" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="ButtonPanel.(Grid.Row)" Value="1" />
+                        <Setter Target="BannerDescriptionPanel.(Grid.ColumnSpan)" Value="2" />
+                        <Setter Target="ButtonPanel.(Grid.Column)" Value="0" />
+                        <Setter Target="ButtonPanel.Margin" Value="0,12,0,0" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
     </Grid>
 </Page>

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

@@ -8,6 +8,7 @@ using Microsoft.CmdPal.UI.ViewModels;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
 
 namespace Microsoft.CmdPal.UI.Settings;
 
@@ -35,4 +36,10 @@ public sealed partial class ExtensionsPage : Page
             }
         }
     }
+
+    private void OnFindInvoked(KeyboardAccelerator sender, KeyboardAcceleratorInvokedEventArgs args)
+    {
+        SearchBox?.Focus(FocusState.Keyboard);
+        args.Handled = true;
+    }
 }

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

@@ -63,6 +63,7 @@
                             <ComboBoxItem x:Uid="Run_Radio_Position_Primary_Monitor" />
                             <ComboBoxItem x:Uid="Run_Radio_Position_Focus" />
                             <ComboBoxItem x:Uid="Run_Radio_Position_In_Place" />
+                            <ComboBoxItem x:Uid="Run_Radio_Position_LastPosition" />
                         </ComboBox>
                     </controls:SettingsCard>
 

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

@@ -25,7 +25,10 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <TitleBar x:Name="AppTitleBar" PaneToggleRequested="AppTitleBar_PaneToggleRequested">
+        <TitleBar
+            x:Name="AppTitleBar"
+            IsTabStop="False"
+            PaneToggleRequested="AppTitleBar_PaneToggleRequested">
             <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
             <TitleBar.LeftHeader>
                 <ImageIcon

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

@@ -428,7 +428,11 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="MoreCommandsButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>More</value>
   </data>
-  <data name="TrayMenu_Settings" xml:space="preserve">
+  <data name="Run_Radio_Position_LastPosition.Content" xml:space="preserve">
+    <value>Last Position</value>
+    <comment>Reopen the window where it was last closed</comment>
+  </data> 
+  <data name="TrayMenu_Settings" xml:space="preserve">  
     <value>Settings</value>
   </data>
   <data name="TrayMenu_Close" xml:space="preserve">
@@ -471,4 +475,46 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="ScreenReader_Announcement_NavigatedToPage0" xml:space="preserve">
     <value>Navigated to {0} page</value>
   </data>
+  <data name="SettingsButton.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Settings (Ctrl+,)</value>
+  </data>
+  <data name="Settings_ExtensionsPage_NoResults_Primary.Text" xml:space="preserve">
+    <value>No extensions found</value>
+  </data>
+  <data name="Settings_ExtensionsPage_NoResults_Secondary.Text" xml:space="preserve">
+    <value>Try a different search term</value>
+  </data>
+  <data name="Settings_ExtensionsPage_More_Button.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>More options</value>
+  </data>
+  <data name="Settings_ExtensionsPage_More_Reload_MenuFlyoutItem.Text" xml:space="preserve">
+    <value>Reload extensions</value>
+  </data>
+  <data name="Settings_ExtensionsPage_Reloading_Text.Text" xml:space="preserve">
+    <value>Reloading extensions..</value>
+  </data>
+	<data name="Settings_ExtensionsPage_Banner_Header.Text" xml:space="preserve">
+    <value>Discover more extensions</value>
+  </data>
+	<data name="Settings_ExtensionsPage_Banner_Description.Text" xml:space="preserve">
+    <value>Find more extensions on the Microsoft Store or WinGet.</value>
+  </data>
+	<data name="Settings_ExtensionsPage_Banner_Hyperlink.Content" xml:space="preserve">
+    <value>Learn how to create your own extensions</value>
+  </data>
+	<data name="Settings_ExtensionsPage_FindExtensions_MicrosoftStore.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Find extensions on the Microsoft Store</value>
+  </data>
+	<data name="Settings_ExtensionsPage_FindExtensions_MicrosoftStore.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Microsoft Store</value>
+  </data>
+	<data name="Settings_ExtensionsPage_FindExtensions_WinGet.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Find extensions on WinGet</value>
+  </data>
+	<data name="Settings_ExtensionsPage_FindExtensions_WinGet.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Microsoft Store</value>
+  </data>
+	<data name="Settings_ExtensionsPage_SearchBox_Placeholder.PlaceholderText" xml:space="preserve">
+    <value>Search extensions</value>
+  </data>
 </root>

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

@@ -25,11 +25,11 @@ public sealed partial class ToastWindow : WindowEx,
     IRecipient<QuitMessage>
 {
     private readonly HWND _hwnd;
+    private readonly DispatcherQueueTimer _debounceTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
+    private readonly HiddenOwnerWindowBehavior _hiddenOwnerWindowBehavior = new();
 
     public ToastViewModel ViewModel { get; } = new();
 
-    private readonly DispatcherQueueTimer _debounceTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
-
     public ToastWindow()
     {
         this.InitializeComponent();
@@ -39,12 +39,7 @@ public sealed partial class ToastWindow : WindowEx,
         this.SetIcon();
         AppWindow.Title = RS_.GetString("ToastWindowTitle");
         AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Collapsed;
-
-        // Tool windows don't show up in ALT+TAB, and don't show up in the taskbar
-        // Since tool windows have smaller corner radii, we need to force the normal ones
-        // to visually match system toasts.
-        this.ToggleExtendedWindowStyle(WINDOW_EX_STYLE.WS_EX_TOOLWINDOW, true);
-        this.SetCornerPreference(DWM_WINDOW_CORNER_PREFERENCE.DWMWCP_ROUND);
+        _hiddenOwnerWindowBehavior.ShowInTaskbar(this, false);
 
         _hwnd = new HWND(WinRT.Interop.WindowNative.GetWindowHandle(this).ToInt32());
         PInvoke.EnableWindow(_hwnd, false);

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

@@ -74,35 +74,11 @@
     <ClCompile>
       <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
-    <ClCompile>
-      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib /profile /opt:ref /opt:icf</AdditionalOptions>
-    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
     <ClCompile>
       <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
-    <ClCompile>
-      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib /profile /opt:ref /opt:icf</AdditionalOptions>
-    </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkManagerTests.cs

@@ -186,4 +186,48 @@ public class BookmarkManagerTests
         Assert.AreEqual("D:\\UpdatedPath", updatedBookmark.Bookmark);
         Assert.IsTrue(bookmarkUpdatedEventFired);
     }
+
+    [TestMethod]
+    public void BookmarkManager_LegacyData_IdsArePersistedAcrossLoads()
+    {
+        // Arrange
+        const string json = """
+                            {
+                                "Data": 
+                                [
+                                    { "Name": "C:\\","Bookmark": "C:\\" },
+                                    { "Name": "Bing.com","Bookmark": "https://bing.com" }
+                                ]
+                            }
+                            """;
+
+        var dataSource = new MockBookmarkDataSource(json);
+
+        // First load: IDs should be generated for legacy entries
+        var manager1 = new BookmarksManager(dataSource);
+        var firstLoad = manager1.Bookmarks.ToList();
+        Assert.AreEqual(2, firstLoad.Count);
+        Assert.AreNotEqual(Guid.Empty, firstLoad[0].Id);
+        Assert.AreNotEqual(Guid.Empty, firstLoad[1].Id);
+
+        // Keep a name->id map to be insensitive to ordering
+        var firstIdsByName = firstLoad.ToDictionary(b => b.Name, b => b.Id);
+
+        // Wait deterministically for async persistence to complete
+        var wasSaved = dataSource.WaitForSave(1, 5000);
+        Assert.IsTrue(wasSaved, "Data was not saved within the expected time.");
+
+        // Second load: should read back the same IDs from persisted data
+        var manager2 = new BookmarksManager(dataSource);
+        var secondLoad = manager2.Bookmarks.ToList();
+        Assert.AreEqual(2, secondLoad.Count);
+
+        var secondIdsByName = secondLoad.ToDictionary(b => b.Name, b => b.Id);
+
+        foreach (var kvp in firstIdsByName)
+        {
+            Assert.IsTrue(secondIdsByName.ContainsKey(kvp.Key), $"Missing bookmark '{kvp.Key}' after reload.");
+            Assert.AreEqual(kvp.Value, secondIdsByName[kvp.Key], $"Bookmark '{kvp.Key}' upgraded ID was not persisted across loads.");
+        }
+    }
 }

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/MockBookmarkDataSource.cs

@@ -2,6 +2,8 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
+using System.Threading;
 using Microsoft.CmdPal.Ext.Bookmarks.Persistence;
 
 namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
@@ -9,6 +11,7 @@ namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
 internal sealed class MockBookmarkDataSource : IBookmarkDataSource
 {
     private string _jsonData;
+    private int _saveCount;
 
     public MockBookmarkDataSource(string initialJsonData = "[]")
     {
@@ -23,5 +26,26 @@ internal sealed class MockBookmarkDataSource : IBookmarkDataSource
     public void SaveBookmarkData(string jsonData)
     {
         _jsonData = jsonData;
+        Interlocked.Increment(ref _saveCount);
+    }
+
+    public int SaveCount => Volatile.Read(ref _saveCount);
+
+    // Waits until at least expectedMinSaves have occurred or the timeout elapses.
+    // Returns true if the condition was met, false on timeout.
+    public bool WaitForSave(int expectedMinSaves = 1, int timeoutMs = 2000)
+    {
+        var start = Environment.TickCount;
+        while (Volatile.Read(ref _saveCount) < expectedMinSaves)
+        {
+            if (Environment.TickCount - start > timeoutMs)
+            {
+                return false;
+            }
+
+            Thread.Sleep(50);
+        }
+
+        return true;
     }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarksManager.cs

@@ -103,7 +103,33 @@ internal sealed partial class BookmarksManager : IDisposable, IBookmarksManager
         try
         {
             var jsonData = _dataSource.GetBookmarkData();
-            _bookmarksData = _parser.ParseBookmarks(jsonData);
+            var bookmarksData = _parser.ParseBookmarks(jsonData);
+
+            // Upgrade old bookmarks if necessary
+            // Pre .95 versions did not assign IDs to bookmarks
+            var upgraded = false;
+            for (var index = 0; index < bookmarksData.Data.Count; index++)
+            {
+                var bookmark = bookmarksData.Data[index];
+                if (bookmark.Id == Guid.Empty)
+                {
+                    bookmarksData.Data[index] = bookmark with { Id = Guid.NewGuid() };
+                    upgraded = true;
+                }
+            }
+
+            lock (_lock)
+            {
+                _bookmarksData = bookmarksData;
+            }
+
+            // LOAD BEARING: Save upgraded data back to file
+            // This ensures that old bookmarks are not repeatedly upgraded on each load,
+            // as the hotkeys and aliases are tied to the generated bookmark IDs.
+            if (upgraded)
+            {
+                _ = SaveChangesAsync();
+            }
         }
         catch (Exception ex)
         {

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/AddBookmarkForm.cs

@@ -30,25 +30,72 @@ internal sealed partial class AddBookmarkForm : FormContent
             "type": "Input.Text",
             "style": "text",
             "id": "bookmark",
-            "value": {{JsonSerializer.Serialize(url, BookmarkSerializationContext.Default.String)}},
-            "label": "{{Resources.bookmarks_form_bookmark_label}}",
+            "value": {{EncodeString(url)}},
+            "label": {{EncodeString(Resources.bookmarks_form_bookmark_label)}},
             "isRequired": true,
-            "errorMessage": "{{Resources.bookmarks_form_bookmark_required}}"
+            "errorMessage": {{EncodeString(Resources.bookmarks_form_bookmark_required)}},
+            "placeholder": {{EncodeString(Resources.bookmarks_form_bookmark_placeholder)}}
         },
         {
             "type": "Input.Text",
             "style": "text",
             "id": "name",
-            "label": "{{Resources.bookmarks_form_name_label}}",
-            "value": {{JsonSerializer.Serialize(name, BookmarkSerializationContext.Default.String)}},
-            "isRequired": false,
-            "errorMessage": "{{Resources.bookmarks_form_name_required}}"
+            "label": {{EncodeString(Resources.bookmarks_form_name_label)}},
+            "value": {{EncodeString(name)}},
+            "isRequired": false
+        },
+        {
+            "type": "RichTextBlock",
+            "inlines": [
+                {
+                    "type": "TextRun",
+                    "text": {{EncodeString(Resources.bookmarks_form_hint_text1)}},
+                    "isSubtle": true,
+                    "size": "Small"
+                },
+                {
+                    "type": "TextRun",
+                    "text": " ",
+                    "isSubtle": true,
+                    "size": "Small"
+                },
+                {
+                    "type": "TextRun",
+                    "text": {{EncodeString(Resources.bookmarks_form_hint_text2)}},
+                    "fontType": "Monospace",
+                    "size": "Small"
+                },
+                {
+                    "type": "TextRun",
+                    "text": " ",
+                    "isSubtle": true,
+                    "size": "Small"
+                },
+                {
+                    "type": "TextRun",
+                    "text": {{EncodeString(Resources.bookmarks_form_hint_text3)}},
+                    "isSubtle": true,
+                    "size": "Small"
+                },
+                {
+                    "type": "TextRun",
+                    "text": " ",
+                    "isSubtle": true,
+                    "size": "Small"
+                },
+                {
+                    "type": "TextRun",
+                    "text": {{EncodeString(Resources.bookmarks_form_hint_text4)}},
+                    "fontType": "Monospace",
+                    "size": "Small"
+                }
+            ]
         }
     ],
     "actions": [
         {
             "type": "Action.Submit",
-            "title": "{{Resources.bookmarks_form_save}}",
+            "title": {{EncodeString(Resources.bookmarks_form_save)}},
             "data": {
                 "name": "name",
                 "bookmark": "bookmark"
@@ -59,6 +106,8 @@ internal sealed partial class AddBookmarkForm : FormContent
 """;
     }
 
+    private static string EncodeString(string s) => JsonSerializer.Serialize(s, BookmarkSerializationContext.Default.String);
+
     public override CommandResult SubmitForm(string payload)
     {
         var formInput = JsonNode.Parse(payload);

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/BookmarkData.cs

@@ -19,7 +19,7 @@ public sealed record BookmarkData
     [SetsRequiredMembers]
     public BookmarkData(Guid id, string? name, string? bookmark)
     {
-        Id = id == Guid.Empty ? Guid.NewGuid() : id;
+        Id = id;
         Name = name ?? string.Empty;
         Bookmark = bookmark ?? string.Empty;
     }

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

@@ -19,7 +19,7 @@ namespace Microsoft.CmdPal.Ext.Bookmarks.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class Resources {
@@ -177,6 +177,15 @@ namespace Microsoft.CmdPal.Ext.Bookmarks.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Enter URL or file path, you can use {placeholders}, e.g. https://www.bing.com/search?q={Query}.
+        /// </summary>
+        public static string bookmarks_form_bookmark_placeholder {
+            get {
+                return ResourceManager.GetString("bookmarks_form_bookmark_placeholder", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to URL or file path is required.
         /// </summary>
@@ -187,7 +196,44 @@ namespace Microsoft.CmdPal.Ext.Bookmarks.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Name.
+        ///   Looks up a localized string similar to You can add placeholders to bookmarks, and Command Palette will prompt you to enter their values when you open the bookmark.
+        ///A placeholder looks like this:.
+        /// </summary>
+        public static string bookmarks_form_hint_text1 {
+            get {
+                return ResourceManager.GetString("bookmarks_form_hint_text1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to {placeholder}.
+        /// </summary>
+        public static string bookmarks_form_hint_text2 {
+            get {
+                return ResourceManager.GetString("bookmarks_form_hint_text2", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to — for example:.
+        /// </summary>
+        public static string bookmarks_form_hint_text3 {
+            get {
+                return ResourceManager.GetString("bookmarks_form_hint_text3", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to https://www.bing.com/search?q={Query}.
+        /// </summary>
+        public static string bookmarks_form_hint_text4 {
+            get {
+                return ResourceManager.GetString("bookmarks_form_hint_text4", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Name (optional).
         /// </summary>
         public static string bookmarks_form_name_label {
             get {

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

@@ -140,7 +140,7 @@
     <comment>"Terminal" should be the localized name of the Windows Terminal</comment>
   </data>
   <data name="bookmarks_form_name_label" xml:space="preserve">
-    <value>Name</value>
+    <value>Name (optional)</value>
   </data>
   <data name="bookmarks_form_save" xml:space="preserve">
     <value>Save</value>
@@ -185,4 +185,20 @@
   <data name="bookmark_toast_failed_open_text" xml:space="preserve">
     <value>Failed to open {0}</value>
   </data>
+  <data name="bookmarks_form_hint_text1" xml:space="preserve">
+    <value>You can add placeholders to bookmarks, and Command Palette will prompt you to enter their values when you open the bookmark.
+A placeholder looks like this:</value>
+  </data>
+  <data name="bookmarks_form_hint_text2" xml:space="preserve">
+    <value>{placeholder}</value>
+  </data>
+  <data name="bookmarks_form_hint_text3" xml:space="preserve">
+    <value>— for example:</value>
+  </data>
+  <data name="bookmarks_form_hint_text4" xml:space="preserve">
+    <value>https://www.bing.com/search?q={Query}</value>
+  </data>
+  <data name="bookmarks_form_bookmark_placeholder" xml:space="preserve">
+    <value>Enter URL or file path, you can use {placeholders}, e.g. https://www.bing.com/search?q={Query}</value>
+  </data>
 </root>

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

@@ -6,7 +6,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.Indexer;
 
-internal sealed class Icons
+internal static class Icons
 {
     internal static IconInfo FileExplorerSegoeIcon { get; } = new("\uEC50");
 
@@ -19,4 +19,8 @@ internal sealed class Icons
     internal static IconInfo DocumentIcon { get; } = new("\uE8A5"); // Document
 
     internal static IconInfo FolderOpenIcon { get; } = new("\uE838"); // FolderOpen
+
+    internal static IconInfo FilesIcon { get; } = new("\uF571"); // PrintAllPages
+
+    internal static IconInfo FilterIcon { get; } = new("\uE71C"); // Filter
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SearchFilters.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.CmdPal.Ext.Indexer.Properties;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Ext.Indexer.Indexer;
+
+internal sealed partial class SearchFilters : Filters
+{
+    public SearchFilters()
+    {
+        CurrentFilterId = "all";
+    }
+
+    public override IFilterItem[] GetFilters()
+    {
+        return [
+            new Filter() { Id = "all", Name = Resources.Indexer_Filter_All, Icon = Icons.FilterIcon },
+            new Separator(),
+            new Filter() { Id = "folders", Name = Resources.Indexer_Filter_Folders_Only, Icon = Icons.FolderOpenIcon },
+            new Filter() { Id = "files", Name = Resources.Indexer_Filter_Files_Only, Icon = Icons.FilesIcon },
+        ];
+    }
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/IndexerPage.cs

@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
+using Microsoft.CmdPal.Ext.Indexer.Indexer;
 using Microsoft.CmdPal.Ext.Indexer.Properties;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -36,6 +37,11 @@ internal sealed partial class IndexerPage : DynamicListPage, IDisposable
         PlaceholderText = Resources.Indexer_PlaceholderText;
         _searchEngine = new();
         _queryCookie = 10;
+
+        var filters = new SearchFilters();
+        filters.PropChanged += Filters_PropChanged;
+        Filters = filters;
+
         CreateEmptyContent();
     }
 
@@ -49,6 +55,11 @@ internal sealed partial class IndexerPage : DynamicListPage, IDisposable
         initialQuery = query;
         SearchText = query;
         disposeSearchEngine = false;
+
+        var filters = new SearchFilters();
+        filters.PropChanged += Filters_PropChanged;
+        Filters = filters;
+
         CreateEmptyContent();
     }
 
@@ -79,30 +90,56 @@ internal sealed partial class IndexerPage : DynamicListPage, IDisposable
     {
         // {20D04FE0-3AEA-1069-A2D8-08002B30309D} is CLSID for "This PC"
         const string template = "search-ms:query={0}&crumb=location:::{{20D04FE0-3AEA-1069-A2D8-08002B30309D}}";
-        var encodedSearchText = UrlEncoder.Default.Encode(SearchText);
+        var fullSearchText = FullSearchString(SearchText);
+        var encodedSearchText = UrlEncoder.Default.Encode(fullSearchText);
         var command = string.Format(CultureInfo.CurrentCulture, template, encodedSearchText);
         ShellHelpers.OpenInShell(command);
     }
 
     public override ICommandItem EmptyContent => _isEmptyQuery ? _noSearchEmptyContent : _nothingFoundEmptyContent;
 
+    private void Filters_PropChanged(object sender, IPropChangedEventArgs args)
+    {
+        PerformSearch(SearchText);
+    }
+
     public override void UpdateSearchText(string oldSearch, string newSearch)
     {
         if (oldSearch != newSearch && newSearch != initialQuery)
         {
-            _ = Task.Run(() =>
-            {
-                _isEmptyQuery = string.IsNullOrWhiteSpace(newSearch);
-                Query(newSearch);
-                LoadMore();
-                OnPropertyChanged(nameof(EmptyContent));
-                initialQuery = null;
-            });
+            PerformSearch(newSearch);
         }
     }
 
+    private void PerformSearch(string newSearch)
+    {
+        var actualSearch = FullSearchString(newSearch);
+        _ = Task.Run(() =>
+        {
+            _isEmptyQuery = string.IsNullOrWhiteSpace(actualSearch);
+            Query(actualSearch);
+            LoadMore();
+            OnPropertyChanged(nameof(EmptyContent));
+            initialQuery = null;
+        });
+    }
+
     public override IListItem[] GetItems() => [.. _indexerListItems];
 
+    private string FullSearchString(string query)
+    {
+        switch (Filters.CurrentFilterId)
+        {
+            case "folders":
+                return $"{query} kind:folders";
+            case "files":
+                return $"{query} kind:NOT folders";
+            case "all":
+            default:
+                return query;
+        }
+    }
+
     public override void LoadMore()
     {
         IsLoading = true;

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

@@ -177,6 +177,33 @@ namespace Microsoft.CmdPal.Ext.Indexer.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Files and folders.
+        /// </summary>
+        internal static string Indexer_Filter_All {
+            get {
+                return ResourceManager.GetString("Indexer_Filter_All", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Files.
+        /// </summary>
+        internal static string Indexer_Filter_Files_Only {
+            get {
+                return ResourceManager.GetString("Indexer_Filter_Files_Only", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Folders.
+        /// </summary>
+        internal static string Indexer_Filter_Folders_Only {
+            get {
+                return ResourceManager.GetString("Indexer_Filter_Folders_Only", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Find file from path.
         /// </summary>