merging main

removed unneeded comments
2025-12-31 01:16:59 +01:00 · 2025-09-03 09:57:51 -04:00 · 2025-09-02 11:43:45 -04:00 · 2025-09-02 11:40:19 -04:00 · 2025-09-02 11:25:36 -04:00 · 2025-09-02 10:49:21 -04:00
241 changed files with 17434 additions and 8475 deletions
--- a/.github/actions/spell-check/allow/code.txt
+++ b/.github/actions/spell-check/allow/code.txt
@@ -94,7 +94,6 @@ onefuzzingestionpreparationtool
 OTP
 Yubi
 Yubico
-Perplexity
 svgl

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

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

 # 8LWXpg is user name but user folder causes a flag
 LWXpg
-# 0x6f677548 is user name but user folder causes a flag
-x6f677548
 Adoumie
 Advaith
 alekhyareddy
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -247,7 +247,6 @@ CONFIGW
 CONFLICTINGMODIFIERKEY
 CONFLICTINGMODIFIERSHORTCUT
 CONOUT
-coreclr
 constexpr
 contentdialog
 contentfiles
@@ -269,8 +268,6 @@ cpcontrols
 cph
 cplusplus
 CPower
-cpptools
-cppvsdbg
 cppwinrt
 createdump
 CREATEPROCESS
@@ -282,7 +279,6 @@ CRH
 critsec
 cropandlock
 Crossdevice
-csdevkit
 CSearch
 CSettings
 cso
@@ -310,7 +306,6 @@ CXVIRTUALSCREEN
 CYSCREEN
 CYSMICON
 CYVIRTUALSCREEN
-Czechia
 cziplib
 Dac
 dacl
@@ -335,7 +330,6 @@ Deact
 debugbreak
 decryptor
 Dedup
-Deduplicator
 Deeplink
 DEFAULTBOOTSTRAPPERINSTALLFOLDER
 DEFAULTCOLOR
@@ -441,7 +435,6 @@ EDITSHORTCUTS
 EDITTEXT
 EFile
 ekus
-emojis
 ENABLEDELAYEDEXPANSION
 ENABLEDPOPUP
 ENABLETAB
@@ -806,7 +799,6 @@ KEYBOARDMANAGEREDITORLIBRARYWRAPPER
 keyboardmanagerstate
 keyboardmanagerui
 keyboardtester
-keycap
 KEYEVENTF
 KEYIMAGE
 keynum
@@ -1455,6 +1447,7 @@ rstringalnum
 rstringalpha
 rstringdigit
 rtb
+RTB
 RTLREADING
 rtm
 runas
@@ -1787,13 +1780,10 @@ UACUI
 UAL
 uap
 UBR
-UBreak
-ubrk
 UCallback
 ucrt
 ucrtd
 uefi
-UError
 uesc
 UFlags
 UHash
@@ -1801,7 +1791,6 @@ UIA
 UIEx
 uild
 uitests
-UITo
 ULONGLONG
 ums
 uncompilable
@@ -1864,7 +1853,6 @@ VFT
 vget
 vgetq
 viewmodels
-virama
 VIRTKEY
 VIRTUALDESK
 VISEGRADRELAY
@@ -2016,7 +2004,6 @@ XButton
 xclip
 xcopy
 XDeployment
-xdf
 XDocument
 XElement
 xfd
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -1,43 +0,0 @@
-# PowerToys – Copilot guide (concise)
-
-This is the top-level guide for AI changes. Keep edits small, follow existing patterns, and cite exact paths in PRs.
-
-Repo map (1‑line per area)
- Core apps: `src/runner/**` (tray/loader), `src/settings-ui/**` (Settings app)
- Shared libs: `src/common/**`
- Modules: `src/modules/*` (one per utility; Command Palette in `src/modules/cmdpal/**`)
- Build tools/docs: `tools/**`, `doc/devdocs/**`
-
-Build and test (defaults)
- Prerequisites: Visual Studio 2022 17.4+, minimal Windows 10 1803+.
- Build discipline:
-  - One terminal per operation (build → test). Don’t switch/open new ones mid-flow.
-  - After making changes, `cd` to the project folder that changed (`.csproj`/`.vcxproj`).
-  - Use script(s) to build, synchronously block and wait in foreground for it to finish: `tools/build/build.ps1|.cmd` (current folder), `build-essentials.*` (once per brand new build for missing nuget packages)
-  - Treat build **exit code 0** as success; any non-zero exit code is a failure, have Copilot read the errors log in the build folder (e.g., `build.*.*.errors.log`) and surface problems.
-  - Don’t start tests or launch Runner until the previous step succeeded.
- Tests (fast + targeted):
-  - Find the test project by product code prefix (e.g., FancyZones, AdvancedPaste). Look for a sibling folder or 1–2 levels up named like `<Product>*UnitTests` or `<Product>*UITests`.
-  - Build the test project, wait for **exit**, then run only those tests via VS Test Explorer or `vstest.console.exe` with filters. Avoid `dotnet test` in this repo.
-  - Add/adjust tests when changing behavior; if skipped, state why (e.g., comment-only, string rename).
-
-Pull requests (expectations)
- Atomic: one logical change; no drive‑by refactors.
- Describe: problem / approach / risk / test evidence.
- List: touched paths if not obvious.
-
-When to ask for clarification
- Ambiguous spec after scanning relevant docs (see below).
- Cross-module impact (shared enum/struct) not clear.
- Security / elevation / installer changes.
-
-Logging (use existing stacks)
- C++: `src/common/logger/**` (`Logger::info|warn|error|debug`). Keep hot paths quiet (hooks, tight loops).
- C#: `ManagedCommon.Logger` (`LogInfo|LogWarning|LogError|LogDebug|LogTrace`). Some UIs use injected `ILogger` via `LoggerInstance.Logger`.
-
-Docs to consult
- `tools/build/BUILD-GUIDELINES.md`
- `doc/devdocs/core/architecture.md`, `doc/devdocs/core/runner.md`, `doc/devdocs/core/settings/readme.md`, `doc/devdocs/modules/readme.md`
-
-Done checklist (self review before finishing)
- Build clean? Tests updated/passed? No unintended formatting? Any new dependency? Documented skips?
--- a/.github/workflows/manual-batch-issue-deduplication.yml
+++ b/.github/workflows/manual-batch-issue-deduplication.yml
@@ -1,38 +1,20 @@
 name: Manual Batch Issue Deduplication

 on:
-  workflow_dispatch:
-    inputs:
-      issue_numbers:
-        description: "JSON array of issue numbers to deduplicate (e.g. [101,102,103])"
-        required: true
-      since:
-        description: "Only compare against issues created after this date (ISO 8601, e.g. 2019-05-05T00:00:00Z)"
-        required: false
-        default: "2019-05-05T00:00:00Z"
-      label_as_duplicate:
-        description: "Apply duplicate label if duplicates are found (true/false)"
-        required: false
-        default: "true"
-
-permissions:
-  models: read
-  issues: write
+  workflow_dispatch: # Only runs when manually triggered

 jobs:
-  deduplicate:
+  batch-deduplicate:
    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        issue: ${{ fromJson(github.event.inputs.issue_numbers) }}
    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Run GenAI Issue Deduplicator
+      - name: Batch Deduplicate Issues
        uses: pelikhan/action-genai-issue-dedup@v0
        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          github_issue: ${{ matrix.issue }}
-          label_as_duplicate: ${{ github.event.inputs.label_as_duplicate }}
-          
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          label-duplicate: "potential duplicate"
+          comment-duplicate: true
+          close-duplicate: false
+          batch-size: 100 
+          since: '2019-05-05T00:00:00Z' # Process issues dating back to 2019
+          duplicate-comment-template: "This issue appears to be a duplicate of #{duplicate_issue_number}."
+          # Add other action-specific inputs if needed
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,43 +0,0 @@
-{
-    "version": "0.2.0",
-    "inputs": [
-        {
-            "id": "arch",
-            "type": "pickString",
-            "description": "Select target architecture",
-            "options": ["x64", "arm64"],
-            "default": "x64"
-        }
-    ],
-    "configurations": [
-        {
-            "name": "Run native executable (no build)",
-            "type": "cppvsdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}\\${input:arch}\\Debug\\PowerToys.exe",
-            "args": [],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-            "console": "integratedTerminal"
-        },
-        {
-            "name": "C/C++ Attach to PowerToys Process (native)",
-            "type": "cppvsdbg",
-            "request": "attach",
-            "processId": "${command:pickProcess}",
-            "symbolSearchPath": "${workspaceFolder}\\${input:arch}\\Debug;${workspaceFolder}\\Debug;${workspaceFolder}\\symbols"
-        },
-        {
-            "name": "Run managed code (managed, no build, ARCH configurable)",
-            "type": "coreclr",
-            "request": "launch",
-            "program": "${workspaceFolder}\\${input:arch}\\Debug\\WinUI3Apps\\PowerToys.Settings.exe",
-            "args": [],
-            "cwd": "${workspaceFolder}",
-            "env": {},
-            "console": "internalConsole",
-            "stopAtEntry": false
-        }
-    ]
-}
--- a/.vscode/mcp.json
+++ b/.vscode/mcp.json
@@ -1,12 +0,0 @@
-{
-  "servers": {
-    "powertoys-mcp": {
-      "command": "D:/work/PowerToys/x64/Debug/PowerToys.MCPServer.exe",
-      "transport": "stdio",
-      "args": [],
-      "env": {
-        "NODE_ENV": "production"
-      }
-    }
-  }
-}
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -61,7 +61,6 @@
    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
    <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
    <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
-	<PackageVersion Include="ModelContextProtocol" Version="0.3.0-preview.4" />
    <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
    <!-- Moq to stay below v4.20 due to behavior change. need to be sure fixed -->
    <PackageVersion Include="Moq" Version="4.18.4" />
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -5,11 +5,13 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runner", "src\runner\runner.vcxproj", "{9412D5C6-2CF2-4FC2-A601-B55508EA9B27}"
 	ProjectSection(ProjectDependencies) = postProject
 		{031AC72E-FA28-4AB7-B690-6F7B9C28AA73} = {031AC72E-FA28-4AB7-B690-6F7B9C28AA73}
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC} = {08E71C67-6A7E-4CA1-B04E-2FB336410BAC}
 		{0B43679E-EDFA-4DA0-AD30-F4628B308B1B} = {0B43679E-EDFA-4DA0-AD30-F4628B308B1B}
 		{0B593A6C-4143-4337-860E-DB5710FB87DB} = {0B593A6C-4143-4337-860E-DB5710FB87DB}
 		{17DA04DF-E393-4397-9CF0-84DABE11032E} = {17DA04DF-E393-4397-9CF0-84DABE11032E}
 		{217DF501-135C-4E38-BFC8-99D4821032EA} = {217DF501-135C-4E38-BFC8-99D4821032EA}
 		{2BE46397-4DFA-414C-9BD4-41E4BBF8CB34} = {2BE46397-4DFA-414C-9BD4-41E4BBF8CB34}
+		{38177D56-6AD1-4ADF-88C9-2843A7932166} = {38177D56-6AD1-4ADF-88C9-2843A7932166}
 		{48804216-2A0E-4168-A6D8-9CD068D14227} = {48804216-2A0E-4168-A6D8-9CD068D14227}
 		{51920F1F-C28C-4ADF-8660-4238766796C2} = {51920F1F-C28C-4ADF-8660-4238766796C2}
 		{5CCC8468-DEC8-4D36-99D4-5C891BEBD481} = {5CCC8468-DEC8-4D36-99D4-5C891BEBD481}
@@ -262,6 +264,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{B39DC643
 		src\common\utils\EventLocker.h = src\common\utils\EventLocker.h
 		src\common\utils\EventWaiter.h = src\common\utils\EventWaiter.h
 		src\common\utils\excluded_apps.h = src\common\utils\excluded_apps.h
+		src\common\utils\shell_ext_registration.h = src\common\utils\shell_ext_registration.h
 		src\common\utils\exec.h = src\common\utils\exec.h
 		src\common\utils\game_mode.h = src\common\utils\game_mode.h
 		src\common\utils\gpo.h = src\common\utils\gpo.h
@@ -281,7 +284,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{B39DC643
 		src\common\utils\registry.h = src\common\utils\registry.h
 		src\common\utils\resources.h = src\common\utils\resources.h
 		src\common\utils\serialized.h = src\common\utils\serialized.h
-		src\common\utils\shell_ext_registration.h = src\common\utils\shell_ext_registration.h
 		src\common\utils\string_utils.h = src\common\utils\string_utils.h
 		src\common\utils\timeutil.h = src\common\utils\timeutil.h
 		src\common\utils\UnhandledExceptionHandler.h = src\common\utils\UnhandledExceptionHandler.h
@@ -793,10 +795,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Window
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.UnitTestBase", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.UnitTestsBase\Microsoft.CmdPal.Ext.UnitTestBase.csproj", "{00D8659C-2068-40B6-8B86-759CD6284BBB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{E11826E1-76DF-42AC-985C-164CC2EE57A1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenRuler.UITests", "src\modules\MeasureTool\Tests\ScreenRuler.UITests\ScreenRuler.UITests.csproj", "{66C069F8-C548-4CA6-8CDE-239104D68E88}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Apps.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.Apps.UnitTests\Microsoft.CmdPal.Ext.Apps.UnitTests.csproj", "{E816D7B1-4688-4ECB-97CC-3D8E798F3830}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Bookmarks.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.Bookmarks.UnitTests\Microsoft.CmdPal.Ext.Bookmarks.UnitTests.csproj", "{E816D7B3-4688-4ECB-97CC-3D8E798F3832}"
@@ -805,9 +803,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WebSea
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Shell.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.Shell.UnitTests\Microsoft.CmdPal.Ext.Shell.UnitTests.csproj", "{E816D7B4-4688-4ECB-97CC-3D8E798F3833}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MCPServer", "MCPServer", "{B637E6DD-FB81-4595-BB9C-01168556EA9E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LightSwitch", "LightSwitch", "{5B201255-53C8-490B-A34F-01F05D48A477}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MCPServer", "src\modules\MCPServer\MCPServer\MCPServer.csproj", "{20CBF173-9E8D-3236-6664-5B9C303794A3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LightSwitchModuleInterface", "src\modules\LightSwitch\LightSwitchModuleInterface\LightSwitchModuleInterface.vcxproj", "{38177D56-6AD1-4ADF-88C9-2843A7932166}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LightModeService", "src\modules\LightSwitch\LightSwitchService\LightSwitchService.vcxproj", "{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -2703,22 +2703,6 @@ Global
 		{61CBF221-9452-4934-B685-146285E080D7}.Release|ARM64.Build.0 = Release|ARM64
 		{61CBF221-9452-4934-B685-146285E080D7}.Release|x64.ActiveCfg = Release|x64
 		{61CBF221-9452-4934-B685-146285E080D7}.Release|x64.Build.0 = Release|x64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|ARM64.Build.0 = Debug|ARM64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|x64.ActiveCfg = Debug|x64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|x64.Build.0 = Debug|x64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|ARM64.ActiveCfg = Release|ARM64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|ARM64.Build.0 = Release|ARM64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|x64.ActiveCfg = Release|x64
-		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|x64.Build.0 = Release|x64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|ARM64.Build.0 = Debug|ARM64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|x64.ActiveCfg = Debug|x64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|x64.Build.0 = Debug|x64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|ARM64.ActiveCfg = Release|ARM64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|ARM64.Build.0 = Release|ARM64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|x64.ActiveCfg = Release|x64
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|x64.Build.0 = Release|x64
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Debug|ARM64.Build.0 = Debug|ARM64
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1}.Debug|x64.ActiveCfg = Debug|x64
@@ -2735,6 +2719,30 @@ Global
 		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|ARM64.Build.0 = Release|ARM64
 		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|x64.ActiveCfg = Release|x64
 		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9}.Release|x64.Build.0 = Release|x64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|ARM64.Build.0 = Debug|ARM64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|x64.ActiveCfg = Debug|x64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Debug|x64.Build.0 = Debug|x64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|ARM64.ActiveCfg = Release|ARM64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|ARM64.Build.0 = Release|ARM64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|x64.ActiveCfg = Release|x64
+		{38F187B2-6638-5A40-072F-DBE5E54070A0}.Release|x64.Build.0 = Release|x64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|ARM64.Build.0 = Debug|ARM64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|x64.ActiveCfg = Debug|x64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Debug|x64.Build.0 = Debug|x64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|ARM64.ActiveCfg = Release|ARM64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|ARM64.Build.0 = Release|ARM64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|x64.ActiveCfg = Release|x64
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE}.Release|x64.Build.0 = Release|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.Build.0 = Debug|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.ActiveCfg = Debug|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.Build.0 = Debug|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.ActiveCfg = Release|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.Build.0 = Release|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.ActiveCfg = Release|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.Build.0 = Release|x64
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|ARM64.Build.0 = Debug|ARM64
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6}.Debug|x64.ActiveCfg = Debug|x64
@@ -2887,14 +2895,6 @@ Global
 		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|ARM64.Build.0 = Release|ARM64
 		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|x64.ActiveCfg = Release|x64
 		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|x64.Build.0 = Release|x64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Debug|ARM64.Build.0 = Debug|ARM64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Debug|x64.ActiveCfg = Debug|x64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Debug|x64.Build.0 = Debug|x64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Release|ARM64.ActiveCfg = Release|ARM64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Release|ARM64.Build.0 = Release|ARM64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Release|x64.ActiveCfg = Release|x64
-		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Release|x64.Build.0 = Release|x64
 		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Debug|ARM64.Build.0 = Debug|ARM64
 		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Debug|x64.ActiveCfg = Debug|x64
@@ -2927,14 +2927,22 @@ Global
 		{E816D7B4-4688-4ECB-97CC-3D8E798F3833}.Release|ARM64.Build.0 = Release|ARM64
 		{E816D7B4-4688-4ECB-97CC-3D8E798F3833}.Release|x64.ActiveCfg = Release|x64
 		{E816D7B4-4688-4ECB-97CC-3D8E798F3833}.Release|x64.Build.0 = Release|x64
-		{20CBF173-9E8D-3236-6664-5B9C303794A3}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{20CBF173-9E8D-3236-6664-5B9C303794A3}.Debug|ARM64.Build.0 = Debug|ARM64
-		{20CBF173-9E8D-3236-6664-5B9C303794A3}.Debug|x64.ActiveCfg = Debug|x64
-		{20CBF173-9E8D-3236-6664-5B9C303794A3}.Debug|x64.Build.0 = Debug|x64
-		{20CBF173-9E8D-3236-6664-5B9C303794A3}.Release|ARM64.ActiveCfg = Release|ARM64
-		{20CBF173-9E8D-3236-6664-5B9C303794A3}.Release|ARM64.Build.0 = Release|ARM64
-		{20CBF173-9E8D-3236-6664-5B9C303794A3}.Release|x64.ActiveCfg = Release|x64
-		{20CBF173-9E8D-3236-6664-5B9C303794A3}.Release|x64.Build.0 = Release|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|ARM64.Build.0 = Debug|ARM64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|x64.ActiveCfg = Debug|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|x64.Build.0 = Debug|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|ARM64.ActiveCfg = Release|ARM64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|ARM64.Build.0 = Release|ARM64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|x64.ActiveCfg = Release|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|x64.Build.0 = Release|x64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Debug|ARM64.Build.0 = Debug|ARM64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Debug|x64.ActiveCfg = Debug|x64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Debug|x64.Build.0 = Debug|x64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Release|ARM64.ActiveCfg = Release|ARM64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Release|ARM64.Build.0 = Release|ARM64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Release|x64.ActiveCfg = Release|x64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3210,10 +3218,10 @@ Global
 		{9BC1C986-1E97-4D07-A7B1-CE226C239EFA} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{99CA1509-FB73-456E-AFAF-AB89C017BD72} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
 		{61CBF221-9452-4934-B685-146285E080D7} = {6B01F1CF-F4DB-48B5-BFE7-0BF576C1D704}
-		{38F187B2-6638-5A40-072F-DBE5E54070A0} = {1AFB6476-670D-4E80-A464-657E01DFF482}
-		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A1} = {2C318EC3-BA86-4372-B1BC-DB0F33C208B2}
 		{43E779F3-D83C-48B1-BA8D-1912DBD76FC9} = {68328142-5B31-4715-BCBB-7B6345EE0971}
+		{38F187B2-6638-5A40-072F-DBE5E54070A0} = {1AFB6476-670D-4E80-A464-657E01DFF482}
+		{DA0744BC-E822-680E-9CEB-D0FBA903A8EE} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
 		{2CF78CF7-8FEB-4BE1-9591-55FA25B48FC6} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{14AFD976-B4D2-49D0-9E6C-AA93CC061B8A} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{9D3F3793-EFE3-4525-8782-238015DABA62} = {66E1534A-1587-42B2-912F-45C994D32904}
@@ -3249,14 +3257,13 @@ Global
 		{E816D7AF-4688-4ECB-97CC-3D8E798F3828} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{E816D7B0-4688-4ECB-97CC-3D8E798F3829} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{00D8659C-2068-40B6-8B86-759CD6284BBB} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{E11826E1-76DF-42AC-985C-164CC2EE57A1} = {7AC943C9-52E8-44CF-9083-744D8049667B}
-		{66C069F8-C548-4CA6-8CDE-239104D68E88} = {E11826E1-76DF-42AC-985C-164CC2EE57A1}
 		{E816D7B1-4688-4ECB-97CC-3D8E798F3830} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{E816D7B3-4688-4ECB-97CC-3D8E798F3832} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{E816D7B2-4688-4ECB-97CC-3D8E798F3831} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{E816D7B4-4688-4ECB-97CC-3D8E798F3833} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{B637E6DD-FB81-4595-BB9C-01168556EA9E} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
-		{20CBF173-9E8D-3236-6664-5B9C303794A3} = {B637E6DD-FB81-4595-BB9C-01168556EA9E}
+		{5B201255-53C8-490B-A34F-01F05D48A477} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
+		{38177D56-6AD1-4ADF-88C9-2843A7932166} = {5B201255-53C8-490B-A34F-01F05D48A477}
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC} = {5B201255-53C8-490B-A34F-01F05D48A477}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}
--- a/doc/devdocs/development/debugging.md
+++ b/doc/devdocs/development/debugging.md
@@ -18,8 +18,8 @@ You can build the entire solution from the command line, which is sometimes fast
 1. Open Developer Command Prompt for VS 2022
 2. Navigate to the repository root directory
 3. Run the following command(don't forget to set the correct platform):
-   ```pwsh
-   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.sln /tl /p:NuGetInteractive="true"
+   ```
+   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.sln
   ```
 4. This process should complete in approximately 13-14 minutes for a full build

--- a/doc/devdocs/development/dev-with-vscode.md
+++ b/doc/devdocs/development/dev-with-vscode.md
@@ -1,128 +0,0 @@
-## Developing PowerToys with Visual Studio Code
-
-This guide shows how to build, debug, and contribute to PowerToys using VS Code instead of (or alongside) full Visual Studio. It focuses on common inner‑loop tasks for C++, .NET, and mixed scenarios present in the solution.
-
-> PowerToys is a large mixed C++ / C# / WinAppSDK solution. VS Code works well for incremental development and quick module iterations, but occasionally you may still prefer full Visual Studio for designer tooling or specialized diagnostics.
-
---
-VS Code extensions Needed:
-
-| Area | Extension | Notes |
-|------|-----------|-------|
-| C++ | ms-vscode.cpptools | IntelliSense, debugging (cppvsdbg) |
-| C# | ms-dotnettools.csdevkit (or C#) | Language service / test explorer |
-
---
-
-## Building in VS Code
-### Configure developer powershell for vs2022 for more convenient dev in vscode.
-1. Configure profile in in settings, entry:  "terminal.integrated.profiles.windows"
-2. Add below config as entry:
-```json
-    "Developer PowerShell for VS 2022": {
-		// Configure based on your preference
-        "path": "C:\\Program Files\\WindowsApps\\Microsoft.PowerShell_7.5.2.0_arm64__8wekyb3d8bbwe\\pwsh.exe",
-        "args": [
-            "-NoExit",
-            "-Command",
-            "& {",
-            "$orig = Get-Location;",
-            // Configure based on your environment
-            "& 'C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Common7\\Tools\\Launch-VsDevShell.ps1';",
-            "Set-Location $orig",
-            "}"
-        ]
-    },
-```
-3. [Optional] Set Developer PowerShell for VS 2022 as your default profile, so that you can get a deep integration with vscode coding agent. 
-
-4. Now You can build with plain `msbuild` or configure tasks.json in below section
-Or reach out to "tools\build\BUILD-GUIDELINES.md"
-
-### Sample plain msbuild command
-```powershell
-# Restore:
-msbuild powertoys.sln -t:restore -p:configuration=debug -p:platform=x64 -m
-
-# Build powertoys sln
-msbuild powertoys.sln -p:configuration=debug -p:platform=x64 -m
-
-# dotnet project
-msbuild src\settings-ui\Settings.UI\PowerToys.Settings.csproj -p:Platform=x64 -p:Configuration=Debug -m
-
-# native project
-msbuild "src\modules\MouseUtils\FindMyMouse\FindMyMouse.vcxproj" -p:Configuration=Debug -p:Platform=x64 -m
-```
-
---
-
-## Debugging
-
-### Existing launch configuration
-
-The repo provides `.vscode/launch.json` with:
-
- `Run PowerToys.exe (no build)`: Launches the already-built executable at `x64/Debug/PowerToys.exe` using `cppvsdbg`.
-
-Build first, then press F5. To switch configuration (Release / ARM64) either edit the path or create additional launch entries.
-
-### Attaching to a running instance
-
-If PowerToys is already running, you can attach to that process:
-
-2. VS Code command palette: “C/C++: (Windows) Attach to Process”.
-3. Filter for `PowerToys.exe` / module-specific processes.
-
-### Debugging managed components
-
-Many modules have a managed component loaded into the PowerToys process. `cppvsdbg` can debug mixed mode, but if you need richer .NET inspection you can create a second configuration using `type: coreclr` and `processId` attachment after the native launch, or just attach separately:
-
-Similar for attach to managed code.
-> Note: In arm64 machine, can only debug arm64 code.
-
-```jsonc
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Run native executable (no build)",
-            "type": "cppvsdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}\\x64\\Debug\\PowerToys.exe",
-            "args": [],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-            "console": "integratedTerminal"
-        },
-        {
-            "name": "C/C++ Attach to PowerToys Process (native)",
-            "type": "cppvsdbg",
-            "request": "attach",
-            "processId": "${command:pickProcess}",
-            "symbolSearchPath": "${workspaceFolder}\\x64\\Debug;${workspaceFolder}\\Debug;${workspaceFolder}\\symbols"
-        },
-        {
-            "name": "Run managed code (managed, no build)",
-            "type": "coreclr",
-            "request": "launch",
-            "program": "${workspaceFolder}\\arm64\\Debug\\WinUI3Apps\\PowerToys.Settings.exe",
-            "args": [],
-            "cwd": "${workspaceFolder}",
-            "env": {},
-            "console": "internalConsole",
-            "stopAtEntry": false
-        }
-    ]
-}
-```
---
-
-## 6. Common tasks & tips
-
-| Task | Command / Action | Notes |
-|------|------------------|-------|
-| Clean | `git clean -xdf` (careful) or `msbuild /t:Clean PowerToys.sln` | Deep clean removes packages & build outputs |
-| Rebuild single project | `msbuild path\to\proj.vcxproj /t:Rebuild -p:Platform=x64 -p:Configuration=Debug` | Faster than whole solution |
-| Generate installer (rare in inner loop) | See `tools\build\build-installer.ps1` | Usually not needed for local debug |
-| Resource conversion errors | Re-run restore + build | Triggers custom PowerShell targets |
--- a/doc/thirdPartyRunPlugins.md
+++ b/doc/thirdPartyRunPlugins.md
@@ -73,5 +73,4 @@ Below are community created plugins that target a website or software.  They are
 | [YubicoOauthOTP](https://github.com/dlnilsson/Community.PowerToys.Run.Plugin.YubicoOauthOTP) | [dlnilsson](https://github.com/dlnilsson) | Display generated codes from OATH accounts stored on the YubiKey in powerToys Run  |
 | [Firefox Bookmark](https://github.com/8LWXpg/PowerToysRun-FirefoxBookmark) | [8LWXpg](https://github.com/8LWXpg) | Open bookmarks in Firefox based browser |
 | [Linear](https://github.com/vednig/powertoys-linear) | [vednig](https://github.com/vednig) | Create Linear Issues directly from Powertoys Run |
-| [PerplexitySearchShortcut](https://github.com/0x6f677548/PowerToys-Run-PerplexitySearchShortcut) | [0x6f677548](https://github.com/0x6f677548) | Search Perplexity |
 | [SpeedTest](https://github.com/ruslanlap/PowerToysRun-SpeedTest) | [ruslanlap](https://github.com/ruslanlap) | One-command internet speed tests with real-time results, modern UI, and shareable links. |
--- a/nuget.config
+++ b/nuget.config
@@ -2,11 +2,11 @@
 <configuration>
 	<packageSources>
 		<clear />
-		<add key="PowerToysPublicDependencies" value="https://pkgs.dev.azure.com/shine-oss/PowerToys/_packaging/PowerToysPublicDependencies/nuget/v3/index.json" />
+		<add key="PowerToysPublicDependencies" value="https://pkgs.dev.azure.com/shine-oss/PowerToys/_packaging/PowerToysPublicDependencies%40Local/nuget/v3/index.json" />
 	</packageSources>
 	<packageSourceMapping>
 		<packageSource key="PowerToysPublicDependencies">
 			<package pattern="*" />
 		</packageSource>
 	</packageSourceMapping>
-</configuration>
+</configuration>
--- a/src/common/Common.UI/SettingsDeepLink.cs
+++ b/src/common/Common.UI/SettingsDeepLink.cs
@@ -17,6 +17,7 @@ namespace Common.UI
            Awake,
            ColorPicker,
            CmdNotFound,
+            LightSwitch,
            FancyZones,
            FileLocksmith,
            Run,
@@ -60,6 +61,8 @@ namespace Common.UI
                    return "ColorPicker";
                case SettingsWindow.CmdNotFound:
                    return "CmdNotFound";
+                case SettingsWindow.LightSwitch:
+                    return "LightSwitch";
                case SettingsWindow.FancyZones:
                    return "FancyZones";
                case SettingsWindow.FileLocksmith:
--- a/src/common/GPOWrapper/GPOWrapper.cpp
+++ b/src/common/GPOWrapper/GPOWrapper.cpp
@@ -28,6 +28,10 @@ namespace winrt::PowerToys::GPOWrapper::implementation
    {
        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredCropAndLockEnabledValue());
    }
+    GpoRuleConfigured GPOWrapper::GetConfiguredLightSwitchEnabledValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredLightSwitchEnabledValue());
+    }
    GpoRuleConfigured GPOWrapper::GetConfiguredFancyZonesEnabledValue()
    {
        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredFancyZonesEnabledValue());
--- a/src/common/GPOWrapper/GPOWrapper.h
+++ b/src/common/GPOWrapper/GPOWrapper.h
@@ -13,6 +13,7 @@ namespace winrt::PowerToys::GPOWrapper::implementation
        static GpoRuleConfigured GetConfiguredCmdPalEnabledValue();
        static GpoRuleConfigured GetConfiguredColorPickerEnabledValue();
        static GpoRuleConfigured GetConfiguredCropAndLockEnabledValue();
+        static GpoRuleConfigured GetConfiguredLightSwitchEnabledValue();
        static GpoRuleConfigured GetConfiguredFancyZonesEnabledValue();
        static GpoRuleConfigured GetConfiguredFileLocksmithEnabledValue();
        static GpoRuleConfigured GetConfiguredSvgPreviewEnabledValue();
--- a/src/common/GPOWrapper/GPOWrapper.idl
+++ b/src/common/GPOWrapper/GPOWrapper.idl
@@ -17,6 +17,7 @@ namespace PowerToys
            static GpoRuleConfigured GetConfiguredCmdPalEnabledValue();
            static GpoRuleConfigured GetConfiguredColorPickerEnabledValue();
            static GpoRuleConfigured GetConfiguredCropAndLockEnabledValue();
+            static GpoRuleConfigured GetConfiguredLightSwitchEnabledValue();
            static GpoRuleConfigured GetConfiguredFancyZonesEnabledValue();
            static GpoRuleConfigured GetConfiguredFileLocksmithEnabledValue();
            static GpoRuleConfigured GetConfiguredSvgPreviewEnabledValue();
--- a/src/common/ManagedCommon/ErrorResponse.cs
+++ b/src/common/ManagedCommon/ErrorResponse.cs
@@ -1,24 +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.
-
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-
-namespace ManagedCommon
-{
-    public sealed class ErrorResponse
-    {
-        public string Error { get; set; } = string.Empty;
-
-        public IEnumerable<string>? RegisteredModules { get; set; }
-
-        public string[]? AvailableEndpoints { get; set; }
-
-        public int? StatusCode { get; set; }
-
-        public DateTimeOffset Timestamp { get; set; }
-    }
-}
--- a/src/common/ManagedCommon/GlobalStatusResponse.cs
+++ b/src/common/ManagedCommon/GlobalStatusResponse.cs
@@ -1,26 +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.
-
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-
-namespace ManagedCommon
-{
-    public sealed class GlobalStatusResponse
-    {
-        public string Application { get; set; } = string.Empty;
-
-        public string? Version { get; set; }
-
-        public string Status { get; set; } = string.Empty;
-
-        public int RegisteredModules { get; set; }
-
-        public Dictionary<string, ModuleStatusResponse> Modules { get; set; } = [];
-
-        public DateTimeOffset Timestamp { get; set; }
-    }
-}
--- a/src/common/ManagedCommon/HttpServer.cs
+++ b/src/common/ManagedCommon/HttpServer.cs
@@ -1,358 +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.
-
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace ManagedCommon
-{
-    public sealed class HttpServer : IDisposable
-    {
-        private readonly HttpListener _listener;
-        private readonly CancellationTokenSource _cancellationTokenSource;
-        private readonly Dictionary<string, IHttpRequestHandler> _requestHandlers;
-        private readonly JsonSerializerOptions _fallbackJsonOptions;
-        private Task? _listenerTask;
-        private bool _disposed;
-
-        public HttpServer(string prefix = "http://localhost:8080/")
-        {
-            _listener = new HttpListener();
-            _listener.Prefixes.Add(prefix);
-            _cancellationTokenSource = new CancellationTokenSource();
-            _requestHandlers = new Dictionary<string, IHttpRequestHandler>(StringComparer.OrdinalIgnoreCase);
-
-            // Cached fallback options for generic deserialization
-            _fallbackJsonOptions = new JsonSerializerOptions
-            {
-                PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-            };
-
-            Logger.LogInfo($"HTTP server configured to listen on: {prefix}");
-        }
-
-        /// <summary>
-        /// Register a request handler for a specific module.
-        /// </summary>
-        /// <param name="handler">The request handler to register.</param>
-        public void RegisterHandler(IHttpRequestHandler handler)
-        {
-            ArgumentNullException.ThrowIfNull(handler);
-
-            if (string.IsNullOrWhiteSpace(handler.ModuleName))
-            {
-                throw new ArgumentException("Module name cannot be null or empty", nameof(handler));
-            }
-
-            _requestHandlers[handler.ModuleName] = handler;
-            Logger.LogInfo($"Registered HTTP handler for module: {handler.ModuleName}");
-        }
-
-        /// <summary>
-        /// Unregister a request handler for a specific module.
-        /// </summary>
-        /// <param name="moduleName">The name of the module to unregister.</param>
-        public void UnregisterHandler(string moduleName)
-        {
-            if (_requestHandlers.Remove(moduleName))
-            {
-                Logger.LogInfo($"Unregistered HTTP handler for module: {moduleName}");
-            }
-        }
-
-        public void Start()
-        {
-            try
-            {
-                _listener.Start();
-                Logger.LogInfo("HTTP server started successfully");
-
-                _listenerTask = Task.Run(async () => await ListenAsync(_cancellationTokenSource.Token));
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError($"Failed to start HTTP server: {ex.Message}");
-                throw;
-            }
-        }
-
-        public void Stop()
-        {
-            try
-            {
-                _cancellationTokenSource.Cancel();
-                _listener.Stop();
-                _listenerTask?.Wait(TimeSpan.FromSeconds(5));
-                Logger.LogInfo("HTTP server stopped");
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError($"Error stopping HTTP server: {ex.Message}");
-            }
-        }
-
-        /// <summary>
-        /// Utility method for modules to write JSON responses.
-        /// </summary>
-        /// <param name="response">The HTTP response to write to.</param>
-        /// <param name="data">The object to serialize as JSON.</param>
-        public async Task WriteJsonResponseAsync(HttpListenerResponse response, object data)
-        {
-            response.ContentType = "application/json";
-            response.ContentEncoding = Encoding.UTF8;
-
-            string json = data switch
-            {
-                ServerStatusResponse serverStatus => JsonSerializer.Serialize(serverStatus, HttpServerJsonContext.Default.ServerStatusResponse),
-                GlobalStatusResponse globalStatus => JsonSerializer.Serialize(globalStatus, HttpServerJsonContext.Default.GlobalStatusResponse),
-                ErrorResponse error => JsonSerializer.Serialize(error, HttpServerJsonContext.Default.ErrorResponse),
-                _ => JsonSerializer.Serialize(data, HttpServerJsonContext.Default.Object),
-            };
-
-            var buffer = Encoding.UTF8.GetBytes(json);
-
-            response.ContentLength64 = buffer.Length;
-            await response.OutputStream.WriteAsync(buffer.AsMemory(), _cancellationTokenSource.Token);
-            response.Close();
-        }
-
-        /// <summary>
-        /// Utility method for modules to read JSON request bodies as string.
-        /// Modules should handle their own deserialization to maintain AOT compatibility.
-        /// </summary>
-        /// <param name="request">The HTTP request to read from.</param>
-        /// <returns>The JSON string, or null if no body.</returns>
-        public async Task<string?> ReadJsonRequestBodyAsync(HttpListenerRequest request)
-        {
-            if (!request.HasEntityBody)
-            {
-                return null;
-            }
-
-            using var reader = new StreamReader(request.InputStream, Encoding.UTF8);
-            var body = await reader.ReadToEndAsync();
-
-            return string.IsNullOrWhiteSpace(body) ? null : body;
-        }
-
-        /// <summary>
-        /// Legacy utility method for modules to read JSON request bodies.
-        /// Warning: This method uses reflection-based deserialization and is not AOT-compatible.
-        /// Consider using ReadJsonRequestBodyAsync and handling deserialization in your module.
-        /// </summary>
-        /// <typeparam name="T">The type to deserialize to.</typeparam>
-        /// <param name="request">The HTTP request to read from.</param>
-        /// <returns>The deserialized object, or null if no body or invalid JSON.</returns>
-        [Obsolete("Use ReadJsonRequestBodyAsync and handle deserialization in your module for AOT compatibility")]
-        public async Task<T?> ReadJsonRequestAsync<T>(HttpListenerRequest request)
-            where T : class
-        {
-            var body = await ReadJsonRequestBodyAsync(request);
-            if (body == null)
-            {
-                return null;
-            }
-
-            try
-            {
-#pragma warning disable IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling
-                return JsonSerializer.Deserialize<T>(body, _fallbackJsonOptions);
-#pragma warning restore IL3050
-#pragma warning restore IL2026
-            }
-            catch (JsonException ex)
-            {
-                Logger.LogError($"Error deserializing request body: {ex.Message}");
-                return null;
-            }
-        }
-
-        public void Dispose()
-        {
-            if (!_disposed)
-            {
-                Stop();
-                _cancellationTokenSource?.Dispose();
-                _listener?.Close();
-                _disposed = true;
-            }
-        }
-
-        private async Task ListenAsync(CancellationToken cancellationToken)
-        {
-            while (!cancellationToken.IsCancellationRequested && _listener.IsListening)
-            {
-                try
-                {
-                    var contextTask = _listener.GetContextAsync();
-                    var context = await contextTask.ConfigureAwait(false);
-
-                    // Handle request asynchronously without blocking the listener
-                    _ = Task.Run(async () => await HandleRequestAsync(context), cancellationToken);
-                }
-                catch (ObjectDisposedException)
-                {
-                    // Expected when listener is stopped
-                    break;
-                }
-                catch (HttpListenerException ex) when (ex.ErrorCode == 995)
-                {
-                    // Expected when listener is stopped
-                    break;
-                }
-                catch (Exception ex)
-                {
-                    Logger.LogError($"Error in HTTP listener: {ex.Message}");
-                }
-            }
-        }
-
-        private async Task HandleRequestAsync(HttpListenerContext context)
-        {
-            try
-            {
-                var request = context.Request;
-                var response = context.Response;
-
-                Logger.LogInfo($"HTTP Request: {request.HttpMethod} {request.Url?.AbsolutePath}");
-
-                // Set CORS headers
-                response.Headers.Add("Access-Control-Allow-Origin", "*");
-                response.Headers.Add("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS");
-                response.Headers.Add("Access-Control-Allow-Headers", "Content-Type");
-
-                if (request.HttpMethod == "OPTIONS")
-                {
-                    response.StatusCode = 200;
-                    response.Close();
-                    return;
-                }
-
-                var path = request.Url?.AbsolutePath?.TrimStart('/');
-
-                if (string.IsNullOrEmpty(path))
-                {
-                    await HandleRootRequestAsync(response);
-                    return;
-                }
-
-                // Parse the path to extract module name and sub-path
-                var segments = path.Split('/', 2);
-                var moduleName = segments[0];
-                var subPath = segments.Length > 1 ? segments[1] : string.Empty;
-
-                // Check for global endpoints
-                if (string.Equals(moduleName, "status", StringComparison.OrdinalIgnoreCase))
-                {
-                    await HandleGlobalStatusAsync(response);
-                    return;
-                }
-
-                // Route to module-specific handler
-                if (_requestHandlers.TryGetValue(moduleName, out var handler))
-                {
-                    try
-                    {
-                        await handler.HandleRequestAsync(context, subPath);
-                    }
-                    catch (Exception ex)
-                    {
-                        Logger.LogError($"Error in module handler for {moduleName}: {ex.Message}");
-                        await HandleErrorAsync(response, 500, $"Internal server error in {moduleName} module: {ex.Message}");
-                    }
-                }
-                else
-                {
-                    await HandleNotFoundAsync(response, moduleName);
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError($"Unhandled error in HTTP request handler: {ex.Message}");
-            }
-        }
-
-        private async Task HandleRootRequestAsync(HttpListenerResponse response)
-        {
-            var rootInfo = new ServerStatusResponse
-            {
-                Application = "PowerToys HTTP Server",
-                Version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version?.ToString(),
-                Status = "Running",
-                RegisteredModules = _requestHandlers.Keys,
-                AvailableEndpoints = [
-                    "GET /status - Get server status",
-                    "GET /{module}/... - Module-specific endpoints",
-                ],
-                Timestamp = DateTimeOffset.Now,
-            };
-
-            await WriteJsonResponseAsync(response, rootInfo);
-        }
-
-        private async Task HandleGlobalStatusAsync(HttpListenerResponse response)
-        {
-            var moduleStatuses = new Dictionary<string, ModuleStatusResponse>();
-
-            foreach (var kvp in _requestHandlers)
-            {
-                moduleStatuses[kvp.Key] = new ModuleStatusResponse
-                {
-                    ModuleName = kvp.Value.ModuleName,
-                    AvailableEndpoints = kvp.Value.GetAvailableEndpoints(),
-                };
-            }
-
-            var status = new GlobalStatusResponse
-            {
-                Application = "PowerToys HTTP Server",
-                Version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version?.ToString(),
-                Status = "Running",
-                RegisteredModules = _requestHandlers.Count,
-                Modules = moduleStatuses,
-                Timestamp = DateTimeOffset.Now,
-            };
-
-            await WriteJsonResponseAsync(response, status);
-        }
-
-        private async Task HandleNotFoundAsync(HttpListenerResponse response, string requestedModule)
-        {
-            var errorResponse = new ErrorResponse
-            {
-                Error = $"Module '{requestedModule}' not found",
-                RegisteredModules = _requestHandlers.Keys,
-                AvailableEndpoints = [
-                    "GET /status - Get server status and available modules",
-                ],
-                Timestamp = DateTimeOffset.Now,
-            };
-
-            response.StatusCode = 404;
-            await WriteJsonResponseAsync(response, errorResponse);
-        }
-
-        private async Task HandleErrorAsync(HttpListenerResponse response, int statusCode, string message)
-        {
-            response.StatusCode = statusCode;
-            var errorResponse = new ErrorResponse
-            {
-                Error = message,
-                StatusCode = statusCode,
-                Timestamp = DateTimeOffset.Now,
-            };
-
-            await WriteJsonResponseAsync(response, errorResponse);
-        }
-    }
-}
--- a/src/common/ManagedCommon/HttpServerJsonContext.cs
+++ b/src/common/ManagedCommon/HttpServerJsonContext.cs
@@ -1,23 +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.
-
-#nullable enable
-
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-
-namespace ManagedCommon
-{
-    [JsonSerializable(typeof(ServerStatusResponse))]
-    [JsonSerializable(typeof(ModuleStatusResponse))]
-    [JsonSerializable(typeof(GlobalStatusResponse))]
-    [JsonSerializable(typeof(ErrorResponse))]
-    [JsonSerializable(typeof(Dictionary<string, ModuleStatusResponse>))]
-    [JsonSerializable(typeof(string[]))]
-    [JsonSerializable(typeof(IEnumerable<string>))]
-    [JsonSerializable(typeof(object))]
-    internal sealed partial class HttpServerJsonContext : JsonSerializerContext
-    {
-    }
-}
--- a/src/common/ManagedCommon/IHttpRequestHandler.cs
+++ b/src/common/ManagedCommon/IHttpRequestHandler.cs
@@ -1,36 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace ManagedCommon
-{
-    public interface IHttpRequestHandler
-    {
-        /// <summary>
-        /// Handle an HTTP request for this module.
-        /// </summary>
-        /// <param name="context">The HTTP context containing request and response.</param>
-        /// <param name="path">The requested path (after module prefix).</param>
-        /// <returns>Task representing the async operation.</returns>
-        Task HandleRequestAsync(HttpListenerContext context, string path);
-
-        /// <summary>
-        /// Get the module name used for URL routing (e.g., "awake", "fancyzones").
-        /// </summary>
-        string ModuleName { get; }
-
-        /// <summary>
-        /// Get the available endpoints for this module (for documentation).
-        /// </summary>
-        string[] GetAvailableEndpoints();
-    }
-}
--- a/src/common/ManagedCommon/ModuleStatusResponse.cs
+++ b/src/common/ManagedCommon/ModuleStatusResponse.cs
@@ -1,15 +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.
-
-#nullable enable
-
-namespace ManagedCommon
-{
-    public sealed class ModuleStatusResponse
-    {
-        public string ModuleName { get; set; } = string.Empty;
-
-        public string[] AvailableEndpoints { get; set; } = [];
-    }
-}
--- a/src/common/ManagedCommon/ModuleType.cs
+++ b/src/common/ManagedCommon/ModuleType.cs
@@ -12,6 +12,7 @@ namespace ManagedCommon
        ColorPicker,
        CmdPal,
        CropAndLock,
+        LightSwitch,
        EnvironmentVariables,
        FancyZones,
        FileLocksmith,
--- a/src/common/ManagedCommon/RotSingletonHost.cs
+++ b/src/common/ManagedCommon/RotSingletonHost.cs
@@ -1,225 +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.Runtime.InteropServices;
-using System.Threading;
-
-#nullable enable
-#pragma warning disable IL2050 // Suppress COM interop trimming warnings for ROT hosting P/Invokes (desktop only scenario)
-
-namespace ManagedCommon
-{
-    /// <summary>
-    /// Generic helper to host a single COM-visible automation object in the Running Object Table (ROT)
-    /// without registry/CLSID class factory registration. Used for lightweight cross-process automation.
-    /// Pattern: create instance -> register with moniker -> wait until Stop.
-    /// Threading: spins up a dedicated STA thread so objects needing STA semantics are safe.
-    /// </summary>
-    public sealed class RotSingletonHost : IDisposable
-    {
-        private readonly Lock _sync = new();
-        private readonly Func<object> _factory;
-        private readonly string _monikerName;
-        private readonly string _threadName;
-        private readonly ManualResetEvent _shutdown = new(false);
-
-        private Thread? _thread;
-        private int _rotCookie;
-        private object? _instance; // keep alive
-        private IMoniker? _moniker;
-        private bool _disposed;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RotSingletonHost"/> class.
-        /// </summary>
-        /// <param name="monikerName">Moniker name (logical unique id), e.g. "Awake.Automation".</param>
-        /// <param name="factory">Factory that creates the object to expose. Should return a COM-visible object.</param>
-        /// <param name="threadName">Optional thread name for diagnostics.</param>
-        public RotSingletonHost(string monikerName, Func<object> factory, string? threadName = null)
-        {
-            _monikerName = string.IsNullOrWhiteSpace(monikerName) ? throw new ArgumentException("Moniker required", nameof(monikerName)) : monikerName;
-            _factory = factory ?? throw new ArgumentNullException(nameof(factory));
-            _threadName = threadName ?? $"RotHost:{_monikerName}";
-        }
-
-        public bool IsRunning => _thread != null;
-
-        public string MonikerName => _monikerName;
-
-        public void Start()
-        {
-            lock (_sync)
-            {
-                if (_disposed)
-                {
-                    ObjectDisposedException.ThrowIf(_disposed, this);
-                }
-
-                if (_thread != null)
-                {
-                    return; // already running
-                }
-
-                _thread = new Thread(ThreadMain)
-                {
-                    IsBackground = true,
-                    Name = _threadName,
-                };
-                _thread.SetApartmentState(ApartmentState.STA);
-                _thread.Start();
-                Logger.LogInfo($"ROT host starting for moniker '{_monikerName}'");
-            }
-        }
-
-        public void Stop()
-        {
-            lock (_sync)
-            {
-                if (_thread == null)
-                {
-                    return;
-                }
-
-                _shutdown.Set();
-            }
-
-            _thread?.Join(3000);
-            _thread = null;
-            _shutdown.Reset();
-        }
-
-        private void ThreadMain()
-        {
-            int hr = Ole32.CoInitializeEx(IntPtr.Zero, Ole32.CoinitApartmentThreaded);
-            if (hr < 0)
-            {
-                Logger.LogError($"CoInitializeEx failed: 0x{hr:X8}");
-                return;
-            }
-
-            try
-            {
-                hr = Ole32.GetRunningObjectTable(0, out var rot);
-                if (hr < 0 || rot == null)
-                {
-                    Logger.LogError($"GetRunningObjectTable failed: 0x{hr:X8}");
-                    return;
-                }
-
-                hr = Ole32.CreateItemMoniker("!", _monikerName, out _moniker);
-                if (hr < 0 || _moniker == null)
-                {
-                    Logger.LogError($"CreateItemMoniker failed: 0x{hr:X8}");
-                    return;
-                }
-
-                _instance = _factory();
-                var unk = Marshal.GetIUnknownForObject(_instance);
-                try
-                {
-                    hr = rot.Register(0x1 /* ROTFLAGS_REGISTRATIONKEEPSALIVE */, _instance, _moniker, out _rotCookie);
-                    if (hr < 0)
-                    {
-                        Logger.LogError($"IRunningObjectTable.Register failed: 0x{hr:X8}");
-                        return;
-                    }
-                }
-                finally
-                {
-                    Marshal.Release(unk);
-                }
-
-                Logger.LogInfo($"ROT registered: '{_monikerName}'");
-                WaitHandle.WaitAny(new WaitHandle[] { _shutdown });
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError($"ROT host exception: {ex}");
-            }
-            finally
-            {
-                try
-                {
-                    if (_rotCookie != 0 && Ole32.GetRunningObjectTable(0, out var rot2) == 0 && rot2 != null)
-                    {
-                        rot2.Revoke(_rotCookie);
-                        _rotCookie = 0;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Logger.LogWarning($"Exception revoking ROT registration: {ex.Message}");
-                }
-
-                Ole32.CoUninitialize();
-                Logger.LogInfo($"ROT host stopped: '{_monikerName}'");
-            }
-        }
-
-        public void Dispose()
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            Stop();
-            _disposed = true;
-        }
-
-        private static class Ole32
-        {
-            internal const int CoinitApartmentThreaded = 0x2;
-
-#pragma warning disable IL2050 // Suppress trimming warnings for COM interop P/Invokes; ROT hosting not used in trimmed scenarios.
-            [DllImport("ole32.dll")]
-            internal static extern int CoInitializeEx(IntPtr pvReserved, int dwCoInit);
-
-            [DllImport("ole32.dll")]
-            internal static extern void CoUninitialize();
-
-            [DllImport("ole32.dll")]
-            internal static extern int GetRunningObjectTable(int reserved, out IRunningObjectTable? prot);
-
-            [DllImport("ole32.dll")]
-            internal static extern int CreateItemMoniker([MarshalAs(UnmanagedType.LPWStr)] string lpszDelim, [MarshalAs(UnmanagedType.LPWStr)] string lpszItem, out IMoniker? ppmk);
-#pragma warning restore IL2050
-        }
-
-        [ComImport]
-        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-        [Guid("00000010-0000-0000-C000-000000000046")]
-        private interface IRunningObjectTable
-        {
-            int Register(int grfFlags, [MarshalAs(UnmanagedType.IUnknown)] object punkObject, IMoniker pmkObjectName, out int pdwRegister);
-
-            int Revoke(int dwRegister);
-
-            void IsRunning(IMoniker pmkObjectName);
-
-            int GetObject(IMoniker pmkObjectName, [MarshalAs(UnmanagedType.IUnknown)] out object? ppunkObject);
-
-            void NoteChangeTime(int dwRegister, ref FileTime pfiletime);
-
-            int GetTimeOfLastChange(IMoniker pmkObjectName, ref FileTime pfiletime);
-
-            int EnumRunning(out object ppenumMoniker);
-        }
-
-        [ComImport]
-        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-        [Guid("0000000f-0000-0000-C000-000000000046")]
-        private interface IMoniker
-        {
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        private struct FileTime
-        {
-            public uint DwLowDateTime;
-            public uint DwHighDateTime;
-        }
-    }
-}
--- a/src/common/ManagedCommon/ServerStatusResponse.cs
+++ b/src/common/ManagedCommon/ServerStatusResponse.cs
@@ -1,26 +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.
-
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-
-namespace ManagedCommon
-{
-    public sealed class ServerStatusResponse
-    {
-        public string Application { get; set; } = string.Empty;
-
-        public string? Version { get; set; }
-
-        public string Status { get; set; } = string.Empty;
-
-        public IEnumerable<string> RegisteredModules { get; set; } = [];
-
-        public string[] AvailableEndpoints { get; set; } = [];
-
-        public DateTimeOffset Timestamp { get; set; }
-    }
-}
--- a/src/common/UITestAutomation/ModuleConfigData.cs
+++ b/src/common/UITestAutomation/ModuleConfigData.cs
@@ -33,7 +33,6 @@ namespace Microsoft.PowerToys.UITest
        Workspaces,
        PowerRename,
        CommandPalette,
-        ScreenRuler,
    }

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

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

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

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

-        /// <summary>
-        /// Copies PowerToys log files to test results directory when test fails.
-        /// Renames files to include the directory structure after \PowerToys.
-        /// </summary>
-        protected void AddLogFilesToTestResultsDirectory()
-        {
-            try
-            {
-                var localAppDataLow = Path.Combine(
-                    Environment.GetEnvironmentVariable("USERPROFILE") ?? string.Empty,
-                    "AppData",
-                    "LocalLow",
-                    "Microsoft",
-                    "PowerToys");
-
-                if (Directory.Exists(localAppDataLow))
-                {
-                    CopyLogFilesFromDirectory(localAppDataLow, string.Empty);
-                }
-
-                var localAppData = Path.Combine(
-                    Environment.GetEnvironmentVariable("LOCALAPPDATA") ?? string.Empty,
-                    "Microsoft",
-                    "PowerToys");
-
-                if (Directory.Exists(localAppData))
-                {
-                    CopyLogFilesFromDirectory(localAppData, string.Empty);
-                }
-            }
-            catch (Exception ex)
-            {
-                // Don't fail the test if log file copying fails
-                Console.WriteLine($"Failed to copy log files: {ex.Message}");
-            }
-        }
-
-        /// <summary>
-        /// Recursively copies log files from a directory and renames them with directory structure.
-        /// </summary>
-        /// <param name="sourceDir">Source directory to copy from</param>
-        /// <param name="relativePath">Relative path from PowerToys folder</param>
-        private void CopyLogFilesFromDirectory(string sourceDir, string relativePath)
-        {
-            if (!Directory.Exists(sourceDir))
-            {
-                return;
-            }
-
-            // Process log files in current directory
-            var logFiles = Directory.GetFiles(sourceDir, "*.log");
-            foreach (var logFile in logFiles)
-            {
-                try
-                {
-                    var fileName = Path.GetFileName(logFile);
-                    var fileNameWithoutExt = Path.GetFileNameWithoutExtension(fileName);
-                    var extension = Path.GetExtension(fileName);
-
-                    // Create new filename with directory structure
-                    var directoryPart = string.IsNullOrEmpty(relativePath) ? string.Empty : relativePath.Replace("\\", "-") + "-";
-                    var newFileName = $"{directoryPart}{fileNameWithoutExt}{extension}";
-
-                    // Copy file to test results directory with new name
-                    var testResultsDir = TestContext.TestResultsDirectory ?? Path.GetTempPath();
-                    var destinationPath = Path.Combine(testResultsDir, newFileName);
-
-                    File.Copy(logFile, destinationPath, true);
-                    TestContext.AddResultFile(destinationPath);
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine($"Failed to copy log file {logFile}: {ex.Message}");
-                }
-            }
-
-            // Recursively process subdirectories
-            var subdirectories = Directory.GetDirectories(sourceDir);
-            foreach (var subdir in subdirectories)
-            {
-                var dirName = Path.GetFileName(subdir);
-                var newRelativePath = string.IsNullOrEmpty(relativePath) ? dirName : Path.Combine(relativePath, dirName);
-                CopyLogFilesFromDirectory(subdir, newRelativePath);
-            }
-        }
-
        /// <summary>
        /// Restart scope exe.
        /// </summary>
--- a/src/common/common.instructions.md
+++ b/src/common/common.instructions.md
@@ -1,16 +0,0 @@
---
-applyTo: "**/*.cs,**/*.cpp,**/*.c,**/*.h,**/*.hpp"
---
-# Common – shared libraries guidance (concise)
-
-Scope
- Logging, IPC, settings, DPI, telemetry, utilities consumed by multiple modules.
-
-Guidelines
- Avoid breaking public headers/APIs; if changed, search & update all callers.
- Coordinate ABI-impacting struct/class layout changes; keep binary compatibility.
- Watch perf in hot paths (hooks, timers, serialization); avoid avoidable allocations.
- Ask before adding third‑party deps or changing serialization formats.
-
-Acceptance
- No unintended ABI breaks, no noisy logs, new non-obvious symbols briefly commented.
--- a/src/common/logger/logger_settings.h
+++ b/src/common/logger/logger_settings.h
@@ -81,6 +81,7 @@ struct LogSettings
    inline const static std::string workspacesSnapshotToolLoggerName = "workspaces-snapshot-tool";
    inline const static std::wstring workspacesSnapshotToolLogPath = L"workspaces-snapshot-tool-log.log";
    inline const static std::string zoomItLoggerName = "zoom-it";
+    inline const static std::string lightSwitchLoggerName = "light-switch";
    inline const static int retention = 30;
    std::wstring logLevel;
    LogSettings();
--- a/src/common/utils/elevation.h
+++ b/src/common/utils/elevation.h
@@ -257,7 +257,10 @@ inline HANDLE run_elevated(const std::wstring& file, const std::wstring& params,
        exec_info.nShow = SW_HIDE;
    }

-    return ShellExecuteExW(&exec_info) ? exec_info.hProcess : nullptr;
+    // failing bc using "runas" with PowerToys.exe already running?
+    BOOL result = ShellExecuteExW(&exec_info);
+
+    return result  ? exec_info.hProcess : nullptr;
 }

 // Run command as non-elevated user, returns true if succeeded, puts the process id into returnPid if returnPid != NULL
--- a/src/common/utils/gpo.h
+++ b/src/common/utils/gpo.h
@@ -30,6 +30,7 @@ namespace powertoys_gpo
    const std::wstring POLICY_CONFIGURE_ENABLED_CMD_NOT_FOUND = L"ConfigureEnabledUtilityCmdNotFound";
    const std::wstring POLICY_CONFIGURE_ENABLED_COLOR_PICKER = L"ConfigureEnabledUtilityColorPicker";
    const std::wstring POLICY_CONFIGURE_ENABLED_CROP_AND_LOCK = L"ConfigureEnabledUtilityCropAndLock";
+    const std::wstring POLICY_CONFIGURE_ENABLED_LIGHT_SWITCH = L"ConfigureEnabledUtilityLightSwitch";
    const std::wstring POLICY_CONFIGURE_ENABLED_FANCYZONES = L"ConfigureEnabledUtilityFancyZones";
    const std::wstring POLICY_CONFIGURE_ENABLED_FILE_LOCKSMITH = L"ConfigureEnabledUtilityFileLocksmith";
    const std::wstring POLICY_CONFIGURE_ENABLED_SVG_PREVIEW = L"ConfigureEnabledUtilityFileExplorerSVGPreview";
@@ -295,6 +296,11 @@ namespace powertoys_gpo
        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_CROP_AND_LOCK);
    }

+    inline gpo_rule_configured_t getConfiguredLightSwitchEnabledValue()
+    {
+        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_LIGHT_SWITCH);
+    }
+
    inline gpo_rule_configured_t getConfiguredFancyZonesEnabledValue()
    {
        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_FANCYZONES);
--- a/src/common/utils/logger_helper.h
+++ b/src/common/utils/logger_helper.h
@@ -3,6 +3,7 @@
 #include <filesystem>
 #include <common/version/version.h>
 #include <common/SettingsAPI/settings_helpers.h>
+#include <common/logger/logger_settings.h>

 namespace LoggerHelpers
 {
--- a/src/dsc/PowerToys.Settings.DSC.Schema.Generator/PowerToys.Settings.DSC.Schema.Generator.csproj
+++ b/src/dsc/PowerToys.Settings.DSC.Schema.Generator/PowerToys.Settings.DSC.Schema.Generator.csproj
@@ -31,11 +31,11 @@
    <!-- The following sections assume that the machine we're building on is always x64. That means we won't be able to run/inspect arm64 executables, therefore we must always execute x64 generator. -->

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

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

 </Project>
--- a/src/gpo/assets/PowerToys.admx
+++ b/src/gpo/assets/PowerToys.admx
@@ -137,6 +137,16 @@
        <decimal value="0" />
      </disabledValue>
    </policy>
+    <policy name="ConfigureEnabledUtilityLightSwitch" class="Both" displayName="$(string.ConfigureEnabledUtilityLightSwitch)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityLightSwitch">
+      <parentCategory ref="PowerToys" />
+      <supportedOn ref="SUPPORTED_POWERTOYS_0_90_0" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
    <policy name="ConfigureEnabledUtilityEnvironmentVariables" class="Both" displayName="$(string.ConfigureEnabledUtilityEnvironmentVariables)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityEnvironmentVariables">
      <parentCategory ref="PowerToys" />
      <supportedOn ref="SUPPORTED_POWERTOYS_0_75_0" />
--- a/src/gpo/assets/en-US/PowerToys.adml
+++ b/src/gpo/assets/en-US/PowerToys.adml
@@ -245,6 +245,7 @@ If you don't configure this policy, the user will be able to control the setting
      <string id="ConfigureEnabledUtilityCmdNotFound">Command Not Found: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityCmdPal">CmdPal: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityCropAndLock">Crop And Lock: Configure enabled state</string>
+      <string id="ConfigureEnabledUtilityLightSwitch">Light Switch: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityEnvironmentVariables">Environment Variables: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityFancyZones">FancyZones: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityFileLocksmith">File Locksmith: Configure enabled state</string>
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.rc
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.rc
@@ -0,0 +1,32 @@
+1 VERSIONINFO
+ FILEVERSION 0,1,0,0
+ PRODUCTVERSION 0,1,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "Company Name"
+            VALUE "FileDescription", "Light Switch Module"
+            VALUE "FileVersion", "0.1.0.0"
+            VALUE "InternalName", "Light Switch"
+            VALUE "LegalCopyright", "Copyright (C) 2019 Company Name"
+            VALUE "OriginalFilename", "PowerToys.LightSwitchModuleInterface.dll"
+            VALUE "ProductName", "Light Switch"
+            VALUE "ProductVersion", "0.1.0.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.sln
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.14.36127.28 d17.14
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LightSwitchModuleInterface", "LightSwitchModuleInterface.vcxproj", "{38177D56-6AD1-4ADF-88C9-2843A7932166}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|x64.ActiveCfg = Debug|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|x64.Build.0 = Debug|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|x64.ActiveCfg = Release|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {FAF634A3-0D98-4A45-B082-D93B59782572}
+	EndGlobalSection
+EndGlobal
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" 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')" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{38177d56-6ad1-4adf-88c9-2843a7932166}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>LightSwitchModuleInterface</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>LightSwitchModuleInterface</ProjectName>
+    <TargetName>PowerToys.LightSwitchModuleInterface</TargetName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>
+        $(SolutionDir)src\;
+        $(SolutionDir)src\modules;
+        $(SolutionDir)src\common\Telemetry;
+        %(AdditionalIncludeDirectories)
+      </AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(CoreLibraryDependencies);%(AdditionalDependencies);advapi32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="ThemeHelper.h" />
+    <ClInclude Include="trace.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="dllmain.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <ClCompile Include="ThemeHelper.cpp" />
+    <ClCompile Include="trace.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="LightSwitchModuleInterface.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
+      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj">
+      <Project>{4aed67b6-55fd-486f-b917-e543dee2cb3c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+  </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')" />
+  </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'))" />
+  </Target>
+</Project>
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj.filters
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj.filters
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="dllmain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="pch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="trace.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ThemeHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="trace.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ThemeHelper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{bbf22ac8-46f8-4206-b44b-9c3897e99ce5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{530ed784-9a70-46a0-8fb6-20d5dee4f7d3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{da1cb871-86d3-414c-adf5-a7e9f2077d2f}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="LightSwitchModuleInterface.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/ThemeHelper.cpp
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/ThemeHelper.cpp
@@ -0,0 +1,81 @@
+#include "pch.h"
+#include <windows.h>
+#include "ThemeHelper.h"
+
+// Controls changing the themes.
+
+void 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 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);
+
+        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 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 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
+}
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/ThemeHelper.h
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/ThemeHelper.h
@@ -0,0 +1,5 @@
+#pragma once
+void SetSystemTheme(bool dark);
+void SetAppsTheme(bool dark);
+bool GetCurrentSystemTheme();
+bool GetCurrentAppsTheme();
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/dllmain.cpp
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/dllmain.cpp
@@ -0,0 +1,546 @@
+#include "pch.h"
+#include <interface/powertoy_module_interface.h>
+#include "trace.h"
+#include <common/logger/logger.h>
+#include <common/SettingsAPI/settings_objects.h>
+#include <common/SettingsAPI/settings_helpers.h>
+#include <locale>
+#include <codecvt>
+#include <common/utils/logger_helper.h>
+#include "ThemeHelper.h"
+
+extern "C" IMAGE_DOS_HEADER __ImageBase;
+
+namespace
+{
+    const wchar_t JSON_KEY_PROPERTIES[] = L"properties";
+    const wchar_t JSON_KEY_WIN[] = L"win";
+    const wchar_t JSON_KEY_ALT[] = L"alt";
+    const wchar_t JSON_KEY_CTRL[] = L"ctrl";
+    const wchar_t JSON_KEY_SHIFT[] = L"shift";
+    const wchar_t JSON_KEY_CODE[] = L"code";
+    const wchar_t JSON_KEY_TOGGLE_THEME_HOTKEY[] = L"toggle-theme-hotkey";
+    const wchar_t JSON_KEY_VALUE[] = L"value";
+}
+
+BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
+{
+    switch (ul_reason_for_call)
+    {
+    case DLL_PROCESS_ATTACH:
+        Trace::RegisterProvider();
+        break;
+    case DLL_THREAD_ATTACH:
+    case DLL_THREAD_DETACH:
+        break;
+    case DLL_PROCESS_DETACH:
+        Trace::UnregisterProvider();
+        break;
+    }
+    return TRUE;
+}
+
+// The PowerToy name that will be shown in the settings.
+const static wchar_t* MODULE_NAME = L"LightSwitch";
+// Add a description that will we shown in the module settings page.
+const static wchar_t* MODULE_DESC = L"This is a module that allows you to control light/dark theming via set times, sun rise, or directly invoking the change.";
+
+enum class ScheduleMode
+{
+    FixedHours,
+    SunsetToSunriseGeo,
+    SunsetToSunriseUser
+    // add more later
+};
+
+inline std::wstring ToString(ScheduleMode mode)
+{
+    switch (mode)
+    {
+    case ScheduleMode::SunsetToSunriseGeo:
+        return L"SunsetToSunriseGeo";
+    case ScheduleMode::SunsetToSunriseUser:
+        return L"SunsetToSunriseUser";
+    case ScheduleMode::FixedHours:
+    default:
+        return L"FixedHours";
+    }
+}
+
+inline ScheduleMode FromString(const std::wstring& str)
+{
+    if (str == L"SunsetToSunriseGeo")
+        return ScheduleMode::SunsetToSunriseGeo;
+    if (str == L"SunsetToSunriseUser")
+        return ScheduleMode::SunsetToSunriseUser;
+    return ScheduleMode::FixedHours;
+}
+
+// These are the properties shown in the Settings page.
+struct ModuleSettings
+{
+    bool m_changeSystem = true;
+    bool m_changeApps = true;
+    ScheduleMode m_scheduleMode = ScheduleMode::FixedHours;
+    int m_lightTime = 480;
+    int m_darkTime = 1200;
+    int m_offset = 0;
+    std::wstring m_latitude = L"0.0";
+    std::wstring m_longitude = L"0.0";
+} g_settings;
+
+class LightSwitchInterface : public PowertoyModuleIface
+{
+private:
+    bool m_enabled = false;
+
+    HANDLE m_process{ nullptr };
+    HANDLE m_force_light_event_handle;
+    HANDLE m_force_dark_event_handle;
+
+    static const constexpr int NUM_DEFAULT_HOTKEYS = 4;
+
+    Hotkey m_toggle_theme_hotkey = { .win = true, .ctrl = true, .shift = true, .alt = false, .key = 'D' };
+
+    void init_settings();
+
+public:
+    LightSwitchInterface()
+    {
+        LoggerHelpers::init_logger(L"LightSwitch", L"ModuleInterface", LogSettings::lightSwitchLoggerName);
+
+        m_force_light_event_handle = CreateDefaultEvent(L"POWEROYS_LIGHTSWITCH_FORCE_LIGHT");
+        m_force_dark_event_handle = CreateDefaultEvent(L"POWEROYS_LIGHTSWITCH_FORCE_DARK");
+
+        init_settings();
+    };
+
+    virtual const wchar_t* get_key() override
+    {
+        return L"LightSwitch";
+    }
+
+    // Destroy the powertoy and free memory
+    virtual void destroy() override
+    {
+        delete this;
+    }
+
+    // Return the display name of the powertoy, this will be cached by the runner
+    virtual const wchar_t* get_name() override
+    {
+        return MODULE_NAME;
+    }
+
+    // Return the configured status for the gpo policy for the module
+    virtual powertoys_gpo::gpo_rule_configured_t gpo_policy_enabled_configuration() override
+    {
+        return powertoys_gpo::getConfiguredLightSwitchEnabledValue();
+    }
+
+    // Return JSON with the configuration options.
+    virtual bool get_config(wchar_t* buffer, int* buffer_size) override
+    {
+        HINSTANCE hinstance = reinterpret_cast<HINSTANCE>(&__ImageBase);
+
+        // Create a Settings object with your module name
+        PowerToysSettings::Settings settings(hinstance, get_name());
+        settings.set_description(MODULE_DESC);
+        settings.set_overview_link(L"https://aka.ms/powertoys");
+
+        // Boolean toggles
+        settings.add_bool_toggle(
+            L"changeSystem",
+            L"Change System Theme",
+            g_settings.m_changeSystem);
+
+        settings.add_bool_toggle(
+            L"changeApps",
+            L"Change Apps Theme",
+            g_settings.m_changeApps);
+
+        settings.add_choice_group(
+            L"scheduleMode",
+            L"Theme schedule mode",
+            ToString(g_settings.m_scheduleMode),
+            { { L"FixedHours", L"Set hours manually" },
+              { L"SunsetToSunriseGeo", L"Use sunrise/sunset times (Geolocation)" },
+              { L"SunsetToSunriseUser", L"Use sunrise/sunset times (User selected)" } });
+
+        // Integer spinners
+        settings.add_int_spinner(
+            L"lightTime",
+            L"Time to switch to light theme (minutes after midnight).",
+            g_settings.m_lightTime,
+            0,
+            1439,
+            1);
+
+        settings.add_int_spinner(
+            L"darkTime",
+            L"Time to switch to dark theme (minutes after midnight).",
+            g_settings.m_darkTime,
+            0,
+            1439,
+            1);
+
+        settings.add_int_spinner(
+            L"offset",
+            L"Time to offset turning on your light/dark themes.",
+            g_settings.m_offset,
+            0,
+            1439,
+            1);
+
+        // Strings for latitude and longitude
+        settings.add_string(
+            L"latitude",
+            L"Your latitude in decimal degrees (e.g. 39.95).",
+            g_settings.m_latitude);
+
+        settings.add_string(
+            L"longitude",
+            L"Your longitude in decimal degrees (e.g. -75.16).",
+            g_settings.m_longitude);
+
+        // One-shot actions (buttons)
+        settings.add_custom_action(
+            L"forceLight",
+            L"Switch immediately to light theme",
+            L"Force Light",
+            L"{}");
+
+        settings.add_custom_action(
+            L"forceDark",
+            L"Switch immediately to dark theme",
+            L"Force Dark",
+            L"{}");
+
+        // Hotkeys
+        PowerToysSettings::HotkeyObject dm_hk = PowerToysSettings::HotkeyObject::from_settings(
+            m_toggle_theme_hotkey.win,
+            m_toggle_theme_hotkey.ctrl,
+            m_toggle_theme_hotkey.alt,
+            m_toggle_theme_hotkey.shift,
+            m_toggle_theme_hotkey.key);
+
+        settings.add_hotkey(
+            L"toggle-theme-hotkey",
+            L"Shortcut to toggle theme immediately",
+            dm_hk);
+
+        // Serialize to buffer for the PowerToys runner
+        return settings.serialize_to_buffer(buffer, buffer_size);
+    }
+
+    // Signal from the Settings editor to call a custom action.
+    // This can be used to spawn more complex editors.
+    void call_custom_action(const wchar_t* action) override
+    {
+        try
+        {
+            auto action_object = PowerToysSettings::CustomActionObject::from_json_string(action);
+
+            if (action_object.get_name() == L"forceLight")
+            {
+                Logger::info(L"[Light Switch] Custom action triggered: Force Light");
+                SetSystemTheme(true);
+                SetAppsTheme(true);
+            }
+            else if (action_object.get_name() == L"forceDark")
+            {
+                Logger::info(L"[Light Switch] Custom action triggered: Force Dark");
+                SetSystemTheme(false);
+                SetAppsTheme(false);
+            }
+        }
+        catch (...)
+        {
+            Logger::error(L"[Light Switch] Invalid custom action JSON");
+        }
+    }
+
+    // Called by the runner to pass the updated settings values as a serialized JSON.
+    virtual void set_config(const wchar_t* config) override
+    {
+        try
+        {
+            auto values = PowerToysSettings::PowerToyValues::from_json_string(config, get_key());
+
+            parse_hotkey(values);
+
+            if (auto v = values.get_bool_value(L"changeSystem"))
+            {
+                g_settings.m_changeSystem = *v;
+            }
+
+            if (auto v = values.get_bool_value(L"changeApps"))
+            {
+                g_settings.m_changeApps = *v;
+            }
+
+            if (auto v = values.get_string_value(L"scheduleMode"))
+            {
+                g_settings.m_scheduleMode = FromString(*v);
+            }
+
+            if (auto v = values.get_int_value(L"lightTime"))
+            {
+                g_settings.m_lightTime = *v;
+            }
+
+            if (auto v = values.get_int_value(L"darkTime"))
+            {
+                g_settings.m_darkTime = *v;
+            }
+
+            if (auto v = values.get_int_value(L"offset"))
+            {
+                g_settings.m_offset = *v;
+            }
+
+            if (auto v = values.get_string_value(L"latitude"))
+            {
+                g_settings.m_latitude = *v;
+            }
+            if (auto v = values.get_string_value(L"longitude"))
+            {
+                g_settings.m_longitude = *v;
+            }
+
+            values.save_to_settings_file();
+        }
+        catch (const std::exception&)
+        {
+            Logger::error("[Light Switch] set_config: Failed to parse or apply config.");
+        }
+    }
+
+    virtual void enable()
+    {
+        m_enabled = true;
+        Logger::info(L"Enabling Light Switch module...");
+
+        unsigned long powertoys_pid = GetCurrentProcessId();
+        std::wstring args = L"--pid " + std::to_wstring(powertoys_pid);
+        std::wstring exe_name = L"LightSwitchService\\PowerToys.LightSwitchService.exe";
+
+        std::wstring resolved_path(MAX_PATH, L'\0');
+        DWORD result = SearchPathW(
+            nullptr,
+            exe_name.c_str(),
+            nullptr,
+            static_cast<DWORD>(resolved_path.size()),
+            resolved_path.data(),
+            nullptr);
+
+        if (result == 0 || result >= resolved_path.size())
+        {
+            Logger::error(L"Failed to locate Light Switch executable: '{}'", exe_name);
+            return;
+        }
+
+        resolved_path.resize(result);
+        Logger::debug(L"Resolved executable path: {}", resolved_path);
+
+        std::wstring command_line = L"\"" + resolved_path + L"\" " + args;
+
+        STARTUPINFO si = { sizeof(si) };
+        PROCESS_INFORMATION pi;
+
+        if (!CreateProcessW(
+                resolved_path.c_str(),
+                command_line.data(),
+                nullptr,
+                nullptr,
+                TRUE,
+                0,
+                nullptr,
+                nullptr,
+                &si,
+                &pi))
+        {
+            Logger::error(L"Failed to launch Light Switch process. {}", get_last_error_or_default(GetLastError()));
+            return;
+        }
+
+        Logger::info(L"Light Switch process launched successfully (PID: {}).", pi.dwProcessId);
+        m_process = pi.hProcess;
+        CloseHandle(pi.hThread);
+    }
+
+    // Disable the powertoy
+    virtual void disable()
+    {
+        Logger::info("Light Switch disabling");
+        m_enabled = false;
+
+        if (m_process)
+        {
+            constexpr DWORD timeout_ms = 1500;
+            DWORD result = WaitForSingleObject(m_process, timeout_ms);
+
+            if (result == WAIT_TIMEOUT)
+            {
+                Logger::warn("Light Switch: Process didn't exit in time. Forcing termination.");
+                TerminateProcess(m_process, 0);
+            }
+
+            CloseHandle(m_process);
+            m_process = nullptr;
+        }
+    }
+
+    // Returns if the powertoys is enabled
+    virtual bool is_enabled() override
+    {
+        return m_enabled;
+    }
+
+    void parse_hotkey(PowerToysSettings::PowerToyValues& settings)
+    {
+        auto settingsObject = settings.get_raw_json();
+        if (settingsObject.GetView().Size())
+        {
+            try
+            {
+                Hotkey _temp_toggle_theme;
+                auto jsonHotkeyObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_TOGGLE_THEME_HOTKEY).GetNamedObject(JSON_KEY_VALUE);
+                _temp_toggle_theme.win = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_WIN);
+                _temp_toggle_theme.alt = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_ALT);
+                _temp_toggle_theme.shift = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_SHIFT);
+                _temp_toggle_theme.ctrl = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_CTRL);
+                _temp_toggle_theme.key = static_cast<unsigned char>(jsonHotkeyObject.GetNamedNumber(JSON_KEY_CODE));
+                m_toggle_theme_hotkey = _temp_toggle_theme;
+            }
+            catch (...)
+            {
+                Logger::error("Failed to initialize Light Switch force dark mode shortcut from settings. Value will keep unchanged.");
+            }
+        }
+        else
+        {
+            Logger::info("Light Switch settings are empty");
+        }
+    }
+
+    virtual size_t get_hotkeys(Hotkey* hotkeys, size_t buffer_size) override
+    {
+        if (hotkeys && buffer_size >= 1)
+        {
+            hotkeys[0] = m_toggle_theme_hotkey;
+        }
+        return 1;
+    }
+
+    virtual bool on_hotkey(size_t hotkeyId) override
+    {
+        if (m_enabled)
+        {
+            Logger::trace(L"Light Switch hotkey pressed");
+            if (!is_process_running())
+            {
+                enable();
+            }
+            else if (hotkeyId == 0)
+            {
+                // get current will return true if in light mode, otherwise false
+                Logger::info(L"[Light Switch] Hotkey triggered: Toggle Theme");
+                if (g_settings.m_changeSystem)
+                {
+                    SetSystemTheme(!GetCurrentSystemTheme());
+                }
+                if (g_settings.m_changeApps)
+                {
+                    SetAppsTheme(!GetCurrentAppsTheme());
+                }
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    bool is_process_running()
+    {
+        return WaitForSingleObject(m_process, 0) == WAIT_TIMEOUT;
+    }
+};
+
+std::wstring utf8_to_wstring(const std::string& str)
+{
+    if (str.empty())
+        return std::wstring();
+
+    int size_needed = MultiByteToWideChar(
+        CP_UTF8,
+        0,
+        str.c_str(),
+        static_cast<int>(str.size()),
+        nullptr,
+        0);
+
+    std::wstring wstr(size_needed, 0);
+
+    MultiByteToWideChar(
+        CP_UTF8,
+        0,
+        str.c_str(),
+        static_cast<int>(str.size()),
+        &wstr[0],
+        size_needed);
+
+    return wstr;
+}
+
+// Load the settings file.
+void LightSwitchInterface::init_settings()
+{
+    Logger::info(L"[Light Switch] init_settings: starting to load settings for module");
+
+    try
+    {
+        PowerToysSettings::PowerToyValues settings =
+            PowerToysSettings::PowerToyValues::load_from_settings_file(get_name());
+
+        parse_hotkey(settings);
+
+        if (auto v = settings.get_bool_value(L"changeSystem"))
+            g_settings.m_changeSystem = *v;
+        if (auto v = settings.get_bool_value(L"changeApps"))
+            g_settings.m_changeApps = *v;
+        if (auto v = settings.get_string_value(L"scheduleMode"))
+            g_settings.m_scheduleMode = FromString(*v);
+        if (auto v = settings.get_int_value(L"lightTime"))
+            g_settings.m_lightTime = *v;
+        if (auto v = settings.get_int_value(L"darkTime"))
+            g_settings.m_darkTime = *v;
+        if (auto v = settings.get_int_value(L"offset"))
+            g_settings.m_offset = *v;
+        if (auto v = settings.get_string_value(L"latitude"))
+            g_settings.m_latitude = *v;
+        if (auto v = settings.get_string_value(L"longitude"))
+            g_settings.m_longitude = *v;
+
+        Logger::info(L"[Light Switch] init_settings: loaded successfully");
+    }
+    catch (const winrt::hresult_error& e)
+    {
+        Logger::error(L"[Light Switch] init_settings: hresult_error 0x{:08X} - {}", e.code(), e.message().c_str());
+    }
+    catch (const std::exception& e)
+    {
+        std::wstring whatStr = utf8_to_wstring(e.what());
+        Logger::error(L"[Light Switch] init_settings: std::exception - {}", whatStr);
+    }
+    catch (...)
+    {
+        Logger::error(L"[Light Switch] init_settings: unknown exception while loading settings");
+    }
+}
+
+extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
+{
+    return new LightSwitchInterface();
+}
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/pch.cpp
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/pch.cpp
@@ -0,0 +1,2 @@
+#include "pch.h"
+#pragma comment(lib, "windowsapp")
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/pch.h
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/pch.h
@@ -0,0 +1,14 @@
+#pragma once
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#include <common/SettingsAPI/settings_helpers.h>
+#include <common/utils/gpo.h>
+#include <common/utils/winapi_error.h>
+#include <shlwapi.h>
+#include <shellapi.h>
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.System.h>
+#include <winrt/Windows.Globalization.h>
+#include <winrt/Windows.ApplicationModel.h>
+#include <winrt/Windows.ApplicationModel.Core.h>
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/resource.h
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/resource.h
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/trace.cpp
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/trace.cpp
@@ -0,0 +1,30 @@
+#include "pch.h"
+#include "trace.h"
+#include <TraceLoggingProvider.h>
+
+TRACELOGGING_DEFINE_PROVIDER(
+    g_hProvider,
+    "Microsoft.PowerToys",
+    // {38e8889b-9731-53f5-e901-e8a7c1753074}
+    (0x38e8889b, 0x9731, 0x53f5, 0xe9, 0x01, 0xe8, 0xa7, 0xc1, 0x75, 0x30, 0x74),
+    TraceLoggingOptionProjectTelemetry());
+
+void Trace::RegisterProvider()
+{
+    TraceLoggingRegister(g_hProvider);
+}
+
+void Trace::UnregisterProvider()
+{
+    TraceLoggingUnregister(g_hProvider);
+}
+
+void Trace::MyEvent()
+{
+    TraceLoggingWrite(
+        g_hProvider,
+        "PowerToyName_MyEvent",
+        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
+        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
+}
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/trace.h
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/trace.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <windows.h>
+#include <TraceLoggingActivity.h>
+#include <common/telemetry/ProjectTelemetry.h>
+
+TRACELOGGING_DECLARE_PROVIDER(g_hProvider);
+
+class Trace
+{
+public:
+    static void RegisterProvider();
+    static void UnregisterProvider();
+    static void MyEvent();
+};
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp
@@ -0,0 +1,251 @@
+#include <windows.h>
+#include <tchar.h>
+#include "ThemeScheduler.h"
+#include "ThemeHelper.h"
+#include <stdio.h>
+#include <string>
+#include <LightSwitchSettings.h>
+#include <common/utils/gpo.h>
+
+SERVICE_STATUS g_ServiceStatus = {};
+SERVICE_STATUS_HANDLE g_StatusHandle = nullptr;
+HANDLE g_ServiceStopEvent = nullptr;
+
+VOID WINAPI ServiceMain(DWORD argc, LPTSTR* argv);
+VOID WINAPI ServiceCtrlHandler(DWORD dwCtrl);
+DWORD WINAPI ServiceWorkerThread(LPVOID lpParam);
+
+// Entry point for the executable
+int _tmain(int argc, TCHAR* argv[])
+{
+    DWORD parentPid = 0;
+    bool debug = false;
+    for (int i = 1; i < argc; ++i)
+    {
+        if (_tcscmp(argv[i], _T("--debug")) == 0)
+            debug = true;
+        else if (_tcscmp(argv[i], _T("--pid")) == 0 && i + 1 < argc)
+            parentPid = _tstoi(argv[++i]);
+    }
+
+    if (debug)
+    {
+        // Create a console window for debug output
+        AllocConsole();
+        FILE* f;
+        freopen_s(&f, "CONOUT$", "w", stdout);
+        freopen_s(&f, "CONOUT$", "w", stderr);
+
+        SetConsoleTitle(L"LightSwitchService Debug");
+
+        // Console mode (debug)
+        g_ServiceStopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr);
+        ServiceWorkerThread(reinterpret_cast<void*>(static_cast<ULONG_PTR>(parentPid)));
+        CloseHandle(g_ServiceStopEvent);
+
+        FreeConsole();
+        return 0;
+    }
+
+    // Try to connect to SCM
+    wchar_t serviceName[] = L"LightSwitchService";
+    SERVICE_TABLE_ENTRYW table[] = { { serviceName, ServiceMain }, { nullptr, nullptr } };
+
+    if (!StartServiceCtrlDispatcherW(table))
+    {
+        DWORD err = GetLastError();
+        if (err == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) // not launched by SCM
+        {
+            g_ServiceStopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr);
+            HANDLE hThread = CreateThread(
+                nullptr, 0, ServiceWorkerThread, reinterpret_cast<void*>(static_cast<ULONG_PTR>(parentPid)), 0, nullptr);
+
+            // Wait so the process stays alive
+            WaitForSingleObject(hThread, INFINITE);
+            CloseHandle(hThread);
+            CloseHandle(g_ServiceStopEvent);
+            return 0;
+        }
+        return static_cast<int>(err);
+    }
+
+    return 0;
+}
+
+// Called when the service is launched by Windows
+VOID WINAPI ServiceMain(DWORD, LPTSTR*)
+{
+    g_StatusHandle = RegisterServiceCtrlHandler(_T("LightSwitchService"), ServiceCtrlHandler);
+    if (!g_StatusHandle)
+        return;
+
+    g_ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
+    g_ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
+    g_ServiceStatus.dwCurrentState = SERVICE_START_PENDING;
+    SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
+
+    g_ServiceStopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr);
+    if (!g_ServiceStopEvent)
+    {
+        g_ServiceStatus.dwCurrentState = SERVICE_STOPPED;
+        g_ServiceStatus.dwWin32ExitCode = GetLastError();
+        SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
+        return;
+    }
+
+    SECURITY_ATTRIBUTES sa{ sizeof(sa) };
+    sa.bInheritHandle = FALSE;
+    sa.lpSecurityDescriptor = nullptr;
+
+    g_ServiceStatus.dwCurrentState = SERVICE_RUNNING;
+    SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
+
+    HANDLE hThread = CreateThread(nullptr, 0, ServiceWorkerThread, nullptr, 0, nullptr);
+    WaitForSingleObject(hThread, INFINITE);
+    CloseHandle(hThread);
+
+    CloseHandle(g_ServiceStopEvent);
+    g_ServiceStatus.dwCurrentState = SERVICE_STOPPED;
+    g_ServiceStatus.dwWin32ExitCode = 0;
+    SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
+}
+
+VOID WINAPI ServiceCtrlHandler(DWORD dwCtrl)
+{
+    switch (dwCtrl)
+    {
+    case SERVICE_CONTROL_STOP:
+        if (g_ServiceStatus.dwCurrentState != SERVICE_RUNNING)
+            break;
+
+        g_ServiceStatus.dwCurrentState = SERVICE_STOP_PENDING;
+        SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
+
+        // Signal the service to stop
+        SetEvent(g_ServiceStopEvent);
+        break;
+
+    default:
+        break;
+    }
+}
+
+DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
+{
+    DWORD parentPid = static_cast<DWORD>(reinterpret_cast<ULONG_PTR>(lpParam));
+    HANDLE hParent = nullptr;
+    if (parentPid)
+        hParent = OpenProcess(SYNCHRONIZE, FALSE, parentPid);
+
+    OutputDebugString(L"[LightSwitchService] Worker thread starting...\n");
+
+    // Initialize settings system
+    LightSwitchSettings::instance().InitFileWatcher();
+
+    auto applyTheme = [](int nowMinutes, int lightMinutes, int darkMinutes, const auto& settings) {
+        bool isLightActive = false;
+
+        if (lightMinutes < darkMinutes)
+        {
+            // Normal case: sunrise < sunset
+            isLightActive = (nowMinutes >= lightMinutes && nowMinutes < darkMinutes);
+        }
+        else
+        {
+            // Wraparound case: e.g. light at 21:00, dark at 06:00
+            isLightActive = (nowMinutes >= lightMinutes || nowMinutes < darkMinutes);
+        }
+
+        if (isLightActive)
+        {
+            if (settings.changeSystem)
+                SetSystemTheme(true);
+            if (settings.changeApps)
+                SetAppsTheme(true);
+        }
+        else
+        {
+            if (settings.changeSystem)
+                SetSystemTheme(false);
+            if (settings.changeApps)
+                SetAppsTheme(false);
+        }
+    };
+
+    // --- At service start: immediately honor the schedule ---
+    {
+        SYSTEMTIME st;
+        GetLocalTime(&st);
+        int nowMinutes = st.wHour * 60 + st.wMinute;
+
+        LightSwitchSettings::instance().LoadSettings();
+        const auto& settings = LightSwitchSettings::instance().settings();
+
+        applyTheme(nowMinutes, settings.lightTime + settings.offset, settings.darkTime + settings.offset, settings);
+    }
+
+    // --- Main loop: wakes once per minute or stop/parent death ---
+    for (;;)
+    {
+        HANDLE waits[2] = { g_ServiceStopEvent, hParent };
+        DWORD count = hParent ? 2 : 1;
+
+        SYSTEMTIME st;
+        GetLocalTime(&st);
+        int nowMinutes = st.wHour * 60 + st.wMinute;
+
+        LightSwitchSettings::instance().LoadSettings();
+        const auto& settings = LightSwitchSettings::instance().settings();
+
+        // Debug print
+        wchar_t msg[160];
+        swprintf_s(msg,
+                   L"[LightSwitchService] now=%02d:%02d | light=%02d:%02d | dark=%02d:%02d\n",
+                   st.wHour,
+                   st.wMinute,
+                   settings.lightTime / 60,
+                   settings.lightTime % 60,
+                   settings.darkTime / 60,
+                   settings.darkTime % 60);
+        OutputDebugString(msg);
+
+        // Apply theme logic
+        applyTheme(nowMinutes, settings.lightTime + settings.offset, settings.darkTime + settings.offset, settings);
+
+        // Sleep until next minute, wake early if stop/parent dies
+        GetLocalTime(&st);
+        int msToNextMinute = (60 - st.wSecond) * 1000 - st.wMilliseconds;
+        if (msToNextMinute < 50)
+            msToNextMinute = 50;
+
+        DWORD wait = WaitForMultipleObjects(count, waits, FALSE, msToNextMinute);
+        if (wait == WAIT_OBJECT_0) // stop event
+            break;
+        if (hParent && wait == WAIT_OBJECT_0 + 1) // parent exited
+            break;
+    }
+
+    if (hParent)
+        CloseHandle(hParent);
+
+    return 0;
+}
+
+int APIENTRY wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
+{
+    if (powertoys_gpo::getConfiguredLightSwitchEnabledValue() == powertoys_gpo::gpo_rule_configured_disabled)
+    {
+        wchar_t msg[160];
+        swprintf_s(
+            msg,
+            L"Tried to start with a GPO policy setting the utility to always be disabled. Please contact your systems administrator.\n");
+        OutputDebugString(msg);
+        return 0;
+    }
+
+    int argc = 0;
+    LPWSTR* argv = CommandLineToArgvW(GetCommandLineW(), &argc);
+    int rc = _tmain(argc, argv); // reuse your existing logic
+    LocalFree(argv);
+    return rc;
+}
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj
@@ -0,0 +1,254 @@
+<?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')" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{08e71c67-6a7e-4ca1-b04e-2fb336410bac}</ProjectGuid>
+    <RootNamespace>LightSwitchService</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.26100.0</WindowsTargetPlatformVersion>
+    <ProjectName>LightSwitchService</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+    <TargetName>PowerToys.LightSwitchService</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <AdditionalIncludeDirectories>
+        ./../;
+        $(SolutionDir)src\common\Telemetry;
+        $(SolutionDir)src\common;
+        $(SolutionDir)src\;
+        $(SolutionDir)deps\spdlog\include;
+        ./;
+        %(AdditionalIncludeDirectories)
+      </AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
+      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\notifications\notifications.vcxproj">
+      <Project>{1d5be09d-78c0-4fd7-af00-ae7c1af7c525}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\Telemetry\EtwTrace\EtwTrace.vcxproj">
+      <Project>{8f021b46-362b-485c-bfba-ccf83e820cbd}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\common\SettingsAPI\FileWatcher.cpp" />
+    <ClCompile Include="..\..\..\common\SettingsAPI\settings_helpers.cpp" />
+    <ClCompile Include="..\..\..\common\SettingsAPI\settings_objects.cpp" />
+    <ClCompile Include="LightSwitchService.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="LightSwitchSettings.cpp" />
+    <ClCompile Include="SettingsConstants.cpp" />
+    <ClCompile Include="ThemeHelper.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="ThemeScheduler.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="WinHookEventIDs.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="LightSwitchSettings.h" />
+    <ClInclude Include="SettingsConstants.h" />
+    <ClInclude Include="SettingsObserver.h" />
+    <ClInclude Include="ThemeHelper.h" />
+    <ClInclude Include="ThemeScheduler.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="WinHookEventIDs.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="..\..\..\..\deps\spdlog.props" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.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')" />
+  </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.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'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
+</Project>
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj.filters
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj.filters
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="LightSwitchService.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ThemeScheduler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ThemeHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\common\SettingsAPI\settings_helpers.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\common\SettingsAPI\settings_objects.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\common\SettingsAPI\FileWatcher.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="LightSwitchSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SettingsConstants.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="WinHookEventIDs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ThemeScheduler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ThemeHelper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="LightSwitchSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SettingsConstants.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SettingsObserver.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="WinHookEventIDs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
+  </ItemGroup>
+</Project>
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp
@@ -0,0 +1,157 @@
+#include "LightSwitchSettings.h"
+#include <common/utils/json.h>
+#include <common/SettingsAPI/settings_helpers.h>
+#include "SettingsObserver.h"
+
+#include <filesystem>
+#include <fstream>
+#include <WinHookEventIDs.h>
+
+using namespace std;
+
+LightSwitchSettings& LightSwitchSettings::instance()
+{
+    static LightSwitchSettings inst;
+    return inst;
+}
+
+LightSwitchSettings::LightSwitchSettings()
+{
+    LoadSettings();
+}
+
+std::wstring LightSwitchSettings::GetSettingsFileName()
+{
+    return PTSettingsHelper::get_module_save_file_location(L"LightSwitch");
+}
+
+void LightSwitchSettings::InitFileWatcher()
+{
+    const std::wstring& settingsFileName = GetSettingsFileName();
+    m_settingsFileWatcher = std::make_unique<FileWatcher>(settingsFileName, [&]() {
+        PostMessageW(HWND_BROADCAST, WM_PRIV_SETTINGS_CHANGED, NULL, NULL);
+    });
+}
+
+void LightSwitchSettings::AddObserver(SettingsObserver& observer)
+{
+    m_observers.insert(&observer);
+}
+
+void LightSwitchSettings::RemoveObserver(SettingsObserver& observer)
+{
+    m_observers.erase(&observer);
+}
+
+void LightSwitchSettings::NotifyObservers(SettingId id) const
+{
+    for (auto observer : m_observers)
+    {
+        if (observer->WantsToBeNotified(id))
+        {
+            observer->SettingsUpdate(id);
+        }
+    }
+}
+
+void LightSwitchSettings::LoadSettings()
+{
+    try
+    {
+        PowerToysSettings::PowerToyValues values =
+            PowerToysSettings::PowerToyValues::load_from_settings_file(L"LightSwitch");
+
+
+        if (const auto jsonVal = values.get_string_value(L"scheduleMode"))
+        {
+            auto val = *jsonVal;
+            auto newMode = FromString(val);
+            if (m_settings.scheduleMode != newMode)
+            {
+                m_settings.scheduleMode = newMode;
+                NotifyObservers(SettingId::ScheduleMode);
+            }
+        }
+
+        // Latitude
+        if (const auto jsonVal = values.get_string_value(L"latitude"))
+        {
+            auto val = *jsonVal;
+            if (m_settings.latitude != val)
+            {
+                m_settings.latitude = val;
+                NotifyObservers(SettingId::Latitude);
+            }
+        }
+
+        // Longitude
+        if (const auto jsonVal = values.get_string_value(L"longitude"))
+        {
+            auto val = *jsonVal;
+            if (m_settings.longitude != val)
+            {
+                m_settings.longitude = val;
+                NotifyObservers(SettingId::Longitude);
+            }
+        }
+
+        // LightTime
+        if (const auto jsonVal = values.get_int_value(L"lightTime"))
+        {
+            auto val = *jsonVal;
+            if (m_settings.lightTime != val)
+            {
+                m_settings.lightTime = val;
+                NotifyObservers(SettingId::LightTime);
+            }
+        }
+
+        // DarkTime
+        if (const auto jsonVal = values.get_int_value(L"darkTime"))
+        {
+            auto val = *jsonVal;
+            if (m_settings.darkTime != val)
+            {
+                m_settings.darkTime = val;
+                NotifyObservers(SettingId::DarkTime);
+            }
+        }
+
+        // Offset
+        if (const auto jsonVal = values.get_int_value(L"offset")) 
+        {
+            auto val = *jsonVal;
+            if (m_settings.offset != val)
+            {
+                m_settings.offset = val;
+                NotifyObservers(SettingId::Offset);
+            }
+        }
+
+        // ChangeSystem
+        if (const auto jsonVal = values.get_bool_value(L"changeSystem"))
+        {
+            auto val = *jsonVal;
+            if (m_settings.changeSystem != val)
+            {
+                m_settings.changeSystem = val;
+                NotifyObservers(SettingId::ChangeSystem);
+            }
+        }
+
+        // ChangeApps
+        if (const auto jsonVal = values.get_bool_value(L"changeApps"))
+        {
+            auto val = *jsonVal;
+            if (m_settings.changeApps != val)
+            {
+                m_settings.changeApps = val;
+                NotifyObservers(SettingId::ChangeApps);
+            }
+        }
+    }
+    catch (...)
+    {
+        // Keeps defaults if load fails
+    }
+}
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.h
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.h
@@ -0,0 +1,87 @@
+#pragma once
+
+#include <unordered_set>
+#include <string>
+#include <vector>
+#include <memory>
+#include <windows.h>
+
+#include <common/SettingsAPI/FileWatcher.h>
+#include <common/SettingsAPI/settings_objects.h>
+#include <SettingsConstants.h>
+
+class SettingsObserver;
+
+enum class ScheduleMode
+{
+    FixedHours,
+    SunsetToSunrise
+    // Add more in the future
+};
+
+inline std::wstring ToString(ScheduleMode mode)
+{
+    switch (mode)
+    {
+    case ScheduleMode::FixedHours:
+        return L"FixedHours";
+    case ScheduleMode::SunsetToSunrise:
+        return L"SunsetToSunrise";
+    default:
+        return L"FixedHours";
+    }
+}
+
+inline ScheduleMode FromString(const std::wstring& str)
+{
+    if (str == L"SunsetToSunrise")
+        return ScheduleMode::SunsetToSunrise;
+    else
+        return ScheduleMode::FixedHours;
+}
+
+struct LightSwitchConfig
+{
+    ScheduleMode scheduleMode = ScheduleMode::FixedHours;
+
+    std::wstring latitude = L"0.0";
+    std::wstring longitude = L"0.0";
+
+    // Stored as minutes since midnight
+    int lightTime = 8 * 60; // 08:00 default
+    int darkTime = 20 * 60; // 20:00 default
+
+    int offset = 0; // offset in minutes to apply to calculated times
+
+    bool changeSystem = false;
+    bool changeApps = false;
+};
+
+class LightSwitchSettings
+{
+public:
+    static LightSwitchSettings& instance();
+
+    static inline const LightSwitchConfig& settings()
+    {
+        return instance().m_settings;
+    }
+
+    void InitFileWatcher();
+    static std::wstring GetSettingsFileName();
+
+    void AddObserver(SettingsObserver& observer);
+    void RemoveObserver(SettingsObserver& observer);
+
+    void LoadSettings();
+
+private:
+    LightSwitchSettings();
+    ~LightSwitchSettings() = default;
+
+    LightSwitchConfig m_settings;
+    std::unique_ptr<FileWatcher> m_settingsFileWatcher;
+    std::unordered_set<SettingsObserver*> m_observers;
+
+    void NotifyObservers(SettingId id) const;
+};
--- a/src/modules/LightSwitch/LightSwitchService/SettingsConstants.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/SettingsConstants.cpp
@@ -0,0 +1 @@
+#include "SettingsConstants.h"
--- a/src/modules/LightSwitch/LightSwitchService/SettingsConstants.h
+++ b/src/modules/LightSwitch/LightSwitchService/SettingsConstants.h
@@ -0,0 +1,13 @@
+#pragma once
+
+enum class SettingId
+{
+    ScheduleMode = 0,
+    Latitude,
+    Longitude,
+    LightTime,
+    DarkTime,
+    Offset,
+    ChangeSystem,
+    ChangeApps
+};
--- a/src/modules/LightSwitch/LightSwitchService/SettingsObserver.h
+++ b/src/modules/LightSwitch/LightSwitchService/SettingsObserver.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <unordered_set>
+#include "SettingsConstants.h"
+
+class LightSwitchSettings;
+
+class SettingsObserver
+{
+public:
+    SettingsObserver(std::unordered_set<SettingId> observedSettings) :
+        m_observedSettings(std::move(observedSettings))
+    {
+        LightSwitchSettings::instance().AddObserver(*this);
+    }
+
+    virtual ~SettingsObserver()
+    {
+        LightSwitchSettings::instance().RemoveObserver(*this);
+    }
+
+    // Override this in your class to respond to updates
+    virtual void SettingsUpdate(SettingId type) {}
+
+    bool WantsToBeNotified(SettingId type) const noexcept
+    {
+        return m_observedSettings.contains(type);
+    }
+
+protected:
+    std::unordered_set<SettingId> m_observedSettings;
+};
--- a/src/modules/LightSwitch/LightSwitchService/ThemeHelper.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/ThemeHelper.cpp
@@ -0,0 +1,80 @@
+#include <windows.h>
+#include "ThemeHelper.h"
+
+// Controls changing the themes.
+
+void 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 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);
+
+        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 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 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
+}
--- a/src/modules/LightSwitch/LightSwitchService/ThemeHelper.h
+++ b/src/modules/LightSwitch/LightSwitchService/ThemeHelper.h
@@ -0,0 +1,5 @@
+#pragma once
+void SetSystemTheme(bool dark);
+void SetAppsTheme(bool dark);
+bool GetCurrentSystemTheme();
+bool GetCurrentAppsTheme();
--- a/src/modules/LightSwitch/LightSwitchService/ThemeScheduler.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/ThemeScheduler.cpp
@@ -0,0 +1,89 @@
+#include "ThemeScheduler.h"
+#include <utility>
+
+SunTimes CalculateSunriseSunset(double latitude, double longitude, int year, int month, int day)
+{
+    double zenith = 90.833;
+    int N1 = static_cast<int>(floor(275.0 * month / 9.0));
+    int N2 = static_cast<int>(floor((static_cast<double>(month) + 9) / 12.0));
+    int N3 = static_cast<int>(floor((1.0 + floor((year - 4.0 * floor(year / 4.0) + 2.0) / 3.0))));
+    int N = N1 - (N2 * N3) + day - 30;
+
+    auto calcTime = [&](bool sunrise) -> double {
+        double lngHour = longitude / 15.0;
+        double t = sunrise ? N + ((6 - lngHour) / 24) : N + ((18 - lngHour) / 24);
+
+        double M = (0.9856 * t) - 3.289;
+        double L = M + (1.916 * sin(deg2rad(M))) + (0.020 * sin(2 * deg2rad(M))) + 282.634;
+        if (L < 0)
+            L += 360;
+        if (L > 360)
+            L -= 360;
+
+        double RA = rad2deg(atan(0.91764 * tan(deg2rad(L))));
+        if (RA < 0)
+            RA += 360;
+        if (RA > 360)
+            RA -= 360;
+
+        double Lquadrant = floor(L / 90) * 90;
+        double RAquadrant = floor(RA / 90) * 90;
+        RA = RA + (Lquadrant - RAquadrant);
+        RA /= 15;
+
+        double sinDec = 0.39782 * sin(deg2rad(L));
+        double cosDec = cos(asin(sinDec));
+
+        double cosH = (cos(deg2rad(zenith)) - (sinDec * sin(deg2rad(latitude)))) / (cosDec * cos(deg2rad(latitude)));
+        if (cosH > 1 || cosH < -1)
+            return -1;
+
+        double H = sunrise ? 360 - rad2deg(acos(cosH)) : rad2deg(acos(cosH));
+        H /= 15;
+
+        double T = H + RA - (0.06571 * t) - 6.622;
+        double UT = T - lngHour;
+        while (UT < 0)
+            UT += 24;
+        while (UT >= 24)
+            UT -= 24;
+
+        return UT;
+    };
+
+    double riseUT = calcTime(true);
+    double setUT = calcTime(false);
+
+    auto toLocal = [](double UT) {
+        TIME_ZONE_INFORMATION tz;
+        DWORD state = GetTimeZoneInformation(&tz);
+        double totalBias = tz.Bias;
+
+        if (state == TIME_ZONE_ID_DAYLIGHT)
+            totalBias += tz.DaylightBias;
+        else if (state == TIME_ZONE_ID_STANDARD)
+            totalBias += tz.StandardBias;
+
+        double biasHours = -(totalBias / 60.0);
+        double localTime = UT + biasHours;
+
+        while (localTime < 0)
+            localTime += 24;
+        while (localTime >= 24)
+            localTime -= 24;
+
+        int hour = static_cast<int>(localTime);
+        int minute = static_cast<int>((localTime - hour) * 60);
+        return std::pair<int, int>{ hour, minute };
+    };
+
+    auto [riseHour, riseMinute] = toLocal(riseUT);
+    auto [setHour, setMinute] = toLocal(setUT);
+
+    SunTimes result;
+    result.sunriseHour = riseHour;
+    result.sunriseMinute = riseMinute;
+    result.sunsetHour = setHour;
+    result.sunsetMinute = setMinute;
+    return result;
+}
--- a/src/modules/LightSwitch/LightSwitchService/ThemeScheduler.h
+++ b/src/modules/LightSwitch/LightSwitchService/ThemeScheduler.h
@@ -0,0 +1,25 @@
+#pragma once
+#include <cmath>
+#include <ctime>
+#include <windows.h>
+
+// Struct to hold calculated sunrise/sunset times
+struct SunTimes
+{
+    int sunriseHour;
+    int sunriseMinute;
+    int sunsetHour;
+    int sunsetMinute;
+};
+
+constexpr double PI = 3.14159265358979323846;
+constexpr double deg2rad(double deg)
+{
+    return deg * PI / 180.0;
+}
+constexpr double rad2deg(double rad)
+{
+    return rad * 180.0 / PI;
+}
+
+SunTimes CalculateSunriseSunset(double latitude, double longitude, int year, int month, int day);
--- a/src/modules/LightSwitch/LightSwitchService/WinHookEventIDs.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/WinHookEventIDs.cpp
@@ -0,0 +1,15 @@
+
+#include "WinHookEventIDs.h"
+#include <wtypes.h>
+#include <mutex>
+
+UINT WM_PRIV_SETTINGS_CHANGED = 0;
+
+std::once_flag init_flag;
+
+void InitializeWinhookEventIds()
+{
+    std::call_once(init_flag, [&] {
+        WM_PRIV_SETTINGS_CHANGED = RegisterWindowMessage(L"{11978F7B-221A-4E65-B9A9-693F7D6E4B25}");
+    });
+}
--- a/src/modules/LightSwitch/LightSwitchService/WinHookEventIDs.h
+++ b/src/modules/LightSwitch/LightSwitchService/WinHookEventIDs.h
@@ -0,0 +1,6 @@
+#pragma once
+#include <Windows.h>
+
+extern UINT WM_PRIV_SETTINGS_CHANGED; // Scheduled when a watched settings file is updated
+
+void InitializeWinhookEventIds();
--- a/src/modules/LightSwitch/LightSwitchService/packages.config
+++ b/src/modules/LightSwitch/LightSwitchService/packages.config
@@ -0,0 +1,5 @@
+<?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>
--- a/src/modules/MCPServer/MCPServer/MCPServer.csproj
+++ b/src/modules/MCPServer/MCPServer/MCPServer.csproj
@@ -1,47 +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.SelfContained.props" />
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <UseWindowsForms>false</UseWindowsForms>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-    <AssemblyName>PowerToys.MCPServer</AssemblyName>
-    <AssemblyDescription>PowerToys MCP Server for Model Context Protocol</AssemblyDescription>
-    <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
-    <OutputPath>..\..\..\..\$(Platform)\$(Configuration)</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <NoWin32Manifest>true</NoWin32Manifest>
-    <RootNamespace>PowerToys.MCPServer</RootNamespace>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <!-- CsWinRT configuration -->
-  <PropertyGroup>
-    <CsWinRTIncludes>PowerToys.GPOWrapper</CsWinRTIncludes>
-    <CsWinRTGeneratedFilesDir>$(OutDir)</CsWinRTGeneratedFilesDir>
-    <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <!-- Core dependencies -->
-    <PackageReference Include="Microsoft.Extensions.Hosting" />
-	<PackageReference Include="ModelContextProtocol " />
-    <PackageReference Include="Microsoft.Data.Sqlite" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- PowerToys project references -->
-    <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
-    <ProjectReference Include="..\..\..\common\GPOWrapper\GPOWrapper.vcxproj" />
-    <ProjectReference Include="..\..\..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="appsettings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-</Project>
--- a/src/modules/MCPServer/MCPServer/Program.cs
+++ b/src/modules/MCPServer/MCPServer/Program.cs
@@ -1,34 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.ComponentModel;
-using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using ModelContextProtocol.Server;
-using PowerToys.MCPServer.Tools;
-
-namespace MCPServer
-{
-    internal sealed class Program
-    {
-        private static async Task<int> Main(string[] args)
-        {
-            var builder = Host.CreateApplicationBuilder(args);
-            builder.Logging.AddConsole(consoleLogOptions =>
-            {
-                // Configure all logs to go to stderr
-                consoleLogOptions.LogToStandardErrorThreshold = LogLevel.Trace;
-            });
-            builder.Services
-                .AddMcpServer()
-                .WithStdioServerTransport()
-                .WithToolsFromAssembly();
-            await builder.Build().RunAsync();
-
-            return 0;
-        }
-    }
-}
--- a/src/modules/MCPServer/MCPServer/Tools/AwakeTools.cs
+++ b/src/modules/MCPServer/MCPServer/Tools/AwakeTools.cs
@@ -1,312 +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.ComponentModel;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using Microsoft.Data.Sqlite;
-using Microsoft.PowerToys.Settings.UI.Library;
-using ModelContextProtocol.Server;
-
-namespace PowerToys.MCPServer.Tools
-{
-    [McpServerToolType]
-    public static class AwakeTools
-    {
-        [McpServerTool]
-        [Description("Echoes the message back to the client.")]
-        public static string SetTimeTest(string message) => $"Hello {message}";
-
-        // =============================
-        // HTTP client (Awake remote control)
-        // =============================
-        private static readonly HttpClient _http = new HttpClient();
-
-        // Base URL for Awake HTTP server. Default matches Awake --http-port default (8080).
-        // Allow override through environment variable POWERTOYS_AWAKE_HTTP (e.g. http://localhost:9090/)
-        private static string BaseUrl => (Environment.GetEnvironmentVariable("POWERTOYS_AWAKE_HTTP") ?? "http://localhost:8080/").TrimEnd('/') + "/";
-
-        private static string JsonError(string msg, int? status = null) => JsonSerializer.Serialize(new { success = false, error = msg, status });
-
-        private static string JsonOk(object payload) => JsonSerializer.Serialize(payload);
-
-        private static string SendAwakeRequest(string method, string relativePath, object? body = null)
-        {
-            try
-            {
-                using var req = new HttpRequestMessage(new HttpMethod(method), BaseUrl + relativePath.TrimStart('/'));
-                if (body != null)
-                {
-                    string json = JsonSerializer.Serialize(body);
-                    req.Content = new StringContent(json, Encoding.UTF8, "application/json");
-                }
-
-                using var resp = _http.Send(req);
-                string respText = resp.Content.ReadAsStringAsync().GetAwaiter().GetResult();
-                if (!resp.IsSuccessStatusCode)
-                {
-                    return JsonError($"HTTP {(int)resp.StatusCode} {resp.StatusCode}", (int)resp.StatusCode) + "\n" + respText;
-                }
-
-                return respText;
-            }
-            catch (HttpRequestException ex)
-            {
-                return JsonError($"Connection failed: {ex.Message}. Ensure Awake is running with --http-server.");
-            }
-            catch (Exception ex)
-            {
-                return JsonError(ex.Message);
-            }
-        }
-
-        [McpServerTool]
-        [Description("RECOMMENDED FOR BUILDS: Intelligently keeps the system awake during build, compile, download, or process operations. Monitors CPU/memory/network activity and prevents sleep only when system is actively working. Automatically returns to sleep when build completes. PREFERRED over indefinite mode for development workflows. Params: cpuThresholdPercent (0-100), memThresholdPercent (0-100), netThresholdKBps (KB/s), sampleIntervalSeconds (>0), inactivityTimeoutSeconds (>0), keepDisplayOn=true|false")]
-        public static string AwakeHttpActivityBased(uint cpuThresholdPercent = 50, uint memThresholdPercent = 50, uint netThresholdKBps = 10, uint sampleIntervalSeconds = 30, uint inactivityTimeoutSeconds = 300, bool keepDisplayOn = true)
-        {
-            if (cpuThresholdPercent > 100)
-            {
-                return JsonError("cpuThresholdPercent must be 0-100");
-            }
-
-            if (memThresholdPercent > 100)
-            {
-                return JsonError("memThresholdPercent must be 0-100");
-            }
-
-            if (sampleIntervalSeconds == 0)
-            {
-                return JsonError("sampleIntervalSeconds must be > 0");
-            }
-
-            if (inactivityTimeoutSeconds == 0)
-            {
-                return JsonError("inactivityTimeoutSeconds must be > 0");
-            }
-
-            return SendAwakeRequest("POST", "awake/activity", new
-            {
-                cpuThresholdPercent,
-                memThresholdPercent,
-                netThresholdKBps,
-                sampleIntervalSeconds,
-                inactivityTimeoutSeconds,
-                keepDisplayOn,
-            });
-        }
-
-        [McpServerTool]
-        [Description("Get Awake HTTP status (GET /awake/status). Requires Awake launched with --http-server.")]
-        public static string AwakeHttpStatus() => SendAwakeRequest("GET", "awake/status");
-
-        [McpServerTool]
-        [Description("Keeps the system awake indefinitely until manually changed. WARNING: Less efficient than activity-based mode for builds. Use only when you need guaranteed continuous awake state regardless of system activity. Params: keepDisplayOn=true|false, processId=0")]
-        public static string AwakeHttpIndefinite(bool keepDisplayOn = true, int processId = 0)
-            => SendAwakeRequest("POST", "awake/indefinite", new { keepDisplayOn, processId });
-
-        [McpServerTool]
-        [Description("Set timed keep-awake via HTTP. Params: seconds (>0), keepDisplayOn=true|false")]
-        public static string AwakeHttpTimed(uint seconds, bool keepDisplayOn = true)
-        {
-            if (seconds == 0)
-            {
-                return JsonError("seconds must be > 0");
-            }
-
-            return SendAwakeRequest("POST", "awake/timed", new { seconds, keepDisplayOn });
-        }
-
-        [McpServerTool]
-        [Description("Set expirable keep-awake via HTTP. Params: expireAt (ISO 8601), keepDisplayOn=true|false")]
-        public static string AwakeHttpExpirable(string expireAt, bool keepDisplayOn = true)
-        {
-            if (string.IsNullOrWhiteSpace(expireAt))
-            {
-                return JsonError("expireAt required (ISO 8601)");
-            }
-
-            return SendAwakeRequest("POST", "awake/expirable", new { expireAt, keepDisplayOn });
-        }
-
-        [McpServerTool]
-        [Description("Set passive mode via HTTP (POST /awake/passive).")]
-        public static string AwakeHttpPassive() => SendAwakeRequest("POST", "awake/passive");
-
-        [McpServerTool]
-        [Description("Toggle display keep-on via HTTP (POST /awake/display/toggle).")]
-        public static string AwakeHttpToggleDisplay() => SendAwakeRequest("POST", "awake/display/toggle");
-
-        [McpServerTool]
-        [Description("Get Awake settings via HTTP (GET /awake/settings).")]
-        public static string AwakeHttpSettings() => SendAwakeRequest("GET", "awake/settings");
-
-        [McpServerTool]
-        [Description("Check current PowerToys Awake mode and configuration. Returns active mode (indefinite, timed, activity-based, or passive), remaining time, thresholds, and display settings. Use to verify if system is being kept awake and what settings are active.")]
-        public static string AwakeHttpConfig() => SendAwakeRequest("GET", "awake/config");
-
-        private sealed class AppUsageRecord
-        {
-            [JsonPropertyName("process")]
-            public string ProcessName { get; set; } = string.Empty;
-
-            [JsonPropertyName("totalSeconds")]
-            public double TotalSeconds { get; set; }
-
-            [JsonPropertyName("lastUpdatedUtc")]
-            public DateTime LastUpdatedUtc { get; set; }
-
-            [JsonPropertyName("firstSeenUtc")]
-            public DateTime FirstSeenUtc { get; set; }
-        }
-
-        [McpServerTool]
-        [Description("Get top N foreground app usage entries recorded by Awake. Reads usage.sqlite if present (preferred) else legacy usage.json. Parameters: top (default 10), days (default 7). Returns JSON array.")]
-        public static string GetAwakeUsageSummary(int top = 10, int days = 7)
-        {
-            try
-            {
-                SettingsUtils utils = new();
-                string settingsPath = utils.GetSettingsFilePath("Awake");
-                string directory = Path.GetDirectoryName(settingsPath)!;
-                string sqlitePath = Path.Combine(directory, "usage.sqlite");
-                string legacyJson = Path.Combine(directory, "usage.json");
-
-                if (File.Exists(sqlitePath))
-                {
-                    return QuerySqlite(sqlitePath, top, days);
-                }
-
-                if (File.Exists(legacyJson))
-                {
-                    return QueryLegacyJson(legacyJson, top, days, note: "legacy-json");
-                }
-
-                return JsonSerializer.Serialize(new { error = "No usage data found", sqlite = sqlitePath, legacy = legacyJson });
-            }
-            catch (Exception ex)
-            {
-                return JsonSerializer.Serialize(new { error = ex.Message });
-            }
-        }
-
-        private static string QuerySqlite(string dbPath, int top, int days)
-        {
-            try
-            {
-                int safeDays = Math.Max(1, days);
-                using SqliteConnection conn = new(new SqliteConnectionStringBuilder { DataSource = dbPath, Mode = SqliteOpenMode.ReadOnly }.ToString());
-                conn.Open();
-                using SqliteCommand cmd = conn.CreateCommand();
-                cmd.CommandText = @"SELECT process_name, SUM(total_seconds) AS total_seconds, MIN(first_seen_utc) AS first_seen_utc, MAX(last_updated_utc) AS last_updated_utc
-FROM process_usage
-WHERE day_utc >= date('now', @cutoff)
-GROUP BY process_name
-ORDER BY total_seconds DESC
-LIMIT @top;";
-                cmd.Parameters.AddWithValue("@cutoff", $"-{safeDays} days");
-                cmd.Parameters.AddWithValue("@top", top);
-
-                var list = cmd.ExecuteReader()
-                    .Cast<System.Data.Common.DbDataRecord>()
-                    .Select(r => new AppUsageRecord
-                    {
-                        ProcessName = r.GetString(0),
-                        TotalSeconds = r.GetDouble(1),
-                        FirstSeenUtc = DateTime.Parse(r.GetString(2), null, System.Globalization.DateTimeStyles.RoundtripKind),
-                        LastUpdatedUtc = DateTime.Parse(r.GetString(3), null, System.Globalization.DateTimeStyles.RoundtripKind),
-                    })
-                    .OrderByDescending(r => r.TotalSeconds)
-                    .Select(r => new
-                    {
-                        process = r.ProcessName,
-                        totalSeconds = Math.Round(r.TotalSeconds, 1),
-                        totalHours = Math.Round(r.TotalSeconds / 3600.0, 2),
-                        firstSeenUtc = r.FirstSeenUtc,
-                        lastUpdatedUtc = r.LastUpdatedUtc,
-                        source = "sqlite",
-                    });
-
-                return JsonSerializer.Serialize(list);
-            }
-            catch (Exception ex)
-            {
-                return JsonSerializer.Serialize(new { error = "sqlite query failed", message = ex.Message, path = dbPath });
-            }
-        }
-
-        private static string QueryLegacyJson(string usageFile, int top, int days, string? note = null)
-        {
-            try
-            {
-                string json = File.ReadAllText(usageFile);
-                using JsonDocument doc = JsonDocument.Parse(json);
-                DateTime cutoff = DateTime.UtcNow.AddDays(-Math.Max(1, days));
-                var result = doc.RootElement
-                    .EnumerateArray()
-                    .Select(e => new
-                    {
-                        process = e.GetPropertyOrDefault("process", string.Empty),
-                        totalSeconds = e.GetPropertyOrDefault("totalSeconds", 0.0),
-                        lastUpdatedUtc = e.GetPropertyOrDefaultDateTime("lastUpdatedUtc"),
-                        firstSeenUtc = e.GetPropertyOrDefaultDateTime("firstSeenUtc"),
-                    })
-                    .Where(r => r.lastUpdatedUtc >= cutoff)
-                    .OrderByDescending(r => r.totalSeconds)
-                    .Take(top)
-                    .Select(r => new
-                    {
-                        r.process,
-                        totalSeconds = Math.Round(r.totalSeconds, 1),
-                        totalHours = Math.Round(r.totalSeconds / 3600.0, 2),
-                        r.firstSeenUtc,
-                        r.lastUpdatedUtc,
-                        source = note ?? "json",
-                    });
-                return JsonSerializer.Serialize(result);
-            }
-            catch (Exception ex)
-            {
-                return JsonSerializer.Serialize(new { error = "legacy json read failed", message = ex.Message, path = usageFile });
-            }
-        }
-
-        private static string GetPropertyOrDefault(this JsonElement element, string name, string defaultValue)
-        {
-            if (element.ValueKind == JsonValueKind.Object && element.TryGetProperty(name, out JsonElement value) && value.ValueKind == JsonValueKind.String)
-            {
-                return value.GetString() ?? defaultValue;
-            }
-
-            return defaultValue;
-        }
-
-        private static double GetPropertyOrDefault(this JsonElement element, string name, double defaultValue)
-        {
-            if (element.ValueKind == JsonValueKind.Object && element.TryGetProperty(name, out JsonElement value) && value.ValueKind == JsonValueKind.Number && value.TryGetDouble(out double d))
-            {
-                return d;
-            }
-
-            return defaultValue;
-        }
-
-        private static DateTime GetPropertyOrDefaultDateTime(this JsonElement element, string name)
-        {
-            if (element.ValueKind == JsonValueKind.Object && element.TryGetProperty(name, out JsonElement value))
-            {
-                if (value.ValueKind == JsonValueKind.String && value.TryGetDateTime(out DateTime dt))
-                {
-                    return dt;
-                }
-            }
-
-            return DateTime.MinValue;
-        }
-    }
-}
--- a/src/modules/MCPServer/MCPServer/Tools/EchoTool.cs
+++ b/src/modules/MCPServer/MCPServer/Tools/EchoTool.cs
@@ -1,17 +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.ComponentModel;
-using ModelContextProtocol.Server;
-
-namespace PowerToys.MCPServer.Tools
-{
-    [McpServerToolType]
-    public static class EchoTool
-    {
-        [McpServerTool]
-        [Description("Echoes the message back to the client.")]
-        public static string Echo(string message) => $"Hello {message}";
-    }
-}
--- a/src/modules/MCPServer/MCPServer/appsettings.json
+++ b/src/modules/MCPServer/MCPServer/appsettings.json
@@ -1,18 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information",
-      "PowerToys.MCPServer": "Debug"
-    }
-  },
-  "MCPServer": {
-    "Port": 8080,
-    "MaxConcurrentConnections": 100,
-    "RequestTimeoutSeconds": 30,
-    "EnableTools": true,
-    "EnableResources": true,
-    "Transport": "http"
-  }
-}
--- a/src/modules/MCPServer/MCPServerModuleInterface/MCPServerModuleInterface.def
+++ b/src/modules/MCPServer/MCPServerModuleInterface/MCPServerModuleInterface.def
@@ -1,2 +0,0 @@
-EXPORTS
-powertoy_create
--- a/src/modules/MCPServer/MCPServerModuleInterface/MCPServerModuleInterface.vcxproj
+++ b/src/modules/MCPServer/MCPServerModuleInterface/MCPServerModuleInterface.vcxproj
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\Common.Cpp.props" />
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <ProjectGuid>{A8B8D654-8F2A-4E6C-9B4F-1234567890AB}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>MCPServerModuleInterface</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <ModuleDefinitionFile>MCPServerModuleInterface.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="dllmain.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="targetver.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="MCPServerModuleInterface.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\common\SettingsAPI\SettingsAPI.vcxproj" />
-    <ProjectReference Include="..\..\..\..\common\logger\logger.vcxproj" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
--- a/src/modules/MCPServer/MCPServerModuleInterface/dllmain.cpp
+++ b/src/modules/MCPServer/MCPServerModuleInterface/dllmain.cpp
@@ -1,298 +0,0 @@
-#include "pch.h"
-#include <interface/powertoy_module_interface.h>
-#include <common/logger/logger.h>
-#include <common/utils/resources.h>
-#include <common/SettingsAPI/settings_objects.h>
-#include <common/utils/winapi_error.h>
-#include <shellapi.h>
-
-namespace NonLocalizable
-{
-    const wchar_t ModulePath[] = L"PowerToys.MCPServer.exe";
-    const wchar_t ModuleKey[] = L"MCPServer";
-}
-
-BOOL APIENTRY DllMain(HMODULE /*hModule*/, DWORD ul_reason_for_call, LPVOID /*lpReserved*/)
-{
-    switch (ul_reason_for_call)
-    {
-    case DLL_PROCESS_ATTACH:
-        break;
-    case DLL_THREAD_ATTACH:
-    case DLL_THREAD_DETACH:
-    case DLL_PROCESS_DETACH:
-        break;
-    }
-    return TRUE;
-}
-
-class MCPServerModuleInterface : public PowertoyModuleIface
-{
-public:
-    virtual PCWSTR get_name() override
-    {
-        return app_name.c_str();
-    }
-
-    virtual const wchar_t* get_key() override
-    {
-        return app_key.c_str();
-    }
-
-    virtual powertoys_gpo::gpo_rule_configured_t gpo_policy_enabled_configuration() override
-    {
-        return powertoys_gpo::gpo_rule_configured_t::gpo_rule_configured_not_configured;
-    }
-
-    virtual bool get_config(wchar_t* buffer, int* buffer_size) override
-    {
-        HINSTANCE hinstance = reinterpret_cast<HINSTANCE>(&__ImageBase);
-        PowerToysSettings::Settings settings(hinstance, get_name());
-        
-        settings.set_description(L"MCP Server provides Model Context Protocol access to PowerToys functionality for AI assistants and tools");
-        settings.set_icon_key(L"pt-mcp-server");
-
-        // Port configuration
-        settings.add_int_spinner(
-            L"port",
-            L"Server Port",
-            m_port,
-            1024,
-            65535,
-            1);
-
-        // Auto start option
-        settings.add_bool_toggle(
-            L"auto_start",
-            L"Auto Start Server",
-            m_auto_start);
-
-        // Enable tools API
-        settings.add_bool_toggle(
-            L"enable_tools",
-            L"Enable Tools API",
-            m_enable_tools);
-
-        // Enable resources API
-        settings.add_bool_toggle(
-            L"enable_resources",
-            L"Enable Resources API", 
-            m_enable_resources);
-
-        // Transport protocol
-        settings.add_dropdown(
-            L"transport",
-            L"Transport Protocol",
-            m_transport,
-            std::vector<std::pair<std::wstring, std::wstring>>{
-                { L"http", L"HTTP" },
-                { L"stdio", L"Standard I/O" },
-                { L"tcp", L"TCP Socket" }
-            });
-
-        return settings.serialize_to_buffer(buffer, buffer_size);
-    }
-
-    virtual void set_config(const wchar_t* config) override
-    {
-        try
-        {
-            PowerToysSettings::PowerToyValues values =
-                PowerToysSettings::PowerToyValues::from_json_string(config, get_key());
-
-            if (auto port = values.get_int_value(L"port"))
-            {
-                m_port = port.value();
-            }
-
-            if (auto auto_start = values.get_bool_value(L"auto_start"))
-            {
-                m_auto_start = auto_start.value();
-            }
-
-            if (auto enable_tools = values.get_bool_value(L"enable_tools"))
-            {
-                m_enable_tools = enable_tools.value();
-            }
-
-            if (auto enable_resources = values.get_bool_value(L"enable_resources"))
-            {
-                m_enable_resources = enable_resources.value();
-            }
-
-            if (auto transport = values.get_string_value(L"transport"))
-            {
-                m_transport = transport.value();
-            }
-
-            values.save_to_settings_file();
-            
-            // If service is running, restart to apply new configuration
-            if (m_enabled && is_process_running())
-            {
-                StopMCPServer();
-                StartMCPServer();
-            }
-        }
-        catch (std::exception& e)
-        {
-            Logger::error("MCPServer configuration parsing failed: {}", std::string{ e.what() });
-        }
-    }
-
-    virtual void enable() override
-    {
-        Logger::info("MCPServer enabling");
-        m_enabled = true;
-        if (m_auto_start)
-        {
-            StartMCPServer();
-        }
-    }
-
-    virtual void disable() override
-    {
-        Logger::info("MCPServer disabling");
-        m_enabled = false;
-        StopMCPServer();
-    }
-
-    virtual bool is_enabled() override
-    {
-        return m_enabled;
-    }
-
-    virtual void destroy() override
-    {
-        StopMCPServer();
-        delete this;
-    }
-
-    MCPServerModuleInterface()
-    {
-        app_name = L"MCP Server";
-        app_key = NonLocalizable::ModuleKey;
-        m_port = 8080;
-        m_auto_start = true;
-        m_enable_tools = true;
-        m_enable_resources = true;
-        m_transport = L"http";
-        init_settings();
-    }
-
-private:
-    void StartMCPServer()
-    {
-        if (m_hProcess && WaitForSingleObject(m_hProcess, 0) == WAIT_TIMEOUT)
-        {
-            return; // Already running
-        }
-
-        std::wstring executable_args = L"--port=" + std::to_wstring(m_port);
-        
-        if (!m_enable_tools)
-        {
-            executable_args += L" --disable-tools";
-        }
-        
-        if (!m_enable_resources)
-        {
-            executable_args += L" --disable-resources";
-        }
-
-        if (!m_transport.empty())
-        {
-            executable_args += L" --transport=" + m_transport;
-        }
-
-        SHELLEXECUTEINFOW sei{ sizeof(sei) };
-        sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI };
-        sei.lpFile = NonLocalizable::ModulePath;
-        sei.nShow = SW_HIDE;
-        sei.lpParameters = executable_args.data();
-        
-        if (ShellExecuteExW(&sei))
-        {
-            m_hProcess = sei.hProcess;
-            Logger::info("MCPServer started successfully on port {} with transport {}", m_port, std::string(m_transport.begin(), m_transport.end()));
-        }
-        else
-        {
-            Logger::error("Failed to start MCPServer");
-            auto message = get_last_error_message(GetLastError());
-            if (message.has_value())
-            {
-                Logger::error(message.value());
-            }
-        }
-    }
-
-    void StopMCPServer()
-    {
-        if (m_hProcess)
-        {
-            TerminateProcess(m_hProcess, 0);
-            CloseHandle(m_hProcess);
-            m_hProcess = nullptr;
-            Logger::info("MCPServer stopped");
-        }
-    }
-
-    bool is_process_running()
-    {
-        return m_hProcess && WaitForSingleObject(m_hProcess, 0) == WAIT_TIMEOUT;
-    }
-
-    void init_settings()
-    {
-        try
-        {
-            PowerToysSettings::PowerToyValues settings =
-                PowerToysSettings::PowerToyValues::load_from_settings_file(get_key());
-
-            if (auto port = settings.get_int_value(L"port"))
-            {
-                m_port = port.value();
-            }
-
-            if (auto auto_start = settings.get_bool_value(L"auto_start"))
-            {
-                m_auto_start = auto_start.value();
-            }
-
-            if (auto enable_tools = settings.get_bool_value(L"enable_tools"))
-            {
-                m_enable_tools = enable_tools.value();
-            }
-
-            if (auto enable_resources = settings.get_bool_value(L"enable_resources"))
-            {
-                m_enable_resources = enable_resources.value();
-            }
-
-            if (auto transport = settings.get_string_value(L"transport"))
-            {
-                m_transport = transport.value();
-            }
-        }
-        catch (std::exception&)
-        {
-            Logger::warn(L"MCPServer settings file not found, using defaults");
-        }
-    }
-
-    std::wstring app_name;
-    std::wstring app_key;
-    bool m_enabled = false;
-    HANDLE m_hProcess = nullptr;
-    int m_port = 8080;
-    bool m_auto_start = true;
-    bool m_enable_tools = true;
-    bool m_enable_resources = true;
-    std::wstring m_transport = L"http";
-};
-
-extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
-{
-    return new MCPServerModuleInterface();
-}
--- a/src/modules/MCPServer/MCPServerModuleInterface/pch.cpp
+++ b/src/modules/MCPServer/MCPServerModuleInterface/pch.cpp
@@ -1 +0,0 @@
-#include "pch.h"
--- a/src/modules/MCPServer/MCPServerModuleInterface/pch.h
+++ b/src/modules/MCPServer/MCPServerModuleInterface/pch.h
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "targetver.h"
-
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
-#include <windows.h>
-#include <unknwn.h>
-#include <restrictederrorinfo.h>
-#include <hstring.h>
-#include <string>
-#include <vector>
--- a/src/modules/MCPServer/MCPServerModuleInterface/targetver.h
+++ b/src/modules/MCPServer/MCPServerModuleInterface/targetver.h
@@ -1,8 +0,0 @@
-#pragma once
-
-// Including SDKDDKVer.h defines the highest available Windows platform.
-
-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
-
-#include <SDKDDKVer.h>
--- a/src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/MainWindow.xaml
+++ b/src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/MainWindow.xaml
@@ -5,7 +5,6 @@
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:winuiex="using:WinUIEx"
-    Title="PowerToys.ScreenRuler"
    IsAlwaysOnTop="True"
    IsMaximizable="False"
    IsMinimizable="False"
@@ -251,7 +250,6 @@
            <ToggleButton
                Name="btnBounds"
                x:Uid="BtnBounds"
-                AutomationProperties.AutomationId="Button_Bounds"
                Click="BoundsTool_Click"
                Content="&#xEF20;"
                KeyboardAcceleratorPlacementMode="Auto"
@@ -269,7 +267,6 @@
            <ToggleButton
                Name="btnSpacing"
                x:Uid="BtnSpacing"
-                AutomationProperties.AutomationId="Button_Spacing"
                Click="MeasureTool_Click"
                Style="{StaticResource ToggleButtonRadioButtonStyle}">
                <ToolTipService.ToolTip>
@@ -287,7 +284,6 @@
            <ToggleButton
                Name="btnHorizontalSpacing"
                x:Uid="BtnHorizontalSpacing"
-                AutomationProperties.AutomationId="Button_SpacingHorizontal"
                Click="HorizontalMeasureTool_Click"
                Style="{StaticResource ToggleButtonRadioButtonStyle}">
                <ToolTipService.ToolTip>
@@ -308,7 +304,6 @@
            <ToggleButton
                Name="btnVerticalSpacing"
                x:Uid="BtnVerticalSpacing"
-                AutomationProperties.AutomationId="Button_SpacingVertical"
                Click="VerticalMeasureTool_Click"
                Style="{StaticResource ToggleButtonRadioButtonStyle}">
                <ToolTipService.ToolTip>
@@ -329,7 +324,6 @@
            <AppBarSeparator />
            <Button
                x:Uid="BtnClosePanel"
-                AutomationProperties.AutomationId="Button_Close"
                Click="ClosePanelTool_Click"
                Content="&#xE8BB;"
                Foreground="{StaticResource CloseButtonBackgroundPointerOver}">
--- a/src/modules/MeasureTool/Tests/ScreenRuler.UITests/Package.appxmanifest
+++ b/src/modules/MeasureTool/Tests/ScreenRuler.UITests/Package.appxmanifest
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  IgnorableNamespaces="uap rescap">
-
-  <Identity
-    Name="d4d0f157-5c12-4390-9689-152b0c86a582"
-    Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
-    Version="1.0.0.0" />
-
-  <mp:PhoneIdentity PhoneProductId="d4d0f157-5c12-4390-9689-152b0c86a582" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
-
-  <Properties>
-    <DisplayName>ScreenRuler.UITests</DisplayName>
-    <PublisherDisplayName>Microsoft</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
-  </Properties>
-
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
-  </Dependencies>
-
-  <Resources>
-    <Resource Language="x-generate"/>
-  </Resources>
-
-  <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="$targetentrypoint$">
-      <uap:VisualElements
-        DisplayName="ScreenRuler.UITests"
-        Description="ScreenRuler.UITests"
-        BackgroundColor="transparent"
-        Square150x150Logo="Assets\Square150x150Logo.png"
-        Square44x44Logo="Assets\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" />
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
-      </uap:VisualElements>
-    </Application>
-  </Applications>
-
-  <Capabilities>
-    <rescap:Capability Name="runFullTrust" />
-  </Capabilities>
-</Package>
--- a/src/modules/MeasureTool/Tests/ScreenRuler.UITests/ScreenRuler.UITests.csproj
+++ b/src/modules/MeasureTool/Tests/ScreenRuler.UITests/ScreenRuler.UITests.csproj
@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-  <PropertyGroup>
-	  <RootNamespace>PowerToys.ScreenRuler.UITests</RootNamespace>
-	  <AssemblyName>ScreenRuler.UITests</AssemblyName>
-	  <IsPackable>false</IsPackable>
-	  <IsTestProject>true</IsTestProject>
-	  <Nullable>enable</Nullable>
-	  <OutputType>Library</OutputType>
-
-	  <!-- This is a UI test, so don't run as part of MSBuild -->
-	  <RunVSTest>false</RunVSTest>
-  </PropertyGroup>
-  <PropertyGroup>
-	  <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\tests\ScreenRuler.UITests\</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-	  <PackageReference Include="MSTest" />
-	  <ProjectReference Include="..\..\..\..\common\UITestAutomation\UITestAutomation.csproj" />
-  </ItemGroup>
-</Project>
- 
--- a/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestBounds.cs
+++ b/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestBounds.cs
@@ -1,27 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.PowerToys.UITest;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace ScreenRuler.UITests
-{
-    [TestClass]
-    public class TestBounds : UITestBase
-    {
-        public TestBounds()
-            : base(PowerToysModule.PowerToysSettings, WindowSize.Large)
-        {
-        }
-
-        [TestMethod("ScreenRuler.BoundsTool")]
-        [TestCategory("Spacing")]
-        public void TestScreenRulerBoundsTool()
-        {
-            TestHelper.InitializeTest(this, "bounds test");
-            TestHelper.PerformBoundsToolTest(this);
-            TestHelper.CleanupTest(this);
-        }
-    }
-}
--- a/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestHelper.cs
+++ b/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestHelper.cs
@@ -1,466 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.PowerToys.UITest;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace ScreenRuler.UITests
-{
-    public static class TestHelper
-    {
-        private static readonly string[] ShortcutSeparators = { " + ", "+", " " };
-
-        // Button automation names from Resources.resw
-        public const string BoundsButtonId = "Button_Bounds";
-        public const string SpacingButtonName = "Button_Spacing";
-        public const string HorizontalSpacingButtonName = "Button_SpacingHorizontal";
-        public const string VerticalSpacingButtonName = "Button_SpacingVertical";
-        public const string CloseButtonId = "Button_Close";
-
-        /// <summary>
-        /// Performs common test initialization: navigate to settings, enable toggle, verify shortcut
-        /// </summary>
-        /// <param name="testBase">The test base instance</param>
-        /// <param name="testName">Name of the test for assertions</param>
-        /// <returns>The activation keys for the test</returns>
-        public static Key[] InitializeTest(UITestBase testBase, string testName)
-        {
-            LaunchFromSetting(testBase);
-
-            var toggleSwitch = SetScreenRulerToggle(testBase, enable: true);
-            Assert.IsTrue(
-                toggleSwitch.IsOn,
-                $"Screen Ruler toggle switch should be ON for {testName}");
-
-            var activationKeys = ReadActivationShortcut(testBase);
-            Assert.IsNotNull(activationKeys, "Should be able to read activation shortcut");
-            Assert.IsTrue(activationKeys.Length > 0, "Activation shortcut should contain at least one key");
-
-            return activationKeys;
-        }
-
-        /// <summary>
-        /// Performs common test cleanup: close ScreenRuler UI
-        /// </summary>
-        /// <param name="testBase">The test base instance</param>
-        public static void CleanupTest(UITestBase testBase)
-        {
-            CloseScreenRulerUI(testBase);
-
-            // Ensure we're attached to settings after cleanup
-            try
-            {
-                testBase.Session.Attach(PowerToysModule.PowerToysSettings);
-            }
-            catch
-            {
-                // Ignore attachment errors - this is just cleanup
-            }
-        }
-
-        /// <summary>
-        /// Navigate to the Screen Ruler (Measure Tool) settings page
-        /// </summary>
-        public static void LaunchFromSetting(UITestBase testBase)
-        {
-            var screenRulers = testBase.Session.FindAll<NavigationViewItem>(By.AccessibilityId("ScreenRulerNavItem"));
-
-            if (screenRulers.Count == 0)
-            {
-                testBase.Session.Find<NavigationViewItem>(By.AccessibilityId("SystemToolsNavItem"), 5000).Click(msPostAction: 500);
-            }
-
-            testBase.Session.Find<NavigationViewItem>(By.AccessibilityId("ScreenRulerNavItem"), 5000).Click(msPostAction: 500);
-        }
-
-        /// <summary>
-        /// Set the Screen Ruler toggle switch to the specified state
-        /// </summary>
-        public static ToggleSwitch SetScreenRulerToggle(UITestBase testBase, bool enable)
-        {
-            var toggleSwitch = testBase.Session.Find<ToggleSwitch>(By.AccessibilityId("Toggle_ScreenRuler"), 5000);
-
-            if (toggleSwitch.IsOn != enable)
-            {
-                toggleSwitch.Click(msPreAction: 1000, msPostAction: 2000);
-            }
-
-            if (toggleSwitch.IsOn != enable)
-            {
-                testBase.Session.SendKey(Key.Space, msPreAction: 0, msPostAction: 2000);
-            }
-
-            return toggleSwitch;
-        }
-
-        /// <summary>
-        /// Set the Screen Ruler toggle and verify its state
-        /// </summary>
-        /// <param name="testBase">The test base instance</param>
-        /// <param name="enable">True to enable, false to disable</param>
-        /// <param name="testName">Name of the test for assertion messages</param>
-        public static void SetAndVerifyScreenRulerToggle(UITestBase testBase, bool enable, string testName)
-        {
-            var toggleSwitch = SetScreenRulerToggle(testBase, enable);
-            Assert.AreEqual(
-                enable,
-                toggleSwitch.IsOn,
-                $"Screen Ruler toggle switch should be {(enable ? "ON" : "OFF")} for {testName}");
-        }
-
-        /// <summary>
-        /// Read the current activation shortcut from the ShortcutControl
-        /// </summary>
-        public static Key[] ReadActivationShortcut(UITestBase testBase)
-        {
-            var shortcutCard = testBase.Session.Find<Element>(By.AccessibilityId("Shortcut_ScreenRuler"), 5000);
-            var shortcutButton = shortcutCard.Find<Element>(By.AccessibilityId("EditButton"), 5000);
-            return ParseShortcutText(shortcutButton.HelpText);
-        }
-
-        /// <summary>
-        /// Parse shortcut text like "Win + Ctrl + Shift + M" into Key array
-        /// </summary>
-        private static Key[] ParseShortcutText(string shortcutText)
-        {
-            if (string.IsNullOrEmpty(shortcutText))
-            {
-                return new Key[] { Key.Win, Key.Ctrl, Key.Shift, Key.M };
-            }
-
-            var keys = new List<Key>();
-            var parts = shortcutText.Split(ShortcutSeparators, StringSplitOptions.RemoveEmptyEntries);
-
-            foreach (var part in parts)
-            {
-                var cleanPart = part.Trim().ToLowerInvariant();
-                var key = cleanPart switch
-                {
-                    "win" or "windows" => Key.Win,
-                    "ctrl" or "control" => Key.Ctrl,
-                    "shift" => Key.Shift,
-                    "alt" => Key.Alt,
-                    _ when cleanPart.Length == 1 && char.IsLetter(cleanPart[0]) &&
-                         cleanPart[0] >= 'a' && cleanPart[0] <= 'z' =>
-                        (Key)Enum.Parse(typeof(Key), cleanPart.ToUpperInvariant()),
-                    _ => (Key?)null,
-                };
-
-                if (key.HasValue)
-                {
-                    keys.Add(key.Value);
-                }
-            }
-
-            return keys.Count > 0 ? keys.ToArray() : new Key[] { Key.Win, Key.Ctrl, Key.Shift, Key.M };
-        }
-
-        /// <summary>
-        /// Check if ScreenRulerUI window is open
-        /// </summary>
-        public static bool IsScreenRulerUIOpen(UITestBase testBase) => testBase.IsWindowOpen("PowerToys.ScreenRuler");
-
-        /// <summary>
-        /// Wait for ScreenRulerUI to reach the specified state within the timeout
-        /// </summary>
-        public static bool WaitForScreenRulerUIState(UITestBase testBase, bool shouldBeOpen, int timeoutMs = 5000, int pollingIntervalMs = 100)
-        {
-            var endTime = DateTime.Now.AddMilliseconds(timeoutMs);
-
-            while (DateTime.Now < endTime)
-            {
-                if (IsScreenRulerUIOpen(testBase) == shouldBeOpen)
-                {
-                    return true;
-                }
-
-                Task.Delay(pollingIntervalMs).Wait();
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Wait for ScreenRulerUI to appear within the specified timeout
-        /// </summary>
-        public static bool WaitForScreenRulerUI(UITestBase testBase, int timeoutMs = 5000) =>
-            WaitForScreenRulerUIState(testBase, shouldBeOpen: true, timeoutMs);
-
-        /// <summary>
-        /// Wait for ScreenRulerUI to disappear within the specified timeout
-        /// </summary>
-        public static bool WaitForScreenRulerUIToDisappear(UITestBase testBase, int timeoutMs = 5000) =>
-            WaitForScreenRulerUIState(testBase, shouldBeOpen: false, timeoutMs);
-
-        /// <summary>
-        /// Close ScreenRulerUI if it's open
-        /// </summary>
-        public static void CloseScreenRulerUI(UITestBase testBase)
-        {
-            if (IsScreenRulerUIOpen(testBase))
-            {
-                try
-                {
-                    // Attach to ScreenRuler window before trying to find and click close button
-                    testBase.Session.Attach(PowerToysModule.ScreenRuler);
-                    var closeButton = testBase.Session.Find<Element>(By.AccessibilityId(CloseButtonId), 15000, true);
-                    closeButton?.Click();
-                }
-                catch
-                {
-                    // If we can't find the close button, ignore - the window might have closed already
-                }
-                finally
-                {
-                    // Attach back to settings after closing
-                    try
-                    {
-                        testBase.Session.Attach(PowerToysModule.PowerToysSettings);
-                    }
-                    catch
-                    {
-                        // Ignore attachment errors
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Get a specific ScreenRulerUI button by its automation name
-        /// </summary>
-        public static Element? GetScreenRulerButton(UITestBase testBase, string buttonName, int timeoutMs = 1000)
-        {
-            return testBase.Session.Find<Element>(By.AccessibilityId(buttonName), timeoutMs, true);
-
-            /*
-            try
-            {
-                // Attach to ScreenRuler window before trying to find buttons
-                testBase.Session.Attach(PowerToysModule.ScreenRuler);
-                return testBase.Session.Find<Element>(By.AccessibilityId(buttonName), timeoutMs, true);
-            }
-            catch
-            {
-                return null;
-            }
-            finally
-            {
-                // Attach back to settings if needed for further operations
-                // This ensures we don't break the test flow
-                try
-                {
-                    testBase.Session.Attach(PowerToysModule.PowerToysSettings);
-                }
-                catch
-                {
-                    // Ignore attachment errors - the calling code will handle as needed
-                }
-            }
-            */
-        }
-
-        /// <summary>
-        /// Clear the clipboard content using STA thread
-        /// </summary>
-        public static void ClearClipboard()
-        {
-            ExecuteInSTAThread(() => System.Windows.Forms.Clipboard.Clear());
-        }
-
-        /// <summary>
-        /// Get text content from clipboard using STA thread
-        /// </summary>
-        public static string GetClipboardText()
-        {
-            string result = string.Empty;
-            ExecuteInSTAThread(() =>
-            {
-                if (System.Windows.Forms.Clipboard.ContainsText())
-                {
-                    result = System.Windows.Forms.Clipboard.GetText();
-                }
-            });
-            return result ?? string.Empty;
-        }
-
-        /// <summary>
-        /// Execute an action in an STA thread with error handling
-        /// </summary>
-        private static void ExecuteInSTAThread(Action action)
-        {
-            try
-            {
-                var staThread = new Thread(() =>
-                {
-                    try
-                    {
-                        action();
-                    }
-                    catch
-                    {
-                        // Ignore clipboard errors
-                    }
-                });
-
-                staThread.SetApartmentState(ApartmentState.STA);
-                staThread.Start();
-                staThread.Join(TimeSpan.FromSeconds(5));
-            }
-            catch
-            {
-                // Ignore clipboard errors
-            }
-        }
-
-        /// <summary>
-        /// Validate clipboard content contains valid spacing measurement for the specified type
-        /// </summary>
-        public static bool ValidateSpacingClipboardContent(string clipboardText, string spacingType)
-        {
-            if (string.IsNullOrEmpty(clipboardText))
-            {
-                return false;
-            }
-
-            return spacingType switch
-            {
-                "Spacing" => Regex.IsMatch(clipboardText, @"\d+\s*[<5B>x×]\s*\d+"),
-                "Horizontal Spacing" or "Vertical Spacing" => Regex.IsMatch(clipboardText, @"^\d+$"),
-                _ => false,
-            };
-        }
-
-        /// <summary>
-        /// Perform a complete spacing tool test operation
-        /// </summary>
-        public static void PerformSpacingToolTest(UITestBase testBase, string buttonId, string testName)
-        {
-            ClearClipboard();
-
-            // Launch ScreenRuler UI
-            var activationKeys = ReadActivationShortcut(testBase);
-            testBase.SendKeys(activationKeys);
-
-            Assert.IsTrue(
-                WaitForScreenRulerUI(testBase, 2000),
-                $"ScreenRulerUI should appear after pressing activation shortcut for {testName}: {string.Join(" + ", activationKeys)}");
-
-            // Attach to ScreenRuler window and click spacing button
-            // testBase.Session.Attach(PowerToysModule.ScreenRuler);
-            var spacingButton = testBase.Session.Find<Element>(By.AccessibilityId(buttonId), 15000, true);
-            Assert.IsNotNull(spacingButton, $"{testName} button should be found");
-
-            spacingButton!.Click();
-            Task.Delay(500).Wait();
-
-            // Perform measurement action (stay attached to ScreenRuler for this)
-            PerformMeasurementAction(testBase);
-
-            // Validate results
-            ValidateClipboardResults(testName);
-
-            // Cleanup - this will handle session attachment properly
-            CloseScreenRulerUI(testBase);
-            Assert.IsTrue(
-                WaitForScreenRulerUIToDisappear(testBase, 2000),
-                $"{testName}: ScreenRulerUI should close after calling CloseScreenRulerUI");
-        }
-
-        /// <summary>
-        /// Perform a bounds tool test operation
-        /// </summary>
-        public static void PerformBoundsToolTest(UITestBase testBase)
-        {
-            ClearClipboard();
-
-            var activationKeys = ReadActivationShortcut(testBase);
-            testBase.SendKeys(activationKeys);
-
-            Assert.IsTrue(
-                WaitForScreenRulerUI(testBase, 2000),
-                $"ScreenRulerUI should appear after pressing activation shortcut: {string.Join(" + ", activationKeys)}");
-
-            // Attach to ScreenRuler window and click bounds button
-            // testBase.Session.Attach(PowerToysModule.ScreenRuler);
-            var boundsButton = testBase.Session.Find<Element>(By.AccessibilityId(BoundsButtonId), 15000, true);
-            Assert.IsNotNull(boundsButton, "Bounds button should be found");
-
-            boundsButton.Click();
-            Task.Delay(500).Wait();
-
-            // Perform drag operation to create 100x100 box (stay attached to ScreenRuler)
-            var currentPos = testBase.GetMousePosition();
-            int startX = currentPos.Item1;
-            int startY = currentPos.Item2 + 200;
-
-            testBase.MoveMouseTo(startX, startY);
-            Task.Delay(200).Wait();
-
-            // Drag operation
-            testBase.Session.PerformMouseAction(MouseActionType.LeftDown);
-            Task.Delay(100).Wait();
-
-            testBase.MoveMouseTo(startX + 99, startY + 99);
-            Task.Delay(200).Wait();
-
-            testBase.Session.PerformMouseAction(MouseActionType.LeftUp);
-            Task.Delay(500).Wait();
-
-            // Dismiss selection
-            testBase.Session.PerformMouseAction(MouseActionType.RightClick);
-            Task.Delay(500).Wait();
-
-            // Validate results
-            string clipboardText = GetClipboardText();
-            Assert.IsFalse(string.IsNullOrEmpty(clipboardText), "Clipboard should contain measurement data");
-            Assert.IsTrue(
-                clipboardText.Contains("100 × 100") || clipboardText.Contains("100 x 100"),
-                $"Clipboard should contain '100 x 100', but contained: '{clipboardText}'");
-
-            // Cleanup - this will handle session attachment properly
-            CloseScreenRulerUI(testBase);
-            Assert.IsTrue(
-                WaitForScreenRulerUIToDisappear(testBase, 2000),
-                "ScreenRulerUI should close after calling CloseScreenRulerUI");
-        }
-
-        /// <summary>
-        /// Perform a measurement action (move mouse and click)
-        /// </summary>
-        private static void PerformMeasurementAction(UITestBase testBase)
-        {
-            var currentPos = testBase.GetMousePosition();
-            int startX = currentPos.Item1;
-            int startY = currentPos.Item2 + 200;
-
-            testBase.MoveMouseTo(startX, startY);
-            Task.Delay(200).Wait();
-
-            testBase.Session.PerformMouseAction(MouseActionType.LeftClick);
-            Task.Delay(500).Wait();
-
-            testBase.Session.PerformMouseAction(MouseActionType.RightClick);
-            Task.Delay(500).Wait();
-        }
-
-        /// <summary>
-        /// Validate clipboard results for spacing tests
-        /// </summary>
-        private static void ValidateClipboardResults(string testName)
-        {
-            string clipboardText = GetClipboardText();
-            Assert.IsFalse(string.IsNullOrEmpty(clipboardText), $"{testName}: Clipboard should contain measurement data");
-
-            bool containsValidPattern = ValidateSpacingClipboardContent(clipboardText, testName);
-            Assert.IsTrue(
-                containsValidPattern,
-                $"{testName}: Clipboard should contain valid spacing measurement, but contained: '{clipboardText}'");
-        }
-    }
-}
--- a/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestShortcutActivation.cs
+++ b/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestShortcutActivation.cs
@@ -1,72 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Threading.Tasks;
-using Microsoft.PowerToys.UITest;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace ScreenRuler.UITests
-{
-    [TestClass]
-    public class TestShortcutActivation : UITestBase
-    {
-        public TestShortcutActivation()
-            : base(PowerToysModule.PowerToysSettings, WindowSize.Large)
-        {
-        }
-
-        [TestMethod("ScreenRuler.ShortcutActivation")]
-        [TestCategory("Activation")]
-        public void TestScreenRulerShortcutActivation()
-        {
-            var activationKeys = TestHelper.InitializeTest(this, "activation test");
-
-            // Test 1: Press the activation shortcut and verify the toolbar appears
-            SendKeys(activationKeys);
-            bool screenRulerAppeared = TestHelper.WaitForScreenRulerUI(this, 1000);
-            Assert.IsTrue(
-                screenRulerAppeared,
-                $"ScreenRulerUI should appear after pressing activation shortcut: {string.Join(" + ", activationKeys)}");
-
-            // Test 2: Press the activation shortcut again and verify the toolbar disappears
-            SendKeys(activationKeys);
-            bool screenRulerDisappeared = TestHelper.WaitForScreenRulerUIToDisappear(this, 1000);
-            Assert.IsTrue(
-                screenRulerDisappeared,
-                $"ScreenRulerUI should disappear after pressing activation shortcut again: {string.Join(" + ", activationKeys)}");
-
-            // Test 3: Disable Screen Ruler and verify that the activation shortcut no longer activates the utility
-            // Ensure we're attached to settings UI before toggling
-            Session.Attach(PowerToysModule.PowerToysSettings);
-            TestHelper.SetAndVerifyScreenRulerToggle(this, enable: false, "disabled state test");
-
-            // Try to activate with shortcut while disabled
-            SendKeys(activationKeys);
-            Task.Delay(1000).Wait();
-            Assert.IsFalse(
-                TestHelper.IsScreenRulerUIOpen(this),
-                "ScreenRulerUI should not appear when Screen Ruler is disabled");
-
-            // Test 4: Enable Screen Ruler and press the activation shortcut and verify the toolbar appears
-            // Ensure we're attached to settings UI before toggling
-            Session.Attach(PowerToysModule.PowerToysSettings);
-            TestHelper.SetAndVerifyScreenRulerToggle(this, enable: true, "re-enabled state test");
-
-            SendKeys(activationKeys);
-            screenRulerAppeared = TestHelper.WaitForScreenRulerUI(this, 1000);
-            Assert.IsTrue(
-                screenRulerAppeared,
-                $"ScreenRulerUI should appear after re-enabling and pressing activation shortcut: {string.Join(" + ", activationKeys)}");
-
-            // Test 5: Verify the utility can be closed via the cleanup method
-            TestHelper.CloseScreenRulerUI(this);
-            bool screenRulerClosed = TestHelper.WaitForScreenRulerUIToDisappear(this, 1000);
-            Assert.IsTrue(
-                screenRulerClosed,
-                "ScreenRulerUI should close after calling CloseScreenRulerUI");
-
-            TestHelper.CleanupTest(this);
-        }
-    }
-}
--- a/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestSpacing.cs
+++ b/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestSpacing.cs
@@ -1,27 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.PowerToys.UITest;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace ScreenRuler.UITests
-{
-    [TestClass]
-    public class TestSpacing : UITestBase
-    {
-        public TestSpacing()
-            : base(PowerToysModule.PowerToysSettings, WindowSize.Large)
-        {
-        }
-
-        [TestMethod("ScreenRuler.SpacingTool")]
-        [TestCategory("Spacing")]
-        public void TestScreenRulerSpacingTool()
-        {
-            TestHelper.InitializeTest(this, "spacing test");
-            TestHelper.PerformSpacingToolTest(this, TestHelper.SpacingButtonName, "Spacing");
-            TestHelper.CleanupTest(this);
-        }
-    }
-}
--- a/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestSpacingHorizontal.cs
+++ b/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestSpacingHorizontal.cs
@@ -1,27 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.PowerToys.UITest;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace ScreenRuler.UITests
-{
-    [TestClass]
-    public class TestSpacingHorizontal : UITestBase
-    {
-        public TestSpacingHorizontal()
-            : base(PowerToysModule.PowerToysSettings, WindowSize.Large)
-        {
-        }
-
-        [TestMethod("ScreenRuler.HorizontalSpacingTool")]
-        [TestCategory("Spacing")]
-        public void TestScreenRulerHorizontalSpacingTool()
-        {
-            TestHelper.InitializeTest(this, "horizontal spacing test");
-            TestHelper.PerformSpacingToolTest(this, TestHelper.HorizontalSpacingButtonName, "Horizontal Spacing");
-            TestHelper.CleanupTest(this);
-        }
-    }
-}
--- a/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestSpacingVertical.cs
+++ b/src/modules/MeasureTool/Tests/ScreenRuler.UITests/TestSpacingVertical.cs
@@ -1,27 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.PowerToys.UITest;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace ScreenRuler.UITests
-{
-    [TestClass]
-    public class TestSpacingVertical : UITestBase
-    {
-        public TestSpacingVertical()
-            : base(PowerToysModule.PowerToysSettings, WindowSize.Large)
-        {
-        }
-
-        [TestMethod("ScreenRuler.VerticalSpacingTool")]
-        [TestCategory("Spacing")]
-        public void TestScreenRulerVerticalSpacingTool()
-        {
-            TestHelper.InitializeTest(this, "vertical spacing test");
-            TestHelper.PerformSpacingToolTest(this, TestHelper.VerticalSpacingButtonName, "Vertical Spacing");
-            TestHelper.CleanupTest(this);
-        }
-    }
-}
--- a/src/modules/MeasureTool/Tests/ScreenRuler.UITests/app.manifest
+++ b/src/modules/MeasureTool/Tests/ScreenRuler.UITests/app.manifest
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="ScreenRuler.UITests.app"/>
-
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- The ID below informs the system that this application is compatible with OS features first introduced in Windows 10. 
-      It is necessary to support features in unpackaged applications, for example the custom titlebar implementation.
-      For more info see https://docs.microsoft.com/windows/apps/windows-app-sdk/use-windows-app-sdk-run-time#declare-os-compatibility-in-your-application-manifest -->
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
-    </application>
-  </compatibility>
-  
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
-    </windowsSettings>
-  </application>
-</assembly>
--- a/src/modules/MouseUtils/MouseUtils.UITests/FindMyMouseTests.cs
+++ b/src/modules/MouseUtils/MouseUtils.UITests/FindMyMouseTests.cs
@@ -49,23 +49,23 @@ namespace MouseUtils.UITests
            settings.BackgroundColor = "000000";
            settings.SpotlightColor = "FFFFFF";

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

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

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

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

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

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

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

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

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

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

            Assert.IsNotNull(foundCustom);

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

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

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

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

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

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

            VerifySpotlightDisappears(ref settings);

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

            Assert.IsNotNull(foundCustom);

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

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

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

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

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

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

            VerifySpotlightDisappears(ref settings);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

            Task.Delay(1000).Wait();
-            this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Click();
+            this.Find<NavigationViewItem>("Mouse utilities").Click();
        }
    }
 }
--- a/src/modules/MouseUtils/MouseUtils.UITests/MouseHighlighterTests.cs
+++ b/src/modules/MouseUtils/MouseUtils.UITests/MouseHighlighterTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

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

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

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

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

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

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

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

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

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

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

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

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

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

-            this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Click();
+            this.Find<NavigationViewItem>("Mouse utilities").Click();
        }
    }
 }
--- a/src/modules/MouseUtils/MouseUtils.UITests/MouseJumpTests.cs
+++ b/src/modules/MouseUtils/MouseUtils.UITests/MouseJumpTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-            this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Click();
+            this.Find<NavigationViewItem>("Mouse utilities").Click();
        }
    }
 }
--- a/src/modules/MouseUtils/MouseUtils.UITests/util/MouseUtilsSettings.cs
+++ b/src/modules/MouseUtils/MouseUtils.UITests/util/MouseUtilsSettings.cs
@@ -11,48 +11,6 @@ namespace MouseUtils.UITests
 {
    public class MouseUtilsSettings
    {
-        // Accessibility ID constants
-        public static class AccessibilityIds
-        {
-            // Mouse Utils module IDs
-            public const string FindMyMouse = "MouseUtils_FindMyMouseTestId";
-            public const string MouseHighlighter = "MouseUtils_MouseHighlighterTestId";
-            public const string MousePointerCrosshairs = "MouseUtils_MousePointerCrosshairsTestId";
-            public const string MouseJump = "MouseUtils_MouseJumpTestId";
-
-            // ToggleSwitch IDs
-            public const string FindMyMouseToggle = "MouseUtils_FindMyMouseToggleId";
-            public const string MouseHighlighterToggle = "MouseUtils_MouseHighlighterToggleId";
-            public const string MousePointerCrosshairsToggle = "MouseUtils_MousePointerCrosshairsToggleId";
-            public const string MouseJumpToggle = "MouseUtils_MouseJumpToggleId";
-
-            // Find My Mouse UI Element IDs
-            public const string FindMyMouseActivationMethod = "MouseUtils_FindMyMouseActivationMethodId";
-            public const string FindMyMouseAppearanceBehavior = "MouseUtils_FindMyMouseAppearanceBehaviorId";
-            public const string FindMyMouseExcludedApps = "MouseUtils_FindMyMouseExcludedAppsId";
-            public const string FindMyMouseBackgroundColor = "MouseUtils_FindMyMouseBackgroundColorId";
-            public const string FindMyMouseSpotlightColor = "MouseUtils_FindMyMouseSpotlightColorId";
-            public const string FindMyMouseOverlayOpacity = "MouseUtils_FindMyMouseOverlayOpacityId";
-            public const string FindMyMouseSpotlightZoom = "MouseUtils_FindMyMouseSpotlightZoomId";
-            public const string FindMyMouseSpotlightRadius = "MouseUtils_FindMyMouseSpotlightRadiusId";
-            public const string FindMyMouseAnimationDuration = "MouseUtils_FindMyMouseAnimationDurationId";
-
-            // Mouse Highlighter UI Element IDs
-            public const string MouseHighlighterActivationShortcut = "MouseUtils_MouseHighlighterActivationShortcutId";
-            public const string MouseHighlighterAppearanceBehavior = "MouseUtils_MouseHighlighterAppearanceBehaviorId";
-
-            // Mouse Pointer Crosshairs UI Element IDs
-            public const string MousePointerCrosshairsAppearanceBehavior = "MouseUtils_MousePointerCrosshairsAppearanceBehaviorId";
-
-            // Mouse Jump UI Element IDs
-            public const string MouseJumpActivationShortcut = "MouseUtils_MouseJumpActivationShortcutId";
-
-            // Navigation IDs
-            public const string InputOutputNavItem = "InputOutputNavItem";
-            public const string MouseUtilitiesNavItem = "MouseUtilitiesNavItem";
-            public const string KeyboardManagerNavItem = "KeyboardManagerNavItem";
-        }
-
        // Mouse Utils Modules
        public enum MouseUtils
        {
--- a/src/modules/ZoomIt/ZoomIt/Zoomit.cpp
+++ b/src/modules/ZoomIt/ZoomIt/Zoomit.cpp
@@ -3525,10 +3525,6 @@ winrt::fire_and_forget StartRecordingAsync( HWND hWnd, LPRECT rcCrop, HWND hWndR
        }
        if( destFile == nullptr ) {

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

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

            if( !g_DrawingShape ) {

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

                prevPt.x = LOWORD( lParam );
                prevPt.y = HIWORD( lParam );
--- a/src/modules/awake/Awake/Awake.csproj
+++ b/src/modules/awake/Awake/Awake.csproj
@@ -1,103 +1,102 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<!-- Look at Directory.Build.props in root for common stuff as well -->
-	<Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
-	<Import Project="..\..\..\Common.SelfContained.props" />
+  <!-- Look at Directory.Build.props in root for common stuff as well -->
+  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="..\..\..\Common.SelfContained.props" />

-	<PropertyGroup>
-		<OutputType>WinExe</OutputType>
-		<OutputPath>..\..\..\..\$(Platform)\$(Configuration)</OutputPath>
-		<Nullable>enable</Nullable>
-		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<UseWindowsForms>False</UseWindowsForms>
-		<!--Per documentation: https://learn.microsoft.com/dotnet/core/compatibility/windows-forms/5.0/automatically-infer-winexe-output-type#outputtype-set-to-winexe-for-wpf-and-winforms-apps -->
-		<DisableWinExeOutputInference>true</DisableWinExeOutputInference>
-		<AssemblyName>PowerToys.Awake</AssemblyName>
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <OutputPath>..\..\..\..\$(Platform)\$(Configuration)</OutputPath>
+    <Nullable>enable</Nullable>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <UseWindowsForms>False</UseWindowsForms>
+    <!--Per documentation: https://learn.microsoft.com/dotnet/core/compatibility/windows-forms/5.0/automatically-infer-winexe-output-type#outputtype-set-to-winexe-for-wpf-and-winforms-apps -->
+    <DisableWinExeOutputInference>true</DisableWinExeOutputInference>
+    <AssemblyName>PowerToys.Awake</AssemblyName>
+    
+    <ApplicationIcon>Assets\Awake\Awake.ico</ApplicationIcon>
+    <PackageProjectUrl>https://awake.den.dev</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/microsoft/powertoys</RepositoryUrl>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+  </PropertyGroup>

-		<ApplicationIcon>Assets\Awake\Awake.ico</ApplicationIcon>
-		<PackageProjectUrl>https://awake.den.dev</PackageProjectUrl>
-		<RepositoryUrl>https://github.com/microsoft/powertoys</RepositoryUrl>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-	</PropertyGroup>
+  <!-- See https://learn.microsoft.com/windows/apps/develop/platform/csharp-winrt/net-projection-from-cppwinrt-component for more info -->
+  <PropertyGroup>
+    <CsWinRTIncludes>PowerToys.GPOWrapper</CsWinRTIncludes>
+    <CsWinRTGeneratedFilesDir>$(OutDir)</CsWinRTGeneratedFilesDir>
+    <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>

-	<!-- See https://learn.microsoft.com/windows/apps/develop/platform/csharp-winrt/net-projection-from-cppwinrt-component for more info -->
-	<PropertyGroup>
-		<CsWinRTIncludes>PowerToys.GPOWrapper</CsWinRTIncludes>
-		<CsWinRTGeneratedFilesDir>$(OutDir)</CsWinRTGeneratedFilesDir>
-		<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
-		<ApplicationManifest>app.manifest</ApplicationManifest>
-	</PropertyGroup>
+  <ItemGroup>
+    <None Remove="Assets\Awake\Awake.ico" />
+    <None Remove="Assets\Awake\disabled.ico" />
+    <None Remove="Assets\Awake\expirable.ico" />
+    <None Remove="Assets\Awake\indefinite.ico" />
+    <None Remove="Assets\Awake\normal.ico" />
+    <None Remove="Assets\Awake\scheduled.ico" />
+    <None Remove="Assets\Awake\timed.ico" />
+  </ItemGroup>

-	<ItemGroup>
-		<None Remove="Assets\Awake\Awake.ico" />
-		<None Remove="Assets\Awake\disabled.ico" />
-		<None Remove="Assets\Awake\expirable.ico" />
-		<None Remove="Assets\Awake\indefinite.ico" />
-		<None Remove="Assets\Awake\normal.ico" />
-		<None Remove="Assets\Awake\scheduled.ico" />
-		<None Remove="Assets\Awake\timed.ico" />
-	</ItemGroup>
-	
-	<ItemGroup>
-		<PackageReference Include="System.CommandLine" />
-		<PackageReference Include="System.Reactive" />
-		<PackageReference Include="System.Runtime.Caching" />
-		<PackageReference Include="Microsoft.Data.Sqlite" />
-	</ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.CommandLine" />
+    <PackageReference Include="System.Reactive" />
+    <PackageReference Include="System.Runtime.Caching" />
+  </ItemGroup>

-	<ItemGroup>
-		<ProjectReference Include="..\..\..\common\GPOWrapper\GPOWrapper.vcxproj" />
-		<ProjectReference Include="..\..\..\common\interop\PowerToys.Interop.vcxproj" />
-		<ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
-		<ProjectReference Include="..\..\..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />
-	</ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\common\GPOWrapper\GPOWrapper.vcxproj" />
+    <ProjectReference Include="..\..\..\common\interop\PowerToys.Interop.vcxproj" />
+    <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
+    <ProjectReference Include="..\..\..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />
+  </ItemGroup>

-	<ItemGroup>
-		<Compile Update="Program.cs">
-			<CopyToOutputDirectory>Never</CopyToOutputDirectory>
-		</Compile>
-		<Compile Update="Properties\Resources.Designer.cs">
-			<DesignTime>True</DesignTime>
-			<AutoGen>True</AutoGen>
-			<DependentUpon>Resources.resx</DependentUpon>
-		</Compile>
-	</ItemGroup>
+  <ItemGroup>
+    <Compile Update="Program.cs">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Compile>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>

-	<ItemGroup>
-		<Content Include="Assets\Awake\Awake.ico">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Assets\Awake\disabled.ico">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Assets\Awake\expirable.ico">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Assets\Awake\indefinite.ico">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Assets\Awake\normal.ico">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Assets\Awake\scheduled.ico">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Assets\Awake\timed.ico">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
+  <ItemGroup>
+    <Content Include="Assets\Awake\Awake.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Awake\disabled.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Awake\expirable.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Awake\indefinite.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Awake\normal.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Awake\scheduled.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Awake\timed.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>

-	<ItemGroup>
-		<EmbeddedResource Update="Properties\Resources.resx">
-			<Generator>ResXFileCodeGenerator</Generator>
-			<LastGenOutput>Resources.Designer.cs</LastGenOutput>
-		</EmbeddedResource>
-	</ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>

-	<ItemGroup>
-		<PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-	</ItemGroup>
-</Project>
+  <ItemGroup>
+    <PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+</Project>
--- a/src/modules/awake/Awake/AwakeAutomation.cs
+++ b/src/modules/awake/Awake/AwakeAutomation.cs
@@ -1,33 +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.Runtime.InteropServices;
-using ManagedCommon;
-
-namespace Awake
-{
-    /// <summary>
-    /// Automation object exposed via the Running Object Table. Intentionally minimal; methods may expand in future.
-    /// </summary>
-    [ComVisible(true)]
-    [ClassInterface(ClassInterfaceType.None)]
-    [Guid("4F1C3769-8D28-4A2D-8A6A-AB2F4C0F5F11")]
-    public sealed class AwakeAutomation : IAwakeAutomation
-    {
-        public string Ping() => "pong";
-
-        public void SetIndefinite() => Logger.LogInfo("Automation: SetIndefinite");
-
-        public void SetTimed(int seconds) => Logger.LogInfo($"Automation: SetTimed {seconds}s");
-
-        public void SetExpirable(int minutes) => Logger.LogInfo($"Automation: SetExpirable {minutes}m");
-
-        public void SetPassive() => Logger.LogInfo("Automation: SetPassive");
-
-        public void Cancel() => Logger.LogInfo("Automation: Cancel");
-
-        public string GetStatusJson() => "{\"ok\":true}";
-    }
-}
--- a/src/modules/awake/Awake/Core/AwakeHttpHandler.cs
+++ b/src/modules/awake/Awake/Core/AwakeHttpHandler.cs
@@ -1,402 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Globalization;
-using System.Net;
-using System.Threading.Tasks;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-
-namespace Awake.Core
-{
-    /// <summary>
-    /// HTTP request handler for Awake module functionality.
-    /// </summary>
-    internal sealed class AwakeHttpHandler : IHttpRequestHandler
-    {
-        public string ModuleName => "awake";
-
-        public string[] GetAvailableEndpoints()
-        {
-            return new[]
-            {
-                "GET /awake/status - Get current Awake status",
-                "GET /awake/config - Get current Awake configuration",
-                "POST /awake/indefinite - Set indefinite keep-awake (body: {\"keepDisplayOn\": true, \"processId\": 0})",
-                "POST /awake/timed - Set timed keep-awake (body: {\"seconds\": 3600, \"keepDisplayOn\": true})",
-                "POST /awake/expirable - Set expirable keep-awake (body: {\"expireAt\": \"2024-12-31T23:59:59Z\", \"keepDisplayOn\": true})",
-                "POST /awake/activity - Set activity-based keep-awake (body: {\"cpuThresholdPercent\": 50, \"memThresholdPercent\": 50, \"netThresholdKBps\": 10, \"sampleIntervalSeconds\": 30, \"inactivityTimeoutSeconds\": 300, \"keepDisplayOn\": true})",
-                "POST /awake/passive - Set passive mode (no keep-awake)",
-                "POST /awake/display/toggle - Toggle display setting",
-                "GET /awake/settings - Get current PowerToys settings",
-            };
-        }
-
-        public async Task HandleRequestAsync(HttpListenerContext context, string path)
-        {
-            var request = context.Request;
-            var response = context.Response;
-            var method = request.HttpMethod.ToUpperInvariant();
-            var pathLower = path.ToLowerInvariant();
-
-            try
-            {
-                switch ((method, pathLower))
-                {
-                    case ("GET", "status"):
-                        await HandleGetStatusAsync(response);
-                        break;
-
-                    case ("GET", "config"):
-                        await HandleGetConfigAsync(response);
-                        break;
-
-                    case ("POST", "indefinite"):
-                        await HandleSetIndefiniteAwakeAsync(request, response);
-                        break;
-
-                    case ("POST", "timed"):
-                        await HandleSetTimedAwakeAsync(request, response);
-                        break;
-
-                    case ("POST", "expirable"):
-                        await HandleSetExpirableAwakeAsync(request, response);
-                        break;
-
-                    case ("POST", "activity"):
-                        await HandleSetActivityBasedAwakeAsync(request, response);
-                        break;
-
-                    case ("POST", "passive"):
-                        await HandleSetPassiveAwakeAsync(response);
-                        break;
-
-                    case ("POST", "display/toggle"):
-                        await HandleToggleDisplayAsync(response);
-                        break;
-
-                    case ("GET", "settings"):
-                        await HandleGetSettingsAsync(response);
-                        break;
-
-                    default:
-                        await HandleNotFoundAsync(response, path);
-                        break;
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError($"Error handling Awake request {method} /{path}: {ex.Message}");
-                await HandleErrorAsync(response, 500, $"Internal server error: {ex.Message}");
-            }
-        }
-
-        private async Task HandleGetStatusAsync(HttpListenerResponse response)
-        {
-            var status = new
-            {
-                Module = "Awake",
-                Version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version?.ToString(),
-                Status = "Running",
-                UsingPowerToysConfig = Manager.IsUsingPowerToysConfig,
-                Timestamp = DateTimeOffset.Now,
-            };
-
-            await WriteJsonResponseAsync(response, status);
-        }
-
-        private async Task HandleGetConfigAsync(HttpListenerResponse response)
-        {
-            var config = Manager.GetCurrentConfig();
-            await WriteJsonResponseAsync(response, config);
-        }
-
-        private async Task HandleSetIndefiniteAwakeAsync(HttpListenerRequest request, HttpListenerResponse response)
-        {
-            var requestData = await ReadJsonRequestAsync<IndefiniteAwakeRequest>(request);
-
-            Manager.SetIndefiniteKeepAwake(
-                requestData?.KeepDisplayOn ?? true,
-                requestData?.ProcessId ?? 0,
-                "HttpServer");
-
-            var result = new
-            {
-                Success = true,
-                Mode = "Indefinite",
-                KeepDisplayOn = requestData?.KeepDisplayOn ?? true,
-                ProcessId = requestData?.ProcessId ?? 0,
-            };
-            await WriteJsonResponseAsync(response, result);
-        }
-
-        private async Task HandleSetTimedAwakeAsync(HttpListenerRequest request, HttpListenerResponse response)
-        {
-            var requestData = await ReadJsonRequestAsync<TimedAwakeRequest>(request);
-
-            if (requestData?.Seconds == null || requestData.Seconds <= 0)
-            {
-                await HandleErrorAsync(response, 400, "Invalid or missing 'seconds' parameter. Must be a positive integer.");
-                return;
-            }
-
-            Manager.SetTimedKeepAwake(
-                requestData.Seconds,
-                requestData.KeepDisplayOn ?? true,
-                "HttpServer");
-
-            var result = new
-            {
-                Success = true,
-                Mode = "Timed",
-                Seconds = requestData.Seconds,
-                KeepDisplayOn = requestData.KeepDisplayOn ?? true,
-            };
-            await WriteJsonResponseAsync(response, result);
-        }
-
-        private async Task HandleSetExpirableAwakeAsync(HttpListenerRequest request, HttpListenerResponse response)
-        {
-            var requestData = await ReadJsonRequestAsync<ExpirableAwakeRequest>(request);
-
-            if (requestData?.ExpireAt == null)
-            {
-                await HandleErrorAsync(response, 400, "Missing 'expireAt' parameter. Expected ISO 8601 format (e.g., '2024-12-31T23:59:59Z').");
-                return;
-            }
-
-            if (requestData.ExpireAt <= DateTimeOffset.Now)
-            {
-                await HandleErrorAsync(response, 400, "Expiration time must be in the future.");
-                return;
-            }
-
-            Manager.SetExpirableKeepAwake(
-                requestData.ExpireAt,
-                requestData.KeepDisplayOn ?? true,
-                "HttpServer");
-
-            var result = new
-            {
-                Success = true,
-                Mode = "Expirable",
-                ExpireAt = requestData.ExpireAt,
-                KeepDisplayOn = requestData.KeepDisplayOn ?? true,
-            };
-            await WriteJsonResponseAsync(response, result);
-        }
-
-        private async Task HandleSetActivityBasedAwakeAsync(HttpListenerRequest request, HttpListenerResponse response)
-        {
-            var requestData = await ReadJsonRequestAsync<ActivityBasedAwakeRequest>(request);
-
-            if (requestData == null)
-            {
-                await HandleErrorAsync(response, 400, "Invalid or missing request body. Expected JSON with cpuThresholdPercent, memThresholdPercent, netThresholdKBps, sampleIntervalSeconds, inactivityTimeoutSeconds, and optional keepDisplayOn.");
-                return;
-            }
-
-            // Validate required parameters
-            if (requestData.CpuThresholdPercent > 100)
-            {
-                await HandleErrorAsync(response, 400, "Invalid cpuThresholdPercent. Must be between 0 and 100.");
-                return;
-            }
-
-            if (requestData.MemThresholdPercent > 100)
-            {
-                await HandleErrorAsync(response, 400, "Invalid memThresholdPercent. Must be between 0 and 100.");
-                return;
-            }
-
-            if (requestData.SampleIntervalSeconds == 0)
-            {
-                await HandleErrorAsync(response, 400, "Invalid sampleIntervalSeconds. Must be greater than 0.");
-                return;
-            }
-
-            if (requestData.InactivityTimeoutSeconds == 0)
-            {
-                await HandleErrorAsync(response, 400, "Invalid inactivityTimeoutSeconds. Must be greater than 0.");
-                return;
-            }
-
-            Manager.SetActivityBasedKeepAwake(
-                requestData.CpuThresholdPercent,
-                requestData.MemThresholdPercent,
-                requestData.NetThresholdKBps,
-                requestData.SampleIntervalSeconds,
-                requestData.InactivityTimeoutSeconds,
-                requestData.KeepDisplayOn ?? true,
-                "HttpServer");
-
-            var result = new
-            {
-                Success = true,
-                Mode = "Activity-based",
-                CpuThresholdPercent = requestData.CpuThresholdPercent,
-                MemThresholdPercent = requestData.MemThresholdPercent,
-                NetThresholdKBps = requestData.NetThresholdKBps,
-                SampleIntervalSeconds = requestData.SampleIntervalSeconds,
-                InactivityTimeoutSeconds = requestData.InactivityTimeoutSeconds,
-                KeepDisplayOn = requestData.KeepDisplayOn ?? true,
-            };
-            await WriteJsonResponseAsync(response, result);
-        }
-
-        private async Task HandleSetPassiveAwakeAsync(HttpListenerResponse response)
-        {
-            Manager.SetPassiveKeepAwake(true, "HttpServer");
-
-            var result = new { Success = true, Mode = "Passive" };
-            await WriteJsonResponseAsync(response, result);
-        }
-
-        private async Task HandleToggleDisplayAsync(HttpListenerResponse response)
-        {
-            Manager.SetDisplay("HttpServer");
-
-            var result = new { Success = true, Action = "Display setting toggled" };
-            await WriteJsonResponseAsync(response, result);
-        }
-
-        private async Task HandleGetSettingsAsync(HttpListenerResponse response)
-        {
-            try
-            {
-                if (Manager.ModuleSettings != null)
-                {
-                    var settings = Manager.ModuleSettings.GetSettings<AwakeSettings>(Constants.AppName);
-                    await WriteJsonResponseAsync(response, settings);
-                }
-                else
-                {
-                    await HandleErrorAsync(response, 500, "Settings module not available");
-                }
-            }
-            catch (Exception ex)
-            {
-                await HandleErrorAsync(response, 500, $"Error retrieving settings: {ex.Message}");
-            }
-        }
-
-        private async Task HandleNotFoundAsync(HttpListenerResponse response, string path)
-        {
-            var errorResponse = new
-            {
-                Error = $"Awake endpoint '/{path}' not found",
-                AvailableEndpoints = GetAvailableEndpoints(),
-                Module = ModuleName,
-                Timestamp = DateTimeOffset.Now,
-            };
-
-            response.StatusCode = 404;
-            await WriteJsonResponseAsync(response, errorResponse);
-        }
-
-        private async Task HandleErrorAsync(HttpListenerResponse response, int statusCode, string message)
-        {
-            response.StatusCode = statusCode;
-            var errorResponse = new
-            {
-                Error = message,
-                StatusCode = statusCode,
-                Module = ModuleName,
-                Timestamp = DateTimeOffset.Now,
-            };
-            await WriteJsonResponseAsync(response, errorResponse);
-        }
-
-        private async Task WriteJsonResponseAsync(HttpListenerResponse response, object data)
-        {
-            // Use HttpServer utility method via static access or DI - for now, replicate the functionality
-            response.ContentType = "application/json";
-            response.ContentEncoding = System.Text.Encoding.UTF8;
-
-#pragma warning disable CA1869 // Cache and reuse 'JsonSerializerOptions' instances
-            var json = System.Text.Json.JsonSerializer.Serialize(
-                data, new System.Text.Json.JsonSerializerOptions
-            {
-                PropertyNamingPolicy = System.Text.Json.JsonNamingPolicy.CamelCase,
-                WriteIndented = true,
-            });
-#pragma warning restore CA1869 // Cache and reuse 'JsonSerializerOptions' instances
-            var buffer = System.Text.Encoding.UTF8.GetBytes(json);
-
-            response.ContentLength64 = buffer.Length;
-            await response.OutputStream.WriteAsync(buffer);
-            response.Close();
-        }
-
-        private async Task<T?> ReadJsonRequestAsync<T>(HttpListenerRequest request)
-            where T : class
-        {
-            if (!request.HasEntityBody)
-            {
-                return null;
-            }
-
-            using var reader = new System.IO.StreamReader(request.InputStream, System.Text.Encoding.UTF8);
-            var body = await reader.ReadToEndAsync();
-
-            if (string.IsNullOrWhiteSpace(body))
-            {
-                return null;
-            }
-
-            try
-            {
-#pragma warning disable CA1869 // Cache and reuse 'JsonSerializerOptions' instances
-                return System.Text.Json.JsonSerializer.Deserialize<T>(body, new System.Text.Json.JsonSerializerOptions
-                {
-                    PropertyNamingPolicy = System.Text.Json.JsonNamingPolicy.CamelCase,
-                });
-#pragma warning restore CA1869 // Cache and reuse 'JsonSerializerOptions' instances
-            }
-            catch (System.Text.Json.JsonException ex)
-            {
-                Logger.LogError($"Error deserializing request body: {ex.Message}");
-                return null;
-            }
-        }
-
-        // Request DTOs
-        private sealed class IndefiniteAwakeRequest
-        {
-            public bool? KeepDisplayOn { get; set; }
-
-            public int? ProcessId { get; set; }
-        }
-
-        private sealed class TimedAwakeRequest
-        {
-            public uint Seconds { get; set; }
-
-            public bool? KeepDisplayOn { get; set; }
-        }
-
-        private sealed class ExpirableAwakeRequest
-        {
-            public DateTimeOffset ExpireAt { get; set; }
-
-            public bool? KeepDisplayOn { get; set; }
-        }
-
-        private sealed class ActivityBasedAwakeRequest
-        {
-            public uint CpuThresholdPercent { get; set; }
-
-            public uint MemThresholdPercent { get; set; }
-
-            public uint NetThresholdKBps { get; set; }
-
-            public uint SampleIntervalSeconds { get; set; }
-
-            public uint InactivityTimeoutSeconds { get; set; }
-
-            public bool? KeepDisplayOn { get; set; }
-        }
-    }
-}
--- a/src/modules/awake/Awake/Core/Manager.cs
+++ b/src/modules/awake/Awake/Core/Manager.cs
@@ -9,7 +9,6 @@ using System.Diagnostics;
 using System.Drawing;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Reactive.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -18,9 +17,6 @@ using System.Text.Json;
 using System.Threading;
 using Awake.Core.Models;
 using Awake.Core.Native;
-
-// New usage tracking namespace
-using Awake.Core.Usage;
 using Awake.Properties;
 using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Library;
@@ -60,26 +56,9 @@ namespace Awake.Core
        private static readonly BlockingCollection<ExecutionState> _stateQueue;
        private static CancellationTokenSource _tokenSource;

-        // Foreground usage tracker instance (lifecycle managed by Program)
-        internal static ForegroundUsageTracker? UsageTracker { get; set; }
-
-        private static PowerSchemeManager powerSchemeManager;
-
-        // Power scheme auto-switch (activity mode)
-        private static string? _originalPowerSchemeGuid;
-        private static bool _powerSchemeSwitched;
-
-        // Process monitoring fields
-        private static List<string> _processMonitoringList = [];
-        private static bool _processMonitoringActive;
-        private static IDisposable? _processMonitoringSubscription;
-        private static uint _processCheckInterval;
-        private static bool _processKeepDisplay;
-
        static Manager()
        {
            _tokenSource = new CancellationTokenSource();
-            powerSchemeManager = new PowerSchemeManager();
            _stateQueue = [];
            ModuleSettings = new SettingsUtils();
        }
@@ -144,19 +123,6 @@ namespace Awake.Core
                : ExecutionState.ES_SYSTEM_REQUIRED | ExecutionState.ES_CONTINUOUS;
        }

-        // Activity mode state
-        private static bool _activityActive;
-        private static DateTimeOffset _activityLastHigh;
-        private static uint _activityCpu;
-        private static uint _activityMem;
-        private static uint _activityNetKBps;
-        private static uint _activitySample;
-        private static uint _activityTimeout;
-        private static bool _activityKeepDisplay;
-        private static PerformanceCounter? _cpuCounter;
-        private static PerformanceCounter? _memCounter;
-        private static List<PerformanceCounter>? _netCounters;
-
        internal static void CancelExistingThread()
        {
            Logger.LogInfo("Ensuring the thread is properly cleaned up...");
@@ -164,10 +130,6 @@ namespace Awake.Core
            // Reset the thread state and handle cancellation.
            _stateQueue.Add(ExecutionState.ES_CONTINUOUS);

-            // Clean up process monitoring subscription if active
-            _processMonitoringSubscription?.Dispose();
-            _processMonitoringSubscription = null;
-
            if (_tokenSource != null)
            {
                _tokenSource.Cancel();
@@ -212,15 +174,6 @@ namespace Awake.Core
                    iconText = $"{Constants.FullAppName} [{Resources.AWAKE_TRAY_TEXT_TIMED}][{ScreenStateString}]";
                    icon = TrayHelper.TimedIcon;
                    break;
-                case AwakeMode.ACTIVITY:
-                    iconText = $"{Constants.FullAppName} [{Resources.AWAKE_TRAY_TEXT_ACTIVITY}][{ScreenStateString}]";
-                    icon = TrayHelper.IndefiniteIcon; // Placeholder icon
-                    break;
-                case AwakeMode.PROCESS:
-                    string processesText = _processMonitoringList.Count > 0 ? string.Join(", ", _processMonitoringList) : "None";
-                    iconText = $"{Constants.FullAppName} [Process Monitor][{ScreenStateString}][{processesText}]";
-                    icon = TrayHelper.IndefiniteIcon; // Use same icon as indefinite for now
-                    break;
            }

            TrayHelper.SetShellIcon(
@@ -230,94 +183,6 @@ namespace Awake.Core
                forceAdd ? TrayIconAction.Add : TrayIconAction.Update);
        }

-        private static void CaptureOriginalPowerScheme()
-        {
-            try
-            {
-                powerSchemeManager.RefreshSchemes();
-                _originalPowerSchemeGuid = powerSchemeManager
-                    .GetAllSchemes()
-                    .FirstOrDefault(s => s.IsActive)?.PSGuid;
-                Logger.LogInfo($"Captured original power scheme: {_originalPowerSchemeGuid ?? "UNKNOWN"}");
-            }
-            catch (Exception ex)
-            {
-                Logger.LogWarning($"Failed to capture original power scheme: {ex.Message}");
-            }
-        }
-
-        private static void SwitchToHighestPerformanceIfNeeded()
-        {
-            if (_powerSchemeSwitched)
-            {
-                return;
-            }
-
-            try
-            {
-                powerSchemeManager.RefreshSchemes();
-                var highest = powerSchemeManager.GetHighestPerformanceScheme();
-                if (highest == null)
-                {
-                    Logger.LogInfo("No power schemes found when attempting high performance switch.");
-                    return;
-                }
-
-                if (highest.IsActive)
-                {
-                    Logger.LogInfo("Already on highest performance scheme – no switch needed.");
-                    return;
-                }
-
-                if (_originalPowerSchemeGuid == null)
-                {
-                    CaptureOriginalPowerScheme();
-                }
-
-                if (powerSchemeManager.SwitchScheme(highest.PSGuid))
-                {
-                    _powerSchemeSwitched = true;
-                    Logger.LogInfo($"Switched to highest performance scheme: {highest.Name} ({highest.PSGuid})");
-                }
-                else
-                {
-                    Logger.LogWarning($"Failed to switch to highest performance scheme: {highest.Name} ({highest.PSGuid})");
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogWarning($"Exception while attempting to switch power scheme: {ex.Message}");
-            }
-        }
-
-        private static void RestoreOriginalPowerSchemeIfNeeded()
-        {
-            if (!_powerSchemeSwitched || string.IsNullOrWhiteSpace(_originalPowerSchemeGuid))
-            {
-                return;
-            }
-
-            try
-            {
-                if (powerSchemeManager.SwitchScheme(_originalPowerSchemeGuid))
-                {
-                    Logger.LogInfo($"Restored original power scheme: {_originalPowerSchemeGuid}");
-                }
-                else
-                {
-                    Logger.LogWarning($"Failed to restore original power scheme: {_originalPowerSchemeGuid}");
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogWarning($"Exception restoring original power scheme: {ex.Message}");
-            }
-            finally
-            {
-                _powerSchemeSwitched = false;
-            }
-        }
-
        internal static void SetIndefiniteKeepAwake(bool keepDisplayOn = false, int processId = 0, [CallerMemberName] string callerName = "")
        {
            PowerToysTelemetry.Log.WriteEvent(new Telemetry.AwakeIndefinitelyKeepAwakeEvent());
@@ -535,22 +400,16 @@ namespace Awake.Core
        internal static void CompleteExit(int exitCode)
        {
            SetPassiveKeepAwake(updateSettings: false);
-            RestoreOriginalPowerSchemeIfNeeded();
+
            if (TrayHelper.WindowHandle != IntPtr.Zero)
            {
+                // Delete the icon.
                TrayHelper.SetShellIcon(TrayHelper.WindowHandle, string.Empty, null, TrayIconAction.Delete);
-                Bridge.SendMessage(TrayHelper.WindowHandle, Native.Constants.WM_CLOSE, 0, 0);
-                Bridge.DestroyWindow(TrayHelper.WindowHandle);
-            }

-            // Dispose usage tracker (flushes data)
-            try
-            {
-                UsageTracker?.Dispose();
-            }
-            catch (Exception ex)
-            {
-                Logger.LogWarning($"Failed disposing UsageTracker: {ex.Message}");
+                // Close the message window that we used for the tray.
+                Bridge.SendMessage(TrayHelper.WindowHandle, Native.Constants.WM_CLOSE, 0, 0);
+
+                Bridge.DestroyWindow(TrayHelper.WindowHandle);
            }

            Bridge.PostQuitMessage(exitCode);
@@ -641,275 +500,6 @@ namespace Awake.Core
            SetModeShellIcon();
        }

-        internal static void SetActivityBasedKeepAwake(
-            uint cpuThresholdPercent,
-            uint memThresholdPercent,
-            uint netThresholdKBps,
-            uint sampleIntervalSeconds,
-            uint inactivityTimeoutSeconds,
-            bool keepDisplayOn,
-            [CallerMemberName] string callerName = "")
-        {
-            Logger.LogInfo($"Activity-based keep-awake invoked by {callerName}. CPU>={cpuThresholdPercent}%, MEM>={memThresholdPercent}%, NET>={netThresholdKBps}KB/s sample={sampleIntervalSeconds}s timeout={inactivityTimeoutSeconds}s display={keepDisplayOn}.");
-
-            CancelExistingThread();
-
-            if (IsUsingPowerToysConfig)
-            {
-                try
-                {
-                    AwakeSettings currentSettings = ModuleSettings!.GetSettings<AwakeSettings>(Constants.AppName) ?? new AwakeSettings();
-                    bool settingsChanged =
-                        currentSettings.Properties.Mode != AwakeMode.ACTIVITY ||
-                        currentSettings.Properties.ActivityCpuThresholdPercent != cpuThresholdPercent ||
-                        currentSettings.Properties.ActivityMemoryThresholdPercent != memThresholdPercent ||
-                        currentSettings.Properties.ActivityNetworkThresholdKBps != netThresholdKBps ||
-                        currentSettings.Properties.ActivitySampleIntervalSeconds != sampleIntervalSeconds ||
-                        currentSettings.Properties.ActivityInactivityTimeoutSeconds != inactivityTimeoutSeconds ||
-                        currentSettings.Properties.KeepDisplayOn != keepDisplayOn;
-
-                    if (settingsChanged)
-                    {
-                        currentSettings.Properties.Mode = AwakeMode.ACTIVITY;
-                        currentSettings.Properties.ActivityCpuThresholdPercent = cpuThresholdPercent;
-                        currentSettings.Properties.ActivityMemoryThresholdPercent = memThresholdPercent;
-                        currentSettings.Properties.ActivityNetworkThresholdKBps = netThresholdKBps;
-                        currentSettings.Properties.ActivitySampleIntervalSeconds = sampleIntervalSeconds;
-                        currentSettings.Properties.ActivityInactivityTimeoutSeconds = inactivityTimeoutSeconds;
-                        currentSettings.Properties.KeepDisplayOn = keepDisplayOn;
-                        ModuleSettings!.SaveSettings(JsonSerializer.Serialize(currentSettings), Constants.AppName);
-                        return; // Settings will be processed triggering this again
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Logger.LogError($"Failed to persist activity mode settings: {ex.Message}");
-                }
-            }
-
-            // Initialize performance counters
-            try
-            {
-                _cpuCounter = new PerformanceCounter("Processor", "% Processor Time", "_Total");
-                _memCounter = new PerformanceCounter("Memory", "% Committed Bytes In Use");
-                _netCounters = PerformanceCounterCategory.GetCategories()
-                    .FirstOrDefault(c => c.CategoryName == "Network Interface")?
-                    .GetInstanceNames()
-                    .Select(n => new PerformanceCounter("Network Interface", "Bytes Total/sec", n))
-                    .ToList() ?? new List<PerformanceCounter>();
-                _cpuCounter.NextValue(); // Prime CPU counter
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError($"Failed to initialize performance counters for activity mode: {ex.Message}");
-                return;
-            }
-
-            _activityCpu = cpuThresholdPercent;
-            _activityMem = memThresholdPercent;
-            _activityNetKBps = netThresholdKBps;
-            _activitySample = Math.Max(1, sampleIntervalSeconds);
-            _activityTimeout = Math.Max(5, inactivityTimeoutSeconds);
-            _activityKeepDisplay = keepDisplayOn;
-            _activityLastHigh = DateTimeOffset.Now;
-            _activityActive = true;
-
-            CurrentOperatingMode = AwakeMode.ACTIVITY;
-            IsDisplayOn = keepDisplayOn;
-            SetModeShellIcon();
-
-            // Capture original scheme before any switch
-            CaptureOriginalPowerScheme();
-
-            TimeSpan sampleInterval = TimeSpan.FromSeconds(_activitySample);
-
-            Observable.Interval(sampleInterval).Subscribe(
-                _ =>
-                {
-                    if (!_activityActive)
-                    {
-                        return;
-                    }
-
-                    float cpu = 0;
-                    float mem = 0;
-                    double netKBps = 0;
-
-                    try
-                    {
-                        cpu = _cpuCounter?.NextValue() ?? 0;
-                        mem = _memCounter?.NextValue() ?? 0;
-                        if (_netCounters != null && _netCounters.Count > 0)
-                        {
-                            netKBps = _netCounters.Sum(c => c.NextValue()) / 1024.0;
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        Logger.LogError($"Performance counter read failure: {ex.Message}");
-                    }
-
-                    bool above =
-                        (_activityCpu == 0 || cpu >= _activityCpu) ||
-                        (_activityMem == 0 || mem >= _activityMem) ||
-                        (_activityNetKBps == 0 || netKBps >= _activityNetKBps);
-
-                    if (above)
-                    {
-                        _activityLastHigh = DateTimeOffset.Now;
-                        _stateQueue.Add(ComputeAwakeState(_activityKeepDisplay));
-                        SwitchToHighestPerformanceIfNeeded();
-                    }
-
-                    TrayHelper.SetShellIcon(
-                        TrayHelper.WindowHandle,
-                        $"{Constants.FullAppName} [Activity][{ScreenStateString}][CPU {cpu:0.#}% | MEM {mem:0.#}% | NET {netKBps:0.#}KB/s]",
-                        TrayHelper.IndefiniteIcon,
-                        TrayIconAction.Update);
-
-                    if ((DateTimeOffset.Now - _activityLastHigh).TotalSeconds >= _activityTimeout)
-                    {
-                        Logger.LogInfo("Activity thresholds not met within timeout window. Ending activity mode.");
-                        _activityActive = false;
-                        CancelExistingThread();
-                        RestoreOriginalPowerSchemeIfNeeded();
-
-                        if (IsUsingPowerToysConfig)
-                        {
-                            SetPassiveKeepAwake();
-                        }
-                        else
-                        {
-                            CompleteExit(Environment.ExitCode);
-                        }
-                    }
-                },
-                ex =>
-                {
-                    Logger.LogError($"Activity mode observable failure: {ex.Message}");
-                },
-                _tokenSource.Token);
-        }
-
-        internal static void SetProcessBasedKeepAwake(
-            List<string> processNames,
-            uint checkIntervalSeconds,
-            bool keepDisplayOn,
-            [CallerMemberName] string callerName = "")
-        {
-            Logger.LogInfo($"Process-based keep-awake invoked by {callerName}. Processes: [{string.Join(", ", processNames)}], CheckInterval: {checkIntervalSeconds}s, Display: {keepDisplayOn}.");
-
-            CancelExistingThread();
-
-            if (IsUsingPowerToysConfig)
-            {
-                try
-                {
-                    AwakeSettings currentSettings = ModuleSettings!.GetSettings<AwakeSettings>(Constants.AppName) ?? new AwakeSettings();
-                    bool settingsChanged =
-                        currentSettings.Properties.Mode != AwakeMode.PROCESS ||
-                        !currentSettings.Properties.ProcessMonitoringList.SequenceEqual(processNames) ||
-                        currentSettings.Properties.ProcessCheckIntervalSeconds != checkIntervalSeconds ||
-                        currentSettings.Properties.KeepDisplayOn != keepDisplayOn;
-
-                    if (settingsChanged)
-                    {
-                        currentSettings.Properties.Mode = AwakeMode.PROCESS;
-                        currentSettings.Properties.ProcessMonitoringList = new List<string>(processNames);
-                        currentSettings.Properties.ProcessCheckIntervalSeconds = checkIntervalSeconds;
-                        currentSettings.Properties.KeepDisplayOn = keepDisplayOn;
-                        ModuleSettings!.SaveSettings(JsonSerializer.Serialize(currentSettings), Constants.AppName);
-                        return; // Settings will be processed triggering this again
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Logger.LogError($"Failed to persist process monitoring settings: {ex.Message}");
-                }
-            }
-
-            _processMonitoringList = [.. processNames];
-            _processCheckInterval = Math.Max(1, checkIntervalSeconds);
-            _processKeepDisplay = keepDisplayOn;
-            _processMonitoringActive = true;
-
-            CurrentOperatingMode = AwakeMode.PROCESS;
-            IsDisplayOn = keepDisplayOn;
-            SetModeShellIcon();
-
-            TimeSpan checkInterval = TimeSpan.FromSeconds(_processCheckInterval);
-
-            Observable.Interval(checkInterval).Subscribe(
-                _ =>
-                {
-                    if (!_processMonitoringActive)
-                    {
-                        return;
-                    }
-
-                    bool anyTargetProcessRunning = false;
-                    List<string> runningProcesses = new();
-
-                    try
-                    {
-                        foreach (string processName in _processMonitoringList)
-                        {
-                            if (string.IsNullOrWhiteSpace(processName))
-                            {
-                                continue;
-                            }
-
-                            // Remove .exe extension if present for process name comparison
-                            string processNameWithoutExt = processName.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)
-                                ? processName.Substring(0, processName.Length - 4)
-                                : processName;
-
-                            Process[] processes = Process.GetProcessesByName(processNameWithoutExt);
-                            if (processes.Length > 0)
-                            {
-                                anyTargetProcessRunning = true;
-                                runningProcesses.Add(processNameWithoutExt);
-                            }
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        Logger.LogError($"Process monitoring check failure: {ex.Message}");
-                    }
-
-                    if (anyTargetProcessRunning)
-                    {
-                        _stateQueue.Add(ComputeAwakeState(_processKeepDisplay));
-
-                        TrayHelper.SetShellIcon(
-                            TrayHelper.WindowHandle,
-                            $"{Constants.FullAppName} [Process Monitor][{ScreenStateString}][Running: {string.Join(", ", runningProcesses)}]",
-                            TrayHelper.IndefiniteIcon,
-                            TrayIconAction.Update);
-                    }
-                    else
-                    {
-                        Logger.LogInfo("No target processes running. Ending process monitoring mode.");
-                        _processMonitoringActive = false;
-                        CancelExistingThread();
-
-                        if (IsUsingPowerToysConfig)
-                        {
-                            SetPassiveKeepAwake();
-                        }
-                        else
-                        {
-                            CompleteExit(Environment.ExitCode);
-                        }
-                    }
-                },
-                ex =>
-                {
-                    Logger.LogError($"Process monitoring observable failure: {ex.Message}");
-                },
-                _tokenSource.Token);
-        }
-
        /// <summary>
        /// Sets the display settings.
        /// </summary>
@@ -943,100 +533,6 @@ namespace Awake.Core
            }
        }

-        /// <summary>
-        /// Gets the current Awake configuration status.
-        /// </summary>
-        /// <returns>Current configuration status information.</returns>
-        public static object GetCurrentConfig()
-        {
-            try
-            {
-                AwakeSettings currentSettings = ModuleSettings?.GetSettings<AwakeSettings>(Constants.AppName) ?? new AwakeSettings();
-
-                var baseConfig = new
-                {
-                    mode = CurrentOperatingMode.ToString(),
-                    keepDisplayOn = IsDisplayOn,
-                    processId = ProcessId,
-                    isUsingPowerToysConfig = IsUsingPowerToysConfig,
-                };
-
-                // Return different parameters based on the current mode
-                return CurrentOperatingMode switch
-                {
-                    AwakeMode.PASSIVE => new
-                    {
-                        baseConfig.mode,
-                        baseConfig.processId,
-                        baseConfig.isUsingPowerToysConfig,
-                    },
-                    AwakeMode.INDEFINITE => new
-                    {
-                        baseConfig.mode,
-                        baseConfig.keepDisplayOn,
-                        baseConfig.processId,
-                        baseConfig.isUsingPowerToysConfig,
-                    },
-                    AwakeMode.TIMED => new
-                    {
-                        baseConfig.mode,
-                        baseConfig.keepDisplayOn,
-                        timeRemaining = TimeRemaining,
-                        intervalHours = currentSettings.Properties.IntervalHours,
-                        intervalMinutes = currentSettings.Properties.IntervalMinutes,
-                        baseConfig.processId,
-                        baseConfig.isUsingPowerToysConfig,
-                    },
-                    AwakeMode.EXPIRABLE => new
-                    {
-                        baseConfig.mode,
-                        baseConfig.keepDisplayOn,
-                        expireAt = ExpireAt == DateTimeOffset.MinValue ? (DateTimeOffset?)null : ExpireAt,
-                        expirationDateTime = currentSettings.Properties.ExpirationDateTime,
-                        baseConfig.processId,
-                        baseConfig.isUsingPowerToysConfig,
-                    },
-                    AwakeMode.ACTIVITY => new
-                    {
-                        baseConfig.mode,
-                        baseConfig.keepDisplayOn,
-                        cpuThresholdPercent = currentSettings.Properties.ActivityCpuThresholdPercent,
-                        memoryThresholdPercent = currentSettings.Properties.ActivityMemoryThresholdPercent,
-                        networkThresholdKBps = currentSettings.Properties.ActivityNetworkThresholdKBps,
-                        sampleIntervalSeconds = currentSettings.Properties.ActivitySampleIntervalSeconds,
-                        inactivityTimeoutSeconds = currentSettings.Properties.ActivityInactivityTimeoutSeconds,
-                        activityActive = _activityActive,
-                        lastHighActivity = _activityLastHigh,
-                        baseConfig.processId,
-                        baseConfig.isUsingPowerToysConfig,
-                    },
-                    AwakeMode.PROCESS => new
-                    {
-                        baseConfig.mode,
-                        baseConfig.keepDisplayOn,
-                        processMonitoringList = currentSettings.Properties.ProcessMonitoringList,
-                        processCheckIntervalSeconds = currentSettings.Properties.ProcessCheckIntervalSeconds,
-                        processMonitoringActive = _processMonitoringActive,
-                        baseConfig.processId,
-                        baseConfig.isUsingPowerToysConfig,
-                    },
-                    _ => new
-                    {
-                        baseConfig.mode,
-                        baseConfig.keepDisplayOn,
-                        baseConfig.processId,
-                        baseConfig.isUsingPowerToysConfig,
-                        error = "Unknown mode",
-                    },
-                };
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError($"Failed to get current config: {ex.Message}");
-                return new { error = "Failed to get current configuration", message = ex.Message };
-            }
-        }
-
        public static Process? GetParentProcess()
        {
            return GetParentProcess(Process.GetCurrentProcess().Handle);
--- a/src/modules/awake/Awake/Core/Models/TrayCommands.cs
+++ b/src/modules/awake/Awake/Core/Models/TrayCommands.cs
@@ -10,7 +10,6 @@ namespace Awake.Core.Models
        TC_MODE_PASSIVE = Native.Constants.WM_USER + 0x3,
        TC_MODE_INDEFINITE = Native.Constants.WM_USER + 0x4,
        TC_MODE_EXPIRABLE = Native.Constants.WM_USER + 0x5,
-        TC_MODE_ACTIVITY = Native.Constants.WM_USER + 0x6,
        TC_EXIT = Native.Constants.WM_USER + 0x64,
        TC_TIME = Native.Constants.WM_USER + 0x65,
    }
--- a/src/modules/awake/Awake/Core/Native/IdleTime.cs
+++ b/src/modules/awake/Awake/Core/Native/IdleTime.cs
@@ -1,44 +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.Runtime.InteropServices;
-
-namespace Awake.Core.Native
-{
-    internal static class IdleTime
-    {
-        // Keep original native field names but suppress StyleCop (interop requires exact names).
-        [StructLayout(LayoutKind.Sequential)]
-        private struct LASTINPUTINFO
-        {
-#pragma warning disable SA1307 // Interop field naming
-            public uint cbSize;
-            public uint dwTime;
-#pragma warning restore SA1307
-        }
-
-        [DllImport("user32.dll")]
-        private static extern bool GetLastInputInfo(ref LASTINPUTINFO plii);
-
-        public static TimeSpan GetIdleTime()
-        {
-            LASTINPUTINFO info = new()
-            {
-                cbSize = (uint)Marshal.SizeOf<LASTINPUTINFO>(),
-            };
-
-            if (!GetLastInputInfo(ref info))
-            {
-                return TimeSpan.Zero;
-            }
-
-            // Calculate elapsed milliseconds since last input considering Environment.TickCount wrap.
-            uint lastInputTicks = info.dwTime;
-            uint nowTicks = (uint)Environment.TickCount;
-            uint delta = nowTicks >= lastInputTicks ? nowTicks - lastInputTicks : (uint.MaxValue - lastInputTicks) + nowTicks + 1;
-            return TimeSpan.FromMilliseconds(delta);
-        }
-    }
-}
--- a/src/modules/awake/Awake/Core/PowerSchemeManager.cs
+++ b/src/modules/awake/Awake/Core/PowerSchemeManager.cs
@@ -1,136 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Text.RegularExpressions;
-
-namespace Awake.Core
-{
-    public class PowerSchemeManager
-    {
-        private readonly List<PowerScheme> _schemes = new();
-
-        public PowerSchemeManager()
-        {
-            RefreshSchemes();
-        }
-
-        public void RefreshSchemes()
-        {
-            _schemes.Clear();
-            var process = new Process
-            {
-                StartInfo = new ProcessStartInfo
-                {
-                    FileName = "powercfg",
-                    Arguments = "/L",
-                    RedirectStandardOutput = true,
-                    UseShellExecute = false,
-                    CreateNoWindow = true,
-                },
-            };
-            process.Start();
-            string output = process.StandardOutput.ReadToEnd();
-            process.WaitForExit();
-
-            var matches = Regex.Matches(output, @"Power Scheme GUID: ([a-fA-F0-9\-]+)\s+\((.+?)\)(\s+\*)?");
-            foreach (Match match in matches)
-            {
-                _schemes.Add(new PowerScheme
-                {
-                    PSGuid = match.Groups[1].Value,
-                    Name = match.Groups[2].Value,
-                    IsActive = match.Groups[3].Value.Contains('*'),
-                });
-            }
-
-            // Rank schemes by performance (descending)
-            _schemes.Sort((a, b) => GetScore(b).CompareTo(GetScore(a)));
-        }
-
-        /// <summary>
-        /// Returns all power schemes sorted by performance (highest first).
-        /// </summary>
-        public IReadOnlyList<PowerScheme> GetAllSchemes() => _schemes;
-
-        /// <summary>
-        /// Returns the highest performance scheme currently available (may already be active).
-        /// </summary>
-        public PowerScheme? GetHighestPerformanceScheme()
-        {
-            if (_schemes.Count == 0)
-            {
-                RefreshSchemes();
-            }
-
-            return _schemes.Count == 0 ? null : _schemes[0];
-        }
-
-        public bool SwitchScheme(string psGuid)
-        {
-            try
-            {
-                var process = new Process
-                {
-                    StartInfo = new ProcessStartInfo
-                    {
-                        FileName = "powercfg",
-                        Arguments = $"/setactive {psGuid}",
-                        UseShellExecute = false,
-                        CreateNoWindow = true,
-                    },
-                };
-                process.Start();
-                process.WaitForExit();
-                RefreshSchemes();
-                return true;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        private static int GetScore(PowerScheme scheme)
-        {
-            // Heuristic based on name (multi-language basic keywords).
-            string name = scheme.Name.ToLowerInvariant();
-
-            // High performance indicators
-            if (name.Contains("ultimate") || name.Contains("ultra"))
-            {
-                return 380;
-            }
-
-            if (name.Contains("high"))
-            {
-                return 310;
-            }
-
-            if (name.Contains("balanced"))
-            {
-                return 200;
-            }
-
-            if (name.Contains("saver"))
-            {
-                return 120;
-            }
-
-            // Default for unknown custom plans.
-            return 180;
-        }
-
-        public class PowerScheme
-        {
-            public string PSGuid { get; set; } = string.Empty;
-
-            public string Name { get; set; } = string.Empty;
-
-            public bool IsActive { get; set; }
-        }
-    }
-}
--- a/src/modules/awake/Awake/Core/TrayHelper.cs
+++ b/src/modules/awake/Awake/Core/TrayHelper.cs
@@ -306,19 +306,6 @@ namespace Awake.Core
                                break;
                            }

-                        case (uint)TrayCommands.TC_MODE_ACTIVITY:
-                            {
-                                AwakeSettings settings = Manager.ModuleSettings!.GetSettings<AwakeSettings>(Constants.AppName);
-                                Manager.SetActivityBasedKeepAwake(
-                                    settings.Properties.ActivityCpuThresholdPercent,
-                                    settings.Properties.ActivityMemoryThresholdPercent,
-                                    settings.Properties.ActivityNetworkThresholdKBps,
-                                    settings.Properties.ActivitySampleIntervalSeconds,
-                                    settings.Properties.ActivityInactivityTimeoutSeconds,
-                                    settings.Properties.KeepDisplayOn);
-                                break;
-                            }
-
                        case (uint)TrayCommands.TC_MODE_PASSIVE:
                            {
                                Manager.SetPassiveKeepAwake();
@@ -468,7 +455,6 @@ namespace Awake.Core
            InsertMenuItem(0, TrayCommands.TC_MODE_PASSIVE, Resources.AWAKE_OFF, mode == AwakeMode.PASSIVE);
            InsertMenuItem(0, TrayCommands.TC_MODE_INDEFINITE, Resources.AWAKE_KEEP_INDEFINITELY, mode == AwakeMode.INDEFINITE);
            InsertMenuItem(0, TrayCommands.TC_MODE_EXPIRABLE, Resources.AWAKE_KEEP_UNTIL_EXPIRATION, mode == AwakeMode.EXPIRABLE, true);
-            InsertMenuItem(0, TrayCommands.TC_MODE_ACTIVITY, Resources.AWAKE_KEEP_ON_ACTIVITY, mode == AwakeMode.ACTIVITY);
        }
    }
 }
--- a/src/modules/awake/Awake/Core/Usage/ForegroundUsageTracker.cs
+++ b/src/modules/awake/Awake/Core/Usage/ForegroundUsageTracker.cs
@@ -1,364 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text.Json;
-using System.Timers;
-using Awake.Core.Native;
-using Awake.Core.Usage.Models;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-
-namespace Awake.Core.Usage
-{
-    internal sealed class ForegroundUsageTracker : IDisposable
-    {
-        private const uint EventSystemForeground = 0x0003;
-        private const uint WinEventOutOfContext = 0x0000;
-        private const double CommitThresholdSeconds = 0.25;
-
-        private static readonly JsonSerializerOptions LegacySerializer = new()
-        {
-            WriteIndented = true,
-        };
-
-        private delegate void WinEventDelegate(
-            IntPtr hWinEventHook,
-            uint eventType,
-            IntPtr hwnd,
-            int idObject,
-            int idChild,
-            uint dwEventThread,
-            uint dwmsEventTime);
-
-        [DllImport("user32.dll")]
-        private static extern IntPtr SetWinEventHook(
-            uint eventMin,
-            uint eventMax,
-            IntPtr hmodWinEventProc,
-            WinEventDelegate lpfnWinEventProc,
-            uint idProcess,
-            uint idThread,
-            uint dwFlags);
-
-        [DllImport("user32.dll")]
-        private static extern bool UnhookWinEvent(IntPtr hWinEventHook);
-
-        [DllImport("user32.dll")]
-        private static extern IntPtr GetForegroundWindow();
-
-        [DllImport("user32.dll")]
-        private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint processId);
-
-        private readonly object _lock = new();
-        private readonly string _legacyJsonPath;
-        private readonly string _dbPath;
-        private readonly Timer _flushTimer;
-        private readonly Timer _pollTimer;
-        private readonly TimeSpan _idleThreshold = TimeSpan.FromSeconds(60);
-        private readonly Dictionary<string, AppUsageRecord> _sessionCache = new(StringComparer.OrdinalIgnoreCase);
-
-        private IUsageStore _store;
-
-        private string? _activeProcess;
-        private DateTime _activeSince;
-        private IntPtr _hook;
-        private WinEventDelegate? _hookDelegate;
-        private IntPtr _lastHwnd;
-        private int _retentionDays;
-        private bool _disposed;
-
-        internal bool Enabled { get; private set; }
-
-        public ForegroundUsageTracker(string legacyJsonPath, int retentionDays)
-        {
-            _legacyJsonPath = legacyJsonPath;
-            _dbPath = Path.Combine(Path.GetDirectoryName(legacyJsonPath)!, "usage.sqlite");
-            _retentionDays = retentionDays;
-            _store = new SqliteUsageStore(_dbPath);
-
-            _flushTimer = new Timer(5000)
-            {
-                AutoReset = true,
-            };
-            _flushTimer.Elapsed += (_, _) => FlushInternal();
-
-            _pollTimer = new Timer(1000)
-            {
-                AutoReset = true,
-            };
-            _pollTimer.Elapsed += (_, _) => PollForeground();
-
-            TryImportLegacy();
-        }
-
-        private void TryImportLegacy()
-        {
-            try
-            {
-                if (!File.Exists(_legacyJsonPath))
-                {
-                    return;
-                }
-
-                string json = File.ReadAllText(_legacyJsonPath);
-                List<AppUsageRecord> list = JsonSerializer.Deserialize<List<AppUsageRecord>>(json, LegacySerializer) ?? new();
-                foreach (AppUsageRecord r in list)
-                {
-                    _store.AddSpan(r.ProcessName, r.TotalSeconds, r.FirstSeenUtc, r.LastUpdatedUtc, _retentionDays);
-                }
-
-                Logger.LogInfo("[AwakeUsage] Imported legacy usage.json into SQLite. Deleting old file.");
-                File.Delete(_legacyJsonPath);
-            }
-            catch (Exception ex)
-            {
-                Logger.LogWarning("[AwakeUsage] Legacy import failed: " + ex.Message);
-            }
-        }
-
-        public void Configure(bool enabled, int retentionDays)
-        {
-            _retentionDays = Math.Max(1, retentionDays);
-            if (enabled == Enabled)
-            {
-                return;
-            }
-
-            Enabled = enabled;
-            if (Enabled)
-            {
-                _activeSince = DateTime.UtcNow;
-                _hookDelegate = WinEventCallback;
-                _hook = SetWinEventHook(EventSystemForeground, EventSystemForeground, IntPtr.Zero, _hookDelegate, 0, 0, WinEventOutOfContext);
-                Logger.LogInfo(_hook != IntPtr.Zero ? "[AwakeUsage] WinEvent hook installed." : "[AwakeUsage] WinEvent hook failed (poll fallback)");
-                CaptureInitialForeground();
-                _flushTimer.Start();
-                _pollTimer.Start();
-                Logger.LogInfo("[AwakeUsage] Tracking enabled (5s flush, sqlite store).");
-            }
-            else
-            {
-                _flushTimer.Stop();
-                _pollTimer.Stop();
-                if (_hook != IntPtr.Zero)
-                {
-                    UnhookWinEvent(_hook);
-                    _hook = IntPtr.Zero;
-                }
-
-                CommitActiveSpan();
-                FlushInternal(force: true);
-                Logger.LogInfo("[AwakeUsage] Tracking disabled.");
-            }
-        }
-
-        private void WinEventCallback(
-            IntPtr hWinEventHook,
-            uint evt,
-            IntPtr hwnd,
-            int idObj,
-            int idChild,
-            uint thread,
-            uint time)
-        {
-            if (_disposed || !Enabled || evt != EventSystemForeground)
-            {
-                return;
-            }
-
-            HandleForegroundChange(hwnd, "hook");
-        }
-
-        private void PollForeground()
-        {
-            if (_disposed || !Enabled)
-            {
-                return;
-            }
-
-            IntPtr hwnd = GetForegroundWindow();
-            if (hwnd == IntPtr.Zero || hwnd == _lastHwnd)
-            {
-                return;
-            }
-
-            HandleForegroundChange(hwnd, "poll");
-        }
-
-        private void CaptureInitialForeground()
-        {
-            IntPtr hwnd = GetForegroundWindow();
-            if (hwnd == IntPtr.Zero)
-            {
-                return;
-            }
-
-            if (TryResolveProcess(hwnd, out string? name))
-            {
-                _activeProcess = name;
-                _activeSince = DateTime.UtcNow;
-                _lastHwnd = hwnd;
-            }
-        }
-
-        private bool TryResolveProcess(IntPtr hwnd, out string? name)
-        {
-            name = null;
-            try
-            {
-                uint pid;
-                uint tid = GetWindowThreadProcessId(hwnd, out pid);
-                if (tid == 0 || pid == 0)
-                {
-                    return false;
-                }
-
-                using Process p = Process.GetProcessById((int)pid);
-                name = SafeProcessName(p);
-                return !string.IsNullOrWhiteSpace(name);
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        private static string SafeProcessName(Process p)
-        {
-            try
-            {
-                return Path.GetFileName(p.MainModule?.FileName) ?? p.ProcessName;
-            }
-            catch
-            {
-                return p.ProcessName;
-            }
-        }
-
-        private void HandleForegroundChange(IntPtr hwnd, string source)
-        {
-            try
-            {
-                CommitActiveSpan();
-                if (!TryResolveProcess(hwnd, out string? name))
-                {
-                    _activeProcess = null;
-                    return;
-                }
-
-                _activeProcess = name;
-                _activeSince = DateTime.UtcNow;
-                _lastHwnd = hwnd;
-            }
-            catch (Exception ex)
-            {
-                Logger.LogWarning("[AwakeUsage] FG change failed: " + ex.Message);
-            }
-        }
-
-        private void CommitActiveSpan()
-        {
-            if (string.IsNullOrEmpty(_activeProcess))
-            {
-                return;
-            }
-
-            if (IdleTime.GetIdleTime() > _idleThreshold)
-            {
-                _activeProcess = null;
-                return;
-            }
-
-            double secs = (DateTime.UtcNow - _activeSince).TotalSeconds;
-            if (secs < CommitThresholdSeconds)
-            {
-                return;
-            }
-
-            lock (_lock)
-            {
-                if (!_sessionCache.TryGetValue(_activeProcess!, out AppUsageRecord? rec))
-                {
-                    rec = new AppUsageRecord
-                    {
-                        ProcessName = _activeProcess!,
-                        FirstSeenUtc = DateTime.UtcNow,
-                        LastUpdatedUtc = DateTime.UtcNow,
-                        TotalSeconds = 0,
-                    };
-                    _sessionCache[_activeProcess!] = rec;
-                }
-
-                rec.TotalSeconds += secs;
-                rec.LastUpdatedUtc = DateTime.UtcNow;
-            }
-
-            _activeSince = DateTime.UtcNow;
-        }
-
-        private void FlushInternal(bool force = false)
-        {
-            try
-            {
-                CommitActiveSpan();
-
-                Dictionary<string, AppUsageRecord> snapshot;
-                lock (_lock)
-                {
-                    snapshot = _sessionCache.ToDictionary(k => k.Key, v => v.Value);
-                    _sessionCache.Clear();
-                }
-
-                foreach (AppUsageRecord rec in snapshot.Values)
-                {
-                    _store.AddSpan(rec.ProcessName, rec.TotalSeconds, rec.FirstSeenUtc, rec.LastUpdatedUtc, _retentionDays);
-                }
-
-                if (force)
-                {
-                    _store.Prune(_retentionDays);
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogWarning("[AwakeUsage] Flush failed: " + ex.Message);
-            }
-        }
-
-        public IReadOnlyList<AppUsageRecord> GetSummary(int top, int days)
-        {
-            CommitActiveSpan();
-            FlushInternal();
-            try
-            {
-                return _store.Query(top, days);
-            }
-            catch (Exception ex)
-            {
-                Logger.LogWarning("[AwakeUsage] Query failed: " + ex.Message);
-                return Array.Empty<AppUsageRecord>();
-            }
-        }
-
-        public void Dispose()
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            _disposed = true;
-            Configure(false, _retentionDays);
-            _store.Dispose();
-            _flushTimer.Dispose();
-            _pollTimer.Dispose();
-        }
-    }
-}
--- a/src/modules/awake/Awake/Core/Usage/IUsageStore.cs
+++ b/src/modules/awake/Awake/Core/Usage/IUsageStore.cs
@@ -1,21 +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.
-
-#pragma warning disable SA1516, SA1636
-using System;
-using System.Collections.Generic;
-using Awake.Core.Usage.Models;
-
-namespace Awake.Core.Usage
-{
-    internal interface IUsageStore : IDisposable
-    {
-        void AddSpan(string processName, double seconds, DateTime firstSeenUtc, DateTime lastUpdatedUtc, int retentionDays);
-
-        IReadOnlyList<AppUsageRecord> Query(int top, int days);
-
-        void Prune(int retentionDays);
-    }
-}
-#pragma warning restore SA1516, SA1636
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jaylyn Barbee	29874a4b41	merging main	2025-09-03 09:57:51 -04:00
Jaylyn Barbee	d4b379d90a	removed unneeded comments	2025-09-02 11:43:45 -04:00
Jaylyn Barbee	6c031d3b47	removed unneeded comments	2025-09-02 11:40:19 -04:00
Jaylyn Barbee	bccaaad247	small fixes to settings page	2025-09-02 11:25:36 -04:00
Jaylyn Barbee	9c4a713791	merging niels most recent changes	2025-09-02 10:49:21 -04:00
Jaylyn Barbee	1be874eade	force mode respects checkboxes	2025-08-29 16:12:26 -04:00
Jaylyn Barbee	565ffb9084	small string fix	2025-08-29 16:03:48 -04:00
Jaylyn Barbee	afd32d0196	fixed toggle mode shortcut	2025-08-29 15:59:52 -04:00
Jaylyn Barbee	e80f38a302	more text fixes	2025-08-29 09:45:22 -04:00
Jaylyn Barbee	ee2dffc6a4	small text fix	2025-08-29 09:43:24 -04:00
Jaylyn Barbee	fee2d0ab81	small text updates	2025-08-29 09:43:00 -04:00
Niels Laute	d403d5a7fb	Adding (temp) icon	2025-08-29 07:38:06 +02:00
Niels Laute	289f47c1ea	UX tweaks	2025-08-29 07:33:33 +02:00
Jaylyn Barbee	6bbfdd9a93	all things merged and well	2025-08-28 17:23:02 -04:00
Jaylyn Barbee	47102583af	Merge branch 'jay/DarkModeModule' of https://github.com/microsoft/PowerToys into jay/DarkModeModule	2025-08-28 17:00:42 -04:00
Jaylyn Barbee	52ff8bea34	merging renaming	2025-08-28 17:00:39 -04:00
Niels Laute	a3441eecc6	Rename pages	2025-08-28 23:00:14 +02:00
Jaylyn Barbee	88cf1ecaec	Changed name from dark mode to light swith	2025-08-28 16:32:22 -04:00
Niels Laute	a1b09180d8	Moving location stuff to the dialog	2025-08-28 22:24:45 +02:00
Niels Laute	6907f26243	Small tweaks + adding chart	2025-08-28 19:41:11 +02:00
Jaylyn Barbee	911a4e1009	some clean up around forcing modeS	2025-08-27 15:41:18 -04:00
Jaylyn Barbee	44be38e9b6	shortcuts working	2025-08-27 15:25:54 -04:00
Jaylyn Barbee	00d15ba780	3rd mode added, user selected city location	2025-08-27 14:15:19 -04:00
Jaylyn Barbee	b1b1791489	offset setting added	2025-08-27 13:02:01 -04:00
Jaylyn Barbee	05ae7129aa	moved some files around	2025-08-26 11:59:39 -04:00
Jaylyn Barbee	4b015605a1	working on mode switching, some bugs right now	2025-08-21 14:15:41 -04:00
Jaylyn Barbee	fa29bebec3	using location services to calculate sun rise and sunset times is working	2025-08-21 13:53:26 -04:00
Jaylyn Barbee	9816d6fc05	Small comment	2025-08-21 11:47:18 -04:00
Jaylyn Barbee	323ddfdf55	stale catchup from sleep/lock at next minute + wrap around scale rather than forcing light mode to be first	2025-08-21 11:35:01 -04:00
Jaylyn Barbee	ae6187101f	stale catchup for if you were shutdown/not running the service	2025-08-21 11:15:53 -04:00
Jaylyn Barbee	be105b5e27	Fixed flashing issue, legacy code got stuck when removing old logic	2025-08-21 10:56:30 -04:00
Jaylyn Barbee	8aedc4a61d	Force mode buttons working using custom actions	2025-08-21 10:43:35 -04:00
Jaylyn Barbee	9c82281bb1	gpo fixes, tested and works!	2025-08-20 14:10:17 -04:00
Jaylyn Barbee	df74f6e3c7	added GPO	2025-08-20 10:20:34 -04:00
Jaylyn Barbee	887e552d43	merged main + ui changes + clean up in logic	2025-08-19 12:09:18 -04:00
Jaylyn Barbee	df61b2863e	changed to date time pickers and separated the apps and system theme change	2025-08-19 11:37:31 -04:00
Jaylyn Barbee	9f581101a8	settings are persisting	2025-08-19 11:21:48 -04:00
Jaylyn Barbee	db41f61010	settings saving correctly	2025-08-19 11:03:10 -04:00
Niels Laute	e28e4582c9	Merge branch 'main' into jay/DarkModeModule	2025-08-19 16:43:51 +02:00
Niels Laute	abc7f3f3fb	UI tweaks in Settings	2025-08-19 16:40:41 +02:00
Jaylyn Barbee	039991bc4a	wiring in settings to load into service	2025-08-19 10:19:37 -04:00
Jaylyn Barbee	a857cc688b	removing the ui	2025-08-19 09:23:51 -04:00
Jaylyn Barbee	1be5e5931a	in nuget package trouble, settings are saving but not loading properly	2025-08-18 17:04:59 -04:00
Jaylyn Barbee	03fafa747f	settings saving appropriately.	2025-08-14 17:07:57 -04:00
Jaylyn Barbee	62b4075349	service works, changes settings based on the time it has in the settings, but settings ui not connected to settings	2025-08-11 14:37:27 -04:00
Jaylyn Barbee	cc42876c01	service is enabling and disabling via ui, still one error at launch	2025-08-11 11:15:54 -04:00
Jaylyn Barbee	2d30fe2ec2	moved logic to service, incomplete right now though	2025-08-08 12:32:29 -04:00
Jaylyn Barbee	247cc47491	got logging figured out	2025-08-07 18:02:28 -04:00
Jaylyn Barbee	7de506010e	trying to figured out build error	2025-08-07 15:53:48 -04:00
Jaylyn Barbee	736a04f65c	small updates	2025-08-06 11:59:42 -04:00
Jaylyn Barbee	b66b44cc49	showing in runner now. settings still not connected, service still not running.	2025-08-06 10:47:16 -04:00
Jaylyn Barbee	f55f465c83	forward progress, trying to figure out runner	2025-08-05 14:20:12 -04:00
Jaylyn Barbee	30e6215003	repair work to the module interface	2025-08-05 13:55:29 -04:00
Jaylyn Barbee	bdafb0e38a	trying to get it to show in runner but imports are busted	2025-08-05 12:21:14 -04:00
Jaylyn Barbee	50c5d577bc	something broken with converters flipping to show settings	2025-08-04 16:41:35 -04:00
Jaylyn Barbee	a9e838ae1d	Starting to fill in settings page	2025-08-04 15:26:32 -04:00
Jaylyn Barbee	c47ff9cd55	interface done?	2025-08-04 12:23:44 -04:00
Jaylyn Barbee	104d4fd6a0	Working on interface	2025-08-04 12:16:55 -04:00
Jaylyn Barbee	37242fbb4d	commit base interface	2025-08-04 11:28:39 -04:00
Jaylyn Barbee	2c39113914	Fixing build errors	2025-08-04 11:23:10 -04:00
Jaylyn Barbee	bf07c11640	Linked to project	2025-08-04 11:03:15 -04:00
Jaylyn Barbee	2c6a8bac27	Dark mode code dump	2025-08-04 10:54:36 -04:00