Some build fixes

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

@@ -330,9 +330,6 @@ HHH
 riday
 YYY
 
-# Unicode
-precomposed
-
 # GitHub issue/PR commands
 azp
 feedbackhub

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

@@ -216,7 +216,6 @@ CImage
 cla
 CLASSDC
 CLASSNOTAVAILABLE
-CLEARTYPE
 clickable
 clickonce
 CLIENTEDGE
@@ -254,7 +253,6 @@ colorhistory
 colorhistorylimit
 COLORKEY
 colorref
-Convs
 comctl
 comdlg
 comexp
@@ -393,7 +391,6 @@ devpal
 dfx
 DIALOGEX
 digicert
-diffs
 DINORMAL
 DISABLEASACTIONKEY
 DISABLENOSCROLL
@@ -531,12 +528,9 @@ eyetracker
 FANCYZONESDRAWLAYOUTTEST
 FANCYZONESEDITOR
 FARPROC
-fdw
 fdx
-FErase
 fesf
 FFFF
-FInc
 Figma
 FILEEXPLORER
 fileexploreraddons
@@ -578,7 +572,6 @@ formatetc
 FORPARSING
 foundrylocal
 FRAMECHANGED
-FRestore
 frm
 FROMTOUCH
 fsanitize
@@ -613,7 +606,6 @@ GETSCREENSAVERRUNNING
 GETSECKEY
 GETSTICKYKEYS
 GETTEXTLENGTH
-gfx
 GHND
 gitmodules
 GMEM
@@ -664,7 +656,6 @@ hdwwiz
 Helpline
 helptext
 HGFE
-hgdiobj
 hglobal
 hhk
 HHmmssfff
@@ -712,7 +703,7 @@ hotlight
 hotspot
 HPAINTBUFFER
 HRAWINPUT
-hredraw
+HREDRAW
 hres
 hresult
 hrgn
@@ -890,7 +881,7 @@ LINKOVERLAY
 LINQTo
 listview
 LIVEDRAW
-livezoom
+LIVEZOOM
 LLKH
 llkhf
 LMEM
@@ -919,7 +910,6 @@ LPBITMAPINFOHEADER
 LPCFHOOKPROC
 LPCITEMIDLIST
 LPCLSID
-lpch
 lpcmi
 LPCMINVOKECOMMANDINFO
 LPCREATESTRUCT
@@ -944,7 +934,6 @@ lptpm
 LPTR
 LPTSTR
 lpv
-LPrivate
 LPW
 lpwcx
 lpwndpl
@@ -993,7 +982,6 @@ mdtext
 mdtxt
 mdwn
 meme
-mcp
 memicmp
 MENUITEMINFO
 MENUITEMINFOW
@@ -1084,8 +1072,6 @@ muxxc
 muxxh
 MVPs
 mvvm
-myorg
-myrepo
 MVVMTK
 MWBEx
 MYICON
@@ -1232,7 +1218,6 @@ opensource
 openxmlformats
 ollama
 onnx
-openurl
 OPTIMIZEFORINVOKE
 ORPHANEDDIALOGTITLE
 ORSCANS
@@ -1310,7 +1295,6 @@ phwnd
 pici
 pidl
 PIDLIST
-PII
 pinfo
 pinvoke
 pipename
@@ -1359,7 +1343,6 @@ ppv
 ppwsz
 prc
 Prefixer
-Premul
 prependpath
 prepopulate
 prevhost
@@ -1509,7 +1492,6 @@ riid
 RKey
 RNumber
 rop
-rollups
 ROUNDSMALL
 ROWSETEXT
 rpcrt
@@ -1654,7 +1636,6 @@ SKIPOWNPROCESS
 sku
 SLGP
 sln
-slnf
 slnx
 SMALLICON
 smartphone
@@ -1915,7 +1896,7 @@ valuegenerator
 variantassignment
 VARTYPE
 vcamp
-vcenter
+VCENTER
 vcgtq
 VCINSTALLDIR
 Vcpkg
@@ -1947,7 +1928,7 @@ vorrq
 VOS
 vpaddlq
 vqsubq
-vredraw
+VREDRAW
 vreinterpretq
 VSC
 VSCBD
@@ -2115,7 +2096,6 @@ xstyler
 XTimer
 XUP
 XVIRTUALSCREEN
-XXL
 xxxxxx
 YAxis
 ycombinator

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

@@ -1,6 +1,6 @@
 ---
 mode: 'agent'
-model: Claude Sonnet 4.5
+model: GPT-5-Codex (Preview)
 description: 'Generate an 80-character git commit title for the local diff.'
 ---
 

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

@@ -1,6 +1,6 @@
 ---
 mode: 'agent'
-model: Claude Sonnet 4.5
+model: GPT-5-Codex (Preview)
 description: 'Generate a PowerToys-ready pull request description from the local diff.'
 ---
 

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

@@ -1,71 +0,0 @@
----
-mode: 'agent'
-model: GPT-5-Codex (Preview)
-description: "  Execute the fix for a GitHub issue using the previously generated implementation plan. Apply code & tests directly in the repo. Output only a PR description (and optional manual steps)."
----
-
-# DEPENDENCY
-Source review prompt (for generating the implementation plan if missing):
-- .github/prompts/review-issue.prompt.md
-
-Required plan file (single source of truth):
-- Generated Files/issueReview/{{issue_number}}/implementation-plan.md
-
-## Dependency Handling
-1) If `implementation-plan.md` exists → proceed.
-2) If missing → run the review prompt:
-   - Invoke: `.github/prompts/review-issue.prompt.md`
-   - Pass: `issue_number={{issue_number}}`
-   - Then re-check for `implementation-plan.md`.
-3) If still missing → stop and generate:
-   - `Generated Files/issueFix/{{issue_number}}/manual-steps.md` containing:
-     “implementation-plan.md not found; please run .github/prompts/review-issue.prompt.md for #{{issue_number}}.”
-
-# GOAL
-For **#{{issue_number}}**:
-- Use implementation-plan.md as the single authority.
-- Apply code and test changes directly in the repository.
-- Produce a PR-ready description.
-
-# OUTPUT FILES
-1) Generated Files/issueFix/{{issue_number}}/pr-description.md
-2) Generated Files/issueFix/{{issue_number}}/manual-steps.md   # only if human interaction or external setup is required
-
-# EXECUTION RULES
-1) Read implementation-plan.md and execute:
-   - Layers & Files → edit/create as listed
-   - Pattern Choices → follow repository conventions
-   - Fundamentals (perf, security, compatibility, accessibility)
-   - Logging & Exceptions
-   - Telemetry (only if explicitly included in the plan)
-   - Risks & Mitigations
-   - Tests to Add
-2) Locate affected files via `rg` or `git grep`.
-3) Add/update tests to enforce the fixed behavior.
-4) If any ambiguity exists, add:
-// TODO(Human input needed): <clarification needed>
-5) Verify locally: build & tests run successfully.
-
-# pr-description.md should include:
-- Title: `Fix: <short summary> (#{{issue_number}})`
-- What changed and why the fix works
-- Files or modules touched
-- Risks & mitigations (implemented)
-- Tests added/updated and how to run them
-- Telemetry behavior (if applicable)
-- Validation / reproduction steps
-- `Closes #{{issue_number}}`
-
-# manual-steps.md (only if needed)
-- List required human actions: secrets, config, approvals, missing info, or code comments requiring human decisions.
-
-# IMPORTANT
-- Apply code and tests directly; do not produce patch files.
-- Follow implementation-plan.md as the source of truth.
-- Insert comments for human review where a decision or input is required.
-- Use repository conventions and deterministic, minimal changes.
-
-# FINALIZE
-- Write pr-description.md
-- Write manual-steps.md only if needed
-- Print concise success message or note items requiring human interaction

.github/prompts/review-issue.prompt.md

@@ -1,158 +0,0 @@
----
-mode: 'agent'
-model: Claude Sonnet 4.5
-description: "You are github issue review and planning expertise, Score (0–100) and write one Implementation Plan. Outputs: overview.md, implementation-plan.md."
----
-
-# GOAL
-For **#{{issue_number}}** produce:
-1) `Generated Files/issueReview/{{issue_number}}/overview.md`
-2) `Generated Files/issueReview/{{issue_number}}/implementation-plan.md`
-
-## Inputs
-  figure out from the prompt on the 
-
-# CONTEXT (brief)
-Ground evidence using `gh issue view {{issue_number}} --json number,title,body,author,createdAt,updatedAt,state,labels,milestone,reactions,comments,linkedPullRequests`, and download the image for understand the context of the issue more.
-Locate source code in current workspace, but also free feel to use via `rg`/`git grep`. Link related issues/PRs.
-
-# OVERVIEW.MD
-## Summary
-Issue, state, milestone, labels. **Signals**: 👍/❤️/👎, comment count, last activity, linked PRs.
-
-## At-a-Glance Score Table
-Present all ratings in a compact table for quick scanning:
-
-| Dimension | Score | Assessment | Key Drivers |
-|-----------|-------|------------|-------------|
-| **A) Business Importance** | X/100 | Low/Medium/High | Top 2 factors with scores |
-| **B) Community Excitement** | X/100 | Low/Medium/High | Top 2 factors with scores |
-| **C) Technical Feasibility** | X/100 | Low/Medium/High | Top 2 factors with scores |
-| **D) Requirement Clarity** | X/100 | Low/Medium/High | Top 2 factors with scores |
-| **Overall Priority** | X/100 | Low/Medium/High/Critical | Average or weighted summary |
-| **Effort Estimate** | X days (T-shirt) | XS/S/M/L/XL/XXL/Epic | Type: bug/feature/chore |
-| **Similar Issues Found** | X open, Y closed | — | Quick reference to related work |
-| **Potential Assignees** | @username, @username | — | Top contributors to module |
-
-**Assessment bands**: 0-25 Low, 26-50 Medium, 51-75 High, 76-100 Critical
-
-## Ratings (0–100) — add evidence & short rationale
-### A) Business Importance
-- Labels (priority/security/regression): **≤35**
-- Milestone/roadmap: **≤25**
-- Customer/contract impact: **≤20**
-- Unblocks/platform leverage: **≤20**
-### B) Community Excitement
-- 👍+❤️ normalized: **≤45**
-- Comment volume & unique participants: **≤25**
-- Recent activity (≤30d): **≤15**
-- Duplicates/related issues: **≤15**
-### C) Technical Feasibility
-- Contained surface/clear seams: **≤30**
-- Existing patterns/utilities: **≤25**
-- Risk (perf/sec/compat) manageable: **≤25**
-- Testability & CI support: **≤20**
-### D) Requirement Clarity
-- Behavior/repro/constraints: **≤60**
-- Non-functionals (perf/sec/i18n/a11y): **≤25**
-- Decision owners/acceptance signals: **≤15**
-
-## Effort
-Days + **T-shirt** (XS 0.5–1d, S 1–2, M 2–4, L 4–7, XL 7–14, XXL 14–30, Epic >30).  
-Type/level: bug/feature/chore/docs/refactor/test-only; severity/value tier.
-
-## Suggested Actions
-Provide actionable recommendations for issue triage and assignment:
-
-### A) Requirement Clarification (if Clarity score <50)
-**When Requirement Clarity (Dimension D) is Medium or Low:**
-- Identify specific gaps in issue description: missing repro steps, unclear expected behavior, undefined acceptance criteria, missing non-functional requirements
-- Draft 3-5 clarifying questions to post as issue comment
-- Suggest additional information needed: screenshots, logs, environment details, OS version, PowerToys version, error messages
-- If behavior is ambiguous, propose 2-3 interpretation scenarios and ask reporter to confirm
-- Example questions:
-  - "Can you provide exact steps to reproduce this issue?"
-  - "What is the expected behavior vs. what you're actually seeing?"
-  - "Does this happen on Windows 10, 11, or both?"
-  - "Can you attach a screenshot or screen recording?"
-
-### B) Correct Label Suggestions
-- Analyze issue type, module, and severity to suggest missing or incorrect labels
-- Recommend labels from: `Issue-Bug`, `Issue-Feature`, `Issue-Docs`, `Issue-Task`, `Priority-High`, `Priority-Medium`, `Priority-Low`, `Needs-Triage`, `Needs-Author-Feedback`, `Product-<ModuleName>`, etc.
-- If Requirement Clarity is low (<50), add `Needs-Author-Feedback` label
-- If current labels are incorrect or incomplete, provide specific label changes with rationale
-
-### C) Find Similar Issues & Past Fixes
-- Search for similar issues using `gh issue list --search "keywords" --state all --json number,title,state,closedAt`
-- Identify patterns: duplicate issues, related bugs, or similar feature requests
-- For closed issues, find linked PRs that fixed them: check `linkedPullRequests` in issue data
-- Provide 3-5 examples of similar issues with format: `#<number> - <title> (closed by PR #<pr>)` or `(still open)`
-
-### D) Identify Subject Matter Experts
-- Use git blame/log to find who fixed similar issues in the past
-- Search for PR authors who touched relevant files: `git log --all --format='%aN' -- <file_paths> | sort | uniq -c | sort -rn | head -5`
-- Check issue/PR history for frequent contributors to the affected module
-- Suggest 2-3 potential assignees with context: `@<username> - <reason>` (e.g., "fixed similar rendering bug in #12345", "maintains FancyZones module")
-
-### E) Semantic Search for Related Work
-- Use semantic_search tool to find similar issues, code patterns, or past discussions
-- Search queries should include: issue keywords, module names, error messages, feature descriptions
-- Cross-reference semantic results with GitHub issue search for comprehensive coverage
-
-**Output format for Suggested Actions section in overview.md:**
-```markdown
-## Suggested Actions
-
-### Clarifying Questions (if Clarity <50)
-Post these questions as issue comment to gather missing information:
-1. <question>
-2. <question>
-3. <question>
-
-**Recommended label**: `Needs-Author-Feedback`
-
-### Label Recommendations
-- Add: `<label>` - <reason>
-- Remove: `<label>` - <reason>
-- Current labels are appropriate ✓
-
-### Similar Issues Found
-1. #<number> - <title> (<state>, closed by PR #<pr> on <date>)
-2. #<number> - <title> (<state>)
-...
-
-### Potential Assignees
-- @<username> - <reason>
-- @<username> - <reason>
-
-### Related Code/Discussions
-- <semantic search findings>
-```
-
-# IMPLEMENTATION-PLAN.MD
-1) **Problem Framing** — restate problem; current vs expected; scope boundaries.  
-2) **Layers & Files** — layers (UI/domain/data/infra/build). For each, list **files/dirs to modify** and **new files** (exact paths + why). Prefer repo patterns; cite examples/PRs.  
-3) **Pattern Choices** — reuse existing; if new, justify trade-offs & transition.  
-4) **Fundamentals** (brief plan or N/A + reason):
-- Performance (hot paths, allocs, caching/streaming)
-- Security (validation, authN/Z, secrets, SSRF/XSS/CSRF)
-- G11N/L10N (resources, number/date, pluralization)
-- Compatibility (public APIs, formats, OS/runtime/toolchain)
-- Extensibility (DI seams, options/flags, plugin points)
-- Accessibility (roles, labels, focus, keyboard, contrast)
-- SOLID & repo conventions (naming, folders, dependency direction)
-5) **Logging & Exception Handling**
-- Where to log; levels; structured fields; correlation/traces.
-- What to catch vs rethrow; retries/backoff; user-visible errors.
-- **Privacy**: never log secrets/PII; redaction policy.
-6) **Telemetry (optional — business metrics only)**
-- Events/metrics (name, when, props); success signal; privacy/sampling; dashboards/alerts.
-7) **Risks & Mitigations** — flags/canary/shadow-write/config guards.  
-8) **Task Breakdown (agent-ready)** — table (leave a blank line before the header so Markdown renders correctly):
-
-| Task | Intent | Files/Areas | Steps | Tests (brief) | Owner (Agent/Human) | Human interaction needed? (why) |
-|---|---|---|---|---|---|---|
-
-9) **Tests to Add (only)**
-- **Unit**: targets, cases (success/edge/error), mocks/fixtures, path, notes.  
-- **UI** (if applicable): flows, locator strategy, env/data/flags, path, flake mitigation.

.github/prompts/review-pr.prompt.md

@@ -1,199 +0,0 @@
----
-mode: 'agent'
-model: Claude Sonnet 4.5
-description: "gh-driven PR review; per-step Markdown + machine-readable outputs"
----
-
-# PR Review — gh + stepwise
-
-**Goal**: Given `{{pr_number}}`, run a *one-topic-per-step* review. Write files to `Generated Files/prReview/{{pr_number}}/` (replace `{{pr_number}}` with the integer). Emit machine‑readable blocks for a GitHub MCP to post review comments.
-
-## PR selection
-Resolve the target PR using these fallbacks in order:
-1. Parse the invocation text for an explicit identifier (first integer following patterns such as a leading hash and digits or the text `PR:` followed by digits).
-2. If no PR is found yet, locate the newest `Generated Files/prReview/_batch/batch-overview-*.md` file (highest timestamp in filename, fallback newest mtime) and take the first entry in its `## PRs` list whose review folder is missing `00-OVERVIEW.md` or contains `__error.flag`.
-3. If the batch file has no pending PRs, query assignments with `gh pr list --assignee @me --state open --json number,updatedAt --limit 20` and pick the most recently updated PR that does not already have a completed review folder.
-4. If still unknown, run `gh pr view --json number` in the current branch and use that result when it is unambiguous.
-5. If every step above fails, prompt the user for a PR number before proceeding.
-
-## Fetch PR data with `gh`
-- `gh pr view {{pr_number}} --json number,baseRefName,headRefName,baseRefOid,headRefOid,changedFiles,files`
-- `gh api repos/:owner/:repo/pulls/{{pr_number}}/files?per_page=250`  # patches for line mapping
-
-### Incremental review workflow
-1. **Check for existing review**: Read `Generated Files/prReview/{{pr_number}}/00-OVERVIEW.md`
-2. **Extract state**: Parse `Last reviewed SHA:` from review metadata section
-3. **Detect changes**: Run `Get-PrIncrementalChanges.ps1 -PullRequestNumber {{pr_number}} -LastReviewedCommitSha {{sha}}`
-4. **Analyze result**:
-   - `NeedFullReview: true` → Review all files in the PR
-   - `NeedFullReview: false` and `IsIncremental: true` → Review only files in `ChangedFiles` array
-   - `ChangedFiles` is empty → No changes, skip review (update iteration history with "No changes since last review")
-5. **Apply smart filtering**: Use the file patterns in smart step filtering table to skip irrelevant steps
-6. **Update metadata**: After completing review, save current `headRefOid` as `Last reviewed SHA:` in `00-OVERVIEW.md`
-
-### Reusable PowerShell scripts
-Scripts live in `.github/review-tools/` to avoid repeated manual approvals during PR reviews:
-
-| Script | Usage |
-| --- | --- |
-| `.github/review-tools/Get-GitHubRawFile.ps1` | Download a repository file at a given ref, optionally with line numbers. |
-| `.github/review-tools/Get-GitHubPrFilePatch.ps1` | Fetch the unified diff for a specific file within a pull request via `gh api`. |
-| `.github/review-tools/Get-PrIncrementalChanges.ps1` | Compare last reviewed SHA with current PR head to identify incremental changes. Returns JSON with changed files, new commits, and whether full review is needed. |
-| `.github/review-tools/Test-IncrementalReview.ps1` | Test helper to preview incremental review detection for a PR. Use before running full review to see what changed. |
-
-Always prefer these scripts (or new ones added under `.github/review-tools/`) over raw `gh api` or similar shell commands so the review flow does not trigger interactive approval prompts.
-
-## Output files
-Folder: `Generated Files/prReview/{{pr_number}}/`
-Files: `00-OVERVIEW.md`, `01-functionality.md`, `02-compatibility.md`, `03-performance.md`, `04-accessibility.md`, `05-security.md`, `06-localization.md`, `07-globalization.md`, `08-extensibility.md`, `09-solid-design.md`, `10-repo-patterns.md`, `11-docs-automation.md`, `12-code-comments.md`, `13-copilot-guidance.md` *(only if guidance md exists).* 
-- **Write-after-step rule:** Immediately after completing each TODO step, persist that step's markdown file before proceeding to the next. Generate `00-OVERVIEW.md` only after every step file has been refreshed for the current run.
-
-## Iteration management
-- Determine the current review iteration by reading `00-OVERVIEW.md` (look for `Review iteration:`). If missing, assume iteration `1`.
-- Extract the last reviewed SHA from `00-OVERVIEW.md` (look for `Last reviewed SHA:` in the review metadata section). If missing, this is iteration 1.
-- **Incremental review detection**:
-  1. Call `.github/review-tools/Get-PrIncrementalChanges.ps1 -PullRequestNumber {{pr_number}} -LastReviewedCommitSha {{last_sha}}` to get delta analysis.
-  2. Parse the JSON result to determine if incremental review is possible (`IsIncremental: true`, `NeedFullReview: false`).
-  3. If force-push detected or first review, proceed with full review of all changed files.
-  4. If incremental, review only the files listed in `ChangedFiles` array and apply smart step filtering (see below).
-- Increment the iteration for each review run and propagate the new value to all step files and the overview.
-- Preserve prior iteration notes by keeping/expanding an `## Iteration history` section in each markdown file, appending the newest summary under `### Iteration <N>`.
-- Summaries should capture key deltas since the previous iteration so reruns can pick up context quickly.
-- **After review completion**, update `Last reviewed SHA:` in `00-OVERVIEW.md` with the current `headRefOid` and update the timestamp.
-
-### Smart step filtering (incremental reviews only)
-When performing incremental review, skip steps that are irrelevant based on changed file types:
-
-| File pattern | Required steps | Skippable steps |
-| --- | --- | --- |
-| `**/*.cs`, `**/*.cpp`, `**/*.h` | Functionality, Compatibility, Performance, Security, SOLID, Repo patterns, Code comments | (depends on files) |
-| `**/*.resx`, `**/Resources/*.xaml` | Localization, Globalization | Most others |
-| `**/*.md` (docs) | Docs & automation | Most others (unless copilot guidance) |
-| `**/*copilot*.md`, `.github/prompts/*.md` | Copilot guidance, Docs & automation | Most others |
-| `**/*.csproj`, `**/*.vcxproj`, `**/packages.config` | Compatibility, Security, Repo patterns | Localization, Globalization, Accessibility |
-| `**/UI/**`, `**/*View.xaml` | Accessibility, Localization | Performance (unless perf-sensitive controls) |
-
-**Default**: If uncertain or files span multiple categories, run all applicable steps. When in doubt, be conservative and review more rather than less.
-
-## TODO steps (one concern each)
-1) Functionality
-2) Compatibility
-3) Performance
-4) Accessibility
-5) Security
-6) Localization
-7) Globalization
-8) Extensibility
-9) SOLID principles
-10) Repo patterns
-11) Docs & automation coverage for the changes
-12) Code comments
-13) Copilot guidance (conditional): if changed folders contain `*copilot*.md` or `.github/prompts/*.md`, review diffs **against** that guidance and write `13-copilot-guidance.md` (omit if none).
-
-## Per-step file template (use verbatim)
-```md
-# <STEP TITLE>
-**PR:** (populate with PR identifier) — Base:<baseRefName> Head:<headRefName>
-**Review iteration:** ITERATION
-
-## Iteration history
-- Maintain subsections titled `### Iteration N` in reverse chronological order (append the latest at the top) with 2–4 bullet highlights.
-
-### Iteration ITERATION
-- <Latest key point 1>
-- <Latest key point 2>
-
-## Checks executed
-- List the concrete checks for *this step only* (5–10 bullets).
-
-## Findings
-(If none, write **None**. Defaults have one or more blocks:)
-
-```mcp-review-comment
-{"file":"relative/path.ext","start_line":123,"end_line":125,"severity":"high|medium|low|info","tags":["<step-slug>","pr-tag-here"],"related_files":["optional/other/file1"],"body":"Problem → Why it matters → Concrete fix. If spans multiple files, name them here."}
-```
-Use the second tag to encode the PR number.
-
-```
-## Overview file (`00-OVERVIEW.md`) template
-```md
-# PR Review Overview — (populate with PR identifier)
-**Review iteration:** ITERATION
-**Changed files:** <n> | **High severity issues:** <count>
-
-## Review metadata
-**Last reviewed SHA:** <headRefOid from gh pr view>
-**Last review timestamp:** <ISO8601 timestamp>
-**Review mode:** <Full|Incremental (N files changed since iteration X)>
-**Base ref:** <baseRefName>
-**Head ref:** <headRefName>
-
-## Step results
-Write lines like: `01 Functionality — <OK|Issues|Skipped> (see 01-functionality.md)` … through step 13.
-Mark steps as "Skipped" when using incremental review smart filtering.
-
-## Iteration history
-- Maintain subsections titled `### Iteration N` mirroring the per-step convention with concise deltas and cross-links to the relevant step files.
-- For incremental reviews, list the specific files that changed and which commits were added.
-```
-
-## Line numbers & multi‑file issues
-- Map head‑side lines from `patch` hunks (`@@ -a,b +c,d @@` → new lines `+c..+c+d-1`).
-- For cross‑file issues: set the primary `"file"`, list others in `"related_files"`, and name them in `"body"`.
-
-## Posting (for MCP)
-- Parse all ```mcp-review-comment``` blocks across step files and post as PR review comments.
-- If posting isn’t available, still write all files.
-
-## Constraint
-Read/analyze only; don't modify code. Keep comments small, specific, and fix‑oriented.
-
-**Testing**: Use `.github/review-tools/Test-IncrementalReview.ps1 -PullRequestNumber 42374` to preview incremental detection before running full review.
-
-## Scratch cache for large PRs
-
-Create a local scratch workspace to progressively summarize diffs and reload state across runs.
-
-### Paths
-- Root: `Generated Files/prReview/{{pr_number}}/__tmp/`
-- Files:
-  - `index.jsonl` — append-only JSON Lines index of artifacts.
-  - `todo-queue.json` — pending items (files/chunks/steps).
-  - `rollup-<step>-v<N>.md` — iterative per-step aggregates.
-  - `file-<hash>.txt` — optional saved chunk text (when needed).
-
-### JSON schema (per line in `index.jsonl`)
-```json
-{"type":"chunk|summary|issue|crosslink",
- "path":"relative/file.ext","chunk_id":"f-12","step":"functionality|compatibility|...",
- "base_sha":"...", "head_sha":"...", "range":[start,end], "version":1,
- "notes":"short text or key:value map", "created_utc":"ISO8601"}
-```
-
-### Phases (stateful; resume-safe)
-0. **Discover** PR + SHAs: `gh pr view <PR> --json baseRefName,headRefName,baseRefOid,headRefOid,files`.
-1. **Chunk** each changed file (head): split into ~300–600 LOC or ~4k chars; stable `chunk_id` = hash(path+start).
-   - Save `chunk` records. Optionally write `file-<hash>.txt` for expensive chunks.
-2. **Summarize** per chunk: intent, APIs, risks per TODO step; emit `summary` records (≤600 tokens each).
-3. **Issues**: convert findings to machine-readable blocks and emit `issue` records (later rendered to step MD).
-4. **Rollups**: build/update `rollup-<step>-v<N>.md` from `summary`+`issue`. Keep prior versions.
-5. **Finalize**: write per-step files + `00-OVERVIEW.md` from rollups. Post comments via MCP if available.
-
-### Re-use & token limits
-- Always **reload** `index.jsonl` first; skip chunks with same `head_sha` and `range`.
-- **Incremental review optimization**: When `Get-PrIncrementalChanges.ps1` returns a subset of changed files, load only chunks from those files. Reuse existing chunks/summaries for unchanged files.
-- Prefer re-summarizing only changed chunks; merge chunk summaries → file summaries → step rollups.
-- When context is tight, load only the minimal chunk text (or its saved `file-<hash>.txt`) needed for a comment.
-
-### Original vs diff
-- Fetch base content when needed: prefer `git show <baseRefName>:<path>`; fallback `gh api repos/:owner/:repo/contents/<path>?ref=<base_sha>` (base64).
-- Use patch hunks from `gh api .../pulls/<PR>/files` to compute **head** line numbers.
-
-### Queue-driven loop
-- Seed `todo-queue.json` with all changed files.
-- Process: chunk → summarize → detect issues → roll up.
-- Append to `index.jsonl` after each step; never rewrite previous lines (append-only).
-
-### Hygiene
-- `__tmp/` is implementation detail; do not include in final artifacts.
-- It is safe to delete to force a clean pass; the next run rebuilds it.

.github/review-tools/Get-GitHubPrFilePatch.ps1

@@ -1,79 +0,0 @@
-<#
-.SYNOPSIS
-    Retrieves the unified diff patch for a specific file in a GitHub pull request.
-
-.DESCRIPTION
-    This script fetches the patch content (unified diff format) for a specified file
-    within a pull request. It uses the GitHub CLI (gh) to query the GitHub API and
-    retrieve file change information.
-
-.PARAMETER PullRequestNumber
-    The pull request number to query.
-
-.PARAMETER FilePath
-    The relative path to the file in the repository (e.g., "src/modules/main.cpp").
-
-.PARAMETER RepositoryOwner
-    The GitHub repository owner. Defaults to "microsoft".
-
-.PARAMETER RepositoryName
-    The GitHub repository name. Defaults to "PowerToys".
-
-.EXAMPLE
-    .\Get-GitHubPrFilePatch.ps1 -PullRequestNumber 42374 -FilePath "src/modules/cmdpal/main.cpp"
-    Retrieves the patch for main.cpp in PR #42374.
-
-.EXAMPLE
-    .\Get-GitHubPrFilePatch.ps1 -PullRequestNumber 42374 -FilePath "README.md" -RepositoryOwner "myorg" -RepositoryName "myrepo"
-    Retrieves the patch from a different repository.
-
-.NOTES
-    Requires GitHub CLI (gh) to be installed and authenticated.
-    Run 'gh auth login' if not already authenticated.
-
-.LINK
-    https://cli.github.com/
-#>
-
-[CmdletBinding()]
-param(
-    [Parameter(Mandatory = $true, HelpMessage = "Pull request number")]
-    [int]$PullRequestNumber,
-
-    [Parameter(Mandatory = $true, HelpMessage = "Relative path to the file in the repository")]
-    [string]$FilePath,
-
-    [Parameter(Mandatory = $false, HelpMessage = "Repository owner")]
-    [string]$RepositoryOwner = "microsoft",
-
-    [Parameter(Mandatory = $false, HelpMessage = "Repository name")]
-    [string]$RepositoryName = "PowerToys"
-)
-
-# Construct GitHub API path for pull request files
-$apiPath = "repos/$RepositoryOwner/$RepositoryName/pulls/$PullRequestNumber/files?per_page=250"
-
-# Query GitHub API to get all files in the pull request
-try {
-    $pullRequestFiles = gh api $apiPath | ConvertFrom-Json
-} catch {
-    Write-Error "Failed to query GitHub API for PR #$PullRequestNumber. Ensure gh CLI is authenticated. Details: $_"
-    exit 1
-}
-
-# Find the matching file in the pull request
-$matchedFile = $pullRequestFiles | Where-Object { $_.filename -eq $FilePath }
-
-if (-not $matchedFile) {
-    Write-Error "File '$FilePath' not found in PR #$PullRequestNumber."
-    exit 1
-}
-
-# Check if patch content exists
-if (-not $matchedFile.patch) {
-    Write-Warning "File '$FilePath' has no patch content (possibly binary or too large)."
-    return
-}
-
-# Output the patch content
-$matchedFile.patch

.github/review-tools/Get-GitHubRawFile.ps1

@@ -1,91 +0,0 @@
-<#
-.SYNOPSIS
-    Downloads and displays the content of a file from a GitHub repository at a specific git reference.
-
-.DESCRIPTION
-    This script fetches the raw content of a file from a GitHub repository using GitHub's raw content API.
-    It can optionally display line numbers and supports any valid git reference (branch, tag, or commit SHA).
-
-.PARAMETER FilePath
-    The relative path to the file in the repository (e.g., "src/modules/main.cpp").
-
-.PARAMETER GitReference
-    The git reference (branch name, tag, or commit SHA) to fetch the file from. Defaults to "main".
-
-.PARAMETER RepositoryOwner
-    The GitHub repository owner. Defaults to "microsoft".
-
-.PARAMETER RepositoryName
-    The GitHub repository name. Defaults to "PowerToys".
-
-.PARAMETER ShowLineNumbers
-    When specified, displays line numbers before each line of content.
-
-.PARAMETER StartLineNumber
-    The starting line number to use when ShowLineNumbers is enabled. Defaults to 1.
-
-.EXAMPLE
-    .\Get-GitHubRawFile.ps1 -FilePath "README.md" -GitReference "main"
-    Downloads and displays the README.md file from the main branch.
-
-.EXAMPLE
-    .\Get-GitHubRawFile.ps1 -FilePath "src/runner/main.cpp" -GitReference "dev/feature-branch" -ShowLineNumbers
-    Downloads main.cpp from a feature branch and displays it with line numbers.
-
-.EXAMPLE
-    .\Get-GitHubRawFile.ps1 -FilePath "LICENSE" -GitReference "abc123def" -ShowLineNumbers -StartLineNumber 10
-    Downloads the LICENSE file from a specific commit and displays it with line numbers starting at 10.
-
-.NOTES
-    Requires internet connectivity to access GitHub's raw content API.
-    Does not require GitHub CLI authentication for public repositories.
-
-.LINK
-    https://docs.github.com/en/rest/repos/contents
-#>
-
-[CmdletBinding()]
-param(
-    [Parameter(Mandatory = $true, HelpMessage = "Relative path to the file in the repository")]
-    [string]$FilePath,
-
-    [Parameter(Mandatory = $false, HelpMessage = "Git reference (branch, tag, or commit SHA)")]
-    [string]$GitReference = "main",
-
-    [Parameter(Mandatory = $false, HelpMessage = "Repository owner")]
-    [string]$RepositoryOwner = "microsoft",
-
-    [Parameter(Mandatory = $false, HelpMessage = "Repository name")]
-    [string]$RepositoryName = "PowerToys",
-
-    [Parameter(Mandatory = $false, HelpMessage = "Display line numbers before each line")]
-    [switch]$ShowLineNumbers,
-
-    [Parameter(Mandatory = $false, HelpMessage = "Starting line number for display")]
-    [int]$StartLineNumber = 1
-)
-
-# Construct the raw content URL
-$rawContentUrl = "https://raw.githubusercontent.com/$RepositoryOwner/$RepositoryName/$GitReference/$FilePath"
-
-# Fetch the file content from GitHub
-try {
-    $response = Invoke-WebRequest -UseBasicParsing -Uri $rawContentUrl
-} catch {
-    Write-Error "Failed to fetch file from $rawContentUrl. Details: $_"
-    exit 1
-}
-
-# Split content into individual lines
-$contentLines = $response.Content -split "`n"
-
-# Display the content with or without line numbers
-if ($ShowLineNumbers) {
-    $currentLineNumber = $StartLineNumber
-    foreach ($line in $contentLines) {
-        Write-Output ("{0:d4}: {1}" -f $currentLineNumber, $line)
-        $currentLineNumber++
-    }
-} else {
-    $contentLines | ForEach-Object { Write-Output $_ }
-}

.github/review-tools/Get-PrIncrementalChanges.ps1

@@ -1,173 +0,0 @@
-<#
-.SYNOPSIS
-    Detects changes between the last reviewed commit and current head of a pull request.
-
-.DESCRIPTION
-    This script compares a previously reviewed commit SHA with the current head of a pull request
-    to determine what has changed. It helps enable incremental reviews by identifying new commits
-    and modified files since the last review iteration.
-
-    The script handles several scenarios:
-    - First review (no previous SHA provided)
-    - No changes (current SHA matches last reviewed SHA)
-    - Force-push detected (last reviewed SHA no longer in history)
-    - Incremental changes (new commits added since last review)
-
-.PARAMETER PullRequestNumber
-    The pull request number to analyze.
-
-.PARAMETER LastReviewedCommitSha
-    The commit SHA that was last reviewed. If omitted, this is treated as a first review.
-
-.PARAMETER RepositoryOwner
-    The GitHub repository owner. Defaults to "microsoft".
-
-.PARAMETER RepositoryName
-    The GitHub repository name. Defaults to "PowerToys".
-
-.OUTPUTS
-    JSON object containing:
-    - PullRequestNumber: The PR number being analyzed
-    - CurrentHeadSha: The current head commit SHA
-    - LastReviewedSha: The last reviewed commit SHA (if provided)
-    - BaseRefName: Base branch name
-    - HeadRefName: Head branch name
-    - IsIncremental: Boolean indicating if incremental review is possible
-    - NeedFullReview: Boolean indicating if a full review is required
-    - ChangedFiles: Array of files that changed (filename, status, additions, deletions)
-    - NewCommits: Array of commits added since last review (sha, message, author, date)
-    - Summary: Human-readable description of changes
-
-.EXAMPLE
-    .\Get-PrIncrementalChanges.ps1 -PullRequestNumber 42374
-    Analyzes PR #42374 with no previous review (first review scenario).
-
-.EXAMPLE
-    .\Get-PrIncrementalChanges.ps1 -PullRequestNumber 42374 -LastReviewedCommitSha "abc123def456"
-    Compares current PR state against the last reviewed commit to identify incremental changes.
-
-.EXAMPLE
-    $changes = .\Get-PrIncrementalChanges.ps1 -PullRequestNumber 42374 -LastReviewedCommitSha "abc123" | ConvertFrom-Json
-    if ($changes.IsIncremental) { Write-Host "Can perform incremental review" }
-    Captures the output as a PowerShell object for further processing.
-
-.NOTES
-    Requires GitHub CLI (gh) to be installed and authenticated.
-    Run 'gh auth login' if not already authenticated.
-
-.LINK
-    https://cli.github.com/
-#>
-
-[CmdletBinding()]
-param(
-    [Parameter(Mandatory = $true, HelpMessage = "Pull request number")]
-    [int]$PullRequestNumber,
-
-    [Parameter(Mandatory = $false, HelpMessage = "Commit SHA that was last reviewed")]
-    [string]$LastReviewedCommitSha,
-
-    [Parameter(Mandatory = $false, HelpMessage = "Repository owner")]
-    [string]$RepositoryOwner = "microsoft",
-
-    [Parameter(Mandatory = $false, HelpMessage = "Repository name")]
-    [string]$RepositoryName = "PowerToys"
-)
-
-# Fetch current pull request state from GitHub
-try {
-    $pullRequestData = gh pr view $PullRequestNumber --json headRefOid,headRefName,baseRefName,baseRefOid | ConvertFrom-Json
-} catch {
-    Write-Error "Failed to fetch PR #$PullRequestNumber details. Details: $_"
-    exit 1
-}
-
-$currentHeadSha = $pullRequestData.headRefOid
-$baseRefName = $pullRequestData.baseRefName
-$headRefName = $pullRequestData.headRefName
-
-# Initialize result object
-$analysisResult = @{
-    PullRequestNumber = $PullRequestNumber
-    CurrentHeadSha = $currentHeadSha
-    BaseRefName = $baseRefName
-    HeadRefName = $headRefName
-    LastReviewedSha = $LastReviewedCommitSha
-    IsIncremental = $false
-    NeedFullReview = $true
-    ChangedFiles = @()
-    NewCommits = @()
-    Summary = ""
-}
-
-# Scenario 1: First review (no previous SHA provided)
-if ([string]::IsNullOrWhiteSpace($LastReviewedCommitSha)) {
-    $analysisResult.Summary = "Initial review - no previous iteration found"
-    $analysisResult.NeedFullReview = $true
-    return $analysisResult | ConvertTo-Json -Depth 10
-}
-
-# Scenario 2: No changes since last review
-if ($currentHeadSha -eq $LastReviewedCommitSha) {
-    $analysisResult.Summary = "No changes since last review (SHA: $currentHeadSha)"
-    $analysisResult.NeedFullReview = $false
-    $analysisResult.IsIncremental = $true
-    return $analysisResult | ConvertTo-Json -Depth 10
-}
-
-# Scenario 3: Check for force-push (last reviewed SHA no longer exists in history)
-try {
-    $null = gh api "repos/$RepositoryOwner/$RepositoryName/commits/$LastReviewedCommitSha" 2>&1
-    if ($LASTEXITCODE -ne 0) {
-        # SHA not found - likely force-push or branch rewrite
-        $analysisResult.Summary = "Force-push detected - last reviewed SHA $LastReviewedCommitSha no longer exists. Full review required."
-        $analysisResult.NeedFullReview = $true
-        return $analysisResult | ConvertTo-Json -Depth 10
-    }
-} catch {
-    $analysisResult.Summary = "Cannot verify last reviewed SHA $LastReviewedCommitSha - assuming force-push. Full review required."
-    $analysisResult.NeedFullReview = $true
-    return $analysisResult | ConvertTo-Json -Depth 10
-}
-
-# Scenario 4: Get incremental changes between last reviewed SHA and current head
-try {
-    $compareApiPath = "repos/$RepositoryOwner/$RepositoryName/compare/$LastReviewedCommitSha...$currentHeadSha"
-    $comparisonData = gh api $compareApiPath | ConvertFrom-Json
-    
-    # Extract new commits information
-    $analysisResult.NewCommits = $comparisonData.commits | ForEach-Object {
-        @{
-            Sha = $_.sha.Substring(0, 7)
-            Message = $_.commit.message.Split("`n")[0]  # First line only
-            Author = $_.commit.author.name
-            Date = $_.commit.author.date
-        }
-    }
-    
-    # Extract changed files information
-    $analysisResult.ChangedFiles = $comparisonData.files | ForEach-Object {
-        @{
-            Filename = $_.filename
-            Status = $_.status  # added, modified, removed, renamed
-            Additions = $_.additions
-            Deletions = $_.deletions
-            Changes = $_.changes
-        }
-    }
-    
-    $fileCount = $analysisResult.ChangedFiles.Count
-    $commitCount = $analysisResult.NewCommits.Count
-    
-    $analysisResult.IsIncremental = $true
-    $analysisResult.NeedFullReview = $false
-    $analysisResult.Summary = "Incremental review: $commitCount new commit(s), $fileCount file(s) changed since SHA $($LastReviewedCommitSha.Substring(0, 7))"
-    
-} catch {
-    Write-Error "Failed to compare commits. Details: $_"
-    $analysisResult.Summary = "Error comparing commits - defaulting to full review"
-    $analysisResult.NeedFullReview = $true
-}
-
-# Return the analysis result as JSON
-return $analysisResult | ConvertTo-Json -Depth 10

.github/review-tools/Test-IncrementalReview.ps1

@@ -1,170 +0,0 @@
-<#
-.SYNOPSIS
-    Tests and previews incremental review detection for a pull request.
-
-.DESCRIPTION
-    This helper script validates the incremental review detection logic by analyzing an existing
-    PR review folder. It reads the last reviewed SHA from the overview file, compares it with
-    the current PR state, and displays detailed information about what has changed.
-    
-    This is useful for:
-    - Testing the incremental review system before running a full review
-    - Understanding what changed since the last review iteration
-    - Verifying that review metadata was properly recorded
-
-.PARAMETER PullRequestNumber
-    The pull request number to test incremental review detection for.
-
-.PARAMETER RepositoryOwner
-    The GitHub repository owner. Defaults to "microsoft".
-
-.PARAMETER RepositoryName
-    The GitHub repository name. Defaults to "PowerToys".
-
-.OUTPUTS
-    Colored console output displaying:
-    - Current and last reviewed commit SHAs
-    - Whether incremental review is possible
-    - List of new commits since last review
-    - List of changed files with status indicators
-    - Recommended review strategy
-
-.EXAMPLE
-    .\Test-IncrementalReview.ps1 -PullRequestNumber 42374
-    Tests incremental review detection for PR #42374.
-
-.EXAMPLE
-    .\Test-IncrementalReview.ps1 -PullRequestNumber 42374 -RepositoryOwner "myorg" -RepositoryName "myrepo"
-    Tests incremental review for a PR in a different repository.
-
-.NOTES
-    Requires GitHub CLI (gh) to be installed and authenticated.
-    Run 'gh auth login' if not already authenticated.
-    
-    Prerequisites:
-    - PR review folder must exist at "Generated Files\prReview\{PRNumber}"
-    - 00-OVERVIEW.md must exist in the review folder
-    - For incremental detection, overview must contain "Last reviewed SHA" metadata
-
-.LINK
-    https://cli.github.com/
-#>
-
-[CmdletBinding()]
-param(
-    [Parameter(Mandatory = $true, HelpMessage = "Pull request number to test")]
-    [int]$PullRequestNumber,
-
-    [Parameter(Mandatory = $false, HelpMessage = "Repository owner")]
-    [string]$RepositoryOwner = "microsoft",
-
-    [Parameter(Mandatory = $false, HelpMessage = "Repository name")]
-    [string]$RepositoryName = "PowerToys"
-)
-
-# Resolve paths to review folder and overview file
-$repositoryRoot = Split-Path (Split-Path $PSScriptRoot -Parent) -Parent
-$reviewFolderPath = Join-Path $repositoryRoot "Generated Files\prReview\$PullRequestNumber"
-$overviewFilePath = Join-Path $reviewFolderPath "00-OVERVIEW.md"
-
-Write-Host "=== Testing Incremental Review for PR #$PullRequestNumber ===" -ForegroundColor Cyan
-Write-Host ""
-
-# Check if review folder exists
-if (-not (Test-Path $reviewFolderPath)) {
-    Write-Host "❌ Review folder not found: $reviewFolderPath" -ForegroundColor Red
-    Write-Host "This appears to be a new review (iteration 1)" -ForegroundColor Yellow
-    exit 0
-}
-
-# Check if overview file exists
-if (-not (Test-Path $overviewFilePath)) {
-    Write-Host "❌ Overview file not found: $overviewFilePath" -ForegroundColor Red
-    Write-Host "This appears to be an incomplete review" -ForegroundColor Yellow
-    exit 0
-}
-
-# Read overview file and extract last reviewed SHA
-Write-Host "📄 Reading overview file..." -ForegroundColor Green
-$overviewFileContent = Get-Content $overviewFilePath -Raw
-
-if ($overviewFileContent -match '\*\*Last reviewed SHA:\*\*\s+(\w+)') {
-    $lastReviewedSha = $Matches[1]
-    Write-Host "✅ Found last reviewed SHA: $lastReviewedSha" -ForegroundColor Green
-} else {
-    Write-Host "⚠️  No 'Last reviewed SHA' found in overview - this may be an old format" -ForegroundColor Yellow
-    Write-Host "Proceeding without incremental detection (full review will be needed)" -ForegroundColor Yellow
-    exit 0
-}
-
-Write-Host ""
-Write-Host "🔍 Running incremental change detection..." -ForegroundColor Cyan
-
-# Call the incremental changes detection script
-$incrementalChangesScriptPath = Join-Path $PSScriptRoot "Get-PrIncrementalChanges.ps1"
-if (-not (Test-Path $incrementalChangesScriptPath)) {
-    Write-Host "❌ Script not found: $incrementalChangesScriptPath" -ForegroundColor Red
-    exit 1
-}
-
-try {
-    $analysisResult = & $incrementalChangesScriptPath `
-        -PullRequestNumber $PullRequestNumber `
-        -LastReviewedCommitSha $lastReviewedSha `
-        -RepositoryOwner $RepositoryOwner `
-        -RepositoryName $RepositoryName | ConvertFrom-Json
-    
-    # Display analysis results
-    Write-Host ""
-    Write-Host "=== Incremental Review Analysis ===" -ForegroundColor Cyan
-    Write-Host "Current HEAD SHA: $($analysisResult.CurrentHeadSha)" -ForegroundColor White
-    Write-Host "Last reviewed SHA: $($analysisResult.LastReviewedSha)" -ForegroundColor White
-    Write-Host "Base branch: $($analysisResult.BaseRefName)" -ForegroundColor White
-    Write-Host "Head branch: $($analysisResult.HeadRefName)" -ForegroundColor White
-    Write-Host ""
-    Write-Host "Is incremental? $($analysisResult.IsIncremental)" -ForegroundColor $(if ($analysisResult.IsIncremental) { "Green" } else { "Yellow" })
-    Write-Host "Need full review? $($analysisResult.NeedFullReview)" -ForegroundColor $(if ($analysisResult.NeedFullReview) { "Yellow" } else { "Green" })
-    Write-Host ""
-    Write-Host "Summary: $($analysisResult.Summary)" -ForegroundColor Cyan
-    Write-Host ""
-    
-    # Display new commits if any
-    if ($analysisResult.NewCommits -and $analysisResult.NewCommits.Count -gt 0) {
-        Write-Host "📝 New commits ($($analysisResult.NewCommits.Count)):" -ForegroundColor Green
-        foreach ($commit in $analysisResult.NewCommits) {
-            Write-Host "  - $($commit.Sha): $($commit.Message)" -ForegroundColor Gray
-        }
-        Write-Host ""
-    }
-    
-    # Display changed files if any
-    if ($analysisResult.ChangedFiles -and $analysisResult.ChangedFiles.Count -gt 0) {
-        Write-Host "📁 Changed files ($($analysisResult.ChangedFiles.Count)):" -ForegroundColor Green
-        foreach ($file in $analysisResult.ChangedFiles) {
-            $statusDisplayColor = switch ($file.Status) {
-                "added"    { "Green" }
-                "removed"  { "Red" }
-                "modified" { "Yellow" }
-                "renamed"  { "Cyan" }
-                default    { "White" }
-            }
-            Write-Host "  - [$($file.Status)] $($file.Filename) (+$($file.Additions)/-$($file.Deletions))" -ForegroundColor $statusDisplayColor
-        }
-        Write-Host ""
-    }
-    
-    # Suggest review strategy based on analysis
-    Write-Host "=== Recommended Review Strategy ===" -ForegroundColor Cyan
-    if ($analysisResult.NeedFullReview) {
-        Write-Host "🔄 Full review recommended" -ForegroundColor Yellow
-    } elseif ($analysisResult.IsIncremental -and ($analysisResult.ChangedFiles.Count -eq 0)) {
-        Write-Host "✅ No changes detected - no review needed" -ForegroundColor Green
-    } elseif ($analysisResult.IsIncremental) {
-        Write-Host "⚡ Incremental review possible - review only changed files" -ForegroundColor Green
-        Write-Host "💡 Consider applying smart step filtering based on file types" -ForegroundColor Cyan
-    }
-    
-} catch {
-    Write-Host "❌ Error running incremental change detection: $_" -ForegroundColor Red
-    exit 1
-}

.github/review-tools/review-tools.instructions.md

@@ -1,313 +0,0 @@
----
-description: PowerShell scripts for efficient PR reviews in PowerToys repository
-applyTo: '**'
----
-
-# PR Review Tools - Reference Guide
-
-PowerShell scripts to support efficient and incremental pull request reviews in the PowerToys repository.
-
-## Quick Start
-
-### Prerequisites
-- PowerShell 7+ (or Windows PowerShell 5.1+)
-- GitHub CLI (`gh`) installed and authenticated (`gh auth login`)
-- Access to the PowerToys repository
-
-### Testing Your Setup
-
-Run the full test suite (recommended):
-```powershell
-cd "d:\PowerToys-00c1\.github\review-tools"
-.\Run-ReviewToolsTests.ps1
-```
-
-Expected: 9-10 tests passing
-
-### Individual Script Tests
-
-**Test incremental change detection:**
-```powershell
-.\Get-PrIncrementalChanges.ps1 -PullRequestNumber 42374
-```
-Expected: JSON output showing review analysis
-
-**Preview incremental review:**
-```powershell
-.\Test-IncrementalReview.ps1 -PullRequestNumber 42374
-```
-Expected: Analysis showing current vs last reviewed SHA
-
-**Fetch file content:**
-```powershell
-.\Get-GitHubRawFile.ps1 -FilePath "README.md" -GitReference "main"
-```
-Expected: README content displayed
-
-**Get PR file patch:**
-```powershell
-.\Get-GitHubPrFilePatch.ps1 -PullRequestNumber 42374 -FilePath ".github/actions/spell-check/expect.txt"
-```
-Expected: Unified diff output
-
-## Available Scripts
-
-### Get-GitHubRawFile.ps1
-
-Downloads and displays file content from a GitHub repository at a specific git reference.
-
-**Purpose:** Retrieve baseline file content for comparison during PR reviews.
-
-**Parameters:**
-- `FilePath` (required): Relative path to file in repository
-- `GitReference` (optional): Git ref (branch, tag, SHA). Default: "main"
-- `RepositoryOwner` (optional): Repository owner. Default: "microsoft"
-- `RepositoryName` (optional): Repository name. Default: "PowerToys"
-- `ShowLineNumbers` (switch): Prefix each line with line number
-- `StartLineNumber` (optional): Starting line number when using `-ShowLineNumbers`. Default: 1
-
-**Usage:**
-```powershell
-.\Get-GitHubRawFile.ps1 -FilePath "src/runner/main.cpp" -GitReference "main" -ShowLineNumbers
-```
-
-### Get-GitHubPrFilePatch.ps1
-
-Fetches the unified diff (patch) for a specific file in a pull request.
-
-**Purpose:** Get the exact changes made to a file in a PR for detailed review.
-
-**Parameters:**
-- `PullRequestNumber` (required): Pull request number
-- `FilePath` (required): Relative path to file in the PR
-- `RepositoryOwner` (optional): Repository owner. Default: "microsoft"
-- `RepositoryName` (optional): Repository name. Default: "PowerToys"
-
-**Usage:**
-```powershell
-.\Get-GitHubPrFilePatch.ps1 -PullRequestNumber 42374 -FilePath "src/modules/cmdpal/main.cpp"
-```
-
-**Output:** Unified diff showing changes made to the file.
-
-### Get-PrIncrementalChanges.ps1
-
-Compares the last reviewed commit with the current PR head to identify incremental changes.
-
-**Purpose:** Enable efficient incremental reviews by detecting what changed since the last review iteration.
-
-**Parameters:**
-- `PullRequestNumber` (required): Pull request number
-- `LastReviewedCommitSha` (optional): SHA of the commit that was last reviewed. If omitted, assumes first review.
-- `RepositoryOwner` (optional): Repository owner. Default: "microsoft"
-- `RepositoryName` (optional): Repository name. Default: "PowerToys"
-
-**Usage:**
-```powershell
-.\Get-PrIncrementalChanges.ps1 -PullRequestNumber 42374 -LastReviewedCommitSha "abc123def456"
-```
-
-**Output:** JSON object with detailed change analysis:
-```json
-{
-  "PullRequestNumber": 42374,
-  "CurrentHeadSha": "xyz789abc123",
-  "LastReviewedSha": "abc123def456",
-  "IsIncremental": true,
-  "NeedFullReview": false,
-  "ChangedFiles": [
-    {
-      "Filename": "src/modules/cmdpal/main.cpp",
-      "Status": "modified",
-      "Additions": 15,
-      "Deletions": 8,
-      "Changes": 23
-    }
-  ],
-  "NewCommits": [
-    {
-      "Sha": "def456",
-      "Message": "Fix memory leak",
-      "Author": "John Doe",
-      "Date": "2025-11-07T10:30:00Z"
-    }
-  ],
-  "Summary": "Incremental review: 1 new commit(s), 1 file(s) changed since SHA abc123d"
-}
-```
-
-**Scenarios Handled:**
-- **No LastReviewedCommitSha**: Returns `NeedFullReview: true` (first review)
-- **SHA matches current HEAD**: Returns empty `ChangedFiles` (no changes)
-- **Force-push detected**: Returns `NeedFullReview: true` (SHA not in history)
-- **Incremental changes**: Returns list of changed files and new commits
-
-### Test-IncrementalReview.ps1
-
-Helper script to test and preview incremental review detection before running the full review.
-
-**Purpose:** Validate incremental review functionality and preview what changed.
-
-**Parameters:**
-- `PullRequestNumber` (required): Pull request number
-- `RepositoryOwner` (optional): Repository owner. Default: "microsoft"
-- `RepositoryName` (optional): Repository name. Default: "PowerToys"
-
-**Usage:**
-```powershell
-.\Test-IncrementalReview.ps1 -PullRequestNumber 42374
-```
-
-**Output:** Colored console output showing:
-- Current and last reviewed SHAs
-- Whether incremental review is possible
-- List of new commits and changed files
-- Recommended review strategy
-
-## Workflow Integration
-
-These scripts integrate with the PR review prompt (`.github/prompts/review-pr.prompt.md`).
-
-### Typical Review Flow
-
-1. **Initial Review (Iteration 1)**
-   - Review prompt processes the PR
-   - Creates `Generated Files/prReview/{PR}/00-OVERVIEW.md`
-   - Includes review metadata section with current HEAD SHA
-
-2. **Subsequent Reviews (Iteration 2+)**
-   - Review prompt reads `00-OVERVIEW.md` to get last reviewed SHA
-   - Calls `Get-PrIncrementalChanges.ps1` to detect what changed
-   - If incremental:
-     - Reviews only changed files
-     - Skips irrelevant review steps (e.g., skip Localization if no `.resx` files changed)
-   - Uses `Get-GitHubPrFilePatch.ps1` to get patches for changed files
-   - Updates `00-OVERVIEW.md` with new SHA and iteration number
-
-### Manual Testing Workflow
-
-Preview changes before review:
-```powershell
-# Check what changed in PR #42374 since last review
-.\Test-IncrementalReview.ps1 -PullRequestNumber 42374
-
-# Get incremental changes programmatically
-$changes = .\Get-PrIncrementalChanges.ps1 -PullRequestNumber 42374 -LastReviewedCommitSha "abc123" | ConvertFrom-Json
-
-if (-not $changes.NeedFullReview) {
-    Write-Host "Only need to review $($changes.ChangedFiles.Count) files"
-    
-    # Review each changed file
-    foreach ($file in $changes.ChangedFiles) {
-        Write-Host "Reviewing $($file.Filename)..."
-        .\Get-GitHubPrFilePatch.ps1 -PullRequestNumber 42374 -FilePath $file.Filename
-    }
-}
-```
-
-## Error Handling and Troubleshooting
-
-### Common Requirements
-
-All scripts:
-- Exit with code 1 on error
-- Write detailed error messages to stderr
-- Require `gh` CLI to be installed and authenticated
-
-### Common Issues
-
-**Error: "gh not found"**
-- **Solution**: Install GitHub CLI from https://cli.github.com/ and run `gh auth login`
-
-**Error: "Failed to query GitHub API"**
-- **Solution**: Verify `gh` authentication with `gh auth status`
-- **Solution**: Check PR number exists and you have repository access
-
-**Error: "PR not found"**
-- **Solution**: Verify the PR number is correct and still exists
-- **Solution**: Ensure repository owner and name are correct
-
-**Error: "SHA not found" or "Force-push detected"**
-- **Explanation**: Last reviewed SHA no longer exists in branch history (force-push occurred)
-- **Solution**: A full review is required; incremental review not possible
-
-**Tests show "FAIL" but functionality works**
-- **Explanation**: Some tests may show exit code failures even when logic is correct
-- **Solution**: Check test output message - if it says "Correctly detected", functionality is working
-
-**Error: "Could not find insertion point"**
-- **Explanation**: Overview file doesn't have expected "**Changed files:**" line
-- **Solution**: Verify overview file format is correct or regenerate it
-
-### Verification Checklist
-
-After setup, verify:
-- [ ] `Run-ReviewToolsTests.ps1` shows 9+ tests passing
-- [ ] `Get-PrIncrementalChanges.ps1` returns valid JSON
-- [ ] `Test-IncrementalReview.ps1` analyzes a PR without errors
-- [ ] `Get-GitHubRawFile.ps1` downloads files correctly
-- [ ] `Get-GitHubPrFilePatch.ps1` retrieves patches correctly
-
-## Best Practices
-
-### For Review Authors
-
-1. **Test before full review**: Use `Test-IncrementalReview.ps1` to preview changes 
-2. **Check for force-push**: Review the analysis output - force-pushes require full reviews
-3. **Smart step filtering**: Skip review steps for file types that didn't change
-
-### For Script Users
-
-1. **Use absolute paths**: When specifying folders, use absolute paths to avoid ambiguity
-2. **Check exit codes**: Scripts exit with code 1 on error - check `$LASTEXITCODE` in automation
-3. **Parse JSON output**: Use `ConvertFrom-Json` to work with structured output from `Get-PrIncrementalChanges.ps1`
-4. **Handle empty results**: Check `ChangedFiles.Count` before iterating
-
-### Performance Tips
-
-1. **Batch operations**: When reviewing multiple PRs, collect all PR numbers and process in batch
-2. **Cache raw files**: Download baseline files once and reuse for multiple comparisons
-3. **Filter early**: Use incremental detection to skip unnecessary file reviews
-4. **Parallel processing**: Consider processing independent PRs in parallel
-
-## Integration with AI Review Systems
-
-These tools are designed to work with AI-powered review systems:
-
-1. **Copilot Instructions**: This file serves as reference documentation for GitHub Copilot
-2. **Structured Output**: JSON output from scripts is easily parsed by AI systems
-3. **Incremental Intelligence**: AI can focus on changed files for more efficient reviews
-4. **Metadata Tracking**: Review iterations are tracked for context-aware suggestions
-
-### Example AI Integration
-
-```powershell
-# Get incremental changes
-$analysis = .\Get-PrIncrementalChanges.ps1 -PullRequestNumber $PR | ConvertFrom-Json
-
-# Feed to AI review system
-$reviewPrompt = @"
-Review the following changed files in PR #$PR:
-$($analysis.ChangedFiles | ForEach-Object { "- $($_.Filename) ($($_.Status))" } | Out-String)
-
-Focus on incremental changes only. Previous review was at SHA $($analysis.LastReviewedSha).
-"@
-
-# Execute AI review with context
-Invoke-AIReview -Prompt $reviewPrompt -Files $analysis.ChangedFiles
-```
-
-## Support and Further Information
-
-For detailed script documentation, use PowerShell's help system:
-```powershell
-Get-Help .\Get-PrIncrementalChanges.ps1 -Full
-Get-Help .\Test-IncrementalReview.ps1 -Detailed
-```
-
-Related documentation:
-- `.github/prompts/review-pr.prompt.md` - Complete review workflow guide
-- `doc/devdocs/` - PowerToys development documentation
-- GitHub CLI documentation: https://cli.github.com/manual/
-
-For issues or questions, refer to the PowerToys contribution guidelines.

.gitignore

@@ -358,4 +358,4 @@ src/common/Telemetry/*.etl
 /src/settings-ui/Settings.UI/Assets/Settings/search.index.json
 
 # PowerToysInstaller Build Temp Files
-installer/*/*.wxs.bk
+installer/*/*.wxs.bk

.pipelines/ESRPSigning_core.json

@@ -131,8 +131,6 @@
 
             "PowerToys.ImageResizer.exe",
             "PowerToys.ImageResizer.dll",
-            "WinUI3Apps\\PowerToys.ImageResizerCLI.exe",
-            "WinUI3Apps\\PowerToys.ImageResizerCLI.dll",
             "PowerToys.ImageResizerExt.dll",
             "PowerToys.ImageResizerContextMenu.dll",
             "ImageResizerContextMenuPackage.msix",
@@ -237,14 +235,6 @@
 
             "PowerToys.CmdPalModuleInterface.dll",
             "CmdPalKeyboardService.dll",
-            "PowerToys.ModuleContracts.dll",
-            "Awake.ModuleServices.dll",
-            "ColorPicker.ModuleServices.dll",
-            "Workspaces.ModuleServices.dll",
-            "Microsoft.CommandPalette.Extensions.dll",
-            "Microsoft.CommandPalette.Extensions.Toolkit.dll",
-            "Microsoft.CmdPal.Ext.PowerToys.dll",
-            "Microsoft.CmdPal.Ext.PowerToys.exe",
             "*Microsoft.CmdPal.UI_*.msix",
 
             "PowerToys.DSC.dll",
@@ -368,13 +358,9 @@
                 "boost_regex-vc143-mt-x32-1_87.dll",
                 "boost_regex-vc143-mt-x64-1_87.dll",
 
-                "Microsoft.ML.OnnxRuntime.dll",
-
                 "UnitsNet.dll",
                 "UtfUnknown.dll",
-                "Wpf.Ui.dll",
-                "Shmuelie.WinRTServer.dll",
-                "ToolGood.Words.Pinyin.dll"
+                "Wpf.Ui.dll"
             ],
             "SigningInfo": {
                 "Operations": [

.pipelines/v2/templates/job-build-project.yml

@@ -624,4 +624,4 @@ jobs:
     - publish: $(JobOutputDirectory)
       artifact: $(JobOutputArtifactName)-failure-$(System.JobAttempt)
       displayName: Publish failure logs
-      condition: or(failed(), canceled())
+      condition: or(failed(), canceled())

.pipelines/v2/templates/pipeline-ci-build.yml

@@ -63,20 +63,3 @@ stages:
               winAppSDKVersionNumber: ${{ parameters.winAppSDKVersionNumber }}
               useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
             timeoutInMinutes: 90
-
-  - stage: Build_SDK
-    displayName: Build Command Palette Toolkit SDK
-    dependsOn: []
-    jobs:
-      - template: job-build-sdk.yml
-        parameters:
-          pool:
-            ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
-              name: SHINE-INT-L
-            ${{ else }}:
-              name: SHINE-OSS-L
-            ${{ if eq(parameters.useVSPreview, true) }}:
-              demands: ImageOverride -equals SHINE-VS17-Preview
-          buildConfigurations: [Release]
-          official: false
-          codeSign: false

.pipelines/versionAndSignCheck.ps1

@@ -104,4 +104,4 @@ if ($totalFailure -gt 0) {
     exit 1
 }
 
-exit 0
+exit 0

DATA_AND_PRIVACY.md

@@ -444,10 +444,6 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.FancyZones_ZoneWindowKeyUp</td>
     <td>Occurs when a key is released while interacting with zones.</td>
   </tr>
-  <tr>
-    <td>Microsoft.PowerToys.FancyZones_CLICommand</td>
-    <td>Triggered when a FancyZones CLI command is executed, logging the command name and success status.</td>
-  </tr>
 </table>
 
 ### FileExplorerAddOns

Directory.Packages.props

@@ -37,7 +37,6 @@
     <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
     <PackageVersion Include="MessagePack" Version="3.1.3" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.CommandPalette.Extensions" Version="0.5.250829002" />
     <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.10" />
     <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.10" />
@@ -95,7 +94,6 @@
     <PackageVersion Include="RtfPipe" Version="2.0.7677.4303" />
     <PackageVersion Include="ScipBe.Common.Office.OneNote" Version="3.0.1" />
     <PackageVersion Include="SharpCompress" Version="0.37.2" />
-    <PackageVersion Include="Shmuelie.WinRTServer" Version="2.1.1" />
     <!-- Don't update SkiaSharp.Views.WinUI to version 3.* branch as this brakes the HexBox control in Registry Preview. -->
     <PackageVersion Include="SkiaSharp.Views.WinUI" Version="2.88.9" />
     <PackageVersion Include="StreamJsonRpc" Version="2.21.69" />
@@ -147,4 +145,4 @@
     <PackageVersion Include="Microsoft.VariantAssignment.Client" Version="2.4.17140001" />
     <PackageVersion Include="Microsoft.VariantAssignment.Contract" Version="3.0.16990001" />
   </ItemGroup>
-</Project>
+</Project>

NOTICE.md

@@ -1560,7 +1560,6 @@ SOFTWARE.
 - ReverseMarkdown
 - ScipBe.Common.Office.OneNote
 - SharpCompress
-- Shmuelie.WinRTServer
 - SkiaSharp.Views.WinUI
 - StreamJsonRpc
 - StyleCop.Analyzers

PowerToys.slnx

@@ -44,10 +44,6 @@
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
-    <Project Path="src/common/PowerToys.ModuleContracts/PowerToys.ModuleContracts.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
     <Project Path="src/common/SettingsAPI/SettingsAPI.vcxproj" Id="6955446d-23f7-4023-9bb3-8657f904af99" />
     <Project Path="src/common/Themes/Themes.vcxproj" Id="98537082-0fdb-40de-abd8-0dc5a4269bab" />
     <Project Path="src/common/UITestAutomation/UITestAutomation.csproj">
@@ -143,7 +139,6 @@
       <Platform Solution="*|x64" Project="x64" />
       <Deploy />
     </Project>
-    <Project Path="src/modules/AdvancedPaste/AdvancedPasteModuleInterface/AdvancedPasteModuleInterface.vcxproj" Id="fc373b24-3293-453c-aaf5-cf2909dcee6a" />
   </Folder>
   <Folder Name="/modules/AdvancedPaste/Tests/">
     <Project Path="src/modules/AdvancedPaste/AdvancedPaste.FuzzTests/AdvancedPaste.FuzzTests.csproj">
@@ -157,30 +152,14 @@
   </Folder>
   <Folder Name="/modules/AlwaysOnTop/">
     <Project Path="src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj" Id="1dc3be92-ce89-43fb-8110-9c043a2fe7a2" />
-    <Project Path="src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj" Id="48a0a19e-a0be-4256-acf8-cc3b80291af9" />
   </Folder>
   <Folder Name="/modules/awake/">
-    <Project Path="src/modules/awake/Awake.ModuleServices/Awake.ModuleServices.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
     <Project Path="src/modules/awake/Awake/Awake.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
-    <Project Path="src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj" Id="5e7360a8-d048-4ed3-8f09-0bfd64c5529a" />
-  </Folder>
-  <Folder Name="/modules/cmdNotFound/">
-    <Project Path="src/modules/cmdNotFound/CmdNotFoundModuleInterface/CmdNotFoundModuleInterface.vcxproj" Id="0014d652-901f-4456-8d65-06fc5f997fb0" />
   </Folder>
   <Folder Name="/modules/colorpicker/">
-    <Project Path="src/modules/colorPicker/ColorPicker.ModuleServices/ColorPicker.ModuleServices.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj" Id="655c9af2-18d3-4da6-80e4-85504a7722ba">
-      <BuildDependency Project="src/common/logger/logger.vcxproj" />
-    </Project>
     <Project Path="src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
@@ -194,7 +173,6 @@
   </Folder>
   <Folder Name="/modules/CommandPalette/">
     <Project Path="src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj" Id="5f63c743-f6ce-4dba-a200-2b3f8a14e8c2" />
-    <Project Path="src/modules/cmdpal/CmdPalModuleInterface/CmdPalModuleInterface.vcxproj" Id="0adeb797-c8c7-4ffa-acd5-2af6cad7ecd8" />
   </Folder>
   <Folder Name="/modules/CommandPalette/Built-in Extensions/">
     <Project Path="src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Microsoft.CmdPal.Ext.Apps.csproj">
@@ -218,11 +196,6 @@
       <Platform Solution="*|x64" Project="x64" />
       <Deploy />
     </Project>
-    <Project Path="src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PowerToys/Microsoft.CmdPal.Ext.PowerToys.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-      <Deploy />
-    </Project>
     <Project Path="src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Registry/Microsoft.CmdPal.Ext.Registry.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
@@ -371,14 +344,12 @@
   </Folder>
   <Folder Name="/modules/CropAndLock/">
     <Project Path="src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj" Id="f5e1146e-b7b3-4e11-85fd-270a500bd78c" />
-    <Project Path="src/modules/CropAndLock/CropAndLockModuleInterface/CropAndLockModuleInterface.vcxproj" Id="3157fa75-86cf-4ee2-8f62-c43f776493c6" />
   </Folder>
   <Folder Name="/modules/EnvironmentVariables/">
     <Project Path="src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariables.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
-    <Project Path="src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/EnvironmentVariablesModuleInterface.vcxproj" Id="b9420661-b0e4-4241-abd4-4a27a1f64250" />
     <Project Path="src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesUILib.csproj" />
   </Folder>
   <Folder Name="/modules/fancyzones/">
@@ -396,7 +367,6 @@
       <Platform Solution="*|x64" Project="x64" />
     </Project>
     <Project Path="src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj" Id="f9c68edf-ac74-4b77-9af1-005d9c9f6a99" />
-    <Project Path="src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj" Id="48804216-2a0e-4168-a6d8-9cd068d14227" />
   </Folder>
   <Folder Name="/modules/fancyzones/Tests/">
     <Project Path="src/modules/fancyzones/FancyZones.FuzzTests/FancyZones.FuzzTests.csproj">
@@ -419,6 +389,131 @@
       <BuildDependency Project="src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj" />
     </Project>
   </Folder>
+  <Folder Name="/modules/File Explorer/">
+    <Project Path="src/modules/previewpane/BgcodePreviewHandler/BgcodePreviewHandler.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/BgcodePreviewHandlerCpp/BgcodePreviewHandlerCpp.vcxproj" Id="f6088a11-1c9e-4420-aa90-cf7e78dd7f1c" />
+    <Project Path="src/modules/previewpane/BgcodeThumbnailProvider/BgcodeThumbnailProvider.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/BgcodeThumbnailProviderCpp/BgcodeThumbnailProviderCpp.vcxproj" Id="47b0678c-806b-4fe1-9f50-46ba88989532" />
+    <Project Path="src/modules/previewpane/Common/PreviewHandlerCommon.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/GcodePreviewHandlerCpp/GcodePreviewHandlerCpp.vcxproj" Id="5a5dd09d-723a-44d3-8f2b-293584c3d731" />
+    <Project Path="src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProviderCpp.vcxproj" Id="56cc2f10-6e41-453d-be16-c593a5e58482" />
+    <Project Path="src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/MarkdownPreviewHandlerCpp/MarkdownPreviewHandlerCpp.vcxproj" Id="ed9a1ac6-aeb0-4569-a6e9-e1696182b545" />
+    <Project Path="src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/MonacoPreviewHandlerCpp/MonacoPreviewHandlerCpp.vcxproj" Id="b3e869c4-8210-4ebd-a621-ff4c4afcbfa9" />
+    <Project Path="src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/PdfPreviewHandlerCpp/PdfPreviewHandlerCpp.vcxproj" Id="54f7c616-fd41-4e62-bff9-015686914f4d" />
+    <Project Path="src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProviderCpp.vcxproj" Id="ca5518ed-0458-4b09-8f53-4122b9888655" />
+    <Project Path="src/modules/previewpane/QoiPreviewHandler/QoiPreviewHandler.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/QoiPreviewHandlerCpp/QoiPreviewHandlerCpp.vcxproj" Id="3baf9c81-a194-4925-a035-5e24a5d1e542" />
+    <Project Path="src/modules/previewpane/QoiThumbnailProvider/QoiThumbnailProvider.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/QoiThumbnailProviderCpp/QoiThumbnailProviderCpp.vcxproj" Id="ccb5e44f-84d9-4203-83c6-1c9ec9302bc7" />
+    <Project Path="src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProviderCpp.vcxproj" Id="d6dcc3ae-18c0-488a-b978-baa9e3cff09d" />
+    <Project Path="src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/SvgPreviewHandlerCpp/SvgPreviewHandlerCpp.vcxproj" Id="143f13e3-d2e3-4d83-b035-356612d99956" />
+    <Project Path="src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProviderCpp.vcxproj" Id="2bbc9e33-21ec-401c-84da-bb6590a9b2aa" />
+  </Folder>
+  <Folder Name="/modules/File Explorer/Tests/">
+    <Project Path="src/modules/previewpane/UnitTests-BgcodePreviewHandler/Preview.BgcodePreviewHandler.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-BgcodeThumbnailProvider/Preview.BgcodeThumbnailProvider.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-GcodePreviewHandler/Preview.GcodePreviewHandler.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-GcodeThumbnailProvider/Preview.GcodeThumbnailProvider.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-MarkdownPreviewHandler/Preview.MarkdownPreviewHandler.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-PdfPreviewHandler/Preview.PdfPreviewHandler.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-PdfThumbnailProvider/Preview.PdfThumbnailProvider.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-PreviewHandlerCommon/Preview.PreviewHandlerCommon.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-QoiPreviewHandler/Preview.QoiPreviewHandler.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-QoiThumbnailProvider/Preview.QoiThumbnailProvider.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-StlThumbnailProvider/Preview.StlThumbnailProvider.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-SvgPreviewHandler/Preview.SvgPreviewHandler.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-SvgThumbnailProvider/Preview.SvgThumbnailProvider.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+  </Folder>
   <Folder Name="/modules/FileLocksmith/">
     <Project Path="src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj" Id="799a50d8-de89-4ed1-8ff8-ad5a9ed8c0ca" />
     <Project Path="src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.vcxproj" Id="57175ec7-92a5-4c1e-8244-e3fbca2a81de" />
@@ -434,7 +529,6 @@
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
-    <Project Path="src/modules/Hosts/HostsModuleInterface/HostsModuleInterface.vcxproj" Id="b41b888c-7db8-4747-b262-4062e05a230d" />
     <Project Path="src/modules/Hosts/HostsUILib/HostsUILib.csproj" />
   </Folder>
   <Folder Name="/modules/Hosts/Tests/">
@@ -459,10 +553,6 @@
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
-    <Project Path="src/modules/imageresizer/ImageResizerCLI/ImageResizerCLI.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
   </Folder>
   <Folder Name="/modules/imageresizer/Tests/">
     <Project Path="src/modules/imageresizer/tests/ImageResizer.UnitTests.csproj">
@@ -475,7 +565,6 @@
   </Folder>
   <Folder Name="/modules/keyboardmanager/">
     <Project Path="src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj" Id="8affa899-0b73-49ec-8c50-0fadda57b2fc" />
-    <Project Path="src/modules/keyboardmanager/dll/KeyboardManager.vcxproj" Id="89f34af7-1c34-4a72-aa6e-534bcf972bd9" />
     <Project Path="src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj" Id="8df78b53-200e-451f-9328-01eb907193ae" />
     <Project Path="src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj" Id="23d2070d-e4ad-4add-85a7-083d9c76ad49" />
     <Project Path="src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/KeyboardManagerEditorLibraryWrapper.vcxproj" Id="4382a954-179a-4078-92af-715187dfff50" />
@@ -491,9 +580,6 @@
     <Project Path="src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj" Id="7f4b3a60-bc27-45a7-8000-68b0b6ea7466" />
   </Folder>
   <Folder Name="/modules/launcher/">
-    <Project Path="src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj" Id="e364f67b-bb12-4e91-b639-355866ebcd8b">
-      <BuildDependency Project="src/modules/launcher/PowerLauncher/PowerLauncher.csproj" />
-    </Project>
     <Project Path="src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
@@ -661,7 +747,6 @@
     </Project>
   </Folder>
   <Folder Name="/modules/LightSwitch/">
-    <Project Path="src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj" Id="38177d56-6ad1-4adf-88c9-2843a7932166" />
     <Project Path="src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj" Id="08e71c67-6a7e-4ca1-b04e-2fb336410bac" />
   </Folder>
   <Folder Name="/modules/LightSwitch/Tests/">
@@ -677,7 +762,6 @@
       <BuildDependency Project="src/common/SettingsAPI/SettingsAPI.vcxproj" />
       <BuildDependency Project="src/common/version/version.vcxproj" />
     </Project>
-    <Project Path="src/modules/MeasureTool/MeasureToolModuleInterface/MeasureToolModuleInterface.vcxproj" Id="92c39820-9f84-4529-bc7d-22aae514d63b" />
     <Project Path="src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
@@ -697,7 +781,6 @@
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
-    <Project Path="src/modules/MouseUtils/MouseJump/MouseJump.vcxproj" Id="8a08d663-4995-40e3-b42c-3f910625f284" />
     <Project Path="src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
@@ -769,14 +852,12 @@
       <Platform Solution="*|x64" Project="x64" />
     </Project>
     <Project Path="src/modules/poweraccent/PowerAccentKeyboardService/PowerAccentKeyboardService.vcxproj" Id="c97d9a5d-206c-454e-997e-009e227d7f02" />
-    <Project Path="src/modules/poweraccent/PowerAccentModuleInterface/PowerAccentModuleInterface.vcxproj" Id="34a354c5-23c7-4343-916c-c52daf4fc39d" />
   </Folder>
   <Folder Name="/modules/PowerOCR/">
     <Project Path="src/modules/PowerOCR/PowerOCR/PowerOCR.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
-    <Project Path="src/modules/PowerOCR/PowerOCRModuleInterface/PowerOCRModuleInterface.vcxproj" Id="6ab6a2d6-f859-4a82-9184-0bd29c9f07d1" />
   </Folder>
   <Folder Name="/modules/PowerOCR/Tests/">
     <Project Path="src/modules/PowerOCR/PowerOCR-UITests/PowerOCR.UITests.csproj">
@@ -806,140 +887,11 @@
       <BuildDependency Project="src/modules/powerrename/lib/PowerRenameLib.vcxproj" />
     </Project>
   </Folder>
-  <Folder Name="/modules/previewpane/">
-    <Project Path="src/modules/previewpane/BgcodePreviewHandler/BgcodePreviewHandler.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/BgcodePreviewHandlerCpp/BgcodePreviewHandlerCpp.vcxproj" Id="f6088a11-1c9e-4420-aa90-cf7e78dd7f1c" />
-    <Project Path="src/modules/previewpane/BgcodeThumbnailProvider/BgcodeThumbnailProvider.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/BgcodeThumbnailProviderCpp/BgcodeThumbnailProviderCpp.vcxproj" Id="47b0678c-806b-4fe1-9f50-46ba88989532" />
-    <Project Path="src/modules/previewpane/Common/PreviewHandlerCommon.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/GcodePreviewHandlerCpp/GcodePreviewHandlerCpp.vcxproj" Id="5a5dd09d-723a-44d3-8f2b-293584c3d731" />
-    <Project Path="src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProviderCpp.vcxproj" Id="56cc2f10-6e41-453d-be16-c593a5e58482" />
-    <Project Path="src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/MarkdownPreviewHandlerCpp/MarkdownPreviewHandlerCpp.vcxproj" Id="ed9a1ac6-aeb0-4569-a6e9-e1696182b545" />
-    <Project Path="src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/MonacoPreviewHandlerCpp/MonacoPreviewHandlerCpp.vcxproj" Id="b3e869c4-8210-4ebd-a621-ff4c4afcbfa9" />
-    <Project Path="src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/PdfPreviewHandlerCpp/PdfPreviewHandlerCpp.vcxproj" Id="54f7c616-fd41-4e62-bff9-015686914f4d" />
-    <Project Path="src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProviderCpp.vcxproj" Id="ca5518ed-0458-4b09-8f53-4122b9888655" />
-    <Project Path="src/modules/previewpane/powerpreview/powerpreview.vcxproj" Id="217df501-135c-4e38-bfc8-99d4821032ea">
-      <BuildDependency Project="src/common/version/version.vcxproj" />
-    </Project>
-    <Project Path="src/modules/previewpane/QoiPreviewHandler/QoiPreviewHandler.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/QoiPreviewHandlerCpp/QoiPreviewHandlerCpp.vcxproj" Id="3baf9c81-a194-4925-a035-5e24a5d1e542" />
-    <Project Path="src/modules/previewpane/QoiThumbnailProvider/QoiThumbnailProvider.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/QoiThumbnailProviderCpp/QoiThumbnailProviderCpp.vcxproj" Id="ccb5e44f-84d9-4203-83c6-1c9ec9302bc7" />
-    <Project Path="src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProviderCpp.vcxproj" Id="d6dcc3ae-18c0-488a-b978-baa9e3cff09d" />
-    <Project Path="src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/SvgPreviewHandlerCpp/SvgPreviewHandlerCpp.vcxproj" Id="143f13e3-d2e3-4d83-b035-356612d99956" />
-    <Project Path="src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProviderCpp.vcxproj" Id="2bbc9e33-21ec-401c-84da-bb6590a9b2aa" />
-  </Folder>
-  <Folder Name="/modules/previewpane/Tests/">
-    <Project Path="src/modules/previewpane/UnitTests-BgcodePreviewHandler/Preview.BgcodePreviewHandler.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-BgcodeThumbnailProvider/Preview.BgcodeThumbnailProvider.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-GcodePreviewHandler/Preview.GcodePreviewHandler.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-GcodeThumbnailProvider/Preview.GcodeThumbnailProvider.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-MarkdownPreviewHandler/Preview.MarkdownPreviewHandler.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-PdfPreviewHandler/Preview.PdfPreviewHandler.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-PdfThumbnailProvider/Preview.PdfThumbnailProvider.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-PreviewHandlerCommon/Preview.PreviewHandlerCommon.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-QoiPreviewHandler/Preview.QoiPreviewHandler.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-QoiThumbnailProvider/Preview.QoiThumbnailProvider.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-StlThumbnailProvider/Preview.StlThumbnailProvider.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-SvgPreviewHandler/Preview.SvgPreviewHandler.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-SvgThumbnailProvider/Preview.SvgThumbnailProvider.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-  </Folder>
   <Folder Name="/modules/RegistryPreview/">
     <Project Path="src/modules/registrypreview/RegistryPreview/RegistryPreview.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
-    <Project Path="src/modules/registrypreview/RegistryPreviewExt/RegistryPreviewExt.vcxproj" Id="697c6af9-0a48-49a9-866c-67da12384015" />
     <Project Path="src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUILib.csproj" />
   </Folder>
   <Folder Name="/modules/RegistryPreview/Test/">
@@ -953,10 +905,6 @@
     <Project Path="src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj" Id="2d604c07-51fc-46bb-9eb7-75aecc7f5e81" />
   </Folder>
   <Folder Name="/modules/Workspaces/">
-    <Project Path="src/modules/Workspaces/Workspaces.ModuleServices/Workspaces.ModuleServices.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
     <Project Path="src/modules/Workspaces/WorkspacesCsharpLibrary/WorkspacesCsharpLibrary.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
@@ -997,7 +945,6 @@
   </Folder>
   <Folder Name="/modules/ZoomIt/">
     <Project Path="src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj" Id="0a84f764-3a88-44cd-aa96-41bdbd48627b" />
-    <Project Path="src/modules/ZoomIt/ZoomItModuleInterface/ZoomItModuleInterface.vcxproj" Id="e4585179-2ac1-4d5f-a3ff-cfc5392f694c" />
     <Project Path="src/modules/ZoomIt/ZoomItSettingsInterop/ZoomItSettingsInterop.vcxproj" Id="ca7d8106-30b9-4aec-9d05-b69b31b8c461" />
   </Folder>
   <Folder Name="/settings-ui/">
@@ -1044,27 +991,26 @@
     <BuildDependency Project="src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj" />
     <BuildDependency Project="src/common/updating/updating.vcxproj" />
     <BuildDependency Project="src/modules/awake/Awake/Awake.csproj" />
-    <BuildDependency Project="src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj" />
-    <BuildDependency Project="src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj" />
     <BuildDependency Project="src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj" />
     <BuildDependency Project="src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj" />
     <BuildDependency Project="src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj" />
-    <BuildDependency Project="src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj" />
     <BuildDependency Project="src/modules/imageresizer/dll/ImageResizerExt.vcxproj" />
     <BuildDependency Project="src/modules/imageresizer/ui/ImageResizerUI.csproj" />
-    <BuildDependency Project="src/modules/keyboardmanager/dll/KeyboardManager.vcxproj" />
-    <BuildDependency Project="src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj" />
-    <BuildDependency Project="src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj" />
     <BuildDependency Project="src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj" />
     <BuildDependency Project="src/modules/powerrename/dll/PowerRenameExt.vcxproj" />
     <BuildDependency Project="src/modules/powerrename/lib/PowerRenameLib.vcxproj" />
     <BuildDependency Project="src/modules/previewpane/Common/PreviewHandlerCommon.csproj" />
     <BuildDependency Project="src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj" />
     <BuildDependency Project="src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj" />
-    <BuildDependency Project="src/modules/previewpane/powerpreview/powerpreview.vcxproj" />
     <BuildDependency Project="src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj" />
     <BuildDependency Project="src/PackageIdentity/PackageIdentity.vcxproj" />
   </Project>
-  <Project Path="src/Update/PowerToys.Update.vcxproj" Id="44ce9ae1-4390-42c5-bacc-0fd6b40aa203" />
-  <Project Path="tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj" Id="64a80062-4d8b-4229-8a38-dfa1d7497749" />
+  <Project Path="src/RunnerV2/RunnerV2/RunnerV2.csproj">
+    <Platform Solution="*|ARM64" Project="ARM64" />
+    <Platform Solution="*|x64" Project="x64" />
+  </Project>
+  <Project Path="src/Update/Update.csproj">
+    <Platform Solution="*|ARM64" Project="ARM64" />
+    <Platform Solution="*|x64" Project="x64" />
+  </Project>
 </Solution>

doc/devdocs/cli-conventions.md

@@ -1,93 +0,0 @@
-# CLI Conventions
-
-This document describes the conventions for implementing command-line interfaces (CLI) in PowerToys modules.
-
-## Library
-
-Use the **System.CommandLine** library for CLI argument parsing. This is already defined in `Directory.Packages.props`:
-
-```xml
-<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-```
-
-Add the reference to your project:
-
-```xml
-<PackageReference Include="System.CommandLine" />
-```
-
-## Option Naming and Definition
-
-- Use `--kebab-case` for long form (e.g., `--shrink-only`).
-- Use single `-x` for short form (e.g., `-s`, `-w`).
-- Define aliases as static readonly arrays: `["--silent", "-s"]`.
-- Create options using `Option<T>` with descriptive help text.
-- Add validators for options that require range or format checking.
-
-## RootCommand Setup
-
-- Create a `RootCommand` with a brief description.
-- Add all options and arguments to the command.
-
-## Parsing
-
-- Use `Parser(rootCommand).Parse(args)` to parse CLI arguments.
-- Extract option values using `parseResult.GetValueForOption()`.
-- Note: Use `Parser` directly; `RootCommand.Parse()` may not be available with the pinned System.CommandLine version.
-
-### Parse/Validation Errors
-
-- On parse/validation errors, print error messages and usage, then exit with non-zero code.
-
-## Examples
-
-Reference implementations:
-- Awake: `src/modules/Awake/Awake/Program.cs`
-- ImageResizer: `src/modules/imageresizer/ui/Cli/`
-
-## Help Output
-
-- Provide a `PrintUsage()` method for custom help formatting if needed.
-
-## Best Practices
-
-1. **Consistency**: Follow existing module patterns.
-2. **Documentation**: Always provide help text for each option.
-3. **Validation**: Validate input and provide clear error messages.
-4. **Atomicity**: Make one logical change per PR; avoid drive-by refactors.
-5. **Build/Test Discipline**: Build and test synchronously, one terminal per operation.
-6. **Style**: Follow repo analyzers (`.editorconfig`, StyleCop) and formatting rules.
-
-## Logging Requirements
-
-- Use `ManagedCommon.Logger` for consistent logging.
-- Initialize logging early in `Main()`.
-- Use dual output (console + log file) for errors and warnings to ensure visibility.
-- Reference: `src/modules/imageresizer/ui/Cli/CliLogger.cs`
-
-## Error Handling
-
-### Exit Codes
-
-- `0`: Success
-- `1`: General error (parsing, validation, runtime)
-- `2`: Invalid arguments (optional)
-
-### Exception Handling
-
-- Always wrap `Main()` in try-catch for unhandled exceptions.
-- Log exceptions before exiting with non-zero code.
-- Display user-friendly error messages to stderr.
-- Preserve detailed stack traces in log files only.
-
-## Testing Requirements
-
-- Include tests for argument parsing, validation, and edge cases.
-- Place CLI tests in module-specific test projects (e.g., `src/modules/[module]/tests/*CliTests.cs`).
-
-## Signing and Deployment
-
-- CLI executables are signed automatically in CI/CD.
-- **New CLI tools**: Add your executable and dll to `.pipelines/ESRPSigning_core.json` in the signing list.
-- CLI executables are deployed alongside their parent module (e.g., `C:\Program Files\PowerToys\modules\[ModuleName]\`).
-- Use self-contained deployment (import `Common.SelfContained.props`).

installer/PowerToysSetupVNext/BaseApplications.wxs

@@ -7,18 +7,11 @@
 
   <Fragment>
     <DirectoryRef Id="INSTALLFOLDER">
-      <Component Id="Microsoft_CommandPalette_Extensions_winmd" Guid="304AD25A-A986-4058-940E-61DB79EBD78C" Bitness="always64">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Microsoft_CommandPalette_Extensions_winmd" Value="" KeyPath="yes" />
-        </RegistryKey>
-        <File Id="Microsoft.CommandPalette.Extensions.winmd" Source="$(var.BinDir)Microsoft.CommandPalette.Extensions.winmd" />
-      </Component>
     <!-- Generated by generateFileComponents.ps1 -->
     <!--BaseApplicationsFiles_Component_Def-->
     </DirectoryRef>
 
     <ComponentGroup Id="BaseApplicationsComponentGroup">
-      <ComponentRef Id="Microsoft_CommandPalette_Extensions_winmd" />
     </ComponentGroup>
 
   </Fragment>

installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj

@@ -173,4 +173,4 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     </ItemGroup>
   </Target>
   <Target Name="Restore" />
-</Project>
+</Project>

src/PackageIdentity/AppxManifest.xml

@@ -10,8 +10,7 @@
   xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
   xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
   xmlns:systemai="http://schemas.microsoft.com/appx/manifest/systemai/windows10"
-  xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"
-  IgnorableNamespaces="uap uap2 uap3 rescap desktop uap10 systemai com">
+  IgnorableNamespaces="uap uap2 uap3 rescap desktop uap10 systemai">
   <Identity
     Name="Microsoft.PowerToys.SparseApp"
     Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
@@ -31,7 +30,6 @@
     <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19000.0" MaxVersionTested="10.0.26226.0" />
   </Dependencies>
   <Capabilities>
-    <Capability Name="internetClient" />
     <rescap:Capability Name="runFullTrust" />
     <systemai:Capability Name="systemAIModels"/>
     <rescap:Capability Name="unvirtualizedResources"/>
@@ -68,42 +66,5 @@
         AppListEntry="none">
       </uap:VisualElements>
     </Application>
-    <Application Id="PowerToys.CmdPalExtension" Executable="Microsoft.CmdPal.Ext.PowerToys.exe" EntryPoint="Windows.FullTrustApplication">
-      <uap:VisualElements
-        DisplayName="PowerToys.CommandPaletteExtension"
-        Description="PowerToys Command Palette Extension"
-        BackgroundColor="transparent"
-        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png"
-        AppListEntry="none">
-      </uap:VisualElements>
-      <Extensions>
-        <com:Extension Category="windows.comServer">
-          <com:ComServer>
-            <com:ExeServer Executable="Microsoft.CmdPal.Ext.PowerToys.exe" Arguments="-RegisterProcessAsComServer" DisplayName="PowerToys Command Palette Extension">
-              <com:Class Id="7EC02C7D-8F98-4A2E-9F23-B58C2C2F2B17" DisplayName="PowerToys Command Palette Extension" />
-            </com:ExeServer>
-          </com:ComServer>
-        </com:Extension>
-        <uap3:Extension Category="windows.appExtension">
-          <uap3:AppExtension Name="com.microsoft.commandpalette"
-            Id="PowerToys"
-            PublicFolder="Public"
-            DisplayName="PowerToys"
-            Description="Surface PowerToys commands inside Command Palette">
-            <uap3:Properties>
-              <CmdPalProvider>
-                <Activation>
-                  <CreateInstance ClassId="7EC02C7D-8F98-4A2E-9F23-B58C2C2F2B17" />
-                </Activation>
-                <SupportedInterfaces>
-                  <Commands/>
-                </SupportedInterfaces>
-              </CmdPalProvider>
-            </uap3:Properties>
-          </uap3:AppExtension>
-        </uap3:Extension>
-      </Extensions>
-    </Application>
   </Applications>
-</Package>
+</Package>

src/RunnerV2/RunnerV2/Extensions/PackageVersionExtensions.cs

@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Windows.ApplicationModel;
+
+namespace RunnerV2.Extensions
+{
+    internal static class PackageVersionExtensions
+    {
+        public static Version ToVersion(this PackageVersion packageVersion)
+        {
+            return new Version(packageVersion.Major, packageVersion.Minor, packageVersion.Build, packageVersion.Revision);
+        }
+    }
+}

src/RunnerV2/RunnerV2/Helpers/COMUtils.cs

@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace RunnerV2.Helpers
+{
+    internal static class COMUtils
+    {
+        public static void InitializeCOMSecurity(string securityDescriptor)
+        {
+            if (!NativeMethods.ConvertStringSecurityDescriptorToSecurityDescriptorW(
+                securityDescriptor,
+                1,
+                out IntPtr pSD,
+                out _))
+            {
+                return;
+            }
+
+            uint absoluteSDSize = 0;
+            uint daclSize = 0;
+            uint groupSize = 0;
+            uint ownerSize = 0;
+            uint saclSize = 0;
+
+            if (!NativeMethods.MakeAbsoluteSD(pSD, IntPtr.Zero, ref absoluteSDSize, IntPtr.Zero, ref daclSize, IntPtr.Zero, ref saclSize, IntPtr.Zero, ref ownerSize, IntPtr.Zero, ref groupSize))
+            {
+                return;
+            }
+
+            IntPtr absoluteSD = Marshal.AllocHGlobal((int)absoluteSDSize);
+            IntPtr dacl = Marshal.AllocHGlobal((int)daclSize);
+            IntPtr sacl = Marshal.AllocHGlobal((int)saclSize);
+            IntPtr owner = Marshal.AllocHGlobal((int)ownerSize);
+            IntPtr group = Marshal.AllocHGlobal((int)groupSize);
+
+            if (!NativeMethods.MakeAbsoluteSD(pSD, absoluteSD, ref absoluteSDSize, dacl, ref daclSize, sacl, ref saclSize, owner, ref ownerSize, group, ref groupSize))
+            {
+                return;
+            }
+
+            _ = NativeMethods.CoInitializeSecurity(
+                absoluteSD,
+                -1,
+                IntPtr.Zero,
+                IntPtr.Zero,
+                6, // RPC_C_AUTHN_LEVEL_PKT_PRIVACY
+                2, // RPC_C_IMP_LEVEL_IDENTIFY
+                IntPtr.Zero,
+                64 | 4096, // EOAC_DYNAMIC_CLOAKING | EOAC_DISABLE_AAA
+                IntPtr.Zero);
+        }
+    }
+}

src/RunnerV2/RunnerV2/Helpers/CentralizedKeyboardHookManager.cs

@@ -0,0 +1,218 @@
+// 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 ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Windows.System;
+
+namespace RunnerV2.Helpers
+{
+    internal static class CentralizedKeyboardHookManager
+    {
+        private static readonly UIntPtr _ignoreKeyEventFlag = 0x5555;
+
+        private static readonly Dictionary<string, List<(HotkeySettings HotkeySettings, Action Action)>> _keyboardHooks = [];
+
+        private static HotkeySettingsControlHook _hotkeySettingsControlHook = new(OnKeyDown, OnKeyUp, IsActive, (_, specialFlags) => specialFlags != _ignoreKeyEventFlag);
+
+        private static void OnKeyDown(int key)
+        {
+            if ((VirtualKey)key == VirtualKey.RightMenu && _ctrlState)
+            {
+                _ctrlAltState = true;
+            }
+
+            switch ((VirtualKey)key)
+            {
+                case VirtualKey.Control:
+                case VirtualKey.LeftControl:
+                case VirtualKey.RightControl:
+                    _ctrlState = true;
+                    break;
+                case VirtualKey.Menu:
+                case VirtualKey.LeftMenu:
+                case VirtualKey.RightMenu:
+                    _altState = true;
+                    break;
+                case VirtualKey.Shift:
+                case VirtualKey.LeftShift:
+                case VirtualKey.RightShift:
+                    _shiftState = true;
+                    break;
+                case VirtualKey.LeftWindows:
+                case VirtualKey.RightWindows:
+                    _winState = true;
+                    break;
+                default:
+                    if (OnKeyboardEvent(new HotkeySettings
+                    {
+                        Code = key,
+                        Ctrl = _ctrlState,
+                        Alt = _altState,
+                        Shift = _shiftState,
+                        Win = _winState,
+                    }))
+                    {
+                        return;
+                    }
+
+                    break;
+            }
+
+            SendSingleKeyboardInput((short)key, (uint)NativeKeyboardHelper.KeyEventF.KeyDown);
+        }
+
+        private static void OnKeyUp(int key)
+        {
+            switch ((VirtualKey)key)
+            {
+                case VirtualKey.Control:
+                case VirtualKey.LeftControl:
+                case VirtualKey.RightControl:
+                    _ctrlState = false;
+                    break;
+                case VirtualKey.Menu:
+                case VirtualKey.LeftMenu:
+                case VirtualKey.RightMenu:
+                    _altState = false;
+                    break;
+                case VirtualKey.Shift:
+                case VirtualKey.LeftShift:
+                case VirtualKey.RightShift:
+                    _shiftState = false;
+                    break;
+                case VirtualKey.LeftWindows:
+                case VirtualKey.RightWindows:
+                    _winState = false;
+                    break;
+            }
+
+            // Correctly release Ctrl key if Ctrl+Alt (AltGr) was used.
+            if (_ctrlAltState && (VirtualKey)key == VirtualKey.RightMenu)
+            {
+                _ctrlAltState = false;
+                _ctrlState = false;
+
+                SendSingleKeyboardInput((short)VirtualKey.LeftControl, (uint)NativeKeyboardHelper.KeyEventF.KeyUp);
+            }
+
+            SendSingleKeyboardInput((short)key, (uint)NativeKeyboardHelper.KeyEventF.KeyUp);
+        }
+
+        private static bool _ctrlState;
+        private static bool _altState;
+        private static bool _shiftState;
+        private static bool _winState;
+        private static bool _ctrlAltState;
+
+        private static bool _isActive;
+
+        private static bool IsActive()
+        {
+            return _isActive;
+        }
+
+        public static void AddKeyboardHook(string moduleName, HotkeySettings hotkeySettings, Action action)
+        {
+#pragma warning disable CA1854 // Prefer the 'IDictionary.TryGetValue(TKey, out TValue)' method
+            if (!_keyboardHooks.ContainsKey(moduleName))
+            {
+                _keyboardHooks[moduleName] = [];
+            }
+#pragma warning restore CA1854 // Prefer the 'IDictionary.TryGetValue(TKey, out TValue)' method
+
+            _keyboardHooks[moduleName].Add((hotkeySettings, action));
+        }
+
+        public static void RemoveAllHooksFromModule(string moduleName)
+        {
+            _keyboardHooks.Remove(moduleName);
+        }
+
+        private static bool OnKeyboardEvent(HotkeySettings pressedHotkey)
+        {
+            bool shortcutHandled = false;
+
+            foreach (var moduleHooks in _keyboardHooks.Values)
+            {
+                foreach (var (hotkeySettings, action) in moduleHooks)
+                {
+                    if (hotkeySettings == pressedHotkey)
+                    {
+                        action();
+                        shortcutHandled = true;
+                    }
+                }
+            }
+
+            return shortcutHandled;
+        }
+
+        public static void Start()
+        {
+            if (_hotkeySettingsControlHook.GetDisposedState())
+            {
+                _hotkeySettingsControlHook = new(OnKeyDown, OnKeyUp, IsActive, (_, specialFlags) => specialFlags != _ignoreKeyEventFlag);
+            }
+
+            _isActive = true;
+        }
+
+        public static void Stop()
+        {
+            _isActive = false;
+            _hotkeySettingsControlHook.Dispose();
+        }
+
+        // Function to send a single key event to the system which would be ignored by the hotkey control.
+        private static void SendSingleKeyboardInput(short keyCode, uint keyStatus)
+        {
+            if (IsExtendedVirtualKey(keyCode))
+            {
+               keyStatus |= (uint)NativeKeyboardHelper.KeyEventF.ExtendedKey;
+            }
+
+            NativeKeyboardHelper.INPUT input = new()
+            {
+                type = NativeKeyboardHelper.INPUTTYPE.INPUT_KEYBOARD,
+                data = new NativeKeyboardHelper.InputUnion
+                {
+                    ki = new NativeKeyboardHelper.KEYBDINPUT
+                    {
+                        wVk = keyCode,
+                        dwFlags = keyStatus,
+                        dwExtraInfo = _ignoreKeyEventFlag,
+                    },
+                },
+            };
+
+            NativeKeyboardHelper.INPUT[] inputs = [input];
+
+            _ = NativeMethods.SendInput(1, inputs, NativeKeyboardHelper.INPUT.Size);
+        }
+
+        private static bool IsExtendedVirtualKey(short vk)
+        {
+            return vk switch
+            {
+                0xA5 => true, // VK_RMENU (Right Alt - AltGr)
+                0xA3 => true, // VK_RCONTROL
+                0x2D => true, // VK_INSERT
+                0x2E => true, // VK_DELETE
+                0x23 => true, // VK_END
+                0x24 => true, // VK_HOME
+                0x21 => true, // VK_PRIOR (Page Up)
+                0x22 => true, // VK_NEXT (Page Down)
+                0x25 => true, // VK_LEFT
+                0x26 => true, // VK_UP
+                0x27 => true, // VK_RIGHT
+                0x28 => true, // VK_DOWN
+                0x90 => true, // VK_NUMLOCK
+                _ => false,
+            };
+        }
+    }
+}

src/RunnerV2/RunnerV2/Helpers/ElevationHelper.cs

@@ -0,0 +1,90 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using static RunnerV2.NativeMethods;
+
+namespace RunnerV2.Helpers
+{
+    internal static partial class ElevationHelper
+    {
+        internal static RestartScheduledMode RestartScheduled { get; set; } = RestartScheduledMode.None;
+
+        internal enum RestartScheduledMode
+        {
+            None,
+            RestartElevated,
+            RestartElevatedWithOpenSettings,
+            RestartNonElevated,
+        }
+
+        private static bool? _cachedValue;
+
+        internal static void RestartIfScheudled()
+        {
+            switch (RestartScheduled)
+            {
+                case RestartScheduledMode.None:
+                    return;
+                case RestartScheduledMode.RestartElevated:
+                    RestartAsAdministrator("--restartedElevated");
+                    break;
+                case RestartScheduledMode.RestartElevatedWithOpenSettings:
+                    RestartAsAdministrator("--restartedElevated --open-settings");
+                    break;
+                case RestartScheduledMode.RestartNonElevated:
+                    // Todo: restart unelevated
+                    break;
+            }
+        }
+
+        private static void RestartAsAdministrator(string arguments)
+        {
+            ProcessStartInfo processStartInfo = new()
+            {
+                Arguments = arguments,
+                Verb = "runas",
+                UseShellExecute = true,
+                FileName = Environment.ProcessPath,
+            };
+
+            try
+            {
+                Process.Start(processStartInfo);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("Failed to restart as administrator: " + ex);
+            }
+        }
+
+        internal static bool IsProcessElevated(bool useCachedValue = true)
+        {
+            if (_cachedValue is not null && useCachedValue)
+            {
+                return _cachedValue.Value;
+            }
+
+            bool elevated = false;
+            if (OpenProcessToken(Process.GetCurrentProcess().Handle, TOKENQUERY, out nint token))
+            {
+                TokenElevation elevation = default;
+                if (GetTokenInformation(token, TOKEN_INFORMATION_CLASS.TOKEN_ELEVATION, ref elevation, (uint)Marshal.SizeOf(elevation), out uint _))
+                {
+                    elevated = elevation.TokenIsElevated != 0;
+                }
+
+                if (token != IntPtr.Zero)
+                {
+                    CloseHandle(token);
+                }
+            }
+
+            _cachedValue = elevated;
+            return elevated;
+        }
+    }
+}

src/RunnerV2/RunnerV2/Helpers/HotkeyManager.cs

@@ -0,0 +1,62 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using ManagedCommon;
+using static RunnerV2.NativeMethods;
+
+namespace RunnerV2.Helpers
+{
+    internal static partial class HotkeyManager
+    {
+        private static readonly Dictionary<int, Action> _hotkeyActions = [];
+
+        [STAThread]
+        public static void EnableHotkey(HotkeyEx hotkey, Action onHotkey)
+        {
+            if (_hotkeyActions.ContainsKey(hotkey.Identifier))
+            {
+                DisableHotkey(hotkey);
+            }
+
+            _hotkeyActions[hotkey.Identifier] = onHotkey;
+
+            if (!RegisterHotKey(Runner.RunnerHwnd, hotkey.Identifier, hotkey.ModifiersMask, hotkey.VkCode))
+            {
+                Console.WriteLine("Failed to register hotkey: " + hotkey);
+                var lastError = Marshal.GetLastWin32Error();
+                Console.WriteLine("LastError: " + lastError);
+            }
+        }
+
+        [STAThread]
+        public static void DisableHotkey(HotkeyEx hotkey)
+        {
+            if (!_hotkeyActions.ContainsKey(hotkey.Identifier))
+            {
+                return;
+            }
+
+            _hotkeyActions.Remove(hotkey.Identifier);
+            if (!UnregisterHotKey(Runner.RunnerHwnd, hotkey.Identifier))
+            {
+                Console.WriteLine("Failed to unregister hotkey: " + hotkey);
+                var lastError = Marshal.GetLastWin32Error();
+                Console.WriteLine("LastError: " + lastError);
+            }
+        }
+
+        public static void ProcessHotkey(nuint hotkeyId)
+        {
+            ulong hashId = hotkeyId.ToUInt64();
+            if (_hotkeyActions.Any(h => h.Key == (int)hashId))
+            {
+                _hotkeyActions.First(h => h.Key == (int)hashId).Value();
+            }
+        }
+    }
+}

src/RunnerV2/RunnerV2/Helpers/PackageHelper.cs

@@ -0,0 +1,179 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using ManagedCommon;
+using RunnerV2.Extensions;
+using Windows.ApplicationModel;
+using Windows.Foundation;
+using Windows.Management.Deployment;
+
+namespace RunnerV2.Helpers
+{
+    /// <summary>
+    /// Provides helper methods for working with UWP packages.
+    /// </summary>
+    internal static partial class PackageHelper
+    {
+        /// <summary>
+        /// Gets the registered UWP package based on the display name and version check.
+        /// </summary>
+        /// <param name="packageDisplayName">The display name of the package.</param>
+        /// <param name="checkVersion">If true, the package version will be checked against the executing assembly version.</param>
+        /// <returns>If a package is found the corresponding <see cref="Package"/> object. If none is found <c>null</c>.</returns>
+        internal static Package? GetRegisteredPackage(string packageDisplayName, bool checkVersion)
+        {
+            PackageManager packageManager = new();
+            foreach (var package in packageManager.FindPackagesForUser(null))
+            {
+                if (package.Id.FullName.Contains(packageDisplayName) && (!checkVersion || package.Id.Version.ToVersion() == Assembly.GetExecutingAssembly().GetName().Version))
+                {
+                    return package;
+                }
+            }
+
+            return null;
+        }
+
+        internal static string[] FindMsixFiles(string directoryPath, bool recursive)
+        {
+            if (!Directory.Exists(directoryPath))
+            {
+                Logger.LogError("Tried to search msix files in " + directoryPath + ", but it does not exist.");
+                return [];
+            }
+
+            List<string> matchedFiles = [];
+
+            try
+            {
+                foreach (string file in Directory.GetFiles(directoryPath, "*", recursive ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly))
+                {
+                    if (File.Exists(file) && msixPackagePattern().IsMatch(Path.GetFileName(file)))
+                    {
+                        matchedFiles.Add(file);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                Logger.LogError("An error occured while searching for MSIX files.", e);
+            }
+
+            return [.. matchedFiles];
+        }
+
+        /// <summary>
+        /// Installs the specified appx package along with its dependencies.
+        /// </summary>
+        /// <param name="packagePath">Path to the package</param>
+        /// <param name="dependencies">Array of dependency package paths</param>
+        /// <returns>True if the installation was successful, false otherwise</returns>
+        internal static bool InstallPackage(string packagePath, string[] dependencies)
+        {
+            Logger.LogInfo("Starting package install of package \"" + packagePath + "\"");
+            PackageManager packageManager = new();
+            List<Uri> uris = [];
+
+            foreach (string dependency in dependencies)
+            {
+                try
+                {
+                    if (IsPackageSatisfied(dependency))
+                    {
+                        Logger.LogInfo("Dependency \"" + dependency + "\" is already satisfied.");
+                        continue;
+                    }
+                    else
+                    {
+                        uris.Add(new Uri(packagePath));
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Logger.LogError("Could not process dependency package at path \"" + dependency + "\"", ex);
+                }
+            }
+
+            try
+            {
+                IAsyncOperationWithProgress<DeploymentResult, DeploymentProgress> deploymentOperation = packageManager.AddPackageAsync(new Uri(packagePath), uris, DeploymentOptions.ForceApplicationShutdown);
+                deploymentOperation.Get();
+
+                switch (deploymentOperation.Status)
+                {
+                    case AsyncStatus.Error:
+                        Logger.LogError($"Registering {packagePath} failed. ErrorCode: {deploymentOperation.ErrorCode}, ErrorText: {deploymentOperation.GetResults().ErrorText}");
+                        break;
+                    case AsyncStatus.Canceled:
+                        Logger.LogError($"Registering {packagePath} was canceled.");
+                        break;
+                    case AsyncStatus.Completed:
+                        Logger.LogInfo($"Registering {packagePath} succeded.");
+                        break;
+                    default:
+                        Logger.LogDebug($"Registering {packagePath} package started.");
+                        break;
+                }
+
+                return true;
+            }
+            catch (Exception e)
+            {
+                Logger.LogError($"Exception thrown while trying to register package: {packagePath}", e);
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Checks if the package specified by the given path is already installed and satisfies the required version.
+        /// </summary>
+        /// <param name="packagePath">Path to the package.</param>
+        /// <returns>True if the package is already installed and satisfies the required version, false otherwise.</returns>
+        private static bool IsPackageSatisfied(string packagePath)
+        {
+            if (!GetPackageNameAndVersionFromAppx(packagePath, out string name, out PackageVersion version))
+            {
+                Logger.LogError("Could not get package name and version from dependency package at path \"" + packagePath + "\"");
+                return false;
+            }
+
+            PackageManager packageManager = new();
+
+            foreach (var package in packageManager.FindPackagesForUser(null))
+            {
+                if (package.Id.Name.Equals(name, StringComparison.OrdinalIgnoreCase) &&
+                    package.Id.Version.ToVersion() > version.ToVersion())
+                {
+                    Logger.LogInfo($@"Package ""{name}"" is already statisfied with version: {package.Id.Version}. Target version: {version}. PackagePath: {packagePath}");
+                    return true;
+                }
+            }
+
+            Logger.LogInfo($@"Package ""{name}"" with version {version} is not satisfied. PackagePath: {packagePath}");
+            return false;
+        }
+
+        /// <summary>
+        /// Gets the package name and version from the specified appx package file.
+        /// </summary>
+        /// <param name="packagePath">Path to the package file.</param>
+        /// <param name="name">Output parameter for the package name.</param>
+        /// <param name="packageVersion">Output parameter for the package version.</param>
+        /// <returns>True if the package name and version were successfully retrieved, false otherwise.</returns>
+        private static bool GetPackageNameAndVersionFromAppx(string packagePath, out string name, out PackageVersion packageVersion)
+        {
+            // Todo: Implement this without interop if possible
+            return NativeMethods.GetPackageNameAndVersionFromAppx(packagePath, out name, out packageVersion);
+        }
+
+        [GeneratedRegex("(^.+\\.(appx|msix|msixbundle)$)", RegexOptions.IgnoreCase)]
+        private static partial Regex msixPackagePattern();
+    }
+}

src/RunnerV2/RunnerV2/Helpers/ProcessHelper.cs

@@ -0,0 +1,30 @@
+// 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.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace RunnerV2.Helpers
+{
+    internal static class ProcessHelper
+    {
+        internal static void ScheudleProcessKill(string processName, int msDelay = 500)
+        {
+            new Thread(async () =>
+            {
+                Process[] processes = Process.GetProcessesByName(processName);
+
+                await Task.Delay(msDelay);
+                foreach (var process in processes)
+                {
+                    if (!process.HasExited)
+                    {
+                        process.Kill();
+                    }
+                }
+            }).Start();
+        }
+    }
+}

src/RunnerV2/RunnerV2/Helpers/SettingsHelper.cs

@@ -0,0 +1,222 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics;
+using System.Drawing;
+using System.Globalization;
+using System.IO;
+using System.IO.Pipelines;
+using System.Linq;
+using System.Text.Json;
+using System.Threading;
+using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.Interop;
+using RunnerV2.Models;
+using Update;
+
+namespace RunnerV2.Helpers
+{
+    /// <summary>
+    /// This class provides helper methods to interact with the PowerToys Settings window.
+    /// </summary>
+    internal static class SettingsHelper
+    {
+        private static readonly SettingsUtils _settingsUtils = SettingsUtils.Default;
+        private static Process? _process;
+        private static TwoWayPipeMessageIPCManaged? _ipc;
+
+        public static void OpenSettingsWindow(bool showOobeWindow = false, bool showScoobeWindow = false, bool showFlyout = false, Point? flyoutPosition = null, string? additionalArguments = null)
+        {
+            if (_process is not null && _ipc is not null && !_process.HasExited)
+            {
+                if (showFlyout)
+                {
+                    _ipc.Send(@"{""ShowYourself"": ""flyout""}");
+                }
+                else
+                {
+                    _ipc.Send($@"{{""ShowYourself"": ""{additionalArguments ?? "Dashboard"}""}}");
+                }
+
+                return;
+            }
+
+            _ipc?.End();
+            _ipc = null;
+
+            // Arg 1: Executable path
+            string executablePath = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) ?? throw new InvalidOperationException("No executable path found"), "WinUI3Apps", "PowerToys.Settings.exe");
+
+            // Arg 2,3: Pipe names
+            Pipe settingsPipe = new();
+            Pipe powertoysPipe = new();
+
+            string powerToysPipeName = @"\\.\pipe\powertoys_runner_" + Guid.NewGuid();
+            string settingsPipeName = @"\\.\pipe\powertoys_settings_" + Guid.NewGuid();
+
+            // Arg 4: Process pid
+            string currentProcessId = Environment.ProcessId.ToString(CultureInfo.InvariantCulture);
+
+            // Arg 5: Settings theme
+            string theme = Program.GeneralSettings.Theme switch
+            {
+                "light" => "light",
+                "dark" => "dark",
+                "system" when ThemeHelpers.GetAppTheme() == AppTheme.Light => "light",
+                "system" when ThemeHelpers.GetAppTheme() == AppTheme.Dark => "dark",
+                _ => throw new NotImplementedException(),
+            };
+
+            // Arg 6: Elevated status
+            string isElevated = Program.GeneralSettings.IsElevated ? "true" : "false";
+
+            // Arg 7: Is user an administrator
+            string isAdmin = Program.GeneralSettings.IsAdmin ? "true" : "false";
+
+            // Arg 8: Show OOBE window
+            string showOobeArg = showOobeWindow ? "true" : "false";
+
+            // Arg 9: Show SCOOBE window
+            string showScoobeArg = showScoobeWindow ? "true" : "false";
+
+            // Arg 10: Show flyout
+            string showFlyoutArg = showFlyout ? "true" : "false";
+
+            // Arg 11: Are there additional settings window arguments
+            string areThereadditionalArgs = string.IsNullOrEmpty(additionalArguments) ? "false" : "true";
+
+            // Arg 12: Are there flyout position arguments
+            string areThereFlyoutPositionArgs = flyoutPosition.HasValue ? "true" : "false";
+
+            string executableArgs = $"{powerToysPipeName} {settingsPipeName} {currentProcessId} {theme} {isElevated} {isAdmin} {showOobeArg} {showScoobeArg} {showFlyoutArg} {areThereadditionalArgs} {areThereFlyoutPositionArgs}";
+
+            if (!string.IsNullOrEmpty(additionalArguments))
+            {
+                executableArgs += $" {additionalArguments}";
+            }
+
+            if (flyoutPosition is not null)
+            {
+                executableArgs += $" {flyoutPosition.Value.X} {flyoutPosition.Value.Y}";
+            }
+
+            _process = Process.Start(executablePath, executableArgs);
+
+            // Initialize listening to pipes
+            _ipc = new TwoWayPipeMessageIPCManaged(powerToysPipeName, settingsPipeName, OnSettingsMessageReceived);
+            _ipc.Start();
+        }
+
+        private static void OnSettingsMessageReceived(string message)
+        {
+            JsonDocument messageDocument = JsonDocument.Parse(message);
+
+            foreach (var property in messageDocument.RootElement.EnumerateObject())
+            {
+                switch (property.Name)
+                {
+                    case "action":
+                        foreach (var moduleName in property.Value.EnumerateObject())
+                        {
+                            _settingsUtils.SaveSettings(moduleName.Value.ToString(), moduleName.Name);
+                            if (moduleName.Name == "general")
+                            {
+                                switch (moduleName.Value.GetProperty("action_name").GetString())
+                                {
+                                    case "restart_elevation":
+                                        ElevationHelper.RestartScheduled = ElevationHelper.RestartScheduledMode.RestartElevatedWithOpenSettings;
+                                        Runner.Close();
+                                        break;
+                                    case "restart_mentain_elevation":
+                                        // Todo:
+                                        break;
+                                    case "check_for_updates":
+                                        UpdateSettingsHelper.TriggerUpdateCheck();
+                                        break;
+                                    case "request_update_state_date":
+                                        // Todo:
+                                        break;
+                                }
+
+                                break;
+                            }
+
+                            foreach (IPowerToysModule ptModule in Runner.LoadedModules)
+                            {
+                                if (ptModule.CustomActions.TryGetValue(moduleName.Value.GetProperty("action_name").GetString() ?? string.Empty, out Action? action))
+                                {
+                                    action();
+                                }
+                            }
+                        }
+
+                        break;
+                    case "get_all_hotkey_conflicts":
+                        // Todo: Handle hotkey conflict
+                        break;
+                    case "bugreport":
+                        TrayIconManager.ProcessTrayMenuCommand((nuint)TrayIconManager.TrayButton.ReportBug);
+                        break;
+                    case "bug_report_status":
+                        _ipc?.Send($@"{{""bug_report_running:"" {(TrayIconManager.IsBugReportToolRunning ? "true" : "false")}");
+                        break;
+                    case "killrunner":
+                        Runner.Close();
+                        break;
+                    case "general":
+                        try
+                        {
+                            _settingsUtils.SaveSettings(property.Value.ToString(), string.Empty);
+                        }
+                        catch (Exception)
+                        {
+                            // TODO: Log error
+                        }
+
+                        NativeMethods.PostMessageW(Runner.RunnerHwnd, (uint)NativeMethods.WindowMessages.REFRESH_SETTINGS, 0, 0);
+
+                        foreach (IPowerToysModule module in Runner.ModulesToLoad)
+                        {
+                            module.OnSettingsChanged("general", property.Value);
+                        }
+
+                        break;
+                    case "powertoys":
+                        foreach (var powertoysSettingsPart in property.Value.EnumerateObject())
+                        {
+                            _settingsUtils.SaveSettings(powertoysSettingsPart.Value.ToString(), powertoysSettingsPart.Name);
+
+                            if (Runner.LoadedModules.Find(m => m.Name == powertoysSettingsPart.Name) is IPowerToysModule module)
+                            {
+                                module.OnSettingsChanged(powertoysSettingsPart.Name, powertoysSettingsPart.Value);
+                            }
+                            else
+                            {
+                                // If no specific module was found, notify all enabled modules
+                                foreach (IPowerToysModule module2 in Runner.LoadedModules.Where(m => m.Enabled))
+                                {
+                                    module2.OnSettingsChanged(powertoysSettingsPart.Name, powertoysSettingsPart.Value);
+                                }
+                            }
+
+                            NativeMethods.PostMessageW(Runner.RunnerHwnd, (uint)NativeMethods.WindowMessages.REFRESH_SETTINGS, 0, 0);
+                        }
+
+                        break;
+                    default:
+                        Console.WriteLine($"Unknown message received from Settings: {property.Name}");
+                        break;
+                }
+            }
+        }
+
+        public static void CloseSettingsWindow()
+        {
+            using var closeEventWrapper = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.PowerToysRunnerTerminateSettingsEvent());
+            closeEventWrapper.Set();
+        }
+    }
+}

src/RunnerV2/RunnerV2/Helpers/TrayIconManager.cs

@@ -0,0 +1,150 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using static RunnerV2.NativeMethods;
+
+namespace RunnerV2.Helpers
+{
+    internal static partial class TrayIconManager
+    {
+        internal static void StartTrayIcon()
+        {
+            NOTIFYICONDATA notifyicondata = new()
+            {
+                CbSize = (uint)Marshal.SizeOf<NOTIFYICONDATA>(),
+                HWnd = Runner.RunnerHwnd,
+                UId = 1,
+                HIcon = Icon.ExtractAssociatedIcon(Environment.ProcessPath!)!.Handle,
+                UFlags = 0x0000001 | 0x00000002 | 0x4,
+                UCallbackMessage = (uint)WindowMessages.ICON_NOTIFY,
+                SzTip = "PowerToys Runner",
+            };
+
+            ChangeWindowMessageFilterEx(Runner.RunnerHwnd, 0x0111, 0x0001, IntPtr.Zero);
+
+            Shell_NotifyIcon(NIMADD, ref notifyicondata);
+        }
+
+        internal static void StopTrayIcon()
+        {
+            NOTIFYICONDATA notifyicondata = new()
+            {
+                CbSize = (uint)Marshal.SizeOf<NOTIFYICONDATA>(),
+                HWnd = Runner.RunnerHwnd,
+                UId = 1,
+            };
+
+            Shell_NotifyIcon(NIMDELETE, ref notifyicondata);
+        }
+
+        internal enum TrayButton : uint
+        {
+            Settings = 1,
+            Documentation,
+            ReportBug,
+            Close,
+        }
+
+        private static bool _doubleClickTimerRunning;
+        private static bool _doubleClickDetected;
+
+        private static IntPtr _trayIconMenu;
+
+        static TrayIconManager()
+        {
+            _trayIconMenu = CreatePopupMenu();
+            AppendMenuW(_trayIconMenu, 0u, new UIntPtr((uint)TrayButton.Settings), "Settings\tDouble-click");
+            AppendMenuW(_trayIconMenu, 0x00000800u, UIntPtr.Zero, string.Empty); // separator
+            AppendMenuW(_trayIconMenu, 0u, new UIntPtr((uint)TrayButton.Documentation), "Documentation");
+            AppendMenuW(_trayIconMenu, 0u, new UIntPtr((uint)TrayButton.ReportBug), "Report a Bug");
+            AppendMenuW(_trayIconMenu, 0x00000800u, UIntPtr.Zero, string.Empty); // separator
+            AppendMenuW(_trayIconMenu, 0u, new UIntPtr((uint)TrayButton.Close), "Close");
+        }
+
+        internal static void ProcessTrayIconMessage(long lParam)
+        {
+            switch (lParam)
+            {
+                case 0x0205: // WM_RBUTTONDBLCLK
+                case 0x007B: // WM_CONTEXTMENU
+                    SetForegroundWindow(Runner.RunnerHwnd);
+                    TrackPopupMenu(_trayIconMenu, 0x0004 | 0x0020, Cursor.Position.X, Cursor.Position.Y, 0, Runner.RunnerHwnd, IntPtr.Zero);
+                    break;
+                case 0x0202: // WM_LBUTTONUP
+                    if (_doubleClickTimerRunning)
+                    {
+                        break;
+                    }
+
+                    _doubleClickTimerRunning = true;
+                    Task.Delay(SystemInformation.DoubleClickTime).ContinueWith(_ =>
+                    {
+                        if (!_doubleClickDetected)
+                        {
+                            SettingsHelper.OpenSettingsWindow(showFlyout: true, flyoutPosition: Cursor.Position);
+                        }
+
+                        _doubleClickDetected = false;
+                        _doubleClickTimerRunning = false;
+                    });
+                    break;
+                case 0x0203: // WM_LBUTTONDBLCLK
+                    _doubleClickDetected = true;
+                    SettingsHelper.OpenSettingsWindow();
+                    break;
+            }
+        }
+
+        internal static bool IsBugReportToolRunning { get; set; }
+
+        internal static void ProcessTrayMenuCommand(nuint commandId)
+        {
+            switch ((TrayButton)commandId)
+            {
+                case TrayButton.Settings:
+                    SettingsHelper.OpenSettingsWindow();
+                    break;
+                case TrayButton.Documentation:
+                    Process.Start(new ProcessStartInfo
+                    {
+                        FileName = "https://aka.ms/PowerToysOverview",
+                        UseShellExecute = true,
+                    });
+                    break;
+                case TrayButton.ReportBug:
+                    Process bugReportProcess = new();
+                    bugReportProcess.StartInfo = new ProcessStartInfo
+                    {
+                        FileName = "Tools\\PowerToys.BugReportTool.exe",
+                        CreateNoWindow = true,
+                    };
+
+                    bugReportProcess.EnableRaisingEvents = true;
+
+                    EnableMenuItem(_trayIconMenu, (uint)TrayButton.ReportBug, 0x000000 | 0x00001);
+
+                    bugReportProcess.Exited += (sender, e) =>
+                    {
+                        bugReportProcess.Dispose();
+                        EnableMenuItem(_trayIconMenu, (uint)TrayButton.ReportBug, 0x00000000);
+                        IsBugReportToolRunning = false;
+                    };
+
+                    bugReportProcess.Start();
+                    IsBugReportToolRunning = true;
+
+                    break;
+                case TrayButton.Close:
+                    Runner.Close();
+                    break;
+            }
+        }
+    }
+}

src/RunnerV2/RunnerV2/Models/IPowerToysModule.cs

@@ -0,0 +1,74 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+
+namespace RunnerV2.Models
+{
+    public interface IPowerToysModule
+    {
+        /// <summary>
+        /// Gets the short name of the module. The same used as the name of the folder containing its settings.
+        /// </summary>
+        public string Name { get; }
+
+        /// <summary>
+        /// This function is called when the module is enabled.
+        /// </summary>
+        public void Enable();
+
+        /// <summary>
+        /// This function is called when the module is disabled.
+        /// </summary>
+        public void Disable();
+
+        /// <summary>
+        /// Gets a value indicating whether the module is enabled.
+        /// </summary>
+        /// <remarks>
+        /// This value shall be read from the settings of the module in the module interface implementation.
+        /// </remarks>
+        public bool Enabled { get; }
+
+        /// <summary>
+        /// Gets the GPO rule configured state for the module.
+        /// </summary>
+        /// <remarks>
+        /// This value shall be read from the GPO settings with the <see cref="GPOWrapper"/> class.
+        /// </remarks>
+        public GpoRuleConfigured GpoRuleConfigured { get; }
+
+        /// <summary>
+        /// Gets a dictionary of hotkeys and their associated actions. Every hotkey must have an associated id.
+        /// </summary>
+        /// <remarks>
+        /// If this property is not overridden, the module is considered to not have hotkeys.
+        /// </remarks>
+        public Dictionary<HotkeyEx, Action> Hotkeys { get => []; }
+
+        /// <summary>
+        /// Gets a list of shortcuts, that shall be registered in the keyboard hook, and their associated actions.
+        /// </summary>
+        /// <remarks>
+        /// If this property is not overridden, the module is considered to not have shortcuts.
+        /// </remarks>
+        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get => []; }
+
+        public Dictionary<string, Action> CustomActions { get => []; }
+
+        /// <summary>
+        /// This function is called when the settings of the module or the general settings are changed.
+        /// </summary>
+        /// <param name="settingsKind">Value of <see cref="Name"/> or "general" indicating the type of change.</param>
+        /// <param name="jsonProperties">The json element with the new settings.</param>
+        public void OnSettingsChanged(string settingsKind, JsonElement jsonProperties)
+        {
+        }
+    }
+}

src/RunnerV2/RunnerV2/Models/ProcessModuleAbstractClass.cs

@@ -0,0 +1,168 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using RunnerV2.Helpers;
+
+namespace RunnerV2.Models
+{
+    /// <summary>
+    /// Base abstract class for modules that launch and manage external processes.
+    /// </summary>
+    internal abstract class ProcessModuleAbstractClass
+    {
+        /// <summary>
+        /// Options for launching a process.
+        /// </summary>
+        [Flags]
+        public enum ProcessLaunchOptions
+        {
+            /// <summary>
+            /// Only a single instance of the process should be running.
+            /// </summary>
+            SingletonProcess = 1,
+
+            /// <summary>
+            /// Elevate the process if the current process is elevated.
+            /// </summary>
+            ElevateIfApplicable = 2,
+
+            /// <summary>
+            /// Provide the runner process ID as the first argument to the launched process.
+            /// </summary>
+            RunnerProcessIdAsFirstArgument = 4,
+
+            /// <summary>
+            /// Indicates that the application should not launch automatically when the specified module is enabled.
+            /// </summary>
+            SupressLaunchOnModuleEnabled = 8,
+
+            /// <summary>
+            /// Specifies that the process should be started using the operating system shell.
+            /// </summary>
+            UseShellExecute = 16,
+
+            /// <summary>
+            /// Indicates that the process should never exit automatically.
+            /// </summary>
+            /// <remarks>Use this value when using a helper process to launch an application like explorer.exe.</remarks>
+            NeverExit = 32,
+
+            /// <summary>
+            /// Suppresses UI when process is launched.
+            /// </summary>
+            HideUI = 64,
+
+            /// <summary>
+            /// Sets the launched process to realtime priority.
+            /// </summary>
+            RealtimePriority = 128,
+        }
+
+        /// <summary>
+        /// Gets the relative or absolute path to the process executable.
+        /// </summary>
+        public abstract string ProcessPath { get; }
+
+        /// <summary>
+        /// Gets the name of the process without the .exe extension.
+        /// </summary>
+        /// <remarks>
+        /// Has no effect if the <see cref="LaunchOptions"/> has the <see cref="ProcessLaunchOptions.UseShellExecute"/> flag set.
+        /// </remarks>
+        public abstract string ProcessName { get; }
+
+        /// <summary>
+        /// Gets the arguments to pass to the process on launch.
+        /// </summary>
+        /// <remarks>
+        /// If not overridden, no arguments are passed.
+        /// If the <see cref="LaunchOptions"/> has the <see cref="ProcessLaunchOptions.RunnerProcessIdAsFirstArgument"/> flag is set, the runner process ID is prepended to these arguments.
+        /// </remarks>
+        public virtual string ProcessArguments { get; } = string.Empty;
+
+        /// <summary>
+        /// Gets the options used to configure how the process is launched.
+        /// </summary>
+        public abstract ProcessLaunchOptions LaunchOptions { get; }
+
+        /// <summary>
+        /// Ensures that atleast one process is launched. If the process is already running, does nothing.
+        /// </summary>
+        public void EnsureLaunched()
+        {
+            Process[] processes = Process.GetProcessesByName(ProcessName);
+            if (processes.Length > 0)
+            {
+                return;
+            }
+
+            LaunchProcess();
+        }
+
+        /// <summary>
+        /// Launches the process with the specified options.
+        /// </summary>
+        /// <param name="isModuleEnableProcess">Specifies if the <see cref="Runner"/> class is currently calling this function as part of a module startup</param>
+        public void LaunchProcess(bool isModuleEnableProcess = false)
+        {
+            if (isModuleEnableProcess && LaunchOptions.HasFlag(ProcessLaunchOptions.SupressLaunchOnModuleEnabled))
+            {
+                return;
+            }
+
+            if (LaunchOptions.HasFlag(ProcessLaunchOptions.SingletonProcess))
+            {
+                Process[] processes = Process.GetProcessesByName(ProcessName);
+                if (processes.Length > 0)
+                {
+                    return;
+                }
+            }
+
+            string arguments = (LaunchOptions.HasFlag(ProcessLaunchOptions.RunnerProcessIdAsFirstArgument) ? Environment.ProcessId.ToString(CultureInfo.InvariantCulture) + (string.IsNullOrEmpty(ProcessArguments) ? string.Empty : " ") : string.Empty) + ProcessArguments;
+
+            Process? p = Process.Start(new ProcessStartInfo()
+            {
+                UseShellExecute = LaunchOptions.HasFlag(ProcessLaunchOptions.UseShellExecute),
+                FileName = ProcessPath,
+                Arguments = arguments,
+                Verb = LaunchOptions.HasFlag(ProcessLaunchOptions.ElevateIfApplicable) && ElevationHelper.IsProcessElevated() ? "runas" : "open",
+            });
+
+            if (LaunchOptions.HasFlag(ProcessLaunchOptions.RealtimePriority))
+            {
+                try
+                {
+                    if (p != null && !p.HasExited)
+                    {
+                        p.PriorityClass = ProcessPriorityClass.RealTime;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine($"[ProcessModuleAbstractClass] Failed to set realtime priority for process {ProcessName}", ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Schedules all processes with the specified <see cref="ProcessName"/>.
+        /// </summary>
+        /// <remarks>
+        /// If the <see cref="LaunchOptions"/> has the <see cref="ProcessLaunchOptions.NeverExit"/> flag set, this function does nothing.
+        /// </remarks>
+        public void ProcessExit()
+        {
+            if (LaunchOptions.HasFlag(ProcessLaunchOptions.NeverExit))
+            {
+                return;
+            }
+
+            ProcessHelper.ScheudleProcessKill(ProcessName);
+        }
+    }
+}

src/RunnerV2/RunnerV2/Models/RegistryChangeSet.cs

@@ -0,0 +1,45 @@
+// 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 RunnerV2.Models
+{
+    internal readonly struct RegistryChangeSet
+    {
+        public RegistryValueChange[] Changes { get; init; }
+
+        public readonly bool IsApplied => Changes.All(c => c.IsApplied);
+
+        public readonly bool Apply()
+        {
+            bool allApplied = true;
+            foreach (var change in Changes)
+            {
+                allApplied = (change.Apply() || !change.Required) && allApplied;
+            }
+
+            return allApplied;
+        }
+
+        public readonly bool ApplyIfNotApplied() => IsApplied || Apply();
+
+        public readonly bool UnApplyIfApplied() => !IsApplied || UnApply();
+
+        public readonly bool UnApply()
+        {
+            bool allUnapplied = true;
+            foreach (var change in Changes)
+            {
+                allUnapplied = (change.UnApply() || !change.Required) && allUnapplied;
+            }
+
+            return allUnapplied;
+        }
+    }
+}

src/RunnerV2/RunnerV2/Models/RegistryValueChange.cs

@@ -0,0 +1,124 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ManagedCommon;
+using Microsoft.Win32;
+
+namespace RunnerV2.Models
+{
+    internal readonly struct RegistryValueChange
+    {
+        public RegistryValueChange()
+        {
+        }
+
+        public required string KeyPath { get; init; }
+
+        public required string? KeyName { get; init; }
+
+        public bool Required { get; init; } = true;
+
+        public required object Value { get; init; }
+
+        public RegistryHive Scope { get; init; } = RegistryHive.CurrentUser;
+
+        private static RegistryValueKind ValueTypeToRegistryValueKind(object value)
+        {
+            return value switch
+            {
+                int => RegistryValueKind.DWord,
+                long => RegistryValueKind.QWord,
+                string => RegistryValueKind.String,
+                string[] => RegistryValueKind.MultiString,
+                byte[] => RegistryValueKind.Binary,
+                _ => throw new ArgumentException("Unsupported value type"),
+            };
+        }
+
+        public readonly bool IsApplied
+        {
+            get
+            {
+                try
+                {
+                    using RegistryKey? key = RegistryKey.OpenBaseKey(Scope, RegistryView.Default).OpenSubKey(KeyPath, false);
+                    return key != null && ValueTypeToRegistryValueKind(Value) == key.GetValueKind(KeyName) && Value.Equals(key.GetValue(KeyName));
+                }
+                catch (Exception e)
+                {
+                    Logger.LogError($"Testing if registry change \"{this}\" is applied failed.", e);
+                    return false;
+                }
+            }
+        }
+
+        public readonly bool RequiresElevation
+        {
+            get => Scope == RegistryHive.LocalMachine;
+        }
+
+        public readonly bool Apply()
+        {
+            try
+            {
+                using RegistryKey? key = RegistryKey.OpenBaseKey(Scope, RegistryView.Default).CreateSubKey(KeyPath, true);
+                if (key == null)
+                {
+                    Logger.LogError($"Applying registry change \"{this}\" failed because the registry key could not be created.");
+                    return false;
+                }
+
+                key.SetValue(KeyName, Value, ValueTypeToRegistryValueKind(Value));
+                return true;
+            }
+            catch (Exception e)
+            {
+                Logger.LogError($"Applying registry change \"{this}\" failed.", e);
+                return false;
+            }
+        }
+
+        public readonly bool UnApply()
+        {
+            try
+            {
+                using RegistryKey? key = RegistryKey.OpenBaseKey(Scope, RegistryView.Default).OpenSubKey(KeyPath, true);
+                if (key == null)
+                {
+                    Logger.LogError($"Unapplying registry change \"{this}\" failed because the registry key could not be opened.");
+                    return false;
+                }
+
+                if (KeyName is not null)
+                {
+                    key.DeleteValue(KeyName, false);
+                }
+                else
+                {
+                    key.SetValue(null, string.Empty); // Delete the default value
+                }
+
+                // Check if the path doesn't contain anything and delete it if so
+                if (key.GetValueNames().Length == 0 && key.GetSubKeyNames().Length == 0)
+                {
+                    RegistryKey.OpenBaseKey(Scope, RegistryView.Default).DeleteSubKey(KeyPath, false);
+                }
+
+                return true;
+            }
+            catch (Exception e)
+            {
+                Logger.LogError($"Unapplying registry change \"{this}\" failed.", e);
+                return false;
+            }
+        }
+
+        public override readonly string ToString() => $"{RegistryKey.OpenBaseKey(Scope, RegistryView.Default).Name}\\{KeyPath}\\{KeyName}:{Value}";
+    }
+}

src/RunnerV2/RunnerV2/Models/SpecialMode.cs

@@ -0,0 +1,15 @@
+// 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 RunnerV2.Models
+{
+    internal enum SpecialMode
+    {
+        None,
+        Win32ToastNotificationCOMServer,
+        ToastNotificationHandler,
+        UpdateNow,
+        ReportSuccessfulUpdate,
+    }
+}

src/RunnerV2/RunnerV2/ModuleInterfaces/AdvancedPasteModuleInterface.cs

@@ -0,0 +1,107 @@
+// 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.Json;
+using System.Windows.Forms;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using PowerToys.GPOWrapper;
+using PowerToys.Interop;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class AdvancedPasteModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IDisposable
+    {
+        public string Name => "AdvancedPaste";
+
+        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.AdvancedPaste;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredAdvancedPasteEnabledValue();
+
+        public void Disable()
+        {
+            if (_ipc != null)
+            {
+                _ipc.Send(Constants.AdvancedPasteTerminateAppMessage());
+                _ipc.End();
+                _ipc = null;
+            }
+        }
+
+        private const string IpcName = @"\\.\pipe\PowerToys.AdvancedPaste";
+        private TwoWayPipeMessageIPCManaged? _ipc;
+
+        public void Enable()
+        {
+            _ipc = new TwoWayPipeMessageIPCManaged(string.Empty, IpcName, (_) => { });
+            _ipc.Start();
+
+            PopulateShortcuts();
+        }
+
+        public void OnSettingsChanged(string settingsKind, JsonElement jsonProperties)
+        {
+            PopulateShortcuts();
+        }
+
+        public void PopulateShortcuts()
+        {
+            _ipc ??= new TwoWayPipeMessageIPCManaged(string.Empty, @"\\.\pipe\PowerToys.AdvancedPaste", (_) => { });
+
+            Shortcuts.Clear();
+
+            AdvancedPasteSettings settings = SettingsUtils.Default.GetSettingsOrDefault<AdvancedPasteSettings>(Name);
+            Shortcuts.Add((settings.Properties.AdvancedPasteUIShortcut, () =>
+                _ipc.Send(Constants.AdvancedPasteShowUIMessage())
+            ));
+            Shortcuts.Add((settings.Properties.PasteAsPlainTextShortcut, TryToPasteAsPlainText));
+            Shortcuts.Add((settings.Properties.PasteAsMarkdownShortcut, () => _ipc.Send(Constants.AdvancedPasteMarkdownMessage())));
+            Shortcuts.Add((settings.Properties.PasteAsJsonShortcut, () => _ipc.Send(Constants.AdvancedPasteJsonMessage())));
+
+            HotkeyAccessor[] hotkeyAccessors = settings.GetAllHotkeyAccessors();
+            int additionalActionsCount = settings.Properties.AdditionalActions.GetAllActions().Count() - 2;
+            for (int i = 0; i < additionalActionsCount; i++)
+            {
+                int scopedI = i;
+                Shortcuts.Add((hotkeyAccessors[4 + i].Value, () => _ipc.Send(Constants.AdvancedPasteAdditionalActionMessage() + " " + (3 + scopedI))));
+            }
+
+            for (int i = 4 + additionalActionsCount; i < hotkeyAccessors.Length; i++)
+            {
+                int scopedI = i;
+                Shortcuts.Add((hotkeyAccessors[i].Value, () => _ipc.Send(Constants.AdvancedPasteCustomActionMessage() + " " + (scopedI - 4 - additionalActionsCount))));
+            }
+        }
+
+        private void TryToPasteAsPlainText()
+        {
+            if (Clipboard.ContainsText())
+            {
+                string text = Clipboard.GetText();
+                SendKeys.SendWait(text);
+            }
+
+            throw new NotImplementedException();
+        }
+
+        public void Dispose()
+        {
+            _ipc?.Dispose();
+        }
+
+        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
+
+        public override string ProcessPath => "WinUI3Apps\\PowerToys.AdvancedPaste.exe";
+
+        public override string ProcessName => "PowerToys.AdvancedPaste";
+
+        public override string ProcessArguments => IpcName;
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
+    }
+}

src/RunnerV2/RunnerV2/ModuleInterfaces/AlwaysOnTopModuleInterface.cs

@@ -0,0 +1,59 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Threading;
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using PowerToys.Interop;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class AlwaysOnTopModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
+    {
+        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.AlwaysOnTop;
+
+        public string Name => "AlwaysOnTop";
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredAlwaysOnTopEnabledValue();
+
+        public void Disable()
+        {
+            using var terminateEventWrapper = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.AlwaysOnTopTerminateEvent());
+            terminateEventWrapper.Set();
+        }
+
+        public void Enable()
+        {
+            InitializeHotkey();
+        }
+
+        private void InitializeHotkey()
+        {
+            Shortcuts.Clear();
+            Shortcuts.Add((SettingsUtils.Default.GetSettings<AlwaysOnTopSettings>(Name).Properties.Hotkey.Value, () =>
+                {
+                    using var pinEventWrapper = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.AlwaysOnTopPinEvent());
+                    pinEventWrapper.Set();
+                }
+            ));
+        }
+
+        public void OnSettingsChanged(string settingsKind, JsonElement jsonProperties)
+        {
+            InitializeHotkey();
+        }
+
+        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
+
+        public override string ProcessPath => "PowerToys.AlwaysOnTop.exe";
+
+        public override string ProcessName => "PowerToys.AlwaysOnTop";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument | ProcessLaunchOptions.ElevateIfApplicable;
+    }
+}

src/RunnerV2/RunnerV2/ModuleInterfaces/AwakeModuleInterface.cs

@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Globalization;
+using System.Threading;
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using PowerToys.Interop;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class AwakeModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
+    {
+        public string Name => "Awake";
+
+        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.Awake;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredAwakeEnabledValue();
+
+        public override string ProcessPath => "PowerToys.Awake.exe";
+
+        public override string ProcessName => "PowerToys.Awake";
+
+        public override string ProcessArguments => $"--use-pt-config --pid {Environment.ProcessId.ToString(CultureInfo.InvariantCulture)}";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess;
+
+        public void Disable()
+        {
+            using var terminateEventWrapper = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.AwakeExitEvent());
+            terminateEventWrapper.Set();
+        }
+
+        public void Enable()
+        {
+        }
+    }
+}

src/RunnerV2/RunnerV2/ModuleInterfaces/CmdNotFoundModuleInterface.cs

@@ -0,0 +1,80 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Threading;
+using ManagedCommon;
+using PowerToys.GPOWrapper;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class CmdNotFoundModuleInterface : IPowerToysModule
+    {
+        public string Name => "CmdNotFound";
+
+        public bool Enabled => true;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredCmdNotFoundEnabledValue();
+
+        public CmdNotFoundModuleInterface()
+        {
+            if (GpoRuleConfigured == GpoRuleConfigured.Disabled)
+            {
+                UninstallModule();
+            }
+
+            if (GpoRuleConfigured == GpoRuleConfigured.Enabled)
+            {
+                InstallModule();
+            }
+        }
+
+        public void InstallModule()
+        {
+            Logger.LogInfo("Installing Command Not Found module invoked through GPO");
+
+            new Thread(async () =>
+            {
+                Process p = Process.Start("pwsh.exe", "-NoProfile -NonInteractive -NoLogo -WindowStyle Hidden -ExecutionPolicy Unrestricted -File \"" + Path.GetDirectoryName(Environment.ProcessPath) + "\\WinUI3Apps\\Assets\\Settings\\Scripts\\EnableModule.ps1" + "\"" + " -scriptPath \"" + Path.GetDirectoryName(Environment.ProcessPath) + "\"");
+                await p.WaitForExitAsync();
+                if (p.ExitCode == 0)
+                {
+                    Logger.LogInfo("Command Not Found was successfully installed.");
+                    return;
+                }
+
+                Logger.LogInfo("Command Not Found failed to install with exit code: " + p.ExitCode);
+            }).Start();
+        }
+
+        public void UninstallModule()
+        {
+            Logger.LogInfo("Uninstalling Command Not Found module invoked through GPO");
+
+            new Thread(async () =>
+            {
+                Process p = Process.Start("pwsh.exe", "-NoProfile -NonInteractive -NoLogo -WindowStyle Hidden -ExecutionPolicy Unrestricted -File \"" + Path.GetDirectoryName(Environment.ProcessPath) + "\\WinUI3Apps\\Assets\\Settings\\Scripts\\DisableModule.ps1" + "\"" + " -scriptPath \"" + Path.GetDirectoryName(Environment.ProcessPath) + "\"");
+                await p.WaitForExitAsync();
+                if (p.ExitCode == 0)
+                {
+                    Logger.LogInfo("Command Not Found was successfully uninstalled.");
+                    return;
+                }
+
+                Logger.LogInfo("Command Not Found failed to uninstall with exit code: " + p.ExitCode);
+            }).Start();
+        }
+
+        public void Disable()
+        {
+        }
+
+        public void Enable()
+        {
+        }
+    }
+}

src/RunnerV2/RunnerV2/ModuleInterfaces/ColorPickerModuleInterface.cs

@@ -0,0 +1,59 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Threading;
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using PowerToys.Interop;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class ColorPickerModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
+    {
+        public string Name => "ColorPicker";
+
+        public bool Enabled => SettingsUtils.Default.GetSettingsOrDefault<GeneralSettings>().Enabled.ColorPicker;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredColorPickerEnabledValue();
+
+        public void Disable()
+        {
+            using var terminateEventWrapper = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.TerminateColorPickerSharedEvent());
+            terminateEventWrapper.Set();
+        }
+
+        public void Enable()
+        {
+            InitializeShortcuts();
+        }
+
+        private void InitializeShortcuts()
+        {
+            Shortcuts.Clear();
+            Shortcuts.Add((SettingsUtils.Default.GetSettings<ColorPickerSettings>(Name).Properties.ActivationShortcut, () =>
+            {
+                using var showUiEventWrapper = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.ShowColorPickerSharedEvent());
+                showUiEventWrapper.Set();
+            }
+            ));
+        }
+
+        public void OnSettingsChanged(string settingsKind, JsonElement jsonProperties)
+        {
+            InitializeShortcuts();
+        }
+
+        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
+
+        public override string ProcessPath => "PowerToys.ColorPickerUI.exe";
+
+        public override string ProcessName => "PowerToys.ColorPickerUI";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
+    }
+}

src/RunnerV2/RunnerV2/ModuleInterfaces/CommandPaletteModuleInterface.cs

@@ -0,0 +1,79 @@
+// 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.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using RunnerV2.Helpers;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class CommandPaletteModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
+    {
+        private const string PackageName = "Microsoft.CommandPalette"
+#if DEBUG
+            + ".Dev"
+#endif
+            ;
+
+        public string Name => "CmdPal";
+
+        public bool Enabled => SettingsUtils.Default.GetSettingsOrDefault<GeneralSettings>().Enabled.CmdPal;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredCmdPalEnabledValue();
+
+        public override string ProcessPath => "explorer.exe";
+
+        public override string ProcessArguments => "x-cmdpal://background";
+
+        public override string ProcessName => string.Empty;
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.UseShellExecute | ProcessLaunchOptions.NeverExit;
+
+        public void Disable()
+        {
+        }
+
+        public void Enable()
+        {
+            if (PackageHelper.GetRegisteredPackage(PackageName, false) is null)
+            {
+                try
+                {
+                    string architectureString = RuntimeInformation.ProcessArchitecture == Architecture.X64 ? "x64" : "ARM64";
+#if DEBUG
+                    string[] msixFiles = PackageHelper.FindMsixFiles(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\WinUI3Apps\\CmdPal\\AppPackages\\Microsoft.CmdPal.UI_0.0.1.0_Debug_Test\\", false);
+                    string[] dependencies = PackageHelper.FindMsixFiles(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\WinUI3Apps\\CmdPal\\AppPackages\\Microsoft.CmdPal.UI_0.0.1.0_Debug_Test\\Dependencies\\" + architectureString + "\\", true);
+#else
+                    string[] msixFiles = PackageHelper.FindMsixFiles(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\WinUI3Apps\\CmdPal\\", false);
+                    string[] dependencies = PackageHelper.FindMsixFiles(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\WinUI3Apps\\CmdPal\\Dependencies\\", true);
+#endif
+
+                    if (msixFiles.Length > 0)
+                    {
+                        if (!PackageHelper.InstallPackage(msixFiles[0], dependencies))
+                        {
+                            Logger.LogError("Failed to register Command Palette package.");
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Logger.LogError("Exception occurred while enabling Command Palette package.", ex);
+                }
+            }
+
+            if (PackageHelper.GetRegisteredPackage(PackageName, false) is null)
+            {
+                Logger.LogError("Command Palette package is not registered after attempting to enable it.");
+                return;
+            }
+        }
+    }
+}

src/RunnerV2/RunnerV2/ModuleInterfaces/CropAndLockModuleInterface.cs

@@ -0,0 +1,68 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Threading;
+using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using PowerToys.Interop;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed partial class CropAndLockModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IDisposable
+    {
+        public string Name => "CropAndLock";
+
+        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.CropAndLock;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredCropAndLockEnabledValue();
+
+        private EventWaitHandle _reparentEvent = new(false, EventResetMode.AutoReset, Constants.CropAndLockReparentEvent());
+        private EventWaitHandle _thumbnailEvent = new(false, EventResetMode.AutoReset, Constants.CropAndLockThumbnailEvent());
+        private EventWaitHandle _terminateEvent = new(false, EventResetMode.AutoReset, Constants.CropAndLockExitEvent());
+
+        public void Disable()
+        {
+            _terminateEvent.Set();
+        }
+
+        public void Enable()
+        {
+            PopulateShortcuts();
+        }
+
+        public void PopulateShortcuts()
+        {
+            Shortcuts.Clear();
+            var settings = SettingsUtils.Default.GetSettings<CropAndLockSettings>(Name);
+            Shortcuts.Add((settings.Properties.ThumbnailHotkey.Value,  () => _thumbnailEvent.Set()));
+            Shortcuts.Add((settings.Properties.ReparentHotkey.Value,  () => _reparentEvent.Set()));
+        }
+
+        public void OnSettingsChanged(string settingsKind, JsonElement jsonProperties)
+        {
+            PopulateShortcuts();
+        }
+
+        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
+
+        public override string ProcessPath => "PowerToys.CropAndLock.exe";
+
+        public override string ProcessName => "PowerToys.CropAndLock";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            _reparentEvent.Dispose();
+            _thumbnailEvent.Dispose();
+            _terminateEvent.Dispose();
+        }
+    }
+}

src/RunnerV2/RunnerV2/ModuleInterfaces/EnvironmentVariablesModuleInterface.cs

@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class EnvironmentVariablesModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
+    {
+        public string Name => "Environment Variables";
+
+        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.EnvironmentVariables;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredEnvironmentVariablesEnabledValue();
+
+        public override string ProcessPath => "WinUI3Apps\\PowerToys.EnvironmentVariables.exe";
+
+        public override string ProcessName => "PowerToys.EnvironmentVariables";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SupressLaunchOnModuleEnabled | ProcessLaunchOptions.NeverExit;
+
+        public void Disable()
+        {
+        }
+
+        public void Enable()
+        {
+        }
+    }
+}

src/RunnerV2/RunnerV2/ModuleInterfaces/FancyZonesModuleInterface.cs

@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using PowerToys.Interop;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class FancyZonesModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
+    {
+        public string Name => "FancyZones";
+
+        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.FancyZones;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredFancyZonesEnabledValue();
+
+        public override string ProcessPath => "PowerToys.FancyZones.exe";
+
+        public override string ProcessName => "PowerToys.FancyZones";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument | ProcessLaunchOptions.HideUI;
+
+        public void Disable()
+        {
+            using var terminateEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.FZEExitEvent());
+            terminateEvent.Set();
+        }
+
+        public void Enable()
+        {
+        }
+
+        public Dictionary<string, Action> CustomActions => new()
+        {
+            {
+                "ToggledFZEditor",
+                () =>
+                {
+                    EnsureLaunched();
+                    using var invokeFZEditorEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.FZEToggleEvent());
+                    invokeFZEditorEvent.Set();
+                }
+            },
+        };
+    }
+}

src/RunnerV2/RunnerV2/ModuleInterfaces/FileExplorerModuleInterface.cs

@@ -0,0 +1,330 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text.Json;
+using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class FileExplorerModuleInterface : IPowerToysModule
+    {
+        private record struct FileExplorerModule(Func<bool> IsEnabled, GpoRuleConfigured GpoRule, RegistryChangeSet RegistryChanges);
+
+        private static readonly List<FileExplorerModule> _fileExplorerModules;
+
+        private static readonly string[] ExtSVG = { ".svg" };
+        private static readonly string[] ExtMarkdown = { ".md", ".markdown", ".mdown", ".mkdn", ".mkd", ".mdwn", ".mdtxt", ".mdtext" };
+        private static readonly string[] ExtPDF = { ".pdf" };
+        private static readonly string[] ExtGCode = { ".gcode" };
+        private static readonly string[] ExtBGCode = { ".bgcode" };
+        private static readonly string[] ExtSTL = { ".stl" };
+        private static readonly string[] ExtQOI = { ".qoi" };
+
+        static FileExplorerModuleInterface()
+        {
+            static PowerPreviewProperties GetProperties() => SettingsUtils.Default.GetSettings<PowerPreviewSettings>(PowerPreviewSettings.ModuleName).Properties;
+
+            string installationPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!;
+
+            _fileExplorerModules = [
+                new FileExplorerModule(
+                    () => GetProperties().EnableBgcodePreview,
+                    GPOWrapper.GetConfiguredBgcodePreviewEnabledValue(),
+                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.PreviewHandler, "{0e6d5bdd-d5f8-4692-a089-8bb88cdd37f4}", Path.Combine(installationPath, "PowerToys.BgcodePreviewHandlerCpp.dll"), "BgcodePreviewHandler", "Binary G-code Preview Handler", ExtBGCode)),
+                new FileExplorerModule(
+                    () => GetProperties().EnableBgcodeThumbnail,
+                    GPOWrapper.GetConfiguredBgcodeThumbnailsEnabledValue(),
+                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.ThumbnailProvider, "{5c93a1e4-99d0-4fb3-991c-6c296a27be21}", Path.Combine(installationPath, "PowerToys.BgcodeThumbnailProviderCpp.dll"), "BgcodeThumbnailProvider", "Binary G-code Thumbnail Provider", ExtBGCode)),
+                new FileExplorerModule(
+                    () => GetProperties().EnableGcodePreview,
+                    GPOWrapper.GetConfiguredGcodePreviewEnabledValue(),
+                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.PreviewHandler, "{A0257634-8812-4CE8-AF11-FA69ACAEAFAE}", Path.Combine(installationPath, "PowerToys.GcodePreviewHandlerCpp.dll"), "GcodePreviewHandler", "G-code Preview Handler", ExtGCode)),
+                new FileExplorerModule(
+                    () => GetProperties().EnableGcodeThumbnail,
+                    GPOWrapper.GetConfiguredGcodeThumbnailsEnabledValue(),
+                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.ThumbnailProvider, "{F2847CBE-CD03-4C83-A359-1A8052C1B9D5}", Path.Combine(installationPath, "PowerToys.GcodeThumbnailProviderCpp.dll"), "GcodeThumbnailProvider", "G-code Thumbnail Provider", ExtGCode)),
+                new FileExplorerModule(
+                    () => GetProperties().EnableMdPreview,
+                    GPOWrapper.GetConfiguredMarkdownPreviewEnabledValue(),
+                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.PreviewHandler, "{60789D87-9C3C-44AF-B18C-3DE2C2820ED3}", Path.Combine(installationPath, "PowerToys.MarkdownPreviewHandlerCpp.dll"), "MarkdownPreviewHandler", "Markdown Preview Handler", ExtMarkdown)),
+                new FileExplorerModule(
+                    () => GetProperties().EnablePdfPreview,
+                    GPOWrapper.GetConfiguredPdfPreviewEnabledValue(),
+                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.PreviewHandler, "{A5A41CC7-02CB-41D4-8C9B-9087040D6098}", Path.Combine(installationPath, "PowerToys.PdfPreviewHandlerCpp.dll"), "PdfPreviewHandler", "PDF Preview Handler", ExtPDF)),
+                new FileExplorerModule(
+                    () => GetProperties().EnablePdfThumbnail,
+                    GPOWrapper.GetConfiguredPdfThumbnailsEnabledValue(),
+                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.ThumbnailProvider, "{D8BB9942-93BD-412D-87E4-33FAB214DC1A}", Path.Combine(installationPath, "PowerToys.PdfThumbnailProviderCpp.dll"), "PdfThumbnailProvider", "PDF Thumbnail Provider", ExtPDF)),
+                new FileExplorerModule(
+                    () => GetProperties().EnableQoiPreview,
+                    GPOWrapper.GetConfiguredQoiPreviewEnabledValue(),
+                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.PreviewHandler, "{729B72CD-B72E-4FE9-BCBF-E954B33FE699}", Path.Combine(installationPath, "PowerToys.QoiPreviewHandlerCpp.dll"), "QoiPreviewHandler", "QOI Preview Handler", ExtQOI)),
+                new FileExplorerModule(
+                    () => GetProperties().EnableQoiThumbnail,
+                    GPOWrapper.GetConfiguredQoiThumbnailsEnabledValue(),
+                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.ThumbnailProvider, "{AD856B15-D25E-4008-AFB7-AFAA55586188}", Path.Combine(installationPath, "PowerToys.QoiThumbnailProviderCpp.dll"), "QoiThumbnailProvider", "QOI Thumbnail Provider", ExtQOI, "image", "Picture")),
+                new FileExplorerModule(
+                    () => GetProperties().EnableStlThumbnail,
+                    GPOWrapper.GetConfiguredStlThumbnailsEnabledValue(),
+                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.ThumbnailProvider, "{77257004-6F25-4521-B602-50ECC6EC62A6}", Path.Combine(installationPath, "PowerToys.StlThumbnailProviderCpp.dll"), "StlThumbnailProvider", "STL Thumbnail Provider", ExtSTL)),
+                new FileExplorerModule(
+                    () => GetProperties().EnableSvgPreview,
+                    GPOWrapper.GetConfiguredSvgPreviewEnabledValue(),
+                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.PreviewHandler, "{FCDD4EED-41AA-492F-8A84-31A1546226E0}", Path.Combine(installationPath, "PowerToys.SvgPreviewHandlerCpp.dll"), "SvgPreviewHandler", "SVG Preview Handler", ExtSVG)),
+                new FileExplorerModule(
+                    () => GetProperties().EnableSvgThumbnail,
+                    GPOWrapper.GetConfiguredSvgThumbnailsEnabledValue(),
+                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.ThumbnailProvider, "{10144713-1526-46C9-88DA-1FB52807A9FF}", Path.Combine(installationPath, "PowerToys.SvgThumbnailProviderCpp.dll"), "SvgThumbnailProvider", "SVG Thumbnail Provider", ExtSVG, "image", "Picture")),
+                GetMonacoFileExplorerModule(installationPath)
+            ];
+        }
+
+        private static FileExplorerModule GetMonacoFileExplorerModule(string installationPath)
+        {
+            // .svgz is a binary file type that Monaco cannot handle, so we exclude it from the preview handler
+            string[] extExclusions = [..ExtMarkdown, ..ExtSVG, ".svgz"];
+            List<string> extensions = [];
+
+            string languagesFilePath = Path.Combine(installationPath, "Assets\\Monaco\\monaco_languages.json");
+
+            if (!File.Exists(languagesFilePath))
+            {
+                Logger.LogError("PowerPreviewModuleInterface: Unable to find monaco_languages.json file at " + languagesFilePath);
+                goto returnLabel;
+            }
+
+            try
+            {
+                JsonDocument jsonDocument = JsonDocument.Parse(File.ReadAllText(languagesFilePath));
+                var list = jsonDocument.RootElement.GetProperty("list");
+
+                foreach (var item in list.EnumerateArray())
+                {
+                    if (item.TryGetProperty("extensions", out JsonElement extensionsElement))
+                    {
+                        foreach (var ext in extensionsElement.EnumerateArray())
+                        {
+                            string extension = ext.GetString() ?? string.Empty;
+                            if (!string.IsNullOrEmpty(extension) && !extensions.Contains(extension, StringComparer.OrdinalIgnoreCase))
+                            {
+                                extensions.Add(extension);
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("PowerPreviewModuleInterface: Failed to parse monaco_languages.json file.", ex);
+            }
+
+        returnLabel:
+            return new FileExplorerModule(
+                () => SettingsUtils.Default.GetSettings<PowerPreviewSettings>(PowerPreviewSettings.ModuleName).Properties.EnableMonacoPreview,
+                GPOWrapper.GetConfiguredMonacoPreviewEnabledValue(),
+                GetFileExplorerAddOnChangeSet(
+                    FileExplorerAddOnType.PreviewHandler,
+                    "{D8034CFA-F34B-41FE-AD45-62FCBB52A6DA}",
+                    Path.Combine(installationPath, "PowerToys.MonacoPreviewHandlerCpp.dll"),
+                    "MonacoPreviewHandler",
+                    "Monaco Preview Handler",
+                    [.. extensions.Where(ext => !extExclusions.Contains(ext))]));
+        }
+
+        private enum FileExplorerAddOnType
+        {
+            ThumbnailProvider,
+            PreviewHandler,
+        }
+
+        private static RegistryChangeSet GetFileExplorerAddOnChangeSet(FileExplorerAddOnType type, string handlerClsid, string pathToHandler, string className, string displayName, string[] fileTypes, string? perceivedType = null, string? fileKindType = null)
+        {
+            string clsidPath = "Software\\Classes\\CLSID\\" + handlerClsid;
+            string inprocServer32Path = clsidPath + "\\InprocServer32";
+
+            string assemblyKeyValue;
+            int lastDotPos = className.LastIndexOf('.');
+
+            if (lastDotPos != -1)
+            {
+                assemblyKeyValue = string.Concat("PowerToys.", className.AsSpan(lastDotPos + 1));
+            }
+            else
+            {
+                assemblyKeyValue = "PowerToys." + className;
+            }
+
+            assemblyKeyValue += $", Version={Assembly.GetExecutingAssembly().GetName().Version!}, Culture=neutral";
+
+            List<RegistryValueChange> changes = [
+                new RegistryValueChange
+                {
+                    KeyPath = clsidPath,
+                    KeyName = "DisplayName",
+                    Value = displayName,
+                },
+                new RegistryValueChange
+                {
+                    KeyPath = clsidPath,
+                    KeyName = null,
+                    Value = className,
+                },
+                new RegistryValueChange
+                {
+                    KeyPath = inprocServer32Path,
+                    KeyName = null,
+                    Value = pathToHandler,
+                },
+                new RegistryValueChange
+                {
+                    KeyPath = inprocServer32Path,
+                    KeyName = "Assembly",
+                    Value = assemblyKeyValue,
+                },
+                new RegistryValueChange
+                {
+                    KeyPath = inprocServer32Path,
+                    KeyName = "Class",
+                    Value = className,
+                },
+                new RegistryValueChange
+                {
+                    KeyPath = inprocServer32Path,
+                    KeyName = "ThreadingModel",
+                    Value = "Apartment",
+                },
+            ];
+
+            foreach (string fileType in fileTypes)
+            {
+                string fileTypePath = "Software\\Classes\\" + fileType;
+                string fileAssociationPath = fileTypePath + "\\shellex\\" + (type == FileExplorerAddOnType.PreviewHandler ? IPREVIEWHANDLERCLSID : ITHUMBNAILPROVIDERCLSID);
+
+                changes.Add(new RegistryValueChange
+                {
+                    KeyPath = fileAssociationPath,
+                    KeyName = null,
+                    Value = handlerClsid,
+                });
+
+                if (!string.IsNullOrEmpty(fileKindType))
+                {
+                    // Registering a file type as a kind needs to be done at the HKEY_LOCAL_MACHINE level.
+                    // Make it optional as well so that we don't fail registering the handler if we can't write to HKEY_LOCAL_MACHINE.
+                    string kindPath = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\KindMap";
+                    changes.Add(new RegistryValueChange
+                    {
+                        Scope = Microsoft.Win32.RegistryHive.LocalMachine,
+                        KeyPath = kindPath,
+                        KeyName = fileType,
+                        Value = fileKindType,
+                        Required = false,
+                    });
+                }
+
+                if (!string.IsNullOrEmpty(perceivedType))
+                {
+                    changes.Add(new RegistryValueChange
+                    {
+                        KeyPath = fileTypePath,
+                        KeyName = "PerceivedType",
+                        Value = perceivedType,
+                    });
+                }
+
+                // this regfile registry key has precedence over Software\Classes\.reg for .reg files
+                if (type == FileExplorerAddOnType.PreviewHandler && fileType.Equals(".reg", StringComparison.OrdinalIgnoreCase))
+                {
+                    string regFilePath = "Software\\Classes\\regfile\\shellex\\" + IPREVIEWHANDLERCLSID;
+                    changes.Add(new RegistryValueChange
+                    {
+                        KeyPath = regFilePath,
+                        KeyName = null,
+                        Value = handlerClsid,
+                    });
+                }
+            }
+
+            if (type == FileExplorerAddOnType.PreviewHandler)
+            {
+                string previewHostClsid = "{6d2b5079-2f0b-48dd-ab7f-97cec514d30b}";
+                string previewHandlerListPath = "(Software\\Microsoft\\Windows\\CurrentVersion\\PreviewHandlers)";
+                changes.Add(new RegistryValueChange
+                {
+                    KeyPath = clsidPath,
+                    KeyName = "AppID",
+                    Value = previewHostClsid,
+                });
+
+                changes.Add(new RegistryValueChange
+                {
+                    KeyPath = previewHandlerListPath,
+                    KeyName = handlerClsid,
+                    Value = displayName,
+                });
+            }
+
+            changes.Add(new RegistryValueChange
+            {
+                Scope = Microsoft.Win32.RegistryHive.LocalMachine,
+                KeyPath = "Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved",
+                KeyName = handlerClsid,
+                Value = displayName,
+                Required = false,
+            });
+
+            return new RegistryChangeSet
+            {
+                Changes = [.. changes],
+            };
+        }
+
+        private const string ITHUMBNAILPROVIDERCLSID = "{E357FCCD-A995-4576-B01F-234630154E96}";
+        private const string IPREVIEWHANDLERCLSID = "{8895b1c6-b41f-4c1c-a562-0d564250836f}";
+
+        public string Name => "File Explorer";
+
+        public bool Enabled => true;
+
+        public GpoRuleConfigured GpoRuleConfigured => GpoRuleConfigured.Unavailable;
+
+        public void Disable()
+        {
+        }
+
+        public void Enable()
+        {
+            OnSettingsChanged("File Explorer", default);
+        }
+
+        public void OnSettingsChanged(string settingsKind, JsonElement jsonProperties)
+        {
+            foreach (FileExplorerModule submodule in _fileExplorerModules)
+            {
+                if (submodule.GpoRule == GpoRuleConfigured.Disabled)
+                {
+                    submodule.RegistryChanges.UnApplyIfApplied();
+                    continue;
+                }
+
+                if (submodule.IsEnabled() || submodule.GpoRule == GpoRuleConfigured.Enabled)
+                {
+                    submodule.RegistryChanges.ApplyIfNotApplied();
+                }
+                else
+                {
+                    submodule.RegistryChanges.UnApplyIfApplied();
+                }
+            }
+        }
+    }
+}

src/RunnerV2/RunnerV2/ModuleInterfaces/HostsModuleInterface.cs

@@ -0,0 +1,35 @@
+// 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 Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class HostsModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
+    {
+        public bool Enabled => SettingsUtils.Default.GetSettingsOrDefault<GeneralSettings>().Enabled.Hosts;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredHostsFileEditorEnabledValue();
+
+        public string Name => "Hosts";
+
+        public override string ProcessPath => "WinUI3Apps\\PowerToys.Hosts.exe";
+
+        public override string ProcessName => "PowerToys.Hosts";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SupressLaunchOnModuleEnabled | ProcessLaunchOptions.NeverExit;
+
+        public void Disable()
+        {
+        }
+
+        public void Enable()
+        {
+        }
+    }
+}

src/RunnerV2/RunnerV2/ModuleInterfaces/KeyboardManagerModuleInterface.cs

@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading;
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using PowerToys.Interop;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class KeyboardManagerModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
+    {
+        public string Name => "Keyboard Manager";
+
+        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.KeyboardManager;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredKeyboardManagerEnabledValue();
+
+        public override string ProcessPath => "KeyboardManagerEngine\\PowerToys.KeyboardManagerEngine.exe";
+
+        public override string ProcessName => "PowerToys.KeyboardManagerEngine";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument | ProcessLaunchOptions.RealtimePriority;
+
+        public void Disable()
+        {
+            using var terminateEvent = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.TerminateKBMSharedEvent());
+            terminateEvent.Set();
+        }
+
+        public void Enable()
+        {
+        }
+    }
+}

src/RunnerV2/RunnerV2/ModuleInterfaces/LightSwitchModuleInterface.cs

@@ -0,0 +1,60 @@
+// 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 Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using PowerToys.Interop;
+using RunnerV2.Models;
+using Settings.UI.Library;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class LightSwitchModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
+    {
+        public string Name => "LightSwitch";
+
+        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.LightSwitch;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredLightSwitchEnabledValue();
+
+        public override string ProcessPath => "LightSwitchService\\PowerToys.LightSwitchService.exe";
+
+        public override string ProcessName => "PowerToys.LightSwitchService";
+
+        public override string ProcessArguments => $"--pid {Environment.ProcessId}";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess;
+
+        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts
+        {
+            get => [(SettingsUtils.Default.GetSettings<LightSwitchSettings>(Name).Properties.ToggleThemeHotkey.Value, () =>
+            {
+                LightSwitchProperties properties = SettingsUtils.Default.GetSettings<LightSwitchSettings>(Name).Properties;
+                EnsureLaunched();
+                if (properties.ChangeSystem.Value)
+                {
+                    ThemeHelper.SetSystemTheme(!ThemeHelper.GetCurrentSystemTheme());
+                }
+
+                if (properties.ChangeApps.Value)
+                {
+                    ThemeHelper.SetAppsTheme(!ThemeHelper.GetCurrentAppsTheme());
+                }
+
+                using var manualOverrideEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.LightSwitchManualOverrideEvent());
+                manualOverrideEvent.Set();
+            })];
+        }
+
+        public void Disable()
+        {
+        }
+
+        public void Enable()
+        {
+        }
+    }
+}

src/RunnerV2/RunnerV2/ModuleInterfaces/MeasureToolModuleInterface.cs

@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using PowerToys.Interop;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class MeasureToolModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
+    {
+        public string Name => "Measure Tool";
+
+        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.MeasureTool;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredScreenRulerEnabledValue();
+
+        public override string ProcessPath => "WinUI3Apps\\PowerToys.MeasureToolUI.exe";
+
+        public override string ProcessName => "PowerToys.MeasureToolUI";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument | ProcessLaunchOptions.SupressLaunchOnModuleEnabled;
+
+        public void Disable()
+        {
+        }
+
+        public void Enable()
+        {
+            PopulateShortcuts();
+        }
+
+        public void OnSettingsChanged(string settingsKind, System.Text.Json.JsonElement jsonProperties)
+        {
+            PopulateShortcuts();
+        }
+
+        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
+
+        private void PopulateShortcuts()
+        {
+            Shortcuts.Clear();
+            Shortcuts.Add((SettingsUtils.Default.GetSettings<MeasureToolSettings>(Name).Properties.ActivationShortcut, () =>
+                {
+                    LaunchProcess();
+                }
+            ));
+        }
+    }
+}

src/RunnerV2/RunnerV2/ModuleInterfaces/MouseJumpModuleInterface.cs

@@ -0,0 +1,58 @@
+// 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 Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using PowerToys.Interop;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class MouseJumpModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
+    {
+        public string Name => "MouseJump";
+
+        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.MouseJump;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredMouseJumpEnabledValue();
+
+        public override string ProcessPath => "PowerToys.MouseJumpUI.exe";
+
+        public override string ProcessName => "PowerToys.MouseJumpUI";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
+
+        public void Disable()
+        {
+            using var terminateEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.TerminateMouseJumpSharedEvent());
+            terminateEvent.Set();
+        }
+
+        public void Enable()
+        {
+            PopulateShortcuts();
+        }
+
+        public void OnSettingsChanged(string settingsKind, System.Text.Json.JsonElement jsonProperties)
+        {
+            PopulateShortcuts();
+        }
+
+        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
+
+        public void PopulateShortcuts()
+        {
+            Shortcuts.Clear();
+            var settings = SettingsUtils.Default.GetSettings<MouseJumpSettings>(Name);
+            Shortcuts.Add((settings.Properties.ActivationShortcut, () =>
+            {
+                EnsureLaunched();
+                using var invokeMouseJumpEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.MouseJumpShowPreviewEvent());
+                invokeMouseJumpEvent.Set();
+            }));
+        }
+    }
+}

src/RunnerV2/RunnerV2/ModuleInterfaces/PowerAccentModuleInterface.cs

@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class PowerAccentModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
+    {
+        public string Name => "PowerAccent";
+
+        public bool Enabled => SettingsUtils.Default.GetSettingsOrDefault<GeneralSettings>().Enabled.PowerAccent;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredQuickAccentEnabledValue();
+
+        public override string ProcessPath => "PowerToys.PowerAccent.exe";
+
+        public override string ProcessName => "PowerToys.PowerAccent";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
+
+        public void Disable()
+        {
+        }
+
+        public void Enable()
+        {
+        }
+    }
+}

src/RunnerV2/RunnerV2/ModuleInterfaces/PowerOCRModuleInterface.cs

@@ -0,0 +1,59 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Threading;
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using PowerToys.Interop;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class PowerOCRModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
+    {
+        public string Name => "TextExtractor";
+
+        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.PowerOcr;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredTextExtractorEnabledValue();
+
+        public override string ProcessPath => "PowerToys.PowerOCR.exe";
+
+        public override string ProcessName => "PowerToys.PowerOCR";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
+
+        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
+
+        private void PopulateShortcuts()
+        {
+            Shortcuts.Clear();
+            Shortcuts.Add((SettingsUtils.Default.GetSettings<PowerOcrSettings>(Name).Properties.ActivationShortcut, () =>
+                {
+                    using var invokeOcrEvent = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.ShowPowerOCRSharedEvent());
+                    invokeOcrEvent.Set();
+                }
+            ));
+        }
+
+        public void Disable()
+        {
+            using var terminateEvent = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.TerminatePowerOCRSharedEvent());
+            terminateEvent.Set();
+        }
+
+        public void Enable()
+        {
+            PopulateShortcuts();
+        }
+
+        public void OnSettingsChanged(string settingsKind, JsonElement jsonProperties)
+        {
+            PopulateShortcuts();
+        }
+    }
+}

src/RunnerV2/RunnerV2/ModuleInterfaces/PowerToysRunModuleInterface.cs

@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using PowerToys.Interop;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class PowerToysRunModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
+    {
+        public string Name => "PowerToys Run";
+
+        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.PowerLauncher;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredPowerLauncherEnabledValue();
+
+        public override string ProcessPath => Path.GetFullPath("PowerToys.PowerLauncher.exe");
+
+        public override string ProcessName => "PowerToys.PowerLauncher";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.ElevateIfApplicable | ProcessLaunchOptions.SingletonProcess;
+
+        public override string ProcessArguments => $"-powerToysPid {Environment.ProcessId}";
+
+        public void Disable()
+        {
+            using var terminateEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.RunExitEvent());
+            terminateEvent.Set();
+        }
+
+        public void Enable()
+        {
+        }
+
+        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts =>
+        [
+            (
+                SettingsUtils.Default.GetSettings<PowerLauncherSettings>(Name).Properties.OpenPowerLauncher,
+                () =>
+                {
+                    EnsureLaunched();
+                    using var invokeRunEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.PowerLauncherCentralizedHookSharedEvent());
+                    invokeRunEvent.Set();
+                }
+            ),
+        ];
+    }
+}

src/RunnerV2/RunnerV2/ModuleInterfaces/RegistryPreviewModuleInterface.cs

@@ -0,0 +1,142 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Text.Json;
+using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.Win32;
+using PowerToys.GPOWrapper;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class RegistryPreviewModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
+    {
+        public bool Enabled => SettingsUtils.Default.GetSettingsOrDefault<GeneralSettings>().Enabled.RegistryPreview;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredHostsFileEditorEnabledValue();
+
+        public string Name => "RegistryPreview";
+
+        public override string ProcessPath => "WinUI3Apps\\PowerToys.RegistryPreview.exe";
+
+        public override string ProcessName => "PowerToys.RegistryPreview";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SupressLaunchOnModuleEnabled | ProcessLaunchOptions.NeverExit;
+
+        public void Disable()
+        {
+            if (!RegistryPreviewChangeSet.UnApplyIfApplied())
+            {
+                Logger.LogError("Unapplying registry changes failed");
+            }
+        }
+
+        public void OnSettingsChanged(string settingsKind, JsonElement jsonProperties)
+        {
+            bool defaultRegApp = SettingsUtils.Default.GetSettings<RegistryPreviewSettings>(Name).Properties.DefaultRegApp;
+            if (defaultRegApp && !RegistryPreviewSetDefaultAppChangeSet.IsApplied)
+            {
+                if (!RegistryPreviewSetDefaultAppChangeSet.Apply())
+                {
+                    Logger.LogError("Applying reg default handler failed.");
+                }
+
+                NativeMethods.SHChangeNotify(NativeMethods.SHCNE_ASSOCCHANGED, NativeMethods.SHCNF_IDLIST, IntPtr.Zero, IntPtr.Zero);
+            }
+            else if (!defaultRegApp && RegistryPreviewSetDefaultAppChangeSet.IsApplied)
+            {
+                if (RegistryPreviewSetDefaultAppChangeSet.UnApply())
+                {
+                    Logger.LogError("Unapplying reg default handler failed.");
+                }
+
+                NativeMethods.SHChangeNotify(NativeMethods.SHCNE_ASSOCCHANGED, NativeMethods.SHCNF_IDLIST, IntPtr.Zero, IntPtr.Zero);
+            }
+        }
+
+        public void Enable()
+        {
+            if (!RegistryPreviewChangeSet.ApplyIfNotApplied())
+            {
+                Logger.LogError("Applying registry changes failed");
+            }
+
+            OnSettingsChanged(null!, default);
+        }
+
+        public Dictionary<string, Action> CustomActions
+        {
+            get => new() { { "Launch", () => LaunchProcess() } };
+        }
+
+        private RegistryChangeSet RegistryPreviewSetDefaultAppChangeSet
+        {
+            get
+            {
+                string installationDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!;
+
+                string appName = "Registry Preview";
+                string registryKeyPrefix = "Software\\Classes\\";
+                RegistryValueChange[] changes =
+                    [
+                        new RegistryValueChange
+                    {
+                        KeyPath = registryKeyPrefix + ProcessName + "\\Application",
+                        KeyName = "ApplicationName",
+                        Value = appName,
+                    },
+                    new RegistryValueChange
+                    {
+                        KeyPath = registryKeyPrefix + ProcessName + "\\DefaultIcon",
+                        KeyName = null,
+                        Value = installationDir + "\\WinUI3Apps\\PowerToys.RegistryPreview.exe",
+                    },
+                    new RegistryValueChange
+                    {
+                        KeyPath = registryKeyPrefix + ProcessName + "\\shell\\open\\command",
+                        KeyName = null,
+                        Value = installationDir + "\\WinUI3Apps\\PowerToys.RegistryPreview.exe \"----ms-protocol:ms-encodedlaunch:App?ContractId=Windows.File&Verb=open&File=%1\"",
+                    },
+                    new RegistryValueChange
+                    {
+                        KeyPath = registryKeyPrefix + ".reg\\OpenWithProgIDs",
+                        KeyName = null,
+                        Value = ProcessName,
+                    }
+                    ];
+                return new RegistryChangeSet { Changes = changes };
+            }
+        }
+
+        private RegistryChangeSet RegistryPreviewChangeSet
+        {
+            get
+            {
+                string installationDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!;
+
+                RegistryValueChange[] changes =
+                    [
+                        new RegistryValueChange
+                    {
+                        KeyPath = "Software\\Classes\\regfile\\shell\\preview\\command",
+                        KeyName = null,
+                        Value = installationDir + "\\WinUI3Apps\\PowerToys.RegistryPreview.exe \"%1\"",
+                    },
+                    new RegistryValueChange
+                    {
+                        KeyPath = "Software\\Classes\\regfile\\shell\\preview",
+                        KeyName = "icon",
+                        Value = installationDir + "\\WinUI3Apps\\Assets\\RegistryPreview\\RegistryPreview.ico",
+                    }
+                    ];
+                return new RegistryChangeSet() { Changes = changes };
+            }
+        }
+    }
+}

src/RunnerV2/RunnerV2/ModuleInterfaces/ZoomItModuleInterface.cs

@@ -0,0 +1,45 @@
+// 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.Threading;
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using PowerToys.Interop;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class ZoomItModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
+    {
+        public string Name => "ZoomIt";
+
+        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.ZoomIt;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredZoomItEnabledValue();
+
+        public override string ProcessPath => "PowerToys.ZoomIt.exe";
+
+        public override string ProcessName => "PowerToys.ZoomIt";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
+
+        public void Disable()
+        {
+        }
+
+        public void Enable()
+        {
+        }
+
+        public Dictionary<string, Action> CustomActions { get => new() { { "refresh_settings", () => OnSettingsChanged(null!, default) } }; }
+
+        public void OnSettingsChanged(string settingsKind, System.Text.Json.JsonElement jsonProperties)
+        {
+            using var refreshSettingsEvent = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.ZoomItRefreshSettingsEvent());
+            refreshSettingsEvent.Set();
+        }
+    }
+}

src/RunnerV2/RunnerV2/NativeMethods.cs

@@ -0,0 +1,246 @@
+// 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.Drawing;
+using System.Runtime.InteropServices;
+using ManagedCommon;
+using Windows.ApplicationModel;
+
+namespace RunnerV2
+{
+    internal static partial class NativeMethods
+    {
+        [LibraryImport("advapi32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool OpenProcessToken(IntPtr processHandle, uint desiredAccess, out IntPtr tokenHandle);
+
+        [LibraryImport("advapi32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool GetTokenInformation(IntPtr tokenHandle, TOKEN_INFORMATION_CLASS tokenInformationClass, ref TokenElevation tokenInformation, uint tokenInformationLength, out uint returnLength);
+
+        [LibraryImport("Kernel32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool CloseHandle(IntPtr hObject);
+
+        internal enum TOKEN_INFORMATION_CLASS
+        {
+            TOKEN_ELEVATION = 20,
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct TokenElevation
+        {
+            public uint TokenIsElevated;
+        }
+
+        internal const int TOKENQUERY = 0x0008;
+
+        [LibraryImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool RegisterHotKey(IntPtr hWnd, int id, uint fsModifiers, uint vk);
+
+        [LibraryImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool UnregisterHotKey(IntPtr hWnd, int id);
+
+        [LibraryImport("user32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool AppendMenuW(IntPtr hMenu, uint uFlags, UIntPtr uIDNewItem, string lpNewItem);
+
+        [LibraryImport("user32.dll", SetLastError = true)]
+        internal static partial IntPtr CreatePopupMenu();
+
+        [LibraryImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool SetForegroundWindow(IntPtr hWnd);
+
+        [LibraryImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool TrackPopupMenu(IntPtr hMenu, uint uFlags, int x, int y, int nReserved, IntPtr hWnd, IntPtr prcRect);
+
+        [LibraryImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool EnableMenuItem(IntPtr hMenu, uint uIDEnableItem, uint uEnable);
+
+        internal const uint NIMADD = 0x00000000;
+        internal const uint NIMDELETE = 0x00000002;
+
+        internal struct NOTIFYICONDATA
+        {
+            public uint CbSize;
+            public IntPtr HWnd;
+            public uint UId;
+            public uint UFlags;
+            public uint UCallbackMessage;
+            public IntPtr HIcon;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
+            public string SzTip;
+            public uint DwState;
+            public uint DwStateMask;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+            public string SzInfo;
+            public uint UTimeoutOrVersion;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)]
+            public string SzInfoTitle;
+            public uint DwInfoFlags;
+            public Guid GuidItem;
+            public IntPtr HBalloonIcon;
+        }
+
+        [DllImport("shell32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool Shell_NotifyIcon(uint dwMessage, ref NOTIFYICONDATA lpdata);
+
+        [LibraryImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool ChangeWindowMessageFilterEx(IntPtr hWnd, uint msg, uint action, IntPtr pChangeFilterStruct);
+
+        internal const uint CSVREDRAW = 0x0001;
+        internal const uint CSHREDRAW = 0x0002;
+
+        internal const uint WSOVERLAPPEDWINDOW = 0x00CF0000;
+        internal const uint WSPOPUP = 0x80000000;
+
+        internal const int CWUSEDEFAULT = unchecked((int)0x80000000);
+
+        internal static readonly IntPtr IDCARROW = new(32512);
+
+        [DllImport("user32.dll")]
+        internal static extern IntPtr GetMessageW(out MSG lpMsg, IntPtr hWnd, uint wMsgFilterMin, uint wMsgFilterMax);
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool TranslateMessage(ref MSG lpMsg);
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool DispatchMessageW(ref MSG lpMsg);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool PostMessageW(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
+
+        [LibraryImport("kernel32.dll")]
+        internal static partial ushort AddAtomW([MarshalAs(UnmanagedType.LPWStr)] string lpString);
+
+        internal struct MSG
+        {
+            public IntPtr HWnd;
+            public uint Message;
+            public UIntPtr WParam;
+            public long LParam;
+            public ulong Time;
+            public Point Pt;
+        }
+
+        internal enum WindowMessages : uint
+        {
+            COMMAND = 0x0111,
+            HOTKEY = 0x0312,
+            ICON_NOTIFY = 0x0800,
+            WINDOWPOSCHANGING = 0x0046,
+            DESTROY = 0x0002,
+            REFRESH_SETTINGS = 0x0400 + 2,
+        }
+
+        [DllImport("user32.dll")]
+        internal static extern ushort RegisterClassW(ref WNDCLASS lpWndClass);
+
+        [LibraryImport("user32.dll", SetLastError = false)]
+        internal static partial IntPtr DefWindowProcW(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam);
+
+        [LibraryImport("user32.dll", SetLastError = true)]
+        internal static partial uint RegisterWindowMessageW([MarshalAs(UnmanagedType.LPWStr)] string lpString);
+
+        [LibraryImport("user32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
+        internal static partial nint CreateWindowExW(
+            uint dwExStyle,
+            string lpClassName,
+            string lpWindowName,
+            uint dwStyle,
+            int x,
+            int y,
+            int nWidth,
+            int nHeight,
+            IntPtr hWndParent,
+            IntPtr hMenu,
+            IntPtr hInstance,
+            IntPtr lpParam);
+
+        [UnmanagedFunctionPointer(CallingConvention.Winapi)]
+        internal delegate IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam);
+
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        internal struct WNDCLASS
+        {
+            public uint Style;
+            public WndProc LpfnWndProc;
+            public int CbClsExtra;
+            public int CbWndExtra;
+            public IntPtr HInstance;
+            public IntPtr HIcon;
+            public IntPtr HCursor;
+            public IntPtr HbrBackground;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string LpszMenuName;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string LpszClassName;
+        }
+
+        [DllImport("Advapi32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool ConvertStringSecurityDescriptorToSecurityDescriptorW(
+            [MarshalAs(UnmanagedType.LPWStr)] string StringSecurityDescriptor,
+            uint StringSDRevision,
+            out IntPtr SecurityDescriptor,
+            out uint SecurityDescriptorSize);
+
+        [DllImport("Advapi32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool MakeAbsoluteSD(
+            IntPtr pSelfRelativeSD,
+            IntPtr pAbsoluteSD,
+            ref uint lpdwAbsoluteSDSize,
+            IntPtr pDacl,
+            ref uint lpdwDaclSize,
+            IntPtr pSacl,
+            ref uint lpdwSaclSize,
+            IntPtr pOwner,
+            ref uint lpdwOwnerSize,
+            IntPtr pPrimaryGroup,
+            ref uint lpdwPrimaryGroupSize);
+
+        [DllImport("ole32.dll", SetLastError = true)]
+        internal static extern int CoInitializeSecurity(
+            IntPtr pSecDesc,
+            int cAuthSvc,
+            IntPtr asAuthSvc,
+            IntPtr pReserved1,
+            uint dwAuthnLevel,
+            uint dwImpLevel,
+            IntPtr pAuthList,
+            uint dwCapabilities,
+            IntPtr pReserved3);
+
+        [DllImport("user32.dll")]
+        internal static extern uint SendInput(uint nInputs, NativeKeyboardHelper.INPUT[] pInputs, int cbSize);
+
+        [DllImport("PowerToys.Interop.dll", CallingConvention = CallingConvention.Cdecl)]
+        internal static extern bool GetPackageNameAndVersionFromAppx(
+            [MarshalAs(UnmanagedType.LPWStr)] string appxPath,
+            [MarshalAs(UnmanagedType.LPWStr)] out string outName,
+            out PackageVersion outVersion);
+
+        [LibraryImport("Shell32.dll", SetLastError = true)]
+        internal static partial void SHChangeNotify(
+            uint wEventId,
+            uint uFlags,
+            IntPtr dwItem1,
+            IntPtr dwItem2);
+
+        internal const uint SHCNE_ASSOCCHANGED = 0x8000000;
+        internal const uint SHCNF_IDLIST = 0x0;
+    }
+}

src/RunnerV2/RunnerV2/Program.cs

@@ -0,0 +1,157 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapperProjection;
+using RunnerV2;
+using RunnerV2.Helpers;
+using RunnerV2.Models;
+using Settings.UI.Library;
+
+internal sealed class Program
+{
+    private static readonly SettingsUtils _settingsUtils = SettingsUtils.Default;
+
+    internal static GeneralSettings GeneralSettings => _settingsUtils.GetSettings<GeneralSettings>();
+
+    private static void Main(string[] args)
+    {
+        Logger.InitializeLogger("\\RunnerLogs");
+
+        string securityDescriptor =
+        "O:BA" // Owner: Builtin (local) administrator
+        + "G:BA" // Group: Builtin (local) administrator
+        + "D:"
+        + "(A;;0x7;;;PS)" // Access allowed on COM_RIGHTS_EXECUTE, _LOCAL, & _REMOTE for Personal self
+        + "(A;;0x7;;;IU)" // Access allowed on COM_RIGHTS_EXECUTE for Interactive Users
+        + "(A;;0x3;;;SY)" // Access allowed on COM_RIGHTS_EXECUTE, & _LOCAL for Local system
+        + "(A;;0x7;;;BA)" // Access allowed on COM_RIGHTS_EXECUTE, _LOCAL, & _REMOTE for Builtin (local) administrator
+        + "(A;;0x3;;;S-1-15-3-1310292540-1029022339-4008023048-2190398717-53961996-4257829345-603366646)" // Access allowed on COM_RIGHTS_EXECUTE, & _LOCAL for Win32WebViewHost package capability
+        + "S:"
+        + "(ML;;NX;;;LW)"; // Integrity label on No execute up for Low mandatory level
+
+        COMUtils.InitializeCOMSecurity(securityDescriptor);
+
+        switch (ShouldRunInSpecialMode(args))
+        {
+            case SpecialMode.None:
+                break;
+            case SpecialMode.UpdateNow:
+                UpdateNow();
+                return;
+            default:
+                throw new NotImplementedException("Special modes are not implemented yet.");
+        }
+
+        bool shouldOpenSettings = args.Any(s => s.StartsWith("--open-settings", StringComparison.InvariantCulture));
+        bool shouldOpenSettingsToSpecificPage = args.Any(s => s.StartsWith("--open-settings=", StringComparison.InvariantCulture));
+
+        // Check if PowerToys is already running
+        if (Process.GetProcessesByName(Process.GetCurrentProcess().ProcessName).Length > 1)
+        {
+            throw new NotImplementedException("Opening another instance window is not supported yet.");
+        }
+
+        /*
+         * Todo: Data diagnotics
+        */
+
+        bool isElevated = ElevationHelper.IsProcessElevated();
+        bool hasDontElevateArgument = args.Contains("--dont-elevate");
+        bool runElevatedSetting = GeneralSettings.RunElevated;
+        bool hasRestartedElevatedArgment = args.Contains("--restartedElevated");
+
+        Action afterInitializationAction = () => { };
+        Version version = Assembly.GetExecutingAssembly().GetName().Version!;
+
+        if ($"v{version.Major}.{version.Minor}.{version.Build}" != _settingsUtils.GetSettings<LastVersionRunSettings>(fileName: "last_version_run.json").LastVersion && (!GeneralSettings.ShowWhatsNewAfterUpdates || GPOWrapper.GetDisableShowWhatsNewAfterUpdatesValue() != GpoRuleConfigured.Disabled))
+        {
+            afterInitializationAction += () =>
+            {
+                SettingsHelper.OpenSettingsWindow(showScoobeWindow: true);
+            };
+        }
+
+        if (!_settingsUtils.GetSettings<OOBESettings>(fileName: "oobe_settings.json").OpenedAtFirstLaunch)
+        {
+            afterInitializationAction += () =>
+            {
+                SettingsHelper.OpenSettingsWindow(showOobeWindow: true);
+            };
+        }
+
+        if (shouldOpenSettings)
+        {
+            afterInitializationAction += () =>
+            {
+                SettingsHelper.OpenSettingsWindow(additionalArguments: shouldOpenSettingsToSpecificPage ? args.First(s => s.StartsWith("--open-settings=", StringComparison.InvariantCulture)).Replace("--open-settings=", string.Empty, StringComparison.InvariantCulture) : null);
+            };
+        }
+
+        // Set last version run
+        _settingsUtils.SaveSettings(new LastVersionRunSettings() { LastVersion = $"v{version.Major}.{version.Minor}.{version.Build}" }.ToJsonString(), fileName: "last_version_run.json");
+
+        switch ((isElevated, hasDontElevateArgument, runElevatedSetting, hasRestartedElevatedArgment))
+        {
+            case (true, true, false, _):
+                // Todo: Scheudle restart as non elevated
+                throw new NotImplementedException();
+            case (true, _, _, _):
+            case (_, _, false, _):
+            case (_, true, _, _):
+            case (false, _, _, true):
+                GeneralSettings tempGeneralSettings = GeneralSettings;
+                tempGeneralSettings.IsElevated = isElevated;
+                _settingsUtils.SaveSettings(tempGeneralSettings.ToJsonString());
+
+                Runner.Run(afterInitializationAction);
+                break;
+            default:
+                ElevationHelper.RestartScheduled = ElevationHelper.RestartScheduledMode.RestartElevated;
+                break;
+        }
+
+        ElevationHelper.RestartIfScheudled();
+    }
+
+    /// <summary>
+    /// Returns whether the application should run in a special mode based on the provided arguments.
+    /// </summary>
+    /// <param name="args">The arguments passed to <see cref="Main(string[])"/></param>
+    /// <returns>The <see cref="SpecialMode"/> the app should run in.</returns>
+    private static SpecialMode ShouldRunInSpecialMode(string[] args)
+    {
+        if (args.Length > 0 && args[0].StartsWith("powertoys://", StringComparison.InvariantCultureIgnoreCase))
+        {
+            Uri uri = new(args[0]);
+            string host = uri.Host.ToLowerInvariant();
+            return host switch
+            {
+                "update_now" => SpecialMode.UpdateNow,
+                _ => SpecialMode.None,
+            };
+        }
+
+        return SpecialMode.None;
+    }
+
+    /// <summary>
+    /// Starts the update process for PowerToys.
+    /// </summary>
+    private static void UpdateNow()
+    {
+        Process.Start(new ProcessStartInfo()
+        {
+            UseShellExecute = false,
+            CreateNoWindow = true,
+            FileName = "PowerToys.Update.exe",
+            Arguments = "-update_now",
+        });
+    }
+}

src/RunnerV2/RunnerV2/Runner.cs

@@ -0,0 +1,315 @@
+// 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.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using ManagedCommon;
+using RunnerV2.Helpers;
+using RunnerV2.Models;
+using RunnerV2.ModuleInterfaces;
+using Update;
+using static RunnerV2.NativeMethods;
+
+namespace RunnerV2
+{
+    internal static partial class Runner
+    {
+        /// <summary>
+        /// Gets the window handle for the Runner main window that hosts the tray icon and receives system messages.
+        /// </summary>
+        public static nint RunnerHwnd { get; private set; }
+
+        private const string TrayWindowClassName = "pt_tray_icon_window_class";
+
+        /// <summary>
+        /// Gets all the currently loaded modules.
+        /// </summary>
+        public static List<IPowerToysModule> LoadedModules { get; } = [];
+
+        /// <summary>
+        /// Gets the list of all available PowerToys modules.
+        /// </summary>
+        public static FrozenSet<IPowerToysModule> ModulesToLoad { get; } =
+        [
+            new ColorPickerModuleInterface(),
+            new AlwaysOnTopModuleInterface(),
+            new HostsModuleInterface(),
+            new PowerAccentModuleInterface(),
+            new AdvancedPasteModuleInterface(),
+            new AwakeModuleInterface(),
+            new CmdNotFoundModuleInterface(),
+            new CommandPaletteModuleInterface(),
+            new CropAndLockModuleInterface(),
+            new EnvironmentVariablesModuleInterface(),
+            new RegistryPreviewModuleInterface(),
+            new FileExplorerModuleInterface(),
+            new ZoomItModuleInterface(),
+            new PowerOCRModuleInterface(),
+            new MeasureToolModuleInterface(),
+            new MouseJumpModuleInterface(),
+            new FancyZonesModuleInterface(),
+            new PowerToysRunModuleInterface(),
+            new KeyboardManagerModuleInterface(),
+            new LightSwitchModuleInterface(),
+        ];
+
+        /// <summary>
+        /// Runs the main message loop for Runner.
+        /// </summary>
+        /// <param name="afterInitializationAction">A function to execute after initialization.</param>
+        internal static void Run(Action afterInitializationAction)
+        {
+            Logger.LogInfo("Runner started");
+
+            InitializeTrayWindow();
+            TrayIconManager.StartTrayIcon();
+
+            Task.Run(UpdateUtilities.UninstallPreviousMsixVersions);
+
+            foreach (IPowerToysModule module in ModulesToLoad)
+            {
+                ToggleModuleStateBasedOnEnabledProperty(module);
+            }
+
+            CentralizedKeyboardHookManager.Start();
+
+            afterInitializationAction();
+
+            MessageLoop();
+        }
+
+        private static readonly uint _taskbarCreatedMessage = RegisterWindowMessageW("TaskbarCreated");
+
+        /// <summary>
+        /// The main message loop that processes Windows messages.
+        /// </summary>
+        [STAThread]
+        private static void MessageLoop()
+        {
+            while (GetMessageW(out MSG msg, IntPtr.Zero, 0, 0) != 0)
+            {
+                TranslateMessage(ref msg);
+                DispatchMessageW(ref msg);
+
+                // Supress duplicate handling of HOTKEY messages
+                if (msg.Message == (uint)WindowMessages.HOTKEY)
+                {
+                    continue;
+                }
+
+                HandleMessage(msg.HWnd, msg.Message, (nint)msg.WParam, (nint)msg.LParam);
+            }
+
+            Close();
+        }
+
+        /// <summary>
+        /// Closes Runner and all loaded modules.
+        /// </summary>
+        [DoesNotReturn]
+        internal static void Close()
+        {
+            TrayIconManager.StopTrayIcon();
+            SettingsHelper.CloseSettingsWindow();
+            ElevationHelper.RestartIfScheudled();
+
+            foreach (IPowerToysModule module in LoadedModules)
+            {
+                try
+                {
+                    module.Disable();
+
+                    if (module is ProcessModuleAbstractClass pmac)
+                    {
+                        pmac.ProcessExit();
+                    }
+
+                    foreach (var hotkey in module.Hotkeys)
+                    {
+                        HotkeyManager.DisableHotkey(hotkey.Key);
+                    }
+                }
+                catch (Exception e)
+                {
+                    MessageBox.Show($"The module {module.Name} failed to unload: \n" + e.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+
+            Environment.Exit(0);
+        }
+
+        /// <summary>
+        /// Toggles the state of a module based on its enabled property and GPO rules.
+        /// </summary>
+        /// <param name="module">The module to toggle</param>
+        public static void ToggleModuleStateBasedOnEnabledProperty(IPowerToysModule module)
+        {
+            try
+            {
+                if ((module.Enabled && (module.GpoRuleConfigured != PowerToys.GPOWrapper.GpoRuleConfigured.Disabled)) || module.GpoRuleConfigured == PowerToys.GPOWrapper.GpoRuleConfigured.Enabled)
+                {
+                    /* Todo: conflict manager */
+
+                    if (!LoadedModules.Contains(module))
+                    {
+                        module.Enable();
+                        if (module is ProcessModuleAbstractClass pmac)
+                        {
+                            pmac.LaunchProcess(true);
+                        }
+
+                        LoadedModules.Add(module);
+                    }
+
+                    // ToArray is called to mitigate mutations while the foreach is executing
+                    foreach (var hotkey in module.Hotkeys.ToArray())
+                    {
+                        HotkeyManager.EnableHotkey(hotkey.Key, hotkey.Value);
+                    }
+
+                    CentralizedKeyboardHookManager.RemoveAllHooksFromModule(module.Name);
+
+                    foreach (var shortcut in module.Shortcuts.ToArray())
+                    {
+                        CentralizedKeyboardHookManager.AddKeyboardHook(module.Name, shortcut.Hotkey, shortcut.Action);
+                    }
+
+                    return;
+                }
+            }
+            catch (IOException)
+            {
+                return;
+            }
+            catch (Exception e)
+            {
+                MessageBox.Show($"The module {module.Name} failed to load: \n" + e.Message, "Error: " + e.GetType().Name, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+
+            try
+            {
+                module.Disable();
+
+                if (module is ProcessModuleAbstractClass pmac)
+                {
+                    pmac.ProcessExit();
+                }
+
+                foreach (var hotkey in module.Hotkeys)
+                {
+                    HotkeyManager.DisableHotkey(hotkey.Key);
+                }
+
+                CentralizedKeyboardHookManager.RemoveAllHooksFromModule(module.Name);
+
+                LoadedModules.Remove(module);
+            }
+            catch (IOException)
+            {
+            }
+            catch (Exception e)
+            {
+                MessageBox.Show($"The module {module.Name} failed to unload: \n" + e.Message, "Error: " + e.GetType().Name, MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        /// <summary>
+        /// Initializes the tray window to receive system messages.
+        /// </summary>
+        [STAThread]
+        private static void InitializeTrayWindow()
+        {
+            IntPtr hInstance = Process.GetCurrentProcess().MainModule!.BaseAddress;
+            IntPtr hCursor = Cursors.Arrow.Handle;
+            IntPtr hIcon = SystemIcons.Application.Handle;
+
+            var wc = new WNDCLASS
+            {
+                HCursor = hCursor,
+                HInstance = hInstance,
+                LpszClassName = TrayWindowClassName,
+                Style = CSHREDRAW | CSVREDRAW,
+                LpfnWndProc = HandleMessage,
+                HIcon = hIcon,
+                HbrBackground = IntPtr.Zero,
+                LpszMenuName = string.Empty,
+                CbClsExtra = 0,
+                CbWndExtra = 0,
+            };
+
+            _ = RegisterClassW(ref wc);
+
+            RunnerHwnd = CreateWindowExW(
+                0,
+                wc.LpszClassName,
+                TrayWindowClassName,
+                WSOVERLAPPEDWINDOW | WSPOPUP,
+                CWUSEDEFAULT,
+                CWUSEDEFAULT,
+                CWUSEDEFAULT,
+                CWUSEDEFAULT,
+                IntPtr.Zero,
+                IntPtr.Zero,
+                wc.HInstance,
+                IntPtr.Zero);
+
+            if (RunnerHwnd == IntPtr.Zero)
+            {
+                var err = Marshal.GetLastPInvokeError();
+                MessageBox.Show($"CreateWindowExW failed. LastError={err}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        /// <summary>
+        /// Handles Windows messages sent to the tray window.
+        /// </summary>
+        private static IntPtr HandleMessage(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
+        {
+            switch (msg)
+            {
+                case (uint)WindowMessages.HOTKEY:
+                    HotkeyManager.ProcessHotkey((nuint)wParam);
+                    break;
+                case (uint)WindowMessages.ICON_NOTIFY:
+                    TrayIconManager.ProcessTrayIconMessage(lParam);
+                    break;
+                case (uint)WindowMessages.COMMAND:
+                    TrayIconManager.ProcessTrayMenuCommand((nuint)wParam);
+                    break;
+                case (uint)WindowMessages.WINDOWPOSCHANGING:
+                    TrayIconManager.StartTrayIcon();
+                    break;
+                case (uint)WindowMessages.DESTROY:
+                    Close();
+                    break;
+                case (uint)WindowMessages.REFRESH_SETTINGS:
+                    foreach (IPowerToysModule module in ModulesToLoad)
+                    {
+                        ToggleModuleStateBasedOnEnabledProperty(module);
+                    }
+
+                    break;
+                default:
+                    if (msg == _taskbarCreatedMessage)
+                    {
+                        TrayIconManager.StartTrayIcon();
+                    }
+
+                    break;
+            }
+
+            return DefWindowProcW(hWnd, msg, wParam, lParam);
+        }
+    }
+}

src/RunnerV2/RunnerV2/RunnerV2.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="..\..\Common.SelfContained.props" />
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <Description>PowerToys Runner</Description>
+    <AssemblyName>PowerToys</AssemblyName>
+    <OutputPath>..\..\..\$(Platform)\$(Configuration)</OutputPath>
+    <Nullable>enable</Nullable>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <ApplicationIcon>icon.ico</ApplicationIcon>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\common\ManagedCommon\ManagedCommon.csproj" />
+    <ProjectReference Include="..\..\common\ManagedCsWin32\ManagedCsWin32.csproj" />
+    <ProjectReference Include="..\..\modules\poweraccent\PowerAccent.UI\PowerAccent.UI.csproj" />
+    <ProjectReference Include="..\..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />
+    <ProjectReference Include="..\..\Update\Update.csproj" />
+  </ItemGroup>
+</Project>

src/RunnerV2/RunnerV2/app.manifest

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </windowsSettings>
+  </application>
+</assembly>

src/Update/PowerToys.Update.base.rc

@@ -1,36 +0,0 @@
-#include <windows.h>
-#include "resource.h"
-#include "../common/version/version.h"
-
-1 VERSIONINFO
-FILEVERSION FILE_VERSION
-PRODUCTVERSION PRODUCT_VERSION
-FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
-FILEFLAGS VS_FF_DEBUG
-#else
-FILEFLAGS 0x0L
-#endif
-FILEOS VOS_NT_WINDOWS32
-FILETYPE VFT_DLL
-FILESUBTYPE VFT2_UNKNOWN 
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
-        BEGIN
-            VALUE "CompanyName", COMPANY_NAME
-            VALUE "FileDescription", FILE_DESCRIPTION
-            VALUE "FileVersion", FILE_VERSION_STRING
-            VALUE "InternalName", INTERNAL_NAME
-            VALUE "LegalCopyright", COPYRIGHT_NOTE
-            VALUE "OriginalFilename", ORIGINAL_FILENAME
-            VALUE "ProductName", PRODUCT_NAME
-            VALUE "ProductVersion", PRODUCT_VERSION_STRING
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
-    END
-END

src/Update/PowerToys.Update.cpp

@@ -1,234 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-#define WIN32_LEAN_AND_MEAN
-#include "Generated Files/resource.h"
-
-#include <Windows.h>
-#include <shellapi.h>
-
-#include <filesystem>
-#include <string_view>
-
-#include <common/updating/updating.h>
-#include <common/updating/updateState.h>
-#include <common/updating/installer.h>
-
-#include <common/utils/elevation.h>
-#include <common/utils/HttpClient.h>
-#include <common/utils/process_path.h>
-#include <common/utils/resources.h>
-#include <common/utils/timeutil.h>
-
-#include <common/SettingsAPI/settings_helpers.h>
-
-#include <common/logger/logger.h>
-
-#include <winrt/Windows.ApplicationModel.h>
-#include <winrt/Windows.Storage.h>
-#include <Msi.h>
-
-#include "../runner/tray_icon.h"
-#include "../runner/UpdateUtils.h"
-
-using namespace cmdArg;
-
-namespace fs = std::filesystem;
-
-std::optional<fs::path> CopySelfToTempDir()
-{
-    std::error_code error;
-    auto dst_path = fs::temp_directory_path() / "PowerToys.Update.exe";
-    fs::copy_file(get_module_filename(), dst_path, fs::copy_options::overwrite_existing, error);
-    if (error)
-    {
-        return std::nullopt;
-    }
-
-    return std::move(dst_path);
-}
-
-std::optional<fs::path> ObtainInstaller(bool& isUpToDate)
-{
-    using namespace updating;
-
-    isUpToDate = false;
-
-    auto state = UpdateState::read();
-
-    const auto new_version_info = get_github_version_info_async().get();
-    if (std::holds_alternative<version_up_to_date>(*new_version_info))
-    {
-        isUpToDate = true;
-        Logger::error("Invoked with -update_now argument, but no update was available");
-        return std::nullopt;
-    }
-
-    if (state.state == UpdateState::readyToDownload || state.state == UpdateState::errorDownloading)
-    {
-        if (!new_version_info)
-        {
-            Logger::error(L"Couldn't obtain github version info: {}", new_version_info.error());
-            return std::nullopt;
-        }
-
-        // Cleanup old updates before downloading the latest
-        updating::cleanup_updates();
-
-        auto downloaded_installer = download_new_version(std::get<new_version_download_info>(*new_version_info)).get();
-        if (!downloaded_installer)
-        {
-            Logger::error("Couldn't download new installer");
-        }
-
-        return downloaded_installer;
-    }
-    else if (state.state == UpdateState::readyToInstall)
-    {
-        fs::path installer{ get_pending_updates_path() / state.downloadedInstallerFilename };
-        if (fs::is_regular_file(installer))
-        {
-            return std::move(installer);
-        }
-        else
-        {
-            Logger::error(L"Couldn't find a downloaded installer {}", installer.native());
-            return std::nullopt;
-        }
-    }
-    else if (state.state == UpdateState::upToDate)
-    {
-        isUpToDate = true;
-        return std::nullopt;
-    }
-
-    Logger::error("Invoked with -update_now argument, but update state was invalid");
-    return std::nullopt;
-}
-
-bool InstallNewVersionStage1(fs::path installer)
-{
-    if (auto copy_in_temp = CopySelfToTempDir())
-    {
-        // Detect if PT was running
-        const auto pt_main_window = FindWindowW(pt_tray_icon_window_class, nullptr);
-
-        if (pt_main_window != nullptr)
-        {
-            SendMessageW(pt_main_window, WM_CLOSE, 0, 0);
-        }
-
-        std::wstring arguments{ UPDATE_NOW_LAUNCH_STAGE2 };
-        arguments += L" \"";
-        arguments += installer.c_str();
-        arguments += L"\"";
-        SHELLEXECUTEINFOW sei{ sizeof(sei) };
-        sei.fMask = { SEE_MASK_FLAG_NO_UI | SEE_MASK_NOASYNC };
-        sei.lpFile = copy_in_temp->c_str();
-        sei.nShow = SW_SHOWNORMAL;
-
-        sei.lpParameters = arguments.c_str();
-        return ShellExecuteExW(&sei) == TRUE;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-bool InstallNewVersionStage2(std::wstring installer_path)
-{
-    std::transform(begin(installer_path), end(installer_path), begin(installer_path), ::towlower);
-
-    bool success = true;
-
-    if (installer_path.ends_with(L".msi"))
-    {
-        success = MsiInstallProductW(installer_path.data(), nullptr) == ERROR_SUCCESS;
-    }
-    else
-    {
-        // If it's not .msi, then it's a wix bootstrapper
-        SHELLEXECUTEINFOW sei{ sizeof(sei) };
-        sei.fMask = { SEE_MASK_FLAG_NO_UI | SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE };
-        sei.lpFile = installer_path.c_str();
-        sei.nShow = SW_SHOWNORMAL;
-        std::wstring parameters = L"/passive /norestart";
-        sei.lpParameters = parameters.c_str();
-
-        success = ShellExecuteExW(&sei) == TRUE;
-
-        // Wait for the install completion
-        if (success)
-        {
-            WaitForSingleObject(sei.hProcess, INFINITE);
-            DWORD exitCode = 0;
-            GetExitCodeProcess(sei.hProcess, &exitCode);
-            success = exitCode == 0;
-            CloseHandle(sei.hProcess);
-        }
-    }
-
-    if (!success)
-    {
-        return false;
-    }
-
-    UpdateState::store([&](UpdateState& state) {
-        state = {};
-        state.githubUpdateLastCheckedDate.emplace(timeutil::now());
-        state.state = UpdateState::upToDate;
-    });
-
-    return true;
-}
-
-int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
-{
-    int nArgs = 0;
-    LPWSTR* args = CommandLineToArgvW(GetCommandLineW(), &nArgs);
-    if (!args || nArgs < 2)
-    {
-        return 1;
-    }
-
-    std::wstring_view action{ args[1] };
-
-    std::filesystem::path logFilePath(PTSettingsHelper::get_root_save_folder_location());
-    logFilePath.append(LogSettings::updateLogPath);
-    Logger::init(LogSettings::updateLoggerName, logFilePath.wstring(), PTSettingsHelper::get_log_settings_file_location());
-
-    if (action == UPDATE_NOW_LAUNCH_STAGE1)
-    {
-        bool isUpToDate = false;
-        auto installerPath = ObtainInstaller(isUpToDate);
-        bool failed = !installerPath.has_value();
-        failed = failed || !InstallNewVersionStage1(std::move(*installerPath));
-        if (failed)
-        {
-            UpdateState::store([&](UpdateState& state) {
-                state = {};
-                state.githubUpdateLastCheckedDate.emplace(timeutil::now());
-                state.state = isUpToDate ? UpdateState::upToDate : UpdateState::errorDownloading;
-            });
-        }
-        return failed;
-    }
-    else if (action == UPDATE_NOW_LAUNCH_STAGE2)
-    {
-        using namespace std::string_view_literals;
-        const bool failed = !InstallNewVersionStage2(args[2]);
-        if (failed)
-        {
-            UpdateState::store([&](UpdateState& state) {
-                state = {};
-                state.githubUpdateLastCheckedDate.emplace(timeutil::now());
-                state.state = UpdateState::errorDownloading;
-            });
-        }
-        return failed;
-    }
-
-    return 0;
-}

src/Update/PowerToys.Update.vcxproj

@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
-  <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
-    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h PowerToys.Update.base.rc PowerToys.Update.rc" />
-  </Target>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <ProjectGuid>{44CE9AE1-4390-42C5-BACC-0FD6B40AA203}</ProjectGuid>
-    <RootNamespace>Update</RootNamespace>
-    <ProjectName>PowerToys.Update</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="..\..\deps\expected.props" />
-  <PropertyGroup>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup>
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>WindowsApp.lib;Msi.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="PowerToys.Update.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\common\logger\logger.vcxproj">
-      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\common\notifications\notifications.vcxproj">
-      <Project>{1d5be09d-78c0-4fd7-af00-ae7c1af7c525}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\common\SettingsAPI\SettingsAPI.vcxproj">
-      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\common\updating\updating.vcxproj">
-      <Project>{17da04df-e393-4397-9cf0-84dabe11032e}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="PowerToys.Update.base.rc" />
-    <ResourceCompile Include="Generated Files\PowerToys.Update.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="..\..\deps\spdlog.props" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
-  </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </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'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
-  </Target>
-</Project>

src/Update/Program.cs

@@ -0,0 +1,183 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
+using System.Threading.Tasks;
+using Update;
+
+[SupportedOSPlatform("windows")]
+internal sealed partial class Program
+{
+    private static readonly string _installerPath = Path.Combine(Path.Combine(
+        Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+        "Microsoft",
+        "PowerToys",
+        "Updates"));
+
+    private static async Task Main(string[] args)
+    {
+        if (args.Length < 1)
+        {
+            Environment.Exit(1);
+            return;
+        }
+
+        string action = args[0];
+
+        switch (action)
+        {
+            case UpdateStage.UPDATENOWLAUNCHSTAGE1:
+                await PerformUpdateNowStage1();
+                break;
+            case UpdateStage.UPDATENOWLAUNCHSTAGE2:
+                if (args.Length < 2)
+                {
+                    Environment.Exit(1);
+                }
+
+                await PerformUpdateNowStage2(args[1]);
+                break;
+            default:
+                break;
+        }
+    }
+
+    private static async Task PerformUpdateNowStage2(string installerPath)
+    {
+        Process installerProcess = new()
+        {
+            StartInfo = new ProcessStartInfo
+            {
+                FileName = installerPath,
+                Arguments = "/passive /norestart",
+                UseShellExecute = true,
+            },
+        };
+
+        installerProcess.Start();
+        await installerProcess.WaitForExitAsync();
+
+        if (installerProcess.ExitCode == 0)
+        {
+            UpdateSettingsHelper.ProcessNoUpdateAvailable();
+        }
+        else
+        {
+            UpdateSettingsHelper.SetUpdateState(UpdatingSettings.UpdatingState.ErrorDownloading);
+        }
+    }
+
+    private static async Task PerformUpdateNowStage1()
+    {
+        UpdateSettingsHelper.TriggerUpdateCheck();
+        UpdateSettingsHelper.UpdateInfo updateInfo = await UpdateSettingsHelper.GetUpdateAvailableInfo();
+
+        if (updateInfo is not UpdateSettingsHelper.UpdateInfo.UpdateAvailable ua)
+        {
+            // No update found
+            Environment.Exit(1);
+            return;
+        }
+
+        // Copy itsself to the temp folder
+        File.Copy("PowerToys.Update.exe", Path.Combine(Path.GetTempPath(), "PowerToys.Update.exe"), true);
+
+        string? installerFilePath = null;
+
+        switch (UpdateSettingsHelper.GetUpdateState())
+        {
+            case UpdatingSettings.UpdatingState.ReadyToDownload:
+            case UpdatingSettings.UpdatingState.ErrorDownloading:
+                CleanupUpdates();
+                installerFilePath = await DownloadFile(ua.InstallerDownloadUrl.ToString(), ua.InstallerFilename);
+                break;
+            case UpdatingSettings.UpdatingState.ReadyToInstall:
+                installerFilePath = Path.Combine(_installerPath, ua.InstallerFilename);
+                if (!File.Exists(installerFilePath))
+                {
+                    // Installer not found
+                    Environment.Exit(1);
+                    return;
+                }
+
+                break;
+            case UpdatingSettings.UpdatingState.UpToDate:
+                Environment.Exit(0);
+                return;
+        }
+
+        if (installerFilePath == null)
+        {
+            UpdateSettingsHelper.SetUpdateState(UpdatingSettings.UpdatingState.ErrorDownloading);
+            Environment.Exit(1);
+            return;
+        }
+
+        IntPtr runnerHwnd = FindWindowW("pt_tray_icon_window_class");
+
+        if (runnerHwnd != IntPtr.Zero)
+        {
+            SendMessageW(runnerHwnd, 0x0010, IntPtr.Zero, IntPtr.Zero); // Send WM_CLOSE
+        }
+
+        string arguments = $"{UpdateStage.UPDATENOWLAUNCHSTAGE2} \"{installerFilePath}\"";
+
+        Process.Start(new ProcessStartInfo
+        {
+            FileName = Path.Combine(Path.GetTempPath(), "PowerToys.Update.exe"),
+            Arguments = arguments,
+            UseShellExecute = true,
+            CreateNoWindow = true,
+            WorkingDirectory = Environment.CurrentDirectory,
+        });
+    }
+
+    private static async Task<string?> DownloadFile(string downloadUri, string downloadFileName)
+    {
+        HttpClient httpClient = new();
+        httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("PowerToys Runner"); // GitHub API requires a user-agent
+
+        // 3 Attempts to download the file
+        for (int i = 0; i < 3; i++)
+        {
+            try
+            {
+                using FileStream fileStream = new(Path.Combine(_installerPath, downloadFileName), FileMode.Create, FileAccess.Write, FileShare.None);
+                await (await httpClient.GetStreamAsync(downloadUri)).CopyToAsync(fileStream);
+                return fileStream.Name;
+            }
+            catch
+            {
+            }
+        }
+
+        return null;
+    }
+
+    private static void CleanupUpdates()
+    {
+        if (!Path.Exists(_installerPath))
+        {
+            return;
+        }
+
+        foreach (string file in Directory.GetFiles(_installerPath).Where(f => f.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)))
+        {
+            File.Delete(file);
+        }
+    }
+
+    [LibraryImport("user32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
+    private static partial IntPtr FindWindowW(string lpClassName);
+
+    [LibraryImport("user32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static partial bool SendMessageW(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam);
+}

src/Update/Resources.resx

@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="DOTNET_CORE_DOWNLOAD_FAILURE" xml:space="preserve">
-    <value>Couldn't download .NET Core Desktop Runtime 3.1, please install it manually.</value>
-  </data>
-  <data name="DOTNET_CORE_DOWNLOAD_FAILURE_TITLE" xml:space="preserve">
-    <value>PowerToys installation error</value>
-  </data>
-  <data name="GITHUB_NEW_VERSION_AVAILABLE" xml:space="preserve">
-    <value>An update to PowerToys is available.</value>
-  </data>
-  <data name="GITHUB_NEW_VERSION_UPDATE_NOW" xml:space="preserve">
-    <value>Update now</value>
-  </data>
-  <data name="GITHUB_NEW_VERSION_AVAILABLE_OFFER_VISIT" xml:space="preserve">
-    <value>An update to PowerToys is available. Visit our GitHub page to update.</value>
-  </data>
-  <data name="GITHUB_NEW_VERSION_MORE_INFO" xml:space="preserve">
-    <value>More info...</value>
-  </data>
-  <data name="TOAST_TITLE" xml:space="preserve">
-    <value>PowerToys Update</value>
-  </data>
-</root>

src/Update/Update.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="..\Common.SelfContained.props" />
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <Description>PowerToys Runner</Description>
+    <AssemblyName>PowerToys.Update</AssemblyName>
+    <OutputPath>..\..\$(Platform)\$(Configuration)</OutputPath>
+    <Nullable>enable</Nullable>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+		<PublishAot>true</PublishAot>
+		<PublishSingleFile>true</PublishSingleFile>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <_IsPublishing Condition="'$(_IsPublishing)'==''">false</_IsPublishing>
+  </PropertyGroup>
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(_IsPublishing)'!='true'">
+    <Exec Command="dotnet publish &quot;$(ProjectPath)&quot; -c $(Configuration) -r $(RuntimeIdentifier) --self-contained -o &quot;$(OutputPath)&quot;" />
+  </Target>
+</Project>

src/Update/UpdateSettingsHelper.cs

@@ -0,0 +1,227 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Net.Http;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Win32;
+
+namespace Update
+{
+    [SupportedOSPlatform("windows")]
+    public static class UpdateSettingsHelper
+    {
+        private static Thread? _updateThread;
+
+        private const string INSTALLERFILENAME = "powertoyssetup";
+        private const string USERINSTALLERFILENAME = "powertoysusersetup";
+
+        public static void TriggerUpdateCheck()
+        {
+            if (_updateThread is not null && _updateThread.IsAlive)
+            {
+                return;
+            }
+
+            _updateThread = new Thread(async () =>
+            {
+                UpdateInfo updateInfo = await GetUpdateAvailableInfo();
+                switch (updateInfo)
+                {
+                    case UpdateInfo.UpdateCheckFailed ucf:
+                        ProcessUpdateCheckFailed(ucf);
+                        break;
+                    case UpdateInfo.UpdateAvailable ua:
+                        ProcessUpdateAvailable(ua);
+                        break;
+                    case UpdateInfo.NoUpdateAvailable:
+                        ProcessNoUpdateAvailable();
+                        break;
+                }
+            });
+
+            _updateThread.Start();
+        }
+
+        internal record UpdateInfo
+        {
+            private UpdateInfo()
+            {
+            }
+
+            public sealed record NoUpdateAvailable : UpdateInfo;
+
+            public sealed record UpdateAvailable(Uri ReleasePageUri, Version AvailableVersion, Uri InstallerDownloadUrl, string InstallerFilename) : UpdateInfo;
+
+            public sealed record UpdateCheckFailed(Exception Exception) : UpdateInfo;
+        }
+
+        internal static async Task<UpdateInfo> GetUpdateAvailableInfo()
+        {
+            Version? currentVersion = Assembly.GetExecutingAssembly().GetName().Version;
+
+            if (currentVersion is null)
+            {
+                // Todo: Log
+                return new UpdateInfo.NoUpdateAvailable();
+            }
+
+            if (currentVersion is { Major: 0, Minor: 0 })
+            {
+                // Pre-release or local build, skip update check
+                return new UpdateInfo.NoUpdateAvailable();
+            }
+
+            try
+            {
+                HttpClient httpClient = new();
+                httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("PowerToys Runner"); // GitHub API requires a user-agent
+                Stream body = await httpClient.GetStreamAsync("https://api.github.com/repos/microsoft/PowerToys/releases/latest").ConfigureAwait(false);
+                JsonElement releaseObject = (await JsonDocument.ParseAsync(body)).RootElement;
+                Version latestVersion = new(releaseObject.GetProperty("tag_name").GetString()?.TrimStart('V', 'v') ?? throw new FormatException("The \"tag_name\" field could not be found"));
+                string architectureString = RuntimeInformation.OSArchitecture switch
+                {
+                    Architecture.X64 => "x64",
+                    Architecture.Arm64 => "arm64",
+                    _ => throw new InvalidDataException("Unknown architecture"),
+                };
+
+                if (latestVersion > currentVersion)
+                {
+                    Uri releasePageUri = new(releaseObject.GetProperty("html_url").GetString() ?? throw new FormatException("The \"html_url\" field could not be found"));
+
+                    string requiredFilename = GetInstallScope() == InstallScope.PerMachine ? INSTALLERFILENAME : USERINSTALLERFILENAME;
+
+                    Uri? installerDownloadUrl = null;
+                    string? installerFilename = null;
+
+                    foreach (JsonElement asset in releaseObject.GetProperty("assets").EnumerateArray())
+                    {
+                        string? name = asset.GetProperty("name").GetString();
+                        string? browserDownloadUrl = asset.GetProperty("browser_download_url").GetString();
+
+                        if (name is null
+                            || browserDownloadUrl is null
+                            || !name.Contains(requiredFilename, StringComparison.InvariantCultureIgnoreCase)
+                            || !name.Contains(".exe", StringComparison.InvariantCultureIgnoreCase)
+                            || !name.Contains(architectureString, StringComparison.InvariantCultureIgnoreCase))
+                        {
+                            continue;
+                        }
+
+                        installerDownloadUrl = new Uri(browserDownloadUrl);
+                        installerFilename = name;
+                        break;
+                    }
+
+                    return installerDownloadUrl is null || installerFilename is null
+                        ? new UpdateInfo.UpdateCheckFailed(new InvalidDataException("No installer found in GitHub release"))
+                        : new UpdateInfo.UpdateAvailable(releasePageUri, latestVersion, installerDownloadUrl, installerFilename);
+                }
+
+                return new UpdateInfo.NoUpdateAvailable();
+            }
+            catch (Exception e)
+            {
+                return new UpdateInfo.UpdateCheckFailed(e);
+            }
+        }
+
+        private enum InstallScope
+        {
+            PerMachine,
+            PerUser,
+        }
+
+        [SupportedOSPlatform("windows")]
+        private static InstallScope GetInstallScope()
+        {
+            if (Registry.LocalMachine.OpenSubKey(@"Software\Classes\powertoys\", false) is not RegistryKey machineKey)
+            {
+                if (Registry.CurrentUser.OpenSubKey(@"Software\Classes\powertoys\", false) is not RegistryKey userKey)
+                {
+                    // Both keys are missing
+                    return InstallScope.PerMachine;
+                }
+
+                if (userKey.GetValue("InstallScope") is not string installScope)
+                {
+                    userKey.Close();
+                    return InstallScope.PerMachine;
+                }
+
+                userKey.Close();
+
+                return installScope.Contains("perUser") ? InstallScope.PerUser : InstallScope.PerMachine;
+            }
+
+            machineKey.Close();
+
+            return InstallScope.PerMachine;
+        }
+
+        private static readonly string _settingsPath = Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+            "Microsoft",
+            "PowerToys");
+
+        private static readonly string _updatingSettingsFile = Path.Combine(_settingsPath, "UpdateState.json");
+
+        private static void ProcessUpdateAvailable(UpdateInfo.UpdateAvailable updateAvailable)
+        {
+            UpdatingSettings updatingSettings = UpdatingSettings.LoadSettings();
+            Console.WriteLine($"Update available: {updateAvailable.AvailableVersion}");
+
+            updatingSettings.State = UpdatingSettings.UpdatingState.ReadyToDownload;
+            updatingSettings.ReleasePageLink = updateAvailable.ReleasePageUri.ToString();
+            updatingSettings.DownloadedInstallerFilename = updateAvailable.InstallerFilename;
+            updatingSettings.ReleasePageLink = updateAvailable.ReleasePageUri.ToString();
+            updatingSettings.LastCheckedDate = DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString(CultureInfo.InvariantCulture);
+
+            File.WriteAllText(_updatingSettingsFile, updatingSettings.ToJsonString());
+        }
+
+        internal static void ProcessNoUpdateAvailable()
+        {
+            UpdatingSettings updatingSettings = UpdatingSettings.LoadSettings();
+
+            updatingSettings.State = UpdatingSettings.UpdatingState.UpToDate;
+            updatingSettings.ReleasePageLink = string.Empty;
+            updatingSettings.DownloadedInstallerFilename = string.Empty;
+            updatingSettings.ReleasePageLink = string.Empty;
+            updatingSettings.LastCheckedDate = DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString(CultureInfo.InvariantCulture);
+            File.WriteAllText(_updatingSettingsFile, updatingSettings.ToJsonString());
+        }
+
+        private static void ProcessUpdateCheckFailed(UpdateInfo.UpdateCheckFailed updateCheckFailed)
+        {
+            // Todo: Log failed attempt
+            UpdatingSettings updatingSettings = UpdatingSettings.LoadSettings();
+
+            updatingSettings.State = UpdatingSettings.UpdatingState.NetworkError;
+            updatingSettings.ReleasePageLink = string.Empty;
+            updatingSettings.DownloadedInstallerFilename = string.Empty;
+            updatingSettings.ReleasePageLink = string.Empty;
+            updatingSettings.LastCheckedDate = DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString(CultureInfo.InvariantCulture);
+            File.WriteAllText(_updatingSettingsFile, updatingSettings.ToJsonString());
+        }
+
+        internal static void SetUpdateState(UpdatingSettings.UpdatingState state)
+        {
+            UpdatingSettings updatingSettings = UpdatingSettings.LoadSettings();
+
+            updatingSettings.State = state;
+            File.WriteAllText(_updatingSettingsFile, updatingSettings.ToJsonString());
+        }
+
+        internal static UpdatingSettings.UpdatingState GetUpdateState() => UpdatingSettings.LoadSettings().State;
+    }
+}

src/Update/UpdateStage.cs

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Update
+{
+    internal static class UpdateStage
+    {
+        internal const string UPDATENOWLAUNCHSTAGE1 = "-update_now";
+        internal const string UPDATENOWLAUNCHSTAGE2 = "-update_now_stage_2";
+    }
+}

src/Update/UpdateUtilities.cs

@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Update
+{
+    public static class UpdateUtilities
+    {
+        public static async void UninstallPreviousMsixVersions()
+        {
+            try
+            {
+                Windows.Management.Deployment.PackageManager packageManager = new();
+                var packages = packageManager.FindPackagesForUser(string.Empty, "Microsoft.PowerToys", "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US");
+
+                Version? currentVersion = Assembly.GetExecutingAssembly().GetName().Version;
+
+                if (currentVersion == null)
+                {
+                    return;
+                }
+
+                foreach (var package in packages)
+                {
+                    Version msixVersion = new Version(package.Id.Version.Major, package.Id.Version.Minor, package.Id.Version.Revision);
+                    if (msixVersion < currentVersion)
+                    {
+                        await packageManager.RemovePackageAsync(package.Id.FullName);
+                    }
+                }
+            }
+            catch
+            {
+            }
+        }
+    }
+}

src/Update/UpdatingSettings.cs

@@ -0,0 +1,124 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Update
+{
+    public sealed class UpdatingSettings
+    {
+        public enum UpdatingState
+        {
+            UpToDate = 0,
+            ErrorDownloading,
+            ReadyToDownload,
+            ReadyToInstall,
+            NetworkError,
+        }
+
+        // Gets or sets a value of the updating state
+        [JsonPropertyName("state")]
+        public UpdatingState State { get; set; }
+
+        // Gets or sets a value of the release page url
+        [JsonPropertyName("releasePageUrl")]
+        public string ReleasePageLink { get; set; } = string.Empty;
+
+        // Gets or sets a value of the github last checked date
+        [JsonPropertyName("githubUpdateLastCheckedDate")]
+        public string LastCheckedDate { get; set; } = string.Empty;
+
+        // Gets or sets a value of the updating state
+        [JsonPropertyName("downloadedInstallerFilename")]
+        public string DownloadedInstallerFilename { get; set; } = string.Empty;
+
+        // Non-localizable strings: Files
+        public const string SettingsFilePath = "\\Microsoft\\PowerToys\\";
+        public const string SettingsFile = "UpdateState.json";
+
+        public string NewVersion
+        {
+            get
+            {
+                if (ReleasePageLink == null)
+                {
+                    return string.Empty;
+                }
+
+                try
+                {
+                    string version = ReleasePageLink.Substring(ReleasePageLink.LastIndexOf('/') + 1);
+                    return version.Trim();
+                }
+                catch (Exception)
+                {
+                }
+
+                return string.Empty;
+            }
+        }
+
+        public string LastCheckedDateLocalized
+        {
+            get
+            {
+                try
+                {
+                    if (LastCheckedDate == null)
+                    {
+                        return string.Empty;
+                    }
+
+                    long seconds = long.Parse(LastCheckedDate, CultureInfo.CurrentCulture);
+                    var date = DateTimeOffset.FromUnixTimeSeconds(seconds).UtcDateTime;
+                    return date.ToLocalTime().ToString(CultureInfo.CurrentCulture);
+                }
+                catch (Exception)
+                {
+                }
+
+                return string.Empty;
+            }
+        }
+
+        public UpdatingSettings()
+        {
+            State = UpdatingState.UpToDate;
+        }
+
+        public static UpdatingSettings LoadSettings()
+        {
+            var localAppDataDir = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+            var file = localAppDataDir + SettingsFilePath + SettingsFile;
+
+            if (File.Exists(file))
+            {
+                try
+                {
+                    FileStream inputStream = File.Open(file, FileMode.Open);
+                    StreamReader reader = new(inputStream);
+                    string data = reader.ReadToEnd();
+                    inputStream.Close();
+                    reader.Dispose();
+
+                    return JsonSerializer.Deserialize(data, UpdatingsSettingsSourceGenerationContext.Default.UpdatingSettings)!;
+                }
+                catch (Exception)
+                {
+                }
+            }
+
+            return new UpdatingSettings();
+        }
+
+        public string ToJsonString()
+        {
+            return JsonSerializer.Serialize(this, UpdatingsSettingsSourceGenerationContext.Default.UpdatingSettings);
+        }
+    }
+}

src/Update/UpdatingsSettingsSourceGenerationContext.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.Text.Json;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
+using System.Threading.Tasks;
+
+namespace Update
+{
+    [JsonSourceGenerationOptions(WriteIndented = true)]
+    [JsonSerializable(typeof(UpdatingSettings))]
+
+    internal sealed partial class UpdatingsSettingsSourceGenerationContext : JsonSerializerContext
+    {
+    }
+}

src/Update/packages.config

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
-</packages>

src/Update/resource.base.h

@@ -1,11 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by PowerToys.Update.rc
-
-//////////////////////////////
-// Non-localizable
-
-#define FILE_DESCRIPTION "PowerToys Update"
-#define INTERNAL_NAME "PowerToys.Update"
-#define ORIGINAL_FILENAME "PowerToys.Update.exe"
-

src/common/Common.UI/SettingsDeepLink.cs

@@ -2,10 +2,8 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Diagnostics;
 using System.IO;
-using ManagedCommon;
 
 namespace Common.UI
 {
@@ -122,33 +120,28 @@ namespace Common.UI
             }
         }
 
-        // What about debug build? Should also consider debug build, maybe tray window message?
-        public static void OpenSettings(SettingsWindow window)
+        public static void OpenSettings(SettingsWindow window, bool mainExecutableIsOnTheParentFolder)
         {
             try
             {
-                var exePath = Path.Combine(
-                    PowerToysPathResolver.GetPowerToysInstallPath(),
-                    "PowerToys.exe");
-
-                if (exePath == null || !File.Exists(exePath))
+                var directoryPath = System.AppContext.BaseDirectory;
+                if (mainExecutableIsOnTheParentFolder)
                 {
-                    Logger.LogError($"Failed to find powertoys exe path, {exePath}");
-                    return;
+                    // Need to go into parent folder for PowerToys.exe. Likely a WinUI3 App SDK application.
+                    directoryPath = Path.Combine(directoryPath, "..");
+                    directoryPath = Path.Combine(directoryPath, "PowerToys.exe");
+                }
+                else
+                {
+                    // PowerToys.exe is in the same path as the application.
+                    directoryPath = Path.Combine(directoryPath, "PowerToys.exe");
                 }
 
-                var args = "--open-settings=" + SettingsWindowNameToString(window);
-
-                Process.Start(new ProcessStartInfo
-                {
-                    FileName = exePath,
-                    Arguments = args,
-                    UseShellExecute = false,
-                });
+                Process.Start(new ProcessStartInfo(directoryPath) { Arguments = "--open-settings=" + SettingsWindowNameToString(window) });
             }
-            catch (Exception ex)
+            catch
             {
-                Logger.LogError(ex.Message);
+                // TODO(stefan): Log exception once unified logging is implemented
             }
         }
     }

src/common/FilePreviewCommon/MarkdownHelper.cs

@@ -39,7 +39,7 @@ namespace Microsoft.PowerToys.FilePreviewCommon
             var softlineBreak = new Markdig.Extensions.Hardlines.SoftlineBreakAsHardlineExtension();
 
             MarkdownPipelineBuilder pipelineBuilder;
-            pipelineBuilder = new MarkdownPipelineBuilder().UseAdvancedExtensions().UseEmojiAndSmiley().UseYamlFrontMatter().UseMathematics().DisableHtml();
+            pipelineBuilder = new MarkdownPipelineBuilder().UseAdvancedExtensions().UseEmojiAndSmiley().UseYamlFrontMatter().UseMathematics();
             pipelineBuilder.Extensions.Add(extension);
             pipelineBuilder.Extensions.Add(softlineBreak);
 

src/common/GPOWrapperProjection/GPOWrapper.cs

@@ -66,5 +66,10 @@ namespace PowerToys.GPOWrapperProjection
         {
             return (GpoRuleConfigured)PowerToys.GPOWrapper.GPOWrapper.GetConfiguredWorkspacesEnabledValue();
         }
+
+        public static GpoRuleConfigured GetDisableShowWhatsNewAfterUpdatesValue()
+        {
+            return (GpoRuleConfigured)PowerToys.GPOWrapper.GPOWrapper.GetDisableShowWhatsNewAfterUpdatesValue();
+        }
     }
 }

src/common/ManagedCommon/HotkeyEx.cs

@@ -2,12 +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.
 
-namespace WorkspacesCsharpLibrary.Data;
-
-public enum InvokePoint
+namespace ManagedCommon
 {
-    EditorButton = 0,
-    Shortcut,
-    LaunchAndEdit,
-    CommandPaletteExtension,
+    public record HotkeyEx(ushort ModifiersMask, ushort VkCode, int Identifier);
 }

src/common/ManagedCommon/HotkeySettingsControlHook.cs

@@ -3,10 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-
 using PowerToys.Interop;
 
-namespace Microsoft.PowerToys.Settings.UI.Library
+namespace ManagedCommon
 {
     public delegate void KeyEvent(int key);
 
@@ -14,7 +13,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
 
     public delegate bool FilterAccessibleKeyboardEvents(int key, UIntPtr extraInfo);
 
-    public class HotkeySettingsControlHook : IDisposable
+    public partial class HotkeySettingsControlHook : IDisposable
     {
         private const int WmKeyDown = 0x100;
         private const int WmKeyUp = 0x101;

src/common/ManagedCommon/LanguageHelper.cs

@@ -18,7 +18,7 @@ namespace ManagedCommon
         internal sealed class OutGoingLanguageSettings
         {
             [JsonPropertyName("language")]
-            public string LanguageTag { get; set; }
+            public string? LanguageTag { get; set; }
         }
 
         public static string LoadLanguage()
@@ -36,7 +36,7 @@ namespace ManagedCommon
                     inputStream.Close();
                     reader.Dispose();
 
-                    return JsonSerializer.Deserialize<OutGoingLanguageSettings>(data, SourceGenerationContext.Default.OutGoingLanguageSettings).LanguageTag;
+                    return JsonSerializer.Deserialize<OutGoingLanguageSettings>(data, SourceGenerationContext.Default.OutGoingLanguageSettings)!.LanguageTag!;
                 }
                 catch (Exception)
                 {

src/common/ManagedCommon/Logger.cs

@@ -29,17 +29,17 @@ namespace ManagedCommon
         /// <summary>
         /// Gets the path to the log directory for the current version of the app.
         /// </summary>
-        public static string CurrentVersionLogDirectoryPath { get; private set; }
+        public static string? CurrentVersionLogDirectoryPath { get; private set; }
 
         /// <summary>
         /// Gets the path to the current log file.
         /// </summary>
-        public static string CurrentLogFile { get; private set; }
+        public static string? CurrentLogFile { get; private set; }
 
         /// <summary>
         /// Gets the path to the log directory for the app.
         /// </summary>
-        public static string AppLogDirectoryPath { get; private set; }
+        public static string? AppLogDirectoryPath { get; private set; }
 
         /// <summary>
         /// Initializes the logger and sets the path for logging.
@@ -50,7 +50,7 @@ namespace ManagedCommon
         public static void InitializeLogger(string applicationLogPath, bool isLocalLow = false)
         {
             string versionedPath = LogDirectoryPath(applicationLogPath, isLocalLow);
-            string basePath = Path.GetDirectoryName(versionedPath);
+            string basePath = Path.GetDirectoryName(versionedPath)!;
 
             if (!Directory.Exists(versionedPath))
             {

src/common/ManagedCommon/ManagedCommon.csproj

@@ -6,6 +6,7 @@
   <PropertyGroup>
     <Description>PowerToys ManagedCommon</Description>
     <AssemblyName>PowerToys.ManagedCommon</AssemblyName>
+		<Nullable>enable</Nullable>
   </PropertyGroup>
 
   <!-- See https://learn.microsoft.com/windows/apps/develop/platform/csharp-winrt/net-projection-from-cppwinrt-component for more info -->
@@ -20,6 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\GPOWrapperProjection\GPOWrapperProjection.csproj" />
     <ProjectReference Include="..\interop\PowerToys.Interop.vcxproj" />
     <ProjectReference Include="..\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
   </ItemGroup>

src/common/ManagedCommon/NativeKeyboardHelper.cs

@@ -5,18 +5,18 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Microsoft.PowerToys.Settings.UI.Helpers
+namespace ManagedCommon
 {
-    internal static class NativeKeyboardHelper
+    public static class NativeKeyboardHelper
     {
         [StructLayout(LayoutKind.Sequential)]
         [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
-        internal struct INPUT
+        public struct INPUT
         {
-            internal INPUTTYPE type;
-            internal InputUnion data;
+            public INPUTTYPE type;
+            public InputUnion data;
 
-            internal static int Size
+            public static int Size
             {
                 get { return Marshal.SizeOf<INPUT>(); }
             }
@@ -24,49 +24,49 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
 
         [StructLayout(LayoutKind.Explicit)]
         [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
-        internal struct InputUnion
+        public struct InputUnion
         {
             [FieldOffset(0)]
-            internal MOUSEINPUT mi;
+            public MOUSEINPUT mi;
             [FieldOffset(0)]
-            internal KEYBDINPUT ki;
+            public KEYBDINPUT ki;
             [FieldOffset(0)]
-            internal HARDWAREINPUT hi;
+            public HARDWAREINPUT hi;
         }
 
         [StructLayout(LayoutKind.Sequential)]
         [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
-        internal struct MOUSEINPUT
+        public struct MOUSEINPUT
         {
-            internal int dx;
-            internal int dy;
-            internal int mouseData;
-            internal uint dwFlags;
-            internal uint time;
-            internal UIntPtr dwExtraInfo;
+            public int dx;
+            public int dy;
+            public int mouseData;
+            public uint dwFlags;
+            public uint time;
+            public UIntPtr dwExtraInfo;
         }
 
         [StructLayout(LayoutKind.Sequential)]
         [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
-        internal struct KEYBDINPUT
+        public struct KEYBDINPUT
         {
-            internal short wVk;
-            internal short wScan;
-            internal uint dwFlags;
-            internal int time;
-            internal UIntPtr dwExtraInfo;
+            public short wVk;
+            public short wScan;
+            public uint dwFlags;
+            public int time;
+            public UIntPtr dwExtraInfo;
         }
 
         [StructLayout(LayoutKind.Sequential)]
         [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
-        internal struct HARDWAREINPUT
+        public struct HARDWAREINPUT
         {
-            internal int uMsg;
-            internal short wParamL;
-            internal short wParamH;
+            public int uMsg;
+            public short wParamL;
+            public short wParamH;
         }
 
-        internal enum INPUTTYPE : uint
+        public enum INPUTTYPE : uint
         {
             INPUT_MOUSE = 0,
             INPUT_KEYBOARD = 1,
@@ -74,7 +74,7 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
         }
 
         [Flags]
-        internal enum KeyEventF
+        public enum KeyEventF
         {
             KeyDown = 0x0000,
             ExtendedKey = 0x0001,

src/common/ManagedCommon/NativeMethods.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 
 namespace ManagedCommon
 {
-    internal static class NativeMethods
+    internal static partial class NativeMethods
     {
         [DllImport("kernel32.dll", SetLastError = true)]
         internal static extern IntPtr OpenProcess(uint processAccess, bool bInheritHandle, int processId);
@@ -21,6 +21,13 @@ namespace ManagedCommon
         [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern bool QueryFullProcessImageName(IntPtr hProcess, uint dwFlags, System.Text.StringBuilder lpExeName, ref uint lpdwSize);
 
+        [LibraryImport("kernel32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
+        internal static partial IntPtr CreateEventW(IntPtr lpEventAttributes, [MarshalAs(UnmanagedType.Bool)] bool bManualReset, [MarshalAs(UnmanagedType.Bool)] bool bInitialState, string lpName);
+
+        [LibraryImport("kernel32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool SetEvent(IntPtr hEvent);
+
         [DllImport("kernel32.dll", SetLastError = true)]
         internal static extern bool GetExitCodeProcess(IntPtr hProcess, out uint lpExitCode);
 

src/common/ManagedCommon/PowerToysPathResolver.cs

@@ -1,168 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.Versioning;
-using Microsoft.Win32;
-
-namespace ManagedCommon
-{
-    [SupportedOSPlatform("windows")]
-    public class PowerToysPathResolver
-    {
-        private const string PowerToysRegistryKey = @"Software\Classes\powertoys";
-        private const string PowerToysExe = "PowerToys.exe";
-
-        /// <summary>
-        /// Gets the PowerToys installation path by checking registry entries
-        /// </summary>
-        /// <returns>The path to PowerToys installation directory, or null if not found</returns>
-        public static string GetPowerToysInstallPath()
-        {
-#if DEBUG
-            // In debug builds, resolve directly from the running process (no installer/registry involved).
-            return GetPathFromCurrentProcess();
-#else
-            // Try to get path from Per-User installation first
-            string path = GetPathFromRegistry(RegistryHive.CurrentUser);
-            if (!string.IsNullOrEmpty(path))
-            {
-                return path;
-            }
-
-            // Fall back to Per-Machine installation
-            path = GetPathFromRegistry(RegistryHive.LocalMachine);
-            if (!string.IsNullOrEmpty(path))
-            {
-                return path;
-            }
-
-            return null;
-#endif
-        }
-
-        private static string GetPathFromRegistry(RegistryHive hive)
-        {
-            try
-            {
-                using var baseKey = RegistryKey.OpenBaseKey(hive, RegistryView.Registry64);
-
-                // First try to get path from the powertoys protocol registration
-                string path = GetPathFromProtocolRegistration(baseKey);
-                if (!string.IsNullOrEmpty(path))
-                {
-                    return path;
-                }
-            }
-            catch (Exception)
-            {
-                // Ignore registry access errors
-            }
-
-            return null;
-        }
-
-        private static string GetPathFromProtocolRegistration(RegistryKey baseKey)
-        {
-            try
-            {
-                using var key = baseKey.OpenSubKey($@"{PowerToysRegistryKey}\shell\open\command");
-
-                if (key != null)
-                {
-                    string command = key.GetValue(string.Empty)?.ToString();
-                    if (!string.IsNullOrEmpty(command))
-                    {
-                        // Parse command like: "C:\Program Files\PowerToys\PowerToys.exe" "%1"
-                        return ExtractPathFromCommand(command);
-                    }
-                }
-            }
-            catch (Exception)
-            {
-                // Ignore registry access errors
-            }
-
-            return null;
-        }
-
-        private static string GetPathFromCurrentProcess()
-        {
-            try
-            {
-                // If we're running inside PowerToys.exe (dev/debug builds), use the executable location.
-                var processPath = Process.GetCurrentProcess().MainModule?.FileName;
-                if (!string.IsNullOrEmpty(processPath))
-                {
-                    var processDir = Path.GetDirectoryName(processPath);
-                    if (!string.IsNullOrEmpty(processDir) && File.Exists(Path.Combine(processDir, PowerToysExe)))
-                    {
-                        return processDir;
-                    }
-                }
-
-                // As a fallback, walk up from AppContext.BaseDirectory to find PowerToys.exe.
-                var directory = new DirectoryInfo(AppContext.BaseDirectory);
-                while (directory != null)
-                {
-                    var candidate = Path.Combine(directory.FullName, PowerToysExe);
-                    if (File.Exists(candidate))
-                    {
-                        return directory.FullName;
-                    }
-
-                    directory = directory.Parent;
-                }
-            }
-            catch
-            {
-                // Ignore reflection/process permission errors; caller will see null and handle accordingly.
-            }
-
-            return null;
-        }
-
-        private static string ExtractPathFromCommand(string command)
-        {
-            if (string.IsNullOrEmpty(command))
-            {
-                return null;
-            }
-
-            try
-            {
-                // Handle quoted paths: "C:\Program Files\PowerToys\PowerToys.exe" "%1"
-                if (command.StartsWith('\"'))
-                {
-                    int endQuote = command.IndexOf('\"', 1);
-                    if (endQuote > 1)
-                    {
-                        string exePath = command.Substring(1, endQuote - 1);
-                        if (File.Exists(exePath))
-                        {
-                            return Path.GetDirectoryName(exePath);
-                        }
-                    }
-                }
-                else
-                {
-                    // Handle unquoted paths (less common)
-                    string[] parts = command.Split(' ');
-                    if (parts.Length > 0 && File.Exists(parts[0]))
-                    {
-                        return Path.GetDirectoryName(parts[0]);
-                    }
-                }
-            }
-            catch (Exception)
-            {
-                // Ignore path parsing errors
-            }
-
-            return null;
-        }
-    }
-}

src/common/ManagedCommon/ThemeHelpers.cs

@@ -24,7 +24,7 @@ namespace ManagedCommon
         // based on https://stackoverflow.com/questions/51334674/how-to-detect-windows-10-light-dark-mode-in-win32-application
         public static AppTheme GetAppTheme()
         {
-            int value = (int)Registry.GetValue($"{HKeyRoot}\\{HkeyWindowsPersonalizeTheme}", HValueAppTheme, 1);
+            int value = (int)Registry.GetValue($"{HKeyRoot}\\{HkeyWindowsPersonalizeTheme}", HValueAppTheme, 1)!;
             return (AppTheme)value;
         }
 

src/common/ManagedCommon/ThemeListener.cs

@@ -24,7 +24,7 @@ namespace ManagedCommon
         /// <summary>
         /// An event that fires if the Theme changes.
         /// </summary>
-        public event ThemeChangedEvent ThemeChanged;
+        public event ThemeChangedEvent? ThemeChanged;
 
         private readonly ManagementEventWatcher watcher;
 
@@ -33,7 +33,7 @@ namespace ManagedCommon
             var currentUser = WindowsIdentity.GetCurrent();
             var query = new WqlEventQuery(
                 $"SELECT * FROM RegistryValueChangeEvent WHERE Hive='HKEY_USERS' AND " +
-                $"KeyPath='{currentUser.User.Value}\\\\{ThemeHelpers.HkeyWindowsPersonalizeTheme.Replace("\\", "\\\\")}' AND ValueName='{ThemeHelpers.HValueAppTheme}'");
+                $"KeyPath='{currentUser.User?.Value}\\\\{ThemeHelpers.HkeyWindowsPersonalizeTheme.Replace("\\", "\\\\")}' AND ValueName='{ThemeHelpers.HValueAppTheme}'");
             watcher = new ManagementEventWatcher(query);
             watcher.EventArrived += Watcher_EventArrived;
             watcher.Start();

src/common/PowerToys.ModuleContracts/IModuleService.cs

@@ -1,47 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Common.UI;
-
-namespace PowerToys.ModuleContracts;
-
-/// <summary>
-/// Base contract for PowerToys modules exposed to the Command Palette.
-/// </summary>
-public interface IModuleService
-{
-    /// <summary>
-    /// Gets module identifier (e.g., Workspaces, Awake).
-    /// </summary>
-    string Key { get; }
-
-    Task<OperationResult> LaunchAsync(CancellationToken cancellationToken = default);
-
-    Task<OperationResult> OpenSettingsAsync(CancellationToken cancellationToken = default);
-}
-
-/// <summary>
-/// Helper base to reduce duplication for simple modules.
-/// </summary>
-public abstract class ModuleServiceBase : IModuleService
-{
-    public abstract string Key { get; }
-
-    protected abstract SettingsDeepLink.SettingsWindow SettingsWindow { get; }
-
-    public abstract Task<OperationResult> LaunchAsync(CancellationToken cancellationToken = default);
-
-    public virtual Task<OperationResult> OpenSettingsAsync(CancellationToken cancellationToken = default)
-    {
-        try
-        {
-            SettingsDeepLink.OpenSettings(SettingsWindow);
-            return Task.FromResult(OperationResult.Ok());
-        }
-        catch (Exception ex)
-        {
-            return Task.FromResult(OperationResult.Fail($"Failed to open settings for {Key}: {ex.Message}"));
-        }
-    }
-}

src/common/PowerToys.ModuleContracts/OperationResult.cs

@@ -1,30 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace PowerToys.ModuleContracts;
-
-/// <summary>
-/// Lightweight result type for module operations.
-/// </summary>
-public readonly record struct OperationResult(bool Success, string? Error = null)
-{
-    public static OperationResult Ok() => new(true, null);
-
-    public static OperationResult Fail(string error) => new(false, error);
-}
-
-/// <summary>
-/// Result type with a payload.
-/// </summary>
-public readonly record struct OperationResult<T>(bool Success, T? Value, string? Error = null);
-
-/// <summary>
-/// Factory helpers for creating operation results.
-/// </summary>
-public static class OperationResults
-{
-    public static OperationResult<T> Ok<T>(T value) => new(true, value, null);
-
-    public static OperationResult<T> Fail<T>(string error) => new(false, default, error);
-}

src/common/PowerToys.ModuleContracts/PowerToys.ModuleContracts.csproj

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\..\Common.Dotnet.AotCompatibility.props" />
-
-  <PropertyGroup>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Common.UI\Common.UI.csproj" />
-  </ItemGroup>
-</Project>

src/common/interop/Constants.cpp

@@ -75,62 +75,10 @@ namespace winrt::PowerToys::Interop::implementation
     {
         return CommonSharedConstants::ADVANCED_PASTE_CUSTOM_ACTION_MESSAGE;
     }
-    hstring Constants::AdvancedPasteShowUIEvent()
-    {
-        return CommonSharedConstants::ADVANCED_PASTE_SHOW_UI_EVENT;
-    }
     hstring Constants::AdvancedPasteTerminateAppMessage()
     {
         return CommonSharedConstants::ADVANCED_PASTE_TERMINATE_APP_MESSAGE;
     }
-    hstring Constants::AlwaysOnTopPinEvent()
-    {
-        return CommonSharedConstants::ALWAYS_ON_TOP_PIN_EVENT;
-    }
-    hstring Constants::FindMyMouseTriggerEvent()
-    {
-        return CommonSharedConstants::FIND_MY_MOUSE_TRIGGER_EVENT;
-    }
-    hstring Constants::MouseHighlighterTriggerEvent()
-    {
-        return CommonSharedConstants::MOUSE_HIGHLIGHTER_TRIGGER_EVENT;
-    }
-    hstring Constants::MouseCrosshairsTriggerEvent()
-    {
-        return CommonSharedConstants::MOUSE_CROSSHAIRS_TRIGGER_EVENT;
-    }
-    hstring Constants::CursorWrapTriggerEvent()
-    {
-        return CommonSharedConstants::CURSOR_WRAP_TRIGGER_EVENT;
-    }
-    hstring Constants::LightSwitchToggleEvent()
-    {
-        return CommonSharedConstants::LIGHTSWITCH_TOGGLE_EVENT;
-    }
-    hstring Constants::ZoomItZoomEvent()
-    {
-        return CommonSharedConstants::ZOOMIT_ZOOM_EVENT;
-    }
-    hstring Constants::ZoomItDrawEvent()
-    {
-        return CommonSharedConstants::ZOOMIT_DRAW_EVENT;
-    }
-    hstring Constants::ZoomItBreakEvent()
-    {
-        return CommonSharedConstants::ZOOMIT_BREAK_EVENT;
-    }
-    hstring Constants::ZoomItLiveZoomEvent()
-    {
-        return CommonSharedConstants::ZOOMIT_LIVEZOOM_EVENT;
-    }
-    hstring Constants::ZoomItSnipEvent()
-    {
-        return CommonSharedConstants::ZOOMIT_SNIP_EVENT;
-    }
-    hstring Constants::ZoomItRecordEvent()
-    {
-        return CommonSharedConstants::ZOOMIT_RECORD_EVENT;
-    }
     hstring Constants::ShowPowerOCRSharedEvent()
     {
         return CommonSharedConstants::SHOW_POWEROCR_SHARED_EVENT;
@@ -247,4 +195,28 @@ namespace winrt::PowerToys::Interop::implementation
     {
         return CommonSharedConstants::CMDPAL_SHOW_EVENT;
     }
+    hstring Constants::AlwaysOnTopPinEvent()
+    {
+        return CommonSharedConstants::ALWAYS_ON_TOP_PIN_EVENT;
+    }
+    hstring Constants::AlwaysOnTopTerminateEvent()
+    {
+        return CommonSharedConstants::ALWAYS_ON_TOP_TERMINATE_EVENT;
+    }
+    hstring Constants::CropAndLockExitEvent()
+    {
+        return CommonSharedConstants::CROP_AND_LOCK_EXIT_EVENT;
+    }
+    hstring Constants::ZoomItRefreshSettingsEvent()
+    {
+        return CommonSharedConstants::ZOOMIT_REFRESH_SETTINGS_EVENT;
+    }
+    hstring Constants::TerminateKBMSharedEvent()
+    {
+        return CommonSharedConstants::TERMINATE_KBM_SHARED_EVENT;
+    }
+    hstring Constants::LightSwitchManualOverrideEvent()
+    {
+        return CommonSharedConstants::LIGHTSWITCH_MANUAL_OVERRIDE_EVENT;
+    }
 }

src/common/interop/Constants.h

@@ -23,20 +23,6 @@ namespace winrt::PowerToys::Interop::implementation
         static hstring AdvancedPasteAdditionalActionMessage();
         static hstring AdvancedPasteCustomActionMessage();
         static hstring AdvancedPasteTerminateAppMessage();
-        static hstring AdvancedPasteShowUIEvent();
-        static hstring AlwaysOnTopPinEvent();
-        static hstring MeasureToolTriggerEvent();
-        static hstring FindMyMouseTriggerEvent();
-        static hstring MouseHighlighterTriggerEvent();
-        static hstring MouseCrosshairsTriggerEvent();
-        static hstring CursorWrapTriggerEvent();
-        static hstring LightSwitchToggleEvent();
-        static hstring ZoomItZoomEvent();
-        static hstring ZoomItDrawEvent();
-        static hstring ZoomItBreakEvent();
-        static hstring ZoomItLiveZoomEvent();
-        static hstring ZoomItSnipEvent();
-        static hstring ZoomItRecordEvent();
         static hstring ShowPowerOCRSharedEvent();
         static hstring TerminatePowerOCRSharedEvent();
         static hstring MouseJumpShowPreviewEvent();
@@ -47,6 +33,7 @@ namespace winrt::PowerToys::Interop::implementation
         static hstring PowerAccentExitEvent();
         static hstring ShortcutGuideTriggerEvent();
         static hstring RegistryPreviewTriggerEvent();
+        static hstring MeasureToolTriggerEvent();
         static hstring GcodePreviewResizeEvent();
         static hstring BgcodePreviewResizeEvent();
         static hstring QoiPreviewResizeEvent();
@@ -59,12 +46,18 @@ namespace winrt::PowerToys::Interop::implementation
         static hstring TerminateHostsSharedEvent();
         static hstring CropAndLockThumbnailEvent();
         static hstring CropAndLockReparentEvent();
+        static hstring CropAndLockExitEvent();
         static hstring ShowEnvironmentVariablesSharedEvent();
         static hstring ShowEnvironmentVariablesAdminSharedEvent();
         static hstring WorkspacesLaunchEditorEvent();
         static hstring WorkspacesHotkeyEvent();
         static hstring PowerToysRunnerTerminateSettingsEvent();
         static hstring ShowCmdPalEvent();
+        static hstring AlwaysOnTopPinEvent();
+        static hstring AlwaysOnTopTerminateEvent();
+        static hstring ZoomItRefreshSettingsEvent();
+        static hstring TerminateKBMSharedEvent();
+        static hstring LightSwitchManualOverrideEvent();
     };
 }
 

src/common/interop/Constants.idl

@@ -20,19 +20,6 @@ namespace PowerToys
             static String AdvancedPasteAdditionalActionMessage();
             static String AdvancedPasteCustomActionMessage();
             static String AdvancedPasteTerminateAppMessage();
-            static String AdvancedPasteShowUIEvent();
-            static String AlwaysOnTopPinEvent();
-            static String FindMyMouseTriggerEvent();
-            static String MouseHighlighterTriggerEvent();
-            static String MouseCrosshairsTriggerEvent();
-            static String CursorWrapTriggerEvent();
-            static String LightSwitchToggleEvent();
-            static String ZoomItZoomEvent();
-            static String ZoomItDrawEvent();
-            static String ZoomItBreakEvent();
-            static String ZoomItLiveZoomEvent();
-            static String ZoomItSnipEvent();
-            static String ZoomItRecordEvent();
             static String ShowPowerOCRSharedEvent();
             static String TerminatePowerOCRSharedEvent();
             static String MouseJumpShowPreviewEvent();
@@ -56,12 +43,18 @@ namespace PowerToys
             static String TerminateHostsSharedEvent();
             static String CropAndLockThumbnailEvent();
             static String CropAndLockReparentEvent();
+            static String CropAndLockExitEvent();
             static String ShowEnvironmentVariablesSharedEvent();
             static String ShowEnvironmentVariablesAdminSharedEvent();
             static String WorkspacesLaunchEditorEvent();
             static String WorkspacesHotkeyEvent();
             static String PowerToysRunnerTerminateSettingsEvent();
             static String ShowCmdPalEvent();
+            static String AlwaysOnTopPinEvent();
+            static String AlwaysOnTopTerminateEvent();
+            static String ZoomItRefreshSettingsEvent();
+            static String TerminateKBMSharedEvent();
+            static String LightSwitchManualOverrideEvent();
         }
     }
-}
+}

src/common/interop/PowerToys.Interop.vcxproj

@@ -93,6 +93,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\utils\package.h" />
     <ClInclude Include="async_message_queue.h" />
     <ClInclude Include="CommonManaged.h">
       <DependentUpon>CommonManaged.idl</DependentUpon>
@@ -114,6 +115,7 @@
     <ClInclude Include="pch.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="shared_constants.h" />
+    <ClInclude Include="ThemeHelper.h" />
     <ClInclude Include="TwoWayPipeMessageIPCManaged.h">
       <DependentUpon>TwoWayPipeMessageIPCManaged.idl</DependentUpon>
     </ClInclude>
@@ -140,6 +142,9 @@
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
+		<ClCompile Include="ThemeHelper.cpp">
+      <DependentUpon>ThemeHelper.idl</DependentUpon>
+		</ClCompile>
     <ClCompile Include="TwoWayPipeMessageIPCManaged.cpp">
       <DependentUpon>TwoWayPipeMessageIPCManaged.idl</DependentUpon>
     </ClCompile>
@@ -162,6 +167,7 @@
     <Midl Include="HotkeyManager.idl" />
     <Midl Include="KeyboardHook.idl" />
     <Midl Include="LayoutMapManaged.idl" />
+    <Midl Include="ThemeHelper.idl" />
     <Midl Include="TwoWayPipeMessageIPCManaged.idl" />
   </ItemGroup>
   <ItemGroup>

src/common/interop/PowerToys.Interop.vcxproj.filters

@@ -54,6 +54,12 @@
     <ClInclude Include="Constants.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\utils\package.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ThemeHelper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="keyboard_layout.cpp">
@@ -83,6 +89,9 @@
     <ClCompile Include="Constants.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="ThemeHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="interop.rc">
@@ -115,6 +124,9 @@
     <Midl Include="TwoWayPipeMessageIPCManaged.idl">
       <Filter>Source Files</Filter>
     </Midl>
+    <Midl Include="ThemeHelper.idl">
+      <Filter>Source Files</Filter>
+    </Midl>
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />

src/common/interop/ThemeHelper.cpp

@@ -0,0 +1,113 @@
+#include "pch.h"
+#include <windows.h>
+#include "ThemeHelper.h"
+#include "ThemeHelper.g.h"
+
+namespace winrt::PowerToys::Interop::implementation
+{
+
+    // 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 ThemeHelper::SetAppsTheme(bool mode)
+    {
+        HKEY hKey;
+        if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                         L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                         0,
+                         KEY_SET_VALUE,
+                         &hKey) == ERROR_SUCCESS)
+        {
+            DWORD value = mode;
+            RegSetValueEx(hKey, L"AppsUseLightTheme", 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);
+        }
+    }
+
+    void ThemeHelper::SetSystemTheme(bool mode)
+    {
+        HKEY hKey;
+        if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                         L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                         0,
+                         KEY_SET_VALUE,
+                         &hKey) == ERROR_SUCCESS)
+        {
+            DWORD value = 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);
+        }
+    }
+
+    bool ThemeHelper::GetCurrentSystemTheme()
+    {
+        HKEY hKey;
+        DWORD value = 1; // default = light
+        DWORD size = sizeof(value);
+
+        if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                         L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                         0,
+                         KEY_READ,
+                         &hKey) == ERROR_SUCCESS)
+        {
+            RegQueryValueEx(hKey, L"SystemUsesLightTheme", nullptr, nullptr, reinterpret_cast<LPBYTE>(&value), &size);
+            RegCloseKey(hKey);
+        }
+
+        return value == 1; // true = light, false = dark
+    }
+
+    bool ThemeHelper::GetCurrentAppsTheme()
+    {
+        HKEY hKey;
+        DWORD value = 1;
+        DWORD size = sizeof(value);
+
+        if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                         L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                         0,
+                         KEY_READ,
+                         &hKey) == ERROR_SUCCESS)
+        {
+            RegQueryValueEx(hKey, L"AppsUseLightTheme", nullptr, nullptr, reinterpret_cast<LPBYTE>(&value), &size);
+            RegCloseKey(hKey);
+        }
+
+        return value == 1; // true = light, false = dark
+    }
+}
+
+#include "ThemeHelper.g.cpp"