Merge branch 'main' into jay/lsv2

<!-- Enter a brief description/summary of your PR here. What does it
fix/what does it change/how was it tested (even manually, if necessary)?
-->
## Summary of the Pull Request
This pull request introduces a new module called "Light Switch" which
allows users to automatically switch between light and dark mode on a
timer.

![Light
Switch](https://github.com/user-attachments/assets/d24d7364-445f-4f23-ab5e-4b8c6a4147ab)

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

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

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

### Known bugs:
- Default settings not saving correctly when switching modes
- Issue: Sometimes when you switch from one mode to another, they are
supposed to update with new defaults but sometimes this fails for the
second variable. Potentially has to do with accessing the settings file
while another chunk of code is still updating.
- Sometimes the system looks "glitched" when switching themes

### To do:
- [x] OOBE page and assets
- [x] Logic to disable the chart when no location has been selected
- [x] Localization

### How to and what to test
Grab the latest installer from the pipeline below for your architecture
and install PowerToys from there.
- Toggle theme shortcutSystem only, Apps only, Both system and apps
selected
- Does changing the values on the settings page update the settings
file? %LOCALAPPDATA%/Microsoft/PowerToys/LightSwitch/settings.json
- Manual mode: System only, Apps only, Both system and apps selected
- Sunrise modes:  Are the times accurate?
- If you manage to let this run through sunset/rise does the theme
change?
- Set your theme to change within the next minute using manual mode and
set your device to sleepOpen your device and login once the time you set
has passed. --> Do your settings resync once the next minute ticks after
logging back into your device?
- Disable the service and ensure the tasks actually ends.
- While the module is disabled:
     - Make sure the shortcut no longer works
     - Make sure the last time you set doesn't trigger a theme change
- Bonus: Toggle GPO Configuration and make sure you are unable to enable
the module

---------

Co-authored-by: Niels Laute <niels.laute@live.nl>
Co-authored-by: Gordon Lam (SH) <yeelam@microsoft.com>

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

@@ -210,6 +210,7 @@ capturevideosample
 cmdow
 Controlz
 cortana
+devhints
 dlnilsson
 fancymouse
 firefox
@@ -229,6 +230,7 @@ regedit
 roslyn
 Skia
 Spotify
+tldr
 Vanara
 wangyi
 WEX

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

@@ -3,6 +3,7 @@ abcdefghjkmnpqrstuvxyz
 abgr
 ABlocked
 ABOUTBOX
+ABORTIFHUNG
 Abug
 Acceleratorkeys
 ACCEPTFILES
@@ -77,6 +78,7 @@ appwiz
 appxpackage
 APSTUDIO
 AQS
+Aquadrant
 ARandom
 ARCHITEW
 ARemapped
@@ -366,6 +368,7 @@ desktopshorcutinstalled
 DESKTOPVERTRES
 devblogs
 devdocs
+devenv
 devmgmt
 DEVMODE
 DEVMODEW
@@ -454,6 +457,7 @@ encryptor
 ENDSESSION
 ENSUREVISIBLE
 ENTERSIZEMOVE
+ENTRYW
 ENU
 environmentvariables
 EOAC
@@ -571,6 +575,7 @@ GETDESKWALLPAPER
 GETDLGCODE
 GETDPISCALEDSIZE
 getfilesiginforedist
+geolocator
 GETHOTKEY
 GETICON
 GETMINMAXINFO
@@ -822,10 +827,12 @@ killrunner
 kmph
 kvp
 Kybd
+LARGEICON
 lastcodeanalysissucceeded
 LASTEXITCODE
 LAYOUTRTL
 LCh
+lbl
 lcid
 LCIDTo
 lcl
@@ -844,6 +851,7 @@ LIBID
 LIMITSIZE
 LIMITTEXT
 lindex
+lightswitch
 linkid
 LINKOVERLAY
 LINQTo
@@ -867,10 +875,13 @@ logon
 LOGMSG
 LOGPIXELSX
 LOGPIXELSY
+lng
 LOn
+lon
 longdate
 LONGNAMES
 lowlevel
+lquadrant
 LOWORD
 lparam
 LPBITMAPINFOHEADER
@@ -1200,8 +1211,10 @@ PACL
 PAINTSTRUCT
 PALETTEWINDOW
 PARENTNOTIFY
+PARENTRELATIVE
 PARENTRELATIVEEDITING
 PARENTRELATIVEFORADDRESSBAR
+PARENTRELATIVEFORUI
 PARENTRELATIVEPARSING
 parray
 PARTIALCONFIRMATIONDIALOGTITLE
@@ -1257,6 +1270,7 @@ pgp
 pguid
 phbm
 phbmp
+phicon
 phwnd
 pici
 pidl
@@ -1265,6 +1279,7 @@ pinfo
 pinvoke
 pipename
 PKBDLLHOOKSTRUCT
+pkgfamily
 plib
 ploc
 ploca
@@ -1383,6 +1398,7 @@ quickaccent
 QUNS
 RAII
 RAlt
+RAquadrant
 randi
 rasterization
 Rasterize
@@ -1681,6 +1697,7 @@ Subdomain
 SUBMODULEUPDATE
 subresource
 Superbar
+suntimes
 sut
 svchost
 SVGIn
@@ -1746,6 +1763,7 @@ tgz
 themeresources
 THH
 THICKFRAME
+THEMECHANGED
 THISCOMPONENT
 throughs
 thumbnailhotkey
@@ -1762,6 +1780,7 @@ tkconverters
 tlb
 tlbimp
 tlc
+tmain
 TNP
 TOGGLEEASYMOUSE
 Toolhelp

.pipelines/ESRPSigning_core.json

@@ -133,6 +133,9 @@
             "PowerToys.ImageResizerContextMenu.dll",
             "ImageResizerContextMenuPackage.msix",
 
+            "PowerToys.LightSwitchModuleInterface.dll",
+            "LightSwitchService\\PowerToys.LightSwitchService.exe",
+
             "PowerToys.KeyboardManager.dll",
             "KeyboardManagerEditor\\PowerToys.KeyboardManagerEditor.exe",
             "KeyboardManagerEngine\\PowerToys.KeyboardManagerEngine.exe",

.pipelines/loc/loc.yml

@@ -29,8 +29,8 @@ steps:
   displayName: 'Touchdown Build - 37400, PRODEXT'
   inputs:
     teamId: 37400
-    TDBuildServiceConnection: $(TouchdownServiceConnection)
-    authType: SubjectNameIssuer
+    FederatedIdentityTDBuildServiceConnection: $(TouchdownServiceConnection)
+    authType: FederatedIdentityTDBuild
     resourceFilePath: |
      src\**\Resources.resx
      src\**\Resource.resx

.pipelines/v2/ci.yml

@@ -32,7 +32,7 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     displayName: "Enable MSBuild Caching"
-    default: false
+    default: true
   - name: runTests
     type: boolean
     displayName: "Run Tests"

.pipelines/v2/templates/steps-fetch-and-prepare-localizations.yml

@@ -8,8 +8,8 @@ steps:
     displayName: 'Download Localization Files -- PowerToys 37400'
     inputs:
       teamId: 37400
-      TDBuildServiceConnection: $(TouchdownServiceConnection)
-      authType: SubjectNameIssuer
+      FederatedIdentityTDBuildServiceConnection: $(TouchdownServiceConnection)
+      authType: FederatedIdentityTDBuild
       resourceFilePath: |
        **\Resources.resx
        **\Resource.resx

.pipelines/verifyCommonProps.ps1

@@ -44,6 +44,9 @@ foreach ($csprojFile in $csprojFilesArray) {
     if ($csprojFile -like '*Microsoft.CmdPal.Core.*.csproj') {
         continue
     }
+    if ($csprojFile -like '*Microsoft.CmdPal.Ext.Shell.csproj') {
+        continue
+    }
 
     $importExists = Test-ImportSharedCsWinRTProps -filePath $csprojFile
     if (!$importExists) {

Directory.Packages.props

@@ -22,7 +22,7 @@
     <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
     <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
-    <PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.250910-build.2249" />
+    <PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.251002-build.2316" />
     <PackageVersion Include="ControlzEx" Version="6.0.0" />
     <PackageVersion Include="HelixToolkit" Version="2.24.0" />
     <PackageVersion Include="HelixToolkit.Core.Wpf" Version="2.24.0" />

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}
@@ -793,6 +795,12 @@ 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}") = "LightSwitch", "LightSwitch", "{5B201255-53C8-490B-A34F-01F05D48A477}"
+EndProject
+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}") = "LightSwitchService", "src\modules\LightSwitch\LightSwitchService\LightSwitchService.vcxproj", "{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}"
+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}"
@@ -811,6 +819,12 @@ 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}") = "Tests", "Tests", "{3DCCD936-D085-4869-A1DE-CA6A64152C94}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LightSwitch.UITests", "src\modules\LightSwitch\Tests\LightSwitch.UITests\LightSwitch.UITests.csproj", "{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests\Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests.csproj", "{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2889,6 +2903,22 @@ 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
+		{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
 		{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
@@ -2945,6 +2975,26 @@ 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
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Debug|ARM64.Build.0 = Debug|ARM64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Debug|x64.ActiveCfg = Debug|x64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Debug|x64.Build.0 = Debug|x64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Debug|x64.Deploy.0 = Debug|x64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Release|ARM64.ActiveCfg = Release|ARM64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Release|ARM64.Build.0 = Release|ARM64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Release|ARM64.Deploy.0 = Release|ARM64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Release|x64.ActiveCfg = Release|x64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Release|x64.Build.0 = Release|x64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Release|x64.Deploy.0 = Release|x64
+		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Debug|ARM64.Build.0 = Debug|ARM64
+		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Debug|x64.ActiveCfg = Debug|x64
+		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Debug|x64.Build.0 = Debug|x64
+		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Release|ARM64.ActiveCfg = Release|ARM64
+		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Release|ARM64.Build.0 = Release|ARM64
+		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Release|x64.ActiveCfg = Release|x64
+		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3258,6 +3308,9 @@ 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}
+		{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}
 		{E11826E1-76DF-42AC-985C-164CC2EE57A1} = {7AC943C9-52E8-44CF-9083-744D8049667B}
 		{66C069F8-C548-4CA6-8CDE-239104D68E88} = {E11826E1-76DF-42AC-985C-164CC2EE57A1}
 		{9605B84E-FAC4-477B-B9EC-0753177EE6A8} = {557C4636-D7E1-4838-A504-7D19B725EE95}
@@ -3267,6 +3320,9 @@ Global
 		{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}
+		{3DCCD936-D085-4869-A1DE-CA6A64152C94} = {5B201255-53C8-490B-A34F-01F05D48A477}
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F} = {3DCCD936-D085-4869-A1DE-CA6A64152C94}
+		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

doc/devdocs/modules/lightswitch.md

@@ -0,0 +1,107 @@
+# Light Switch
+
+[Public Overview – Microsoft Learn](https://learn.microsoft.com/en-us/windows/powertoys/light-switch)
+
+## Quick Links
+
+* [All Issues](https://github.com/microsoft/PowerToys/issues?q=is%3Aissue%20state%3Aopen%20label%3AProduct-LightSwitch)
+* [Bugs](https://github.com/microsoft/PowerToys/issues?q=is%3Aissue%20state%3Aopen%20label%3AProduct-LightSwitch%20label%3AIssue-Bug)
+* [Pull Requests](https://github.com/microsoft/PowerToys/pulls?q=is%3Apr+is%3Aopen+label%3AProduct-LightSwitch)
+
+## Overview
+
+The **Light Switch** module lets users automatically transition between light and dark mode using a timed schedule or a keyboard shortcut.
+
+## Features
+
+* Set custom times to start and stop dark mode.
+* Use geolocation to determine local sunrise and sunset times.
+* Apply offsets in sunrise mode (e.g., 15 minutes before sunset).
+* Quickly toggle between modes with a keyboard shortcut (`Ctrl+Shift+Win+D` by default).
+* Choose whether theme changes apply to:
+
+  * Apps only
+  * System only
+  * Both apps and system
+
+## Architecture
+
+### Main Components
+
+* **Shortcut/Hotkey**
+  Listens for a hotkey event. Calling `onHotkey()` flips the theme flags.
+
+  > **Note:** Using the shortcut overrides the current schedule until the next transition event.
+
+* **LightSwitchService**
+  Reads settings and applies theming. Runs a check every minute to ensure the state is correct.
+
+* **SettingsXAML/LightSwitch**
+  Provides the settings UI for configuring schedules, syncing location, and customizing shortcuts.
+
+* **Settings.UI/ViewModels/LightSwitchViewModel.cs**
+  Handles updates to the settings file and communicates changes to the front end.
+
+* **modules/LightSwitch/Tests**
+  Contains UI tests that verify interactions between the settings UI, system state, and `settings.json`.
+
+### Data Flow
+
+1. User configures settings in the UI (default: manual mode, light mode from 06:00–18:00).
+2. Every minute, the service checks the time.
+
+   * If it’s not a threshold, the service sleeps until the next minute.
+   * If it matches a threshold, the service applies the theme based on settings and returns to sleep.
+3. At **midnight**, when in *Sunrise to Sunset* mode, the service updates daily sunrise and sunset times.
+4. If the machine was asleep during a scheduled event, the service applies the correct settings at the next check.
+
+## User Interface
+
+The module’s settings are exposed in the PowerToys Settings UI. Options include:
+
+* Shortcut customization
+* Mode selection (Manual or Sunrise to Sunset)
+* Manual start/stop times (manual mode only)
+* Automatic sunrise/sunset calculation (location-based)
+* Time offsets (sunrise mode)
+* Target scope (system, apps, or both)
+
+## Development Environment Setup
+
+### Prerequisites
+
+* Visual Studio 2019 or later
+* Windows 10 SDK
+* PowerToys repository cloned from GitHub
+
+### Building and Testing
+
+1. Clone the repo:
+
+   ```sh
+   git clone https://github.com/microsoft/PowerToys.git
+   ```
+2. Initialize submodules:
+
+   ```sh
+   git submodule update --init --recursive
+   ```
+3. Build the solution:
+
+   ```sh
+   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.sln
+   ```
+
+   > Note: This may take some time.
+4. Set `runner` as the startup project and press **F5**.
+5. Enable Light Switch in PowerToys Settings.
+6. To debug the service:
+
+   * Press `Ctrl+Alt+P` or go to **Debug > Attach to Process**.
+   * Select `LightSwitchService.exe` and click **Attach**.
+   * You can now set breakpoints in the service files.
+7. To debug the Settings UI:
+
+   * Set the startup project to `PowerToys.Settings` and press **F5**.
+   * Note: Light Switch settings will not persist in this mode (they depend on the service executable).
+   * Alternatively, you can attach `PowerToys.Settings.exe` to the debugger while `runner` is running to test the full flow with breakpoints.

doc/thirdPartyRunPlugins.md

@@ -50,6 +50,7 @@ Contact the developers of a plugin directly for assistance with a specific plugi
 | [Hotkeys](https://github.com/ruslanlap/PowerToysRun-Hotkeys) | [ruslanlap](https://github.com/ruslanlap) | Create, manage, and trigger custom keyboard shortcuts directly from PowerToys Run. |
 | [RandomGen](https://github.com/ruslanlap/PowerToysRun-RandomGen) | [ruslanlap](https://github.com/ruslanlap) | 🎲 Generate random data instantly with a single keystroke. Perfect for developers, testers, designers, and anyone who needs quick access to random data. Features include secure passwords, PINs, names, business data, dates, numbers, GUIDs, color codes, and more. Especially useful for designers who need random color codes and placeholder content. |
 | [Open With Cursor](https://github.com/VictorNoxx/PowerToys-Run-Cursor/) | [VictorNoxx](https://github.com/VictorNoxx) | Open Visual Studio, VS Code recents with Cursor AI |
+| [CheatSheets](https://github.com/ruslanlap/PowerToysRun-CheatSheets) | [ruslanlap](https://github.com/ruslanlap) | 📚 Find cheat sheets and command examples instantly from tldr pages, cheat.sh, and devhints.io. Features include favorites system, categories, offline mode, and smart caching. |
 
 ## Extending software plugins
 

installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp

@@ -1283,7 +1283,7 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
     }
     processes.resize(bytes / sizeof(processes[0]));
 
-    std::array<std::wstring_view, 41> processesToTerminate = {
+    std::array<std::wstring_view, 42> processesToTerminate = {
         L"PowerToys.PowerLauncher.exe",
         L"PowerToys.Settings.exe",
         L"PowerToys.AdvancedPaste.exe",
@@ -1298,6 +1298,7 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
         L"PowerToys.Hosts.exe",
         L"PowerToys.PowerRename.exe",
         L"PowerToys.ImageResizer.exe",
+        L"PowerToys.LightSwitchService.exe",
         L"PowerToys.GcodeThumbnailProvider.exe",
         L"PowerToys.BgcodeThumbnailProvider.exe",
         L"PowerToys.PdfThumbnailProvider.exe",

installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj

@@ -65,6 +65,7 @@
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Hosts.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Hosts.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\ImageResizer.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\ImageResizer.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\KeyboardManager.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\KeyboardManager.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\LightSwitch.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\LightSwitch.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\MouseWithoutBorders.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\MouseWithoutBorders.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\NewPlus.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\NewPlus.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Peek.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Peek.wxs.bk""""

installer/PowerToysSetupVNext/LightSwitch.wxs

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define LightSwitchFiles=?>
+  <?define LightSwitchFilesPath=$(var.BinDir)\LightSwitchService\?>
+
+  <Fragment>
+    <!-- Light Switch background service -->
+
+    <!-- Create a directory for the service binaries -->
+    <DirectoryRef Id="INSTALLFOLDER">
+      <Directory Id="LightSwitchServiceFolder" Name="LightSwitchService" />
+    </DirectoryRef>
+
+    <!-- File components generated by generateAllFileComponents.ps1 -->
+    <DirectoryRef Id="LightSwitchServiceFolder" FileSource="$(var.LightSwitchFilesPath)">
+      <!-- Generated by generateFileComponents.ps1 -->
+      <!--LightSwitchFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Group to include the service + cleanup on uninstall -->
+    <ComponentGroup Id="LightSwitchComponentGroup">
+
+      <!-- Ensures folder removal on uninstall -->
+      <Component Id="RemoveLightSwitchServiceFolder" Guid="C1E2F2ED-34A2-4EB0-8E17-DC0535F50F9D" Directory="INSTALLFOLDER">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveLightSwitchServiceFolder" Value="" KeyPath="yes" />
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderLightSwitchServiceFolder" Directory="LightSwitchServiceFolder" On="uninstall" />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj

@@ -41,6 +41,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
       call move /Y ..\..\..\FileExplorerPreview.wxs.bk ..\..\..\FileExplorerPreview.wxs
       call move /Y ..\..\..\FileLocksmith.wxs.bk ..\..\..\FileLocksmith.wxs
       call move /Y ..\..\..\Hosts.wxs.bk ..\..\..\Hosts.wxs
+      call move /Y ..\..\..\LightSwitch.wxs.bk ..\..\..\LightSwitch.wxs
       call move /Y ..\..\..\ImageResizer.wxs.bk ..\..\..\ImageResizer.wxs
       call move /Y ..\..\..\KeyboardManager.wxs.bk ..\..\..\KeyboardManager.wxs
       call move /Y ..\..\..\MouseWithoutBorders.wxs.bk ..\..\..\MouseWithoutBorders.wxs
@@ -114,6 +115,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     <Compile Include="FileLocksmith.wxs" />
     <Compile Include="Hosts.wxs" />
     <Compile Include="ImageResizer.wxs" />
+    <Compile Include="LightSwitch.wxs" />
     <Compile Include="KeyboardManager.wxs" />
     <Compile Include="Peek.wxs" />
     <Compile Include="PowerRename.wxs" />

installer/PowerToysSetupVNext/Product.wxs

@@ -50,6 +50,7 @@
       <ComponentGroupRef Id="HostsComponentGroup" />
       <ComponentGroupRef Id="ImageResizerComponentGroup" />
       <ComponentGroupRef Id="KeyboardManagerComponentGroup" />
+      <ComponentGroupRef Id="LightSwitchComponentGroup" />
       <ComponentGroupRef Id="PeekComponentGroup" />
       <ComponentGroupRef Id="PowerRenameComponentGroup" />
       <ComponentGroupRef Id="RegistryPreviewComponentGroup" />

installer/PowerToysSetupVNext/generateAllFileComponents.ps1

@@ -182,6 +182,10 @@ Generate-FileComponents -fileListName "HostsAssetsFiles" -wxsFilePath $PSScriptR
 Generate-FileList -fileDepsJson "" -fileListName ImageResizerAssetsFiles -wxsFilePath $PSScriptRoot\ImageResizer.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\ImageResizer"
 Generate-FileComponents -fileListName "ImageResizerAssetsFiles" -wxsFilePath $PSScriptRoot\ImageResizer.wxs -regroot $registryroot
 
+# Light Switch Service
+Generate-FileList -fileDepsJson "" -fileListName LightSwitchFiles -wxsFilePath $PSScriptRoot\LightSwitch.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\LightSwitchService"
+Generate-FileComponents -fileListName "LightSwitchFiles" -wxsFilePath $PSScriptRoot\LightSwitch.wxs -regroot $registryroot
+
 #New+
 Generate-FileList -fileDepsJson "" -fileListName NewPlusAssetsFiles -wxsFilePath $PSScriptRoot\NewPlus.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\NewPlus"
 Generate-FileComponents -fileListName "NewPlusAssetsFiles" -wxsFilePath $PSScriptRoot\NewPlus.wxs -regroot $registryroot

src/CmdPalVersion.props

@@ -2,7 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <CmdPalVersion Condition="'$(CmdPalVersion)'=='' and '$(XES_APPXMANIFESTVERSION)'!=''">$(XES_APPXMANIFESTVERSION)</CmdPalVersion>
+
+    <!-- MIKE: The file you're looking for is src/modules/cmdpal/custom.props -->
     <CmdPalVersion Condition="'$(CmdPalVersion)'==''">0.0.1.0</CmdPalVersion>
+
     <DevEnvironment>Local</DevEnvironment>
 
     <!-- Forcing for every DLL on by default -->

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:

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());

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();

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();

src/common/ManagedCommon/ModuleType.cs

@@ -19,6 +19,7 @@ namespace ManagedCommon
         Hosts,
         ImageResizer,
         KeyboardManager,
+        LightSwitch,
         MouseHighlighter,
         MouseJump,
         MousePointerCrosshairs,

src/common/UITestAutomation/Element/Element.cs

@@ -81,6 +81,14 @@ namespace Microsoft.PowerToys.UITest
             get { return this.windowsElement?.Selected ?? false; }
         }
 
+        /// <summary>
+        /// Gets a value indicating whether the UI element is visible to the user.
+        /// </summary>
+        public bool Displayed
+        {
+            get { return this.windowsElement?.Displayed ?? false; }
+        }
+
         /// <summary>
         /// Gets the Rect of the UI element.
         /// </summary>
@@ -329,7 +337,7 @@ namespace Microsoft.PowerToys.UITest
         /// Send Key of the element.
         /// </summary>
         /// <param name="key">The Key to Send.</param>
-        protected void SendKeys(string key)
+        public void SendKeys(string key)
         {
             PerformAction((actions, windowElement) =>
             {
@@ -369,5 +377,19 @@ namespace Microsoft.PowerToys.UITest
             Assert.IsNotNull(this.windowsElement, $"WindowsElement is null in method SaveToPngFile with parameter: path = {path}");
             this.windowsElement.GetScreenshot().SaveAsFile(path);
         }
+
+        public void EnsureVisible(Element scrollViewer, int maxScrolls = 10)
+        {
+            int count = 0;
+            if (scrollViewer.WindowsElement != null)
+            {
+                while (!this.windowsElement!.Displayed && count < maxScrolls)
+                {
+                    scrollViewer.WindowsElement.SendKeys(OpenQA.Selenium.Keys.PageDown);
+                    Task.Delay(250).Wait();
+                    count++;
+                }
+            }
+        }
     }
 }

src/common/UITestAutomation/ModuleConfigData.cs

@@ -34,6 +34,7 @@ namespace Microsoft.PowerToys.UITest
         PowerRename,
         CommandPalette,
         ScreenRuler,
+        LightSwitch,
     }
 
     /// <summary>
@@ -106,6 +107,7 @@ namespace Microsoft.PowerToys.UITest
                 [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"),
+                [PowerToysModule.LightSwitch] = new ModuleInfo("PowerToys.LightSwitch.exe", "PowerToys.LightSwitch", "LightSwitchService"),
             };
         }
 

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();

src/common/utils/elevation.h

@@ -257,7 +257,9 @@ 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;
+    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

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);

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_95_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" />

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>

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

src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj

@@ -0,0 +1,225 @@
+<?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>
+    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </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>..\..\..\common\inc;..\..\..\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>

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>

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
+}

src/modules/LightSwitch/LightSwitchModuleInterface/ThemeHelper.h

@@ -0,0 +1,5 @@
+#pragma once
+void SetSystemTheme(bool dark);
+void SetAppsTheme(bool dark);
+bool GetCurrentSystemTheme();
+bool GetCurrentAppsTheme();

src/modules/LightSwitch/LightSwitchModuleInterface/dllmain.cpp

@@ -0,0 +1,570 @@
+#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,
+    SunsetToSunrise,
+    // add more later
+};
+
+inline std::wstring ToString(ScheduleMode mode)
+{
+    switch (mode)
+    {
+    case ScheduleMode::SunsetToSunrise:
+        return L"SunsetToSunrise";
+    case ScheduleMode::FixedHours:
+    default:
+        return L"FixedHours";
+    }
+}
+
+inline ScheduleMode FromString(const std::wstring& str)
+{
+    if (str == L"SunsetToSunrise")
+        return ScheduleMode::SunsetToSunrise;
+    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_sunrise_offset = 0;
+    int m_sunset_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;
+    HANDLE m_manual_override_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"POWERTOYS_LIGHTSWITCH_FORCE_LIGHT");
+        m_force_dark_event_handle = CreateDefaultEvent(L"POWERTOYS_LIGHTSWITCH_FORCE_DARK");
+        m_manual_override_event_handle = CreateDefaultEvent(L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
+
+        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"SunsetToSunrise", L"Use sunrise/sunset times" } });
+
+        // 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"sunrise_offset",
+            L"Time to offset turning on your light theme.",
+            g_settings.m_sunrise_offset,
+            0,
+            1439,
+            1);
+
+        settings.add_int_spinner(
+            L"sunset_offset",
+            L"Time to offset turning on your dark theme.",
+            g_settings.m_sunset_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"sunrise_offset"))
+            {
+                g_settings.m_sunrise_offset = *v;
+            }
+
+            if (auto v = values.get_int_value(L"m_sunset_offset"))
+            {
+                g_settings.m_sunset_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 named '{}' at location '{}'",
+                exe_name,
+                resolved_path.c_str());
+            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_manual_override_event_handle);
+            m_manual_override_event_handle = nullptr;
+
+            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());
+                }
+
+                if (m_manual_override_event_handle)
+                {
+                    SetEvent(m_manual_override_event_handle);
+                    Logger::debug(L"[Light Switch] Manual override event set");
+                }
+            }
+
+            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"sunrise_offset"))
+            g_settings.m_sunrise_offset = *v;
+        if (auto v = settings.get_int_value(L"sunset_offset"))
+            g_settings.m_sunset_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();
+}

src/modules/LightSwitch/LightSwitchModuleInterface/pch.cpp

@@ -0,0 +1,2 @@
+#include "pch.h"
+#pragma comment(lib, "windowsapp")

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>

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));
+}

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();
+};

src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp

@@ -0,0 +1,295 @@
+#include <windows.h>
+#include <tchar.h>
+#include "ThemeScheduler.h"
+#include "ThemeHelper.h"
+#include <common/SettingsAPI/settings_objects.h>
+#include <common/SettingsAPI/settings_helpers.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;
+static int g_lastUpdatedDay = -1;
+
+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]);
+    }
+
+    // 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;
+    }
+}
+
+static void update_sun_times(auto& settings)
+{
+    double latitude = std::stod(settings.latitude);
+    double longitude = std::stod(settings.longitude);
+
+    SYSTEMTIME st;
+    GetLocalTime(&st);
+
+    SunTimes newTimes = CalculateSunriseSunset(latitude, longitude, st.wYear, st.wMonth, st.wDay);
+
+    int newLightTime = newTimes.sunriseHour * 60 + newTimes.sunriseMinute;
+    int newDarkTime = newTimes.sunsetHour * 60 + newTimes.sunsetMinute;
+
+    auto values = PowerToysSettings::PowerToyValues::load_from_settings_file(L"LightSwitch");
+    values.add_property(L"lightTime", newLightTime);
+    values.add_property(L"darkTime", newDarkTime);
+    values.save_to_settings_file();
+
+    OutputDebugString(L"[LightSwitchService] Updated sun times and saved to config.\n");
+}
+
+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();
+
+    // Open the manual override event created by the module interface
+    HANDLE hManualOverride = OpenEventW(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
+
+    auto applyTheme = [](int nowMinutes, int lightMinutes, int darkMinutes, const auto& settings) {
+        bool isLightActive = false;
+
+        if (lightMinutes < darkMinutes)
+        {
+            // Normal case: sunrise < sunset
+            isLightActive = (nowMinutes >= lightMinutes && nowMinutes < darkMinutes);
+        }
+        else
+        {
+            // Wraparound case: e.g. light at 21:00, dark at 06:00
+            isLightActive = (nowMinutes >= lightMinutes || nowMinutes < darkMinutes);
+        }
+
+        bool isSystemCurrentlyLight = GetCurrentSystemTheme();
+        bool isAppsCurrentlyLight = GetCurrentAppsTheme();
+
+        if (isLightActive)
+        {
+            if (settings.changeSystem && !isSystemCurrentlyLight)
+                SetSystemTheme(true);
+            if (settings.changeApps && !isAppsCurrentlyLight)
+                SetAppsTheme(true);
+        }
+        else
+        {
+            if (settings.changeSystem && isSystemCurrentlyLight)
+                SetSystemTheme(false);
+            if (settings.changeApps && isAppsCurrentlyLight)
+                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.sunrise_offset, settings.darkTime + settings.sunset_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();
+
+        // Refresh suntimes at day boundary
+        if (g_lastUpdatedDay != st.wDay)
+        {
+            update_sun_times(settings);
+            g_lastUpdatedDay = st.wDay;
+
+            OutputDebugString(L"[LightSwitchService] Recalculated sun times at new day boundary.\n");
+        }
+
+        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);
+
+        // --- Manual override check ---
+        bool manualOverrideActive = false;
+        if (hManualOverride)
+        {
+            manualOverrideActive = (WaitForSingleObject(hManualOverride, 0) == WAIT_OBJECT_0);
+        }
+
+        if (manualOverrideActive)
+        {
+            // Did we hit a scheduled boundary? (reset override at boundary)
+            if (nowMinutes == (settings.lightTime + settings.sunrise_offset) % 1440 ||
+                nowMinutes == (settings.darkTime + settings.sunset_offset) % 1440)
+            {
+                ResetEvent(hManualOverride);
+                OutputDebugString(L"[LightSwitchService] Manual override cleared at boundary\n");
+            }
+            else
+            {
+                OutputDebugString(L"[LightSwitchService] Skipping schedule due to manual override\n");
+                goto sleep_until_next_minute;
+            }
+        }
+
+        // Apply theme logic (only runs if no manual override or override just cleared)
+        applyTheme(nowMinutes, settings.lightTime + settings.sunrise_offset, settings.darkTime + settings.sunset_offset, settings);
+
+    sleep_until_next_minute:
+        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 (hManualOverride)
+        CloseHandle(hManualOverride);
+    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;
+}

src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj

@@ -0,0 +1,219 @@
+<?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|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>
+    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <TargetName>PowerToys.LightSwitchService</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <AdditionalIncludeDirectories>
+        ./../;
+        ..\..\..\common\Telemetry;
+        ..\..\..\common;
+        ..\..\..\;
+        ..\..\..\..\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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <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>
+    <ResourceCompile Include="LightSwitchService.rc" />
+  </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>

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>

src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp

@@ -0,0 +1,167 @@
+#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"sunrise_offset")) 
+        {
+            auto val = *jsonVal;
+            if (m_settings.sunrise_offset != val)
+            {
+                m_settings.sunrise_offset = val;
+                NotifyObservers(SettingId::Sunrise_Offset);
+            }
+        }
+
+        if (const auto jsonVal = values.get_int_value(L"sunset_offset"))
+        {
+            auto val = *jsonVal;
+            if (m_settings.sunset_offset != val)
+            {
+                m_settings.sunset_offset = val;
+                NotifyObservers(SettingId::Sunset_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
+    }
+}

src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.h

@@ -0,0 +1,88 @@
+#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 sunrise_offset = 0;
+    int sunset_offset = 0;
+
+    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;
+};

src/modules/LightSwitch/LightSwitchService/SettingsConstants.cpp

@@ -0,0 +1 @@
+#include "SettingsConstants.h"

src/modules/LightSwitch/LightSwitchService/SettingsConstants.h

@@ -0,0 +1,14 @@
+#pragma once
+
+enum class SettingId
+{
+    ScheduleMode = 0,
+    Latitude,
+    Longitude,
+    LightTime,
+    DarkTime,
+    Sunrise_Offset,
+    Sunset_Offset,
+    ChangeSystem,
+    ChangeApps
+};

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;
+};

src/modules/LightSwitch/LightSwitchService/ThemeHelper.cpp

@@ -0,0 +1,81 @@
+#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);
+    }
+}
+
+// Can think of this as "is the current theme light?"
+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
+}

src/modules/LightSwitch/LightSwitchService/ThemeHelper.h

@@ -0,0 +1,5 @@
+#pragma once
+void SetSystemTheme(bool dark);
+void SetAppsTheme(bool dark);
+bool GetCurrentSystemTheme();
+bool GetCurrentAppsTheme();

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;
+}

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);

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}");
+    });
+}

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();

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>

src/modules/LightSwitch/LightSwitchService/resource.h

@@ -0,0 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by LightSwitchService.rc
+//
+#define IDI_ICON1                       101
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

src/modules/LightSwitch/Tests/LightSwitch.UITests/LightSwitch.UITests.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
+  <PropertyGroup>
+    <RootNamespace>PowerToys.LightSwitch.UITests</RootNamespace>
+    <AssemblyName>LightSwitch.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\LightSwitch.UITests\</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+	  <PackageReference Include="MSTest" />
+	  <ProjectReference Include="..\..\..\..\common\UITestAutomation\UITestAutomation.csproj" />
+  </ItemGroup>
+</Project>

src/modules/LightSwitch/Tests/LightSwitch.UITests/Package.appxmanifest

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  IgnorableNamespaces="uap rescap">
+
+  <Identity
+    Name="ad22010c-e33e-4459-848e-a1ed976bfd3b"
+    Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
+    Version="1.0.0.0" />
+
+  <mp:PhoneIdentity PhoneProductId="ad22010c-e33e-4459-848e-a1ed976bfd3b" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
+  <Properties>
+    <DisplayName>LightSwitch.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="LightSwitch.UITests"
+        Description="LightSwitch.UITests"
+        BackgroundColor="transparent"
+        Square150x150Logo="Assets\Square150x150Logo.png"
+        Square44x44Logo="Assets\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" />
+        <uap:SplashScreen Image="Assets\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+</Package>

src/modules/LightSwitch/Tests/LightSwitch.UITests/TestGeolocation.cs

@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.PowerToys.UITest;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace LightSwitch.UITests
+{
+    [TestClass]
+    public class TestGeolocation : UITestBase
+    {
+        public TestGeolocation()
+            : base(PowerToysModule.PowerToysSettings, WindowSize.Large)
+        {
+        }
+
+        [TestMethod("LightSwitch.Geolocation")]
+        [TestCategory("Location")]
+        public void TestGeolocationUpdate()
+        {
+            TestHelper.InitializeTest(this, "geolocation test");
+            TestHelper.PerformGeolocationTest(this);
+            TestHelper.CleanupTest(this);
+        }
+    }
+}

src/modules/LightSwitch/Tests/LightSwitch.UITests/TestHelper.cs

@@ -0,0 +1,439 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using Microsoft.PowerToys.UITest;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.Win32;
+
+namespace LightSwitch.UITests
+{
+    internal sealed class TestHelper
+    {
+        private static readonly string[] ShortcutSeparators = { " + ", "+", " " };
+
+        /// <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 = SetLightSwitchToggle(testBase, enable: true);
+            Assert.IsTrue(
+                toggleSwitch.IsOn,
+                $"Light Switch 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>
+        /// Navigate to the Light Switch settings page
+        /// </summary>
+        public static void LaunchFromSetting(UITestBase testBase)
+        {
+            var lightSwitch = testBase.Session.FindAll<NavigationViewItem>(By.AccessibilityId("LightSwitchNavItem"));
+
+            if (lightSwitch.Count == 0)
+            {
+                testBase.Session.Find<NavigationViewItem>(By.AccessibilityId("SystemToolsNavItem"), 5000).Click(msPostAction: 500);
+            }
+
+            testBase.Session.Find<NavigationViewItem>(By.AccessibilityId("LightSwitchNavItem"), 5000).Click(msPostAction: 500);
+        }
+
+        /// <summary>
+        /// Set the Light Switch enable toggle switch to the specified state
+        /// </summary>
+        public static ToggleSwitch SetLightSwitchToggle(UITestBase testBase, bool enable)
+        {
+            var toggleSwitch = testBase.Session.Find<ToggleSwitch>(By.AccessibilityId("Toggle_LightSwitch"), 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>
+        /// Read the current activation shortcut from the ShortcutControl
+        /// </summary>
+        public static Key[] ReadActivationShortcut(UITestBase testBase)
+        {
+            var shortcutCard = testBase.Session.Find<Element>(By.AccessibilityId("Shortcut_LightSwitch"), 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.D };
+            }
+
+            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.D };
+        }
+
+        /// <summary>
+        /// Performs common test cleanup: close LightSwitch task
+        /// </summary>
+        /// <param name="testBase">The test base instance</param>
+        public static void CleanupTest(UITestBase testBase)
+        {
+            // TODO: Make sure the task kills?
+            // CloseLightSwitch(testBase);
+
+            // Ensure we're attached to settings after cleanup
+            try
+            {
+                testBase.Session.Attach(PowerToysModule.PowerToysSettings);
+            }
+            catch
+            {
+                // Ignore attachment errors - this is just cleanup
+            }
+        }
+
+        /// <summary>
+        /// Perform a update time test operation
+        /// </summary>
+        public static void PerformUpdateTimeTest(UITestBase testBase)
+        {
+            // Make sure in manual mode
+            var modeCombobox = testBase.Session.Find<Element>(By.AccessibilityId("ModeSelection_LightSwitch"), 5000);
+            Assert.IsNotNull(modeCombobox, "Mode combobox not found.");
+
+            var neededTabs = 6;
+
+            if (modeCombobox.Text != "Manual")
+            {
+                modeCombobox.Click();
+                var manualListItem = testBase.Session.Find<Element>(By.AccessibilityId("ManualCBItem_LightSwitch"), 5000);
+                Assert.IsNotNull(manualListItem, "Manual combobox item not found.");
+                manualListItem.Click();
+                neededTabs = 1;
+            }
+
+            Assert.AreEqual("Manual", modeCombobox.Text, "Mode combobox should be set to Manual.");
+
+            var timeline = testBase.Session.Find<Element>(By.AccessibilityId("Timeline_LightSwitch"), 5000);
+            Assert.IsNotNull(timeline, "Timeline not found.");
+
+            var helpText = timeline.GetAttribute("HelpText");
+            string originalEndValue = GetHelpTextValue(helpText, "End");
+
+            for (int i = 0; i < neededTabs; i++)
+            {
+                testBase.Session.SendKeys(Key.Tab);
+            }
+
+            testBase.Session.SendKeys(Key.Enter);
+            testBase.Session.SendKeys(Key.Up);
+            testBase.Session.SendKeys(Key.Enter);
+
+            helpText = timeline.GetAttribute("HelpText");
+            string updatedEndValue = GetHelpTextValue(helpText, "End");
+
+            Assert.AreNotEqual(originalEndValue, updatedEndValue, "Timeline end time should have been updated.");
+
+            helpText = timeline.GetAttribute("HelpText");
+            string originalStartValue = GetHelpTextValue(helpText, "Start");
+
+            testBase.Session.SendKeys(Key.Tab);
+            testBase.Session.SendKeys(Key.Enter);
+            testBase.Session.SendKeys(Key.Up);
+            testBase.Session.SendKeys(Key.Enter);
+
+            helpText = timeline.GetAttribute("HelpText");
+            string updatedStartValue = GetHelpTextValue(helpText, "Start");
+
+            Assert.AreNotEqual(originalStartValue, updatedStartValue, "Timeline start time should have been updated.");
+        }
+
+        /// <summary>
+        /// Perform a update geolocation test operation
+        /// </summary>
+        public static void PerformUserSelectedLocationTest(UITestBase testBase)
+        {
+            // Make sure in sun time mode
+            var modeCombobox = testBase.Session.Find<Element>(By.AccessibilityId("ModeSelection_LightSwitch"), 5000);
+            Assert.IsNotNull(modeCombobox, "Mode combobox not found.");
+
+            if (modeCombobox.Text != "Sunset to sunrise")
+            {
+                modeCombobox.Click();
+                var sunriseListItem = testBase.Session.Find<Element>(By.AccessibilityId("SunCBItem_LightSwitch"), 5000);
+                Assert.IsNotNull(sunriseListItem, "Sunrise combobox item not found.");
+                sunriseListItem.Click();
+            }
+
+            Assert.AreEqual("Sunset to sunrise", modeCombobox.Text, "Mode combobox should be set to Sunset to sunrise.");
+
+            var setLocationButton = testBase.Session.Find<Element>(By.AccessibilityId("SetLocationButton_LightSwitch"), 5000);
+            Assert.IsNotNull(setLocationButton, "Set location button not found.");
+            setLocationButton.Click();
+
+            var autoSuggestTextbox = testBase.Session.Find<Element>(By.AccessibilityId("CitySearchBox_LightSwitch"), 5000);
+            Assert.IsNotNull(autoSuggestTextbox, "City search box not found.");
+            autoSuggestTextbox.Click();
+            autoSuggestTextbox.SendKeys("Seattle");
+            autoSuggestTextbox.SendKeys(OpenQA.Selenium.Keys.Down);
+            autoSuggestTextbox.SendKeys(OpenQA.Selenium.Keys.Enter);
+
+            var latLong = testBase.Session.Find<Element>(By.AccessibilityId("LocationResultText_LightSwitch"), 5000);
+            Assert.IsFalse(string.IsNullOrWhiteSpace(latLong.Text));
+
+            var sunrise = testBase.Session.Find<Element>(By.AccessibilityId("SunriseText_LightSwitch"), 5000);
+            Assert.IsFalse(string.IsNullOrWhiteSpace(sunrise.Text));
+
+            var sunset = testBase.Session.Find<Element>(By.AccessibilityId("SunsetText_LightSwitch"), 5000);
+            Assert.IsFalse(string.IsNullOrWhiteSpace(sunset.Text));
+        }
+
+        /// <summary>
+        /// Perform a update geolocation test operation
+        /// </summary>
+        public static void PerformGeolocationTest(UITestBase testBase)
+        {
+            // Make sure in sun time mode
+            var modeCombobox = testBase.Session.Find<Element>(By.AccessibilityId("ModeSelection_LightSwitch"), 5000);
+            Assert.IsNotNull(modeCombobox, "Mode combobox not found.");
+
+            if (modeCombobox.Text != "Sunset to sunrise")
+            {
+                modeCombobox.Click();
+                var sunriseListItem = testBase.Session.Find<Element>(By.AccessibilityId("SunCBItem_LightSwitch"), 5000);
+                Assert.IsNotNull(sunriseListItem, "Sunrise combobox item not found.");
+                sunriseListItem.Click();
+            }
+
+            Assert.AreEqual("Sunset to sunrise", modeCombobox.Text, "Mode combobox should be set to Sunset to sunrise.");
+
+            // Click the select city button
+            var setLocationButton = testBase.Session.Find<Element>(By.AccessibilityId("SetLocationButton_LightSwitch"), 5000);
+            Assert.IsNotNull(setLocationButton, "Set location button not found.");
+            setLocationButton.Click(msPostAction: 8000);
+
+            var latLong = testBase.Session.Find<Element>(By.AccessibilityId("LocationResultText_LightSwitch"), 5000);
+            Assert.IsFalse(string.IsNullOrWhiteSpace(latLong.Text));
+
+            var sunrise = testBase.Session.Find<Element>(By.AccessibilityId("SunriseText_LightSwitch"), 5000);
+            Assert.IsFalse(string.IsNullOrWhiteSpace(sunrise.Text));
+
+            var sunset = testBase.Session.Find<Element>(By.AccessibilityId("SunsetText_LightSwitch"), 5000);
+            Assert.IsFalse(string.IsNullOrWhiteSpace(sunset.Text));
+        }
+
+        /// <summary>
+        /// Perform a update time test operation
+        /// </summary>
+        public static void PerformOffsetTest(UITestBase testBase)
+        {
+            // Make sure in sun time mode
+            var modeCombobox = testBase.Session.Find<Element>(By.AccessibilityId("ModeSelection_LightSwitch"), 5000);
+            Assert.IsNotNull(modeCombobox, "Mode combobox not found.");
+
+            if (modeCombobox.Text != "Sunset to sunrise")
+            {
+                modeCombobox.Click();
+                var sunriseListItem = testBase.Session.Find<Element>(By.AccessibilityId("SunCBItem_LightSwitch"), 5000);
+                Assert.IsNotNull(sunriseListItem, "Sunrise combobox item not found.");
+                sunriseListItem.Click();
+            }
+
+            Assert.AreEqual("Sunset to sunrise", modeCombobox.Text, "Mode combobox should be set to Sunset to sunrise.");
+
+            // Testing sunrise offset
+            var sunriseOffset = testBase.Session.Find<Element>(By.AccessibilityId("SunriseOffset_LightSwitch"), 5000);
+            Assert.IsNotNull(sunriseOffset, "Sunrise offset number box not found.");
+
+            var timeline = testBase.Session.Find<Element>(By.AccessibilityId("Timeline_LightSwitch"), 5000);
+            Assert.IsNotNull(timeline, "Timeline not found.");
+
+            var helpText = timeline.GetAttribute("HelpText");
+            string originalStartValue = GetHelpTextValue(helpText, "Start");
+
+            sunriseOffset.Click();
+            testBase.Session.SendKeys(Key.Up);
+
+            helpText = timeline.GetAttribute("HelpText");
+            string updatedStartValue = GetHelpTextValue(helpText, "Start");
+
+            Assert.AreNotEqual(originalStartValue, updatedStartValue, "Timeline start time should have been updated.");
+
+            // Testing sunset offset
+            var sunsetOffset = testBase.Session.Find<Element>(By.AccessibilityId("SunsetOffset_LightSwitch"), 5000);
+            Assert.IsNotNull(sunsetOffset, "Sunrise offset number box not found.");
+
+            helpText = timeline.GetAttribute("HelpText");
+            string originalEndValue = GetHelpTextValue(helpText, "End");
+
+            sunsetOffset.Click();
+            testBase.Session.SendKeys(Key.Up);
+
+            helpText = timeline.GetAttribute("HelpText");
+            string updatedEndValue = GetHelpTextValue(helpText, "End");
+
+            Assert.AreNotEqual(originalEndValue, updatedEndValue, "Timeline end time should have been updated.");
+        }
+
+        /// <summary>
+        /// Perform a test for shortcut changing themes
+        /// </summary>
+        public static void PerformShortcutTest(UITestBase testBase, Key[] activationKeys)
+        {
+            // Test when both are checked
+            var systemCheckbox = testBase.Session.Find<Element>(By.AccessibilityId("ChangeSystemCheckbox_LightSwitch"), 5000);
+            Assert.IsNotNull(systemCheckbox, "System checkbox not found.");
+
+            var scrollViewer = testBase.Session.Find<Element>(By.AccessibilityId("PageScrollViewer"));
+            systemCheckbox.EnsureVisible(scrollViewer);
+
+            int neededTabs = 10;
+
+            if (!systemCheckbox.Selected)
+            {
+                for (int i = 0; i < neededTabs; i++)
+                {
+                    testBase.Session.SendKeys(Key.Tab);
+                }
+
+                systemCheckbox.Click();
+            }
+
+            Assert.IsTrue(systemCheckbox.Selected, "System checkbox should be checked.");
+
+            var appsCheckbox = testBase.Session.Find<Element>(By.AccessibilityId("ChangeAppsCheckbox_LightSwitch"), 5000);
+            Assert.IsNotNull(appsCheckbox, "Apps checkbox not found.");
+
+            if (!appsCheckbox.Selected)
+            {
+                appsCheckbox.Click();
+            }
+
+            Assert.IsTrue(appsCheckbox.Selected, "Apps checkbox should be checked.");
+
+            var systemBeforeValue = GetSystemTheme();
+            var appsBeforeValue = GetAppsTheme();
+
+            testBase.Session.SendKeys(activationKeys);
+            Task.Delay(5000).Wait();
+
+            var systemAfterValue = GetSystemTheme();
+            var appsAfterValue = GetAppsTheme();
+
+            Assert.AreNotEqual(systemBeforeValue, systemAfterValue, "System theme should have changed.");
+            Assert.AreNotEqual(appsBeforeValue, appsAfterValue, "Apps theme should have changed.");
+
+            // Test with nothing checked
+            if (systemCheckbox.Selected)
+            {
+                systemCheckbox.Click();
+            }
+
+            if (appsCheckbox.Selected)
+            {
+                appsCheckbox.Click();
+            }
+
+            Assert.IsFalse(systemCheckbox.Selected, "System checkbox should be unchecked.");
+            Assert.IsFalse(appsCheckbox.Selected, "Apps checkbox should be unchecked.");
+
+            var noneSystemBeforeValue = GetSystemTheme();
+            var noneAppsBeforeValue = GetAppsTheme();
+
+            testBase.Session.SendKeys(activationKeys);
+            Task.Delay(5000).Wait();
+
+            var noneSystemAfterValue = GetSystemTheme();
+            var noneAppsAfterValue = GetAppsTheme();
+
+            Assert.AreEqual(noneSystemBeforeValue, noneSystemAfterValue, "System theme should not have changed.");
+            Assert.AreEqual(noneAppsBeforeValue, noneAppsAfterValue, "Apps theme should not have changed.");
+        }
+
+        /* Helpers */
+        private static int GetSystemTheme()
+        {
+            using var key = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize");
+            if (key is null)
+            {
+                return 1;
+            }
+
+            return (int)key.GetValue("SystemUsesLightTheme", 1);
+        }
+
+        private static int GetAppsTheme()
+        {
+            using var key = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize");
+            if (key is null)
+            {
+                return 1;
+            }
+
+            return (int)key.GetValue("AppsUseLightTheme", 1);
+        }
+
+        private static string GetHelpTextValue(string helpText, string key)
+        {
+            foreach (var part in helpText.Split(';'))
+            {
+                var kv = part.Split('=');
+                if (kv.Length == 2 && kv[0] == key)
+                {
+                    return kv[1];
+                }
+            }
+
+            return string.Empty;
+        }
+    }
+}

src/modules/LightSwitch/Tests/LightSwitch.UITests/TestOffset.cs

@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.PowerToys.UITest;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace LightSwitch.UITests
+{
+    [TestClass]
+    public class TestOffset : UITestBase
+    {
+        public TestOffset()
+            : base(PowerToysModule.PowerToysSettings, WindowSize.Large)
+        {
+        }
+
+        [TestMethod("LightSwitch.Offset")]
+        [TestCategory("Time")]
+        public void TestTimeOffset()
+        {
+            TestHelper.InitializeTest(this, "offset test");
+            TestHelper.PerformOffsetTest(this);
+            TestHelper.CleanupTest(this);
+        }
+    }
+}

src/modules/LightSwitch/Tests/LightSwitch.UITests/TestShortcut.cs

@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.PowerToys.UITest;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace LightSwitch.UITests
+{
+    [TestClass]
+    public class TestShortcut : UITestBase
+    {
+        public TestShortcut()
+            : base(PowerToysModule.PowerToysSettings, WindowSize.Large)
+        {
+        }
+
+        [TestMethod("LightSwitch.TestShortcut")]
+        [TestCategory("Shortcut")]
+        public void TestLightSwitchShortcut()
+        {
+            var activationKeys = TestHelper.InitializeTest(this, "light switch shortcut test");
+            TestHelper.PerformShortcutTest(this, activationKeys);
+            TestHelper.CleanupTest(this);
+        }
+    }
+}

src/modules/LightSwitch/Tests/LightSwitch.UITests/TestUpdateManualTime.cs

@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.PowerToys.UITest;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace LightSwitch.UITests
+{
+    [TestClass]
+    public class TestUpdateManualTime : UITestBase
+    {
+        public TestUpdateManualTime()
+            : base(PowerToysModule.PowerToysSettings, WindowSize.Large)
+        {
+        }
+
+        [TestMethod("LightSwitch.UpdateManualTime")]
+        [TestCategory("Time")]
+        public void TestUpdateTime()
+        {
+            TestHelper.InitializeTest(this, "update manual time test");
+            TestHelper.PerformUpdateTimeTest(this);
+            TestHelper.CleanupTest(this);
+        }
+    }
+}

src/modules/LightSwitch/Tests/LightSwitch.UITests/TestUserSelectedLocation.cs

@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.PowerToys.UITest;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace LightSwitch.UITests
+{
+    [TestClass]
+    public class TestUserSelectedLocation : UITestBase
+    {
+        public TestUserSelectedLocation()
+            : base(PowerToysModule.PowerToysSettings, WindowSize.Large)
+        {
+        }
+
+        [TestMethod("LightSwitch.UserSelectedLocation")]
+        [TestCategory("Location")]
+        public void TestUserSelectedLocationUpdate()
+        {
+            TestHelper.InitializeTest(this, "user selected location test");
+            TestHelper.PerformUserSelectedLocationTest(this);
+            TestHelper.CleanupTest(this);
+        }
+    }
+}

src/modules/LightSwitch/Tests/LightSwitch.UITests/app.manifest

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="LightSwitch.UITests.app"/>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- The ID below informs the system that this application is compatible with OS features first introduced in Windows 10. 
+      It is necessary to support features in unpackaged applications, for example the custom titlebar implementation.
+      For more info see https://docs.microsoft.com/windows/apps/windows-app-sdk/use-windows-app-sdk-run-time#declare-os-compatibility-in-your-application-manifest -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+  
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </windowsSettings>
+  </application>
+</assembly>

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/SupersedingAsyncGate.cs

@@ -13,7 +13,7 @@ namespace Microsoft.CmdPal.Core.Common.Helpers;
 /// If ExecuteAsync is called while already executing, it cancels the current execution
 /// and starts the operation again (superseding behavior).
 /// </summary>
-public partial class SupersedingAsyncGate : IDisposable
+public sealed partial class SupersedingAsyncGate : IDisposable
 {
     private readonly Func<CancellationToken, Task> _action;
     private readonly Lock _lock = new();

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/SupersedingAsyncValueGate`1.cs

@@ -0,0 +1,189 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CmdPal.Core.Common.Helpers;
+
+/// <summary>
+/// An async gate that ensures only one value computation runs at a time.
+/// If ExecuteAsync is called while already executing, it cancels the current computation
+/// and starts the operation again (superseding behavior).
+/// Once a value is successfully computed, it is applied (via the provided <see cref="Action{T}"/>).
+/// The apply step uses its own lock so that long-running apply logic does not block the
+/// computation / superseding pipeline, while still remaining serialized with respect to
+/// other apply calls.
+/// </summary>
+/// <typeparam name="T">The type of the computed value.</typeparam>
+public sealed partial class SupersedingAsyncValueGate<T> : IDisposable
+{
+    private readonly Func<CancellationToken, Task<T>> _valueFactory;
+    private readonly Action<T> _apply;
+    private readonly Lock _lock = new();              // Controls scheduling / superseding
+    private readonly Lock _applyLock = new();         // Serializes application of results
+    private int _callId;
+    private TaskCompletionSource<T>? _currentTcs;
+    private CancellationTokenSource? _currentCancellationSource;
+    private Task? _executingTask;
+
+    public SupersedingAsyncValueGate(
+        Func<CancellationToken, Task<T>> valueFactory,
+        Action<T> apply)
+    {
+        ArgumentNullException.ThrowIfNull(valueFactory);
+        ArgumentNullException.ThrowIfNull(apply);
+        _valueFactory = valueFactory;
+        _apply = apply;
+    }
+
+    /// <summary>
+    /// Executes the configured value computation. If another execution is running, this call will
+    /// cancel the current execution and restart the computation. The returned task completes when
+    /// (and only if) the computation associated with this invocation completes (or is canceled / superseded).
+    /// </summary>
+    /// <param name="cancellationToken">Optional external cancellation token.</param>
+    /// <returns>The computed value for this invocation.</returns>
+    public async Task<T> ExecuteAsync(CancellationToken cancellationToken = default)
+    {
+        TaskCompletionSource<T> tcs;
+
+        lock (_lock)
+        {
+            // Supersede any in-flight computation.
+            _currentCancellationSource?.Cancel();
+            _currentTcs?.TrySetException(new OperationCanceledException("Superseded by newer call"));
+
+            tcs = new(TaskCreationOptions.RunContinuationsAsynchronously);
+            _currentTcs = tcs;
+            _callId++;
+
+            if (_executingTask is null)
+            {
+                _executingTask = Task.Run(ExecuteLoop, CancellationToken.None);
+            }
+        }
+
+        using var ctr = cancellationToken.Register(state => ((TaskCompletionSource<T>)state!).TrySetCanceled(cancellationToken), tcs);
+        return await tcs.Task.ConfigureAwait(false);
+    }
+
+    private async Task ExecuteLoop()
+    {
+        try
+        {
+            while (true)
+            {
+                TaskCompletionSource<T>? currentTcs;
+                CancellationTokenSource? currentCts;
+                int currentCallId;
+
+                lock (_lock)
+                {
+                    currentTcs = _currentTcs;
+                    currentCallId = _callId;
+
+                    if (currentTcs is null)
+                    {
+                        break; // Nothing pending.
+                    }
+
+                    _currentCancellationSource?.Dispose();
+                    _currentCancellationSource = new();
+                    currentCts = _currentCancellationSource;
+                }
+
+                try
+                {
+                    var value = await _valueFactory(currentCts.Token).ConfigureAwait(false);
+                    CompleteSuccessIfCurrent(currentTcs, currentCallId, value);
+                }
+                catch (OperationCanceledException)
+                {
+                    CompleteIfCurrent(currentTcs, currentCallId, t => t.TrySetCanceled(currentCts.Token));
+                }
+                catch (Exception ex)
+                {
+                    CompleteIfCurrent(currentTcs, currentCallId, t => t.TrySetException(ex));
+                }
+            }
+        }
+        finally
+        {
+            lock (_lock)
+            {
+                _currentTcs = null;
+                _currentCancellationSource?.Dispose();
+                _currentCancellationSource = null;
+                _executingTask = null;
+            }
+        }
+    }
+
+    private void CompleteSuccessIfCurrent(TaskCompletionSource<T> candidate, int id, T value)
+    {
+        var shouldApply = false;
+        lock (_lock)
+        {
+            if (_currentTcs == candidate && _callId == id)
+            {
+                // Mark as consumed so a new computation can start immediately.
+                _currentTcs = null;
+                shouldApply = true;
+            }
+        }
+
+        if (!shouldApply)
+        {
+            return; // Superseded meanwhile.
+        }
+
+        Exception? applyException = null;
+        try
+        {
+            lock (_applyLock)
+            {
+                _apply(value);
+            }
+        }
+        catch (Exception ex)
+        {
+            applyException = ex;
+        }
+
+        if (applyException is null)
+        {
+            candidate.TrySetResult(value);
+        }
+        else
+        {
+            candidate.TrySetException(applyException);
+        }
+    }
+
+    private void CompleteIfCurrent(
+        TaskCompletionSource<T> candidate,
+        int id,
+        Action<TaskCompletionSource<T>> complete)
+    {
+        lock (_lock)
+        {
+            if (_currentTcs == candidate && _callId == id)
+            {
+                complete(candidate);
+                _currentTcs = null;
+            }
+        }
+    }
+
+    public void Dispose()
+    {
+        lock (_lock)
+        {
+            _currentCancellationSource?.Cancel();
+            _currentCancellationSource?.Dispose();
+            _currentTcs?.TrySetException(new ObjectDisposedException(nameof(SupersedingAsyncValueGate<T>)));
+            _currentTcs = null;
+        }
+
+        GC.SuppressFinalize(this);
+    }
+}

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/IRunHistoryService.cs

@@ -2,8 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Collections.Generic;
-
 namespace Microsoft.CmdPal.Core.Common.Services;
 
 public interface IRunHistoryService
@@ -25,3 +23,12 @@ public interface IRunHistoryService
     /// <param name="item">The run history item to add.</param>
     void AddRunHistoryItem(string item);
 }
+
+public interface ITelemetryService
+{
+    void LogRunQuery(string query, int resultCount, ulong durationMs);
+
+    void LogRunCommand(string command, bool asAdmin, bool success);
+
+    void LogOpenUri(string uri, bool isWeb, bool success);
+}

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

@@ -17,7 +17,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
     public ExtensionObject<ICommandItem> Model => _commandItemModel;
 
     private readonly ExtensionObject<ICommandItem> _commandItemModel = new(null);
-    private CommandContextItemViewModel? _defaultCommandContextItem;
+    private CommandContextItemViewModel? _defaultCommandContextItemViewModel;
 
     internal InitializedState Initialized { get; private set; } = InitializedState.Uninitialized;
 
@@ -43,9 +43,9 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
 
     public string Subtitle { get; private set; } = string.Empty;
 
-    private IconInfoViewModel _listItemIcon = new(null);
+    private IconInfoViewModel _icon = new(null);
 
-    public IconInfoViewModel Icon => _listItemIcon.IsSet ? _listItemIcon : Command.Icon;
+    public IconInfoViewModel Icon => _icon.IsSet ? _icon : Command.Icon;
 
     public CommandViewModel Command { get; private set; }
 
@@ -69,9 +69,9 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
     {
         get
         {
-            List<IContextItemViewModel> l = _defaultCommandContextItem is null ?
+            List<IContextItemViewModel> l = _defaultCommandContextItemViewModel is null ?
                 new() :
-                [_defaultCommandContextItem];
+                [_defaultCommandContextItemViewModel];
 
             l.AddRange(MoreCommands);
             return l;
@@ -136,11 +136,11 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
 
         Command.InitializeProperties();
 
-        var listIcon = model.Icon;
-        if (listIcon is not null)
+        var icon = model.Icon;
+        if (icon is not null)
         {
-            _listItemIcon = new(listIcon);
-            _listItemIcon.InitializeProperties();
+            _icon = new(icon);
+            _icon.InitializeProperties();
         }
 
         // TODO: Do these need to go into FastInit?
@@ -201,21 +201,19 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
 
         if (!string.IsNullOrEmpty(model.Command?.Name))
         {
-            _defaultCommandContextItem = new(new CommandContextItem(model.Command!), PageContext)
+            _defaultCommandContextItemViewModel = new CommandContextItemViewModel(new CommandContextItem(model.Command!), PageContext)
             {
                 _itemTitle = Name,
                 Subtitle = Subtitle,
                 Command = Command,
 
                 // TODO this probably should just be a CommandContextItemViewModel(CommandItemViewModel) ctor, or a copy ctor or whatever
+                // Anything we set manually here must stay in sync with the corresponding properties on CommandItemViewModel.
             };
 
             // Only set the icon on the context item for us if our command didn't
             // have its own icon
-            if (!Command.HasIcon)
-            {
-                _defaultCommandContextItem._listItemIcon = _listItemIcon;
-            }
+            UpdateDefaultContextItemIcon();
         }
 
         Initialized |= InitializedState.SelectionInitialized;
@@ -238,7 +236,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
             _itemTitle = "Error";
             Subtitle = "Item failed to load";
             MoreCommands = [];
-            _listItemIcon = _errorIcon;
+            _icon = _errorIcon;
             Initialized |= InitializedState.Error;
         }
 
@@ -275,7 +273,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
             _itemTitle = "Error";
             Subtitle = "Item failed to load";
             MoreCommands = [];
-            _listItemIcon = _errorIcon;
+            _icon = _errorIcon;
             Initialized |= InitializedState.Error;
         }
 
@@ -305,17 +303,18 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         switch (propertyName)
         {
             case nameof(Command):
-                if (Command is not null)
-                {
-                    Command.PropertyChanged -= Command_PropertyChanged;
-                }
-
+                Command.PropertyChanged -= Command_PropertyChanged;
                 Command = new(model.Command, PageContext);
                 Command.InitializeProperties();
 
                 // Extensions based on Command Palette SDK < 0.3 CommandItem class won't notify when Title changes because Command
                 // or Command.Name change. This is a workaround to ensure that the Title is always up-to-date for extensions with old SDK.
                 _itemTitle = model.Title;
+
+                _defaultCommandContextItemViewModel?.Command = Command;
+                _defaultCommandContextItemViewModel?.UpdateTitle(_itemTitle);
+                UpdateDefaultContextItemIcon();
+
                 UpdateProperty(nameof(Name));
                 UpdateProperty(nameof(Title));
                 UpdateProperty(nameof(Icon));
@@ -326,12 +325,22 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
                 break;
 
             case nameof(Subtitle):
-                this.Subtitle = model.Subtitle;
+                var modelSubtitle = model.Subtitle;
+                this.Subtitle = modelSubtitle;
+                _defaultCommandContextItemViewModel?.Subtitle = modelSubtitle;
                 break;
 
             case nameof(Icon):
-                _listItemIcon = new(model.Icon);
-                _listItemIcon.InitializeProperties();
+                var oldIcon = _icon;
+                _icon = new(model.Icon);
+                _icon.InitializeProperties();
+                if (oldIcon.IsSet || _icon.IsSet)
+                {
+                    UpdateProperty(nameof(Icon));
+                }
+
+                UpdateDefaultContextItemIcon();
+
                 break;
 
             case nameof(model.MoreCommands):
@@ -378,26 +387,49 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
     private void Command_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
     {
         var propertyName = e.PropertyName;
+        var model = _commandItemModel.Unsafe;
+        if (model is null)
+        {
+            return;
+        }
+
         switch (propertyName)
         {
             case nameof(Command.Name):
                 // Extensions based on Command Palette SDK < 0.3 CommandItem class won't notify when Title changes because Command
                 // or Command.Name change. This is a workaround to ensure that the Title is always up-to-date for extensions with old SDK.
-                var model = _commandItemModel.Unsafe;
-                if (model is not null)
-                {
-                    _itemTitle = model.Title;
-                }
+                _itemTitle = model.Title;
+                UpdateProperty(nameof(Title), nameof(Name));
 
-                UpdateProperty(nameof(Title));
-                UpdateProperty(nameof(Name));
+                _defaultCommandContextItemViewModel?.UpdateTitle(model.Command.Name);
                 break;
+
             case nameof(Command.Icon):
+                UpdateDefaultContextItemIcon();
                 UpdateProperty(nameof(Icon));
                 break;
         }
     }
 
+    private void UpdateDefaultContextItemIcon()
+    {
+        // Command icon takes precedence over our icon on the primary command
+        _defaultCommandContextItemViewModel?.UpdateIcon(Command.Icon.IsSet ? Command.Icon : _icon);
+    }
+
+    private void UpdateTitle(string? title)
+    {
+        _itemTitle = title ?? string.Empty;
+        UpdateProperty(nameof(Title));
+    }
+
+    private void UpdateIcon(IIconInfo? iconInfo)
+    {
+        _icon = new(iconInfo);
+        _icon.InitializeProperties();
+        UpdateProperty(nameof(Icon));
+    }
+
     protected override void UnsafeCleanup()
     {
         base.UnsafeCleanup();
@@ -411,10 +443,10 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         }
 
         // _listItemIcon.SafeCleanup();
-        _listItemIcon = new(null); // necessary?
+        _icon = new(null); // necessary?
 
-        _defaultCommandContextItem?.SafeCleanup();
-        _defaultCommandContextItem = null;
+        _defaultCommandContextItemViewModel?.SafeCleanup();
+        _defaultCommandContextItemViewModel = null;
 
         Command.PropertyChanged -= Command_PropertyChanged;
         Command.SafeCleanup();

src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props

@@ -3,12 +3,13 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.CommandPalette.Extensions" Version="0.2.0" />
+    <PackageVersion Include="Microsoft.CommandPalette.Extensions" Version="0.5.250829002" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24508.2" />
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.183" />
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools.MSIX" Version="1.7.20250829.1" />
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.250907003" />
     <PackageVersion Include="Shmuelie.WinRTServer" Version="2.1.1" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />

src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateCmdPalExtension.csproj

@@ -40,10 +40,13 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CommandPalette.Extensions" />
     <PackageReference Include="Microsoft.Windows.CsWinRT" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" />
-    <PackageReference Include="Microsoft.Web.WebView2" />
-    <PackageReference Include="System.Text.Json" />
     <PackageReference Include="Shmuelie.WinRTServer" />
+
+    <!-- Needed to enable building an MSIX package -->
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools.MSIX">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <!--
@@ -84,6 +87,9 @@
     <!-- In Release builds, trimming is enabled by default. 
          feel free to disable this if needed -->
     <PublishTrimmed>true</PublishTrimmed>
+
+    <!-- In release, also ignore the aforementioned ILLink warning -->
+    <ILLinkTreatWarningsAsErrors>false</ILLinkTreatWarningsAsErrors>
   </PropertyGroup>
 
 

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

@@ -52,6 +52,8 @@ public partial class SettingsModel : ObservableObject
 
     public MonitorBehavior SummonOn { get; set; } = MonitorBehavior.ToMouse;
 
+    public bool DisableAnimations { get; set; } = true;
+
     // END SETTINGS
     ///////////////////////////////////////////////////////////////////////////
 

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

@@ -128,6 +128,16 @@ public partial class SettingsViewModel : INotifyPropertyChanged
         }
     }
 
+    public bool DisableAnimations
+    {
+        get => _settings.DisableAnimations;
+        set
+        {
+            _settings.DisableAnimations = value;
+            Save();
+        }
+    }
+
     public ObservableCollection<ProviderSettingsViewModel> CommandProviders { get; } = [];
 
     public SettingsViewModel(SettingsModel settings, IServiceProvider serviceProvider, TaskScheduler scheduler)

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

@@ -114,7 +114,7 @@ public partial class App : Application
         services.AddSingleton<ICommandProvider, ShellCommandsProvider>();
         services.AddSingleton<ICommandProvider, CalculatorCommandProvider>();
         services.AddSingleton<ICommandProvider>(files);
-        services.AddSingleton<ICommandProvider, BookmarksCommandProvider>();
+        services.AddSingleton<ICommandProvider, BookmarksCommandProvider>(_ => BookmarksCommandProvider.CreateWithDefaultStore());
 
         services.AddSingleton<ICommandProvider, WindowWalkerCommandsProvider>();
         services.AddSingleton<ICommandProvider, WebSearchCommandsProvider>();
@@ -160,7 +160,7 @@ public partial class App : Application
 
         services.AddSingleton<IRootPageService, PowerToysRootPageService>();
         services.AddSingleton<IAppHostService, PowerToysAppHostService>();
-        services.AddSingleton(new TelemetryForwarder());
+        services.AddSingleton<ITelemetryService, TelemetryForwarder>();
 
         // ViewModels
         services.AddSingleton<ShellViewModel>();

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

@@ -31,7 +31,7 @@
 
             <!--  Template for context items in the context item menu  -->
             <DataTemplate x:Key="DefaultContextMenuViewModelTemplate" x:DataType="coreViewModels:CommandContextItemViewModel">
-                <Grid AutomationProperties.Name="{x:Bind Title}">
+                <Grid AutomationProperties.Name="{x:Bind Title, Mode=OneWay}">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="32" />
                         <ColumnDefinition Width="*" />
@@ -42,7 +42,7 @@
                         Height="16"
                         Margin="4,0,0,0"
                         HorizontalAlignment="Left"
-                        SourceKey="{x:Bind Icon}"
+                        SourceKey="{x:Bind Icon, Mode=OneWay}"
                         SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
                     <TextBlock
                         x:Name="TitleTextBlock"
@@ -51,11 +51,11 @@
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         MaxLines="1"
-                        Text="{x:Bind Title}"
+                        Text="{x:Bind Title, Mode=OneWay}"
                         TextTrimming="WordEllipsis"
                         TextWrapping="NoWrap">
                         <ToolTipService.ToolTip>
-                            <ToolTip Content="{x:Bind Title}" Visibility="{Binding IsTextTrimmed, ElementName=TitleTextBlock, Converter={StaticResource BoolToVisibilityConverter}}" />
+                            <ToolTip Content="{x:Bind Title, Mode=OneWay}" Visibility="{Binding IsTextTrimmed, ElementName=TitleTextBlock, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
                         </ToolTipService.ToolTip>
                     </TextBlock>
                     <TextBlock
@@ -65,13 +65,13 @@
                         VerticalAlignment="Center"
                         Foreground="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
                         Style="{StaticResource CaptionTextBlockStyle}"
-                        Text="{x:Bind RequestedShortcut, Converter={StaticResource KeyChordToStringConverter}}" />
+                        Text="{x:Bind RequestedShortcut, Mode=OneWay, Converter={StaticResource KeyChordToStringConverter}}" />
                 </Grid>
             </DataTemplate>
 
             <!--  Template for context items flagged as critical  -->
             <DataTemplate x:Key="CriticalContextMenuViewModelTemplate" x:DataType="coreViewModels:CommandContextItemViewModel">
-                <Grid AutomationProperties.Name="{x:Bind Title}">
+                <Grid AutomationProperties.Name="{x:Bind Title, Mode=OneWay}">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="32" />
                         <ColumnDefinition Width="*" />
@@ -83,7 +83,7 @@
                         Margin="4,0,0,0"
                         HorizontalAlignment="Left"
                         Foreground="{ThemeResource SystemFillColorCriticalBrush}"
-                        SourceKey="{x:Bind Icon}"
+                        SourceKey="{x:Bind Icon, Mode=OneWay}"
                         SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
                     <TextBlock
                         x:Name="TitleTextBlock"
@@ -93,11 +93,11 @@
                         VerticalAlignment="Center"
                         MaxLines="1"
                         Style="{StaticResource ContextItemTitleTextBlockCriticalStyle}"
-                        Text="{x:Bind Title}"
+                        Text="{x:Bind Title, Mode=OneWay}"
                         TextTrimming="WordEllipsis"
                         TextWrapping="NoWrap">
                         <ToolTipService.ToolTip>
-                            <ToolTip Content="{x:Bind Title}" Visibility="{Binding IsTextTrimmed, ElementName=TitleTextBlock, Converter={StaticResource BoolToVisibilityConverter}}" />
+                            <ToolTip Content="{x:Bind Title, Mode=OneWay}" Visibility="{Binding IsTextTrimmed, ElementName=TitleTextBlock, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
                         </ToolTipService.ToolTip>
                     </TextBlock>
                     <TextBlock
@@ -106,7 +106,7 @@
                         HorizontalAlignment="Right"
                         VerticalAlignment="Center"
                         Style="{StaticResource ContextItemCaptionTextBlockCriticalStyle}"
-                        Text="{x:Bind RequestedShortcut, Converter={StaticResource KeyChordToStringConverter}}" />
+                        Text="{x:Bind RequestedShortcut, Mode=OneWay, Converter={StaticResource KeyChordToStringConverter}}" />
                 </Grid>
             </DataTemplate>
 

src/modules/cmdpal/Microsoft.CmdPal.UI/Events/RunEvents.cs

@@ -0,0 +1,80 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.Tracing;
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.CmdPal.UI.Events;
+
+// Just put all the run events in one file for simplicity.
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
+[EventData]
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
+public class CmdPalRunQuery : EventBase, IEvent
+{
+    public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+
+    public string Query { get; set; }
+
+    public int ResultCount { get; set; }
+
+    public ulong DurationMs { get; set; }
+
+    public CmdPalRunQuery(string query, int resultCount, ulong durationMs)
+    {
+        EventName = "CmdPal_RunQuery";
+        Query = query;
+        ResultCount = resultCount;
+        DurationMs = durationMs;
+    }
+}
+
+[EventData]
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
+public class CmdPalRunCommand : EventBase, IEvent
+{
+    public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+
+    public string Command { get; set; }
+
+    public bool AsAdmin { get; set; }
+
+    public bool Success { get; set; }
+
+    public CmdPalRunCommand(string command, bool asAdmin, bool success)
+    {
+        EventName = "CmdPal_RunCommand";
+        Command = command;
+        AsAdmin = asAdmin;
+        Success = success;
+    }
+}
+
+[EventData]
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
+public class CmdPalOpenUri : EventBase, IEvent
+{
+    public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+
+    public string Uri { get; set; }
+
+    public bool IsWeb { get; set; }
+
+    public bool Success { get; set; }
+
+    public CmdPalOpenUri(string uri, bool isWeb, bool success)
+    {
+        EventName = "CmdPal_OpenUri";
+        Uri = uri;
+        IsWeb = isWeb;
+        Success = success;
+    }
+}
+
+#pragma warning restore SA1649 // File name should match first type name
+#pragma warning restore SA1402 // File may only contain a single type

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

@@ -2,9 +2,17 @@
 // 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.UI.Xaml;
+
 namespace Microsoft.CmdPal.UI.Helpers;
 
 internal static class BindTransformers
 {
     public static bool Negate(bool value) => !value;
+
+    public static Visibility EmptyToCollapsed(string? input)
+        => string.IsNullOrEmpty(input) ? Visibility.Collapsed : Visibility.Visible;
+
+    public static Visibility EmptyOrWhitespaceToCollapsed(string? input)
+        => string.IsNullOrWhiteSpace(input) ? Visibility.Collapsed : Visibility.Visible;
 }

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

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.UI.Events;
 using Microsoft.PowerToys.Telemetry;
@@ -19,6 +20,7 @@ namespace Microsoft.CmdPal.UI;
 /// or something similar, but this works for now.
 /// </summary>
 internal sealed class TelemetryForwarder :
+    ITelemetryService,
     IRecipient<BeginInvokeMessage>,
     IRecipient<CmdPalInvokeResultMessage>
 {
@@ -37,4 +39,19 @@ internal sealed class TelemetryForwarder :
     {
         PowerToysTelemetry.Log.WriteEvent(new BeginInvoke());
     }
+
+    public void LogRunQuery(string query, int resultCount, ulong durationMs)
+    {
+        PowerToysTelemetry.Log.WriteEvent(new CmdPalRunQuery(query, resultCount, durationMs));
+    }
+
+    public void LogRunCommand(string command, bool asAdmin, bool success)
+    {
+        PowerToysTelemetry.Log.WriteEvent(new CmdPalRunCommand(command, asAdmin, success));
+    }
+
+    public void LogOpenUri(string uri, bool isWeb, bool success)
+    {
+        PowerToysTelemetry.Log.WriteEvent(new CmdPalOpenUri(uri, isWeb, success));
+    }
 }

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

@@ -360,33 +360,51 @@ public sealed partial class MainWindow : WindowEx,
     private void HideWindow()
     {
         // Cloak our HWND to avoid all animations.
-        Cloak();
+        var cloaked = Cloak();
 
         // Then hide our HWND, to make sure that the OS gives the FG / focus back to another app
         // (there's no way for us to guess what the right hwnd might be, only the OS can do it right)
         PInvoke.ShowWindow(_hwnd, SHOW_WINDOW_CMD.SW_HIDE);
 
-        // TRICKY: show our HWND again. This will trick XAML into painting our
-        // HWND again, so that we avoid the "flicker" caused by a WinUI3 app
-        // window being first shown
-        // SW_SHOWNA will prevent us for trying to fight the focus back
-        PInvoke.ShowWindow(_hwnd, SHOW_WINDOW_CMD.SW_SHOWNA);
+        if (cloaked)
+        {
+            // TRICKY: show our HWND again. This will trick XAML into painting our
+            // HWND again, so that we avoid the "flicker" caused by a WinUI3 app
+            // window being first shown
+            // SW_SHOWNA will prevent us for trying to fight the focus back
+            PInvoke.ShowWindow(_hwnd, SHOW_WINDOW_CMD.SW_SHOWNA);
 
-        // Intentionally leave the window cloaked. So our window is "visible",
-        // but also cloaked, so you can't see it.
+            // Intentionally leave the window cloaked. So our window is "visible",
+            // but also cloaked, so you can't see it.
+
+            // If the window was not cloaked, then leave it hidden.
+            // Sure, it's not ideal, but at least it's not visible.
+        }
     }
 
-    private void Cloak()
+    private bool Cloak()
     {
+        bool wasCloaked;
         unsafe
         {
             BOOL value = true;
-            PInvoke.DwmSetWindowAttribute(_hwnd, DWMWINDOWATTRIBUTE.DWMWA_CLOAK, &value, (uint)sizeof(BOOL));
+            var hr = PInvoke.DwmSetWindowAttribute(_hwnd, DWMWINDOWATTRIBUTE.DWMWA_CLOAK, &value, (uint)sizeof(BOOL));
+            if (hr.Failed)
+            {
+                Logger.LogWarning($"DWM cloaking of the main window failed. HRESULT: {hr.Value}.");
+            }
+
+            wasCloaked = hr.Succeeded;
         }
 
-        // Because we're only cloaking the window, bury it at the bottom in case something can
-        // see it - e.g. some accessibility helper (note: this also removes the top-most status).
-        PInvoke.SetWindowPos(_hwnd, HWND.HWND_BOTTOM, 0, 0, 0, 0, SET_WINDOW_POS_FLAGS.SWP_NOMOVE | SET_WINDOW_POS_FLAGS.SWP_NOSIZE);
+        if (wasCloaked)
+        {
+            // Because we're only cloaking the window, bury it at the bottom in case something can
+            // see it - e.g. some accessibility helper (note: this also removes the top-most status).
+            PInvoke.SetWindowPos(_hwnd, HWND.HWND_BOTTOM, 0, 0, 0, 0, SET_WINDOW_POS_FLAGS.SWP_NOMOVE | SET_WINDOW_POS_FLAGS.SWP_NOSIZE);
+        }
+
+        return wasCloaked;
     }
 
     private void Uncloak()

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

@@ -41,6 +41,31 @@
                 FalseValue="Visible"
                 TrueValue="Collapsed" />
 
+            <Style
+                x:Key="DetailKeyTextBlockStyle"
+                BasedOn="{StaticResource CaptionTextBlockStyle}"
+                TargetType="TextBlock">
+                <Setter Property="IsTextSelectionEnabled" Value="True" />
+                <Setter Property="TextWrapping" Value="WrapWholeWords" />
+                <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
+            </Style>
+
+            <Style
+                x:Key="SeparatorKeyTextBlockStyle"
+                BasedOn="{StaticResource BodyStrongTextBlockStyle}"
+                TargetType="TextBlock">
+                <Setter Property="IsTextSelectionEnabled" Value="True" />
+                <Setter Property="TextWrapping" Value="WrapWholeWords" />
+            </Style>
+
+            <Style
+                x:Key="DetailValueTextBlockStyle"
+                BasedOn="{StaticResource BodyTextBlockStyle}"
+                TargetType="TextBlock">
+                <Setter Property="IsTextSelectionEnabled" Value="True" />
+                <Setter Property="TextWrapping" Value="WrapWholeWords" />
+            </Style>
+
             <DataTemplate x:Key="TagTemplate" x:DataType="coreViewModels:TagViewModel">
                 <cpcontrols:Tag
                     HorizontalAlignment="Left"
@@ -68,7 +93,7 @@
                                 Margin="0,3,8,0"
                                 SourceKey="{x:Bind Icon, Mode=OneWay}"
                                 SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
-                            <TextBlock Text="{x:Bind Name}" />
+                            <TextBlock Style="{StaticResource BodyTextBlockStyle}" Text="{x:Bind Name}" />
                         </StackPanel>
                     </Button>
                 </StackPanel>
@@ -76,20 +101,13 @@
 
             <DataTemplate x:Key="DetailsLinkTemplate" x:DataType="coreViewModels:DetailsLinkViewModel">
                 <StackPanel Orientation="Vertical">
+                    <TextBlock Style="{StaticResource DetailKeyTextBlockStyle}" Text="{x:Bind Key, Mode=OneWay}" />
                     <TextBlock
-                        IsTextSelectionEnabled="True"
-                        Text="{x:Bind Key, Mode=OneWay}"
-                        TextWrapping="WrapWholeWords" />
-                    <TextBlock
-                        FontSize="12"
-                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        IsTextSelectionEnabled="True"
+                        Style="{StaticResource DetailValueTextBlockStyle}"
                         Text="{x:Bind Text, Mode=OneWay}"
-                        TextWrapping="WrapWholeWords"
                         Visibility="{x:Bind IsText, Mode=OneWay}" />
                     <HyperlinkButton
                         Padding="0"
-                        FontSize="12"
                         NavigateUri="{x:Bind Link, Mode=OneWay}"
                         Visibility="{x:Bind IsLink, Mode=OneWay}">
                         <TextBlock Text="{x:Bind Text, Mode=OneWay}" TextWrapping="Wrap" />
@@ -98,10 +116,7 @@
             </DataTemplate>
             <DataTemplate x:Key="DetailsCommandsTemplate" x:DataType="coreViewModels:DetailsCommandsViewModel">
                 <StackPanel Orientation="Vertical" Spacing="4">
-                    <TextBlock
-                        IsTextSelectionEnabled="True"
-                        Text="{x:Bind Key, Mode=OneWay}"
-                        TextWrapping="WrapWholeWords" />
+                    <TextBlock Style="{StaticResource DetailKeyTextBlockStyle}" Text="{x:Bind Key, Mode=OneWay}" />
                     <ItemsControl
                         ItemTemplate="{StaticResource CommandTemplate}"
                         ItemsSource="{x:Bind Commands, Mode=OneWay}"
@@ -111,24 +126,20 @@
             <DataTemplate x:Key="DetailsSeparatorTemplate" x:DataType="coreViewModels:DetailsSeparatorViewModel">
                 <StackPanel Margin="0,8,8,0" Orientation="Vertical">
                     <Border
-                        Margin="8,0,0,0"
-                        BorderBrush="{ThemeResource TextFillColorSecondaryBrush}"
+                        Margin="0,0,0,0"
+                        BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
                         BorderThickness="0,0,0,2">
                         <TextBlock
-                            Margin="-8,0,0,8"
-                            FontWeight="SemiBold"
-                            IsTextSelectionEnabled="True"
+                            Margin="0,0,0,0"
+                            Style="{StaticResource SeparatorKeyTextBlockStyle}"
                             Text="{x:Bind Key, Mode=OneWay}"
-                            TextWrapping="WrapWholeWords" />
+                            Visibility="{x:Bind help:BindTransformers.EmptyOrWhitespaceToCollapsed(Key), FallbackValue=Collapsed}" />
                     </Border>
                 </StackPanel>
             </DataTemplate>
             <DataTemplate x:Key="DetailsTagsTemplate" x:DataType="coreViewModels:DetailsTagsViewModel">
                 <StackPanel Orientation="Vertical" Spacing="4">
-                    <TextBlock
-                        IsTextSelectionEnabled="True"
-                        Text="{x:Bind Key, Mode=OneWay}"
-                        TextWrapping="WrapWholeWords" />
+                    <TextBlock Style="{StaticResource DetailKeyTextBlockStyle}" Text="{x:Bind Key, Mode=OneWay}" />
                     <ItemsControl
                         ItemTemplate="{StaticResource TagTemplate}"
                         ItemsSource="{x:Bind Tags, Mode=OneWay}"

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

@@ -101,6 +101,18 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
         _pageNavigatedAnnouncement = CompositeFormat.Parse(pageAnnouncementFormat);
     }
 
+    /// <summary>
+    /// Gets the default page animation, depending on the settings
+    /// </summary>
+    private NavigationTransitionInfo DefaultPageAnimation
+    {
+        get
+        {
+            var settings = App.Current.Services.GetService<SettingsModel>()!;
+            return settings.DisableAnimations ? _noAnimation : _slideRightTransition;
+        }
+    }
+
     public void Receive(NavigateBackMessage message)
     {
         var settings = App.Current.Services.GetService<SettingsModel>()!;
@@ -142,7 +154,7 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
                     _ => throw new NotSupportedException(),
                 },
                 message.Page,
-                message.WithAnimation ? _slideRightTransition : _noAnimation);
+                message.WithAnimation ? DefaultPageAnimation : _noAnimation);
 
             PowerToysTelemetry.Log.WriteEvent(new OpenPage(RootFrame.BackStackDepth));
 
@@ -549,19 +561,25 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
 
     private static void ShellPage_OnPreviewKeyDown(object sender, KeyRoutedEventArgs e)
     {
-        if (e.Key == VirtualKey.Left && e.KeyStatus.IsMenuKeyDown)
+        var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
+        var altPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Menu).HasFlag(CoreVirtualKeyStates.Down);
+        var shiftPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
+        var winPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.LeftWindows).HasFlag(CoreVirtualKeyStates.Down) ||
+                         InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.RightWindows).HasFlag(CoreVirtualKeyStates.Down);
+
+        var onlyAlt = altPressed && !ctrlPressed && !shiftPressed && !winPressed;
+        if (e.Key == VirtualKey.Left && onlyAlt)
         {
             WeakReferenceMessenger.Default.Send<NavigateBackMessage>(new());
             e.Handled = true;
         }
+        else if (e.Key == VirtualKey.Home && onlyAlt)
+        {
+            WeakReferenceMessenger.Default.Send<GoHomeMessage>(new(WithAnimation: false));
+            e.Handled = true;
+        }
         else
         {
-            var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
-            var altPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Menu).HasFlag(CoreVirtualKeyStates.Down);
-            var shiftPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
-            var winPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.LeftWindows).HasFlag(CoreVirtualKeyStates.Down) ||
-                             InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.RightWindows).HasFlag(CoreVirtualKeyStates.Down);
-
             // The CommandBar is responsible for handling all the item keybindings,
             // since the bound context item may need to then show another
             // context menu

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

@@ -88,6 +88,10 @@
                         <ToggleSwitch IsOn="{x:Bind viewModel.ShowSystemTrayIcon, Mode=TwoWay}" />
                     </controls:SettingsCard>
 
+                    <controls:SettingsCard x:Uid="Settings_GeneralPage_DisableAnimations_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE945;}">
+                        <ToggleSwitch IsOn="{x:Bind viewModel.DisableAnimations, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+
                     <!--  'For Developers' section  -->
 
                     <TextBlock x:Uid="ForDevelopersSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />

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

@@ -407,6 +407,12 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="Settings_GeneralPage_ShowSystemTrayIcon_SettingsCard.Description" xml:space="preserve">
     <value>Choose if Command Palette is visible in the system tray</value>
   </data>
+  <data name="Settings_GeneralPage_DisableAnimations_SettingsCard.Header" xml:space="preserve">
+    <value>Disable animations</value>
+  </data>
+  <data name="Settings_GeneralPage_DisableAnimations_SettingsCard.Description" xml:space="preserve">
+    <value>Disable animations when switching between pages</value>
+  </data>
   <data name="BackButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Back</value>
   </data>

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

@@ -1,42 +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.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
-
-[TestClass]
-public class BookmarkDataTests
-{
-    [TestMethod]
-    public void BookmarkDataWebUrlDetection()
-    {
-        // Act
-        var webBookmark = new BookmarkData
-        {
-            Name = "Test Site",
-            Bookmark = "https://test.com",
-        };
-
-        var nonWebBookmark = new BookmarkData
-        {
-            Name = "Local File",
-            Bookmark = "C:\\temp\\file.txt",
-        };
-
-        var placeholderBookmark = new BookmarkData
-        {
-            Name = "Placeholder",
-            Bookmark = "{Placeholder}",
-        };
-
-        // Assert
-        Assert.IsTrue(webBookmark.IsWebUrl());
-        Assert.IsFalse(webBookmark.IsPlaceholder);
-        Assert.IsFalse(nonWebBookmark.IsWebUrl());
-        Assert.IsFalse(nonWebBookmark.IsPlaceholder);
-
-        Assert.IsTrue(placeholderBookmark.IsPlaceholder);
-    }
-}