Adding (temp) icon

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

@@ -25,14 +25,11 @@ ADMINS
 adml
 admx
 advancedpaste
-advancedpasteui
-advancedpasteuishortcut
 advfirewall
 AFeature
 affordances
 AFX
 AGGREGATABLE
-AHK
 AHybrid
 akv
 ALarger
@@ -43,7 +40,6 @@ ALLINPUT
 Allman
 Allmodule
 ALLOWUNDO
-allpc
 ALLVIEW
 ALPHATYPE
 AModifier
@@ -633,7 +629,6 @@ HKCU
 hkey
 HKLM
 HKM
-hkmng
 HKPD
 HKU
 HMD
@@ -651,11 +646,7 @@ Hostx
 hotfixes
 hotkeycontrol
 HOTKEYF
-hotkeylockmachine
-hotkeyreconnect
 hotkeys
-hotkeyswitch
-hotkeytoggleeasymouse
 hotlight
 hotspot
 HPAINTBUFFER
@@ -668,7 +659,6 @@ HROW
 hsb
 HSCROLL
 hsi
-HSpeed
 HTCLIENT
 hthumbnail
 HTOUCHINPUT
@@ -714,12 +704,9 @@ IMAGERESIZERCONTEXTMENU
 IMAGERESIZEREXT
 imageresizerinput
 imageresizersettings
-imagetotext
-imagetotextshortcut
 imagingdevices
 ime
 imgflip
-inapp
 inbox
 INCONTACT
 Indo
@@ -773,7 +760,6 @@ istep
 ith
 ITHUMBNAIL
 IUI
-IUWP
 IWIC
 jfif
 jgeosdfsdsgmkedfgdfgdfgbkmhcgcflmi
@@ -803,7 +789,6 @@ keyvault
 KILLFOCUS
 killrunner
 kmph
-kvp
 Kybd
 lastcodeanalysissucceeded
 LASTEXITCODE
@@ -842,7 +827,6 @@ localappdata
 localpackage
 LOCALSYSTEM
 LOCATIONCHANGE
-LOCKMACHINE
 LOCKTYPE
 LOGFONT
 LOGFONTW
@@ -928,7 +912,6 @@ MDL
 mdtext
 mdtxt
 mdwn
-measuretool
 meme
 memicmp
 MENUITEMINFO
@@ -978,7 +961,6 @@ MOUSEHWHEEL
 MOUSEINPUT
 mousejump
 mousepointer
-mousepointercrosshairs
 mouseutils
 MOVESIZEEND
 MOVESIZESTART
@@ -1118,7 +1100,6 @@ NOTSRCCOPY
 NOTSRCERASE
 notwindows
 NOTXORPEN
-nowarn
 NOZORDER
 NPH
 npmjs
@@ -1180,18 +1161,6 @@ PARENTRELATIVEFORADDRESSBAR
 PARENTRELATIVEPARSING
 parray
 PARTIALCONFIRMATIONDIALOGTITLE
-pasteashtmlfile
-pasteashtmlfileshortcut
-pasteasjson
-pasteasjsonshortcut
-pasteasmarkdown
-pasteasmarkdownshortcut
-pasteasplaintext
-pasteasplaintextshortcut
-pasteaspngfile
-pasteaspngfileshortcut
-pasteastxtfile
-pasteastxtfileshortcut
 PATCOPY
 PATHMUSTEXIST
 PATINVERT
@@ -1259,7 +1228,6 @@ Pomodoro
 Popups
 POPUPWINDOW
 POSITIONITEM
-powerocr
 POWERRENAMECONTEXTMENU
 powerrenameinput
 POWERRENAMETEST
@@ -1400,7 +1368,6 @@ Removelnk
 renamable
 RENAMEONCOLLISION
 reparented
-reparenthotkey
 reparenting
 reportfileaccesses
 requery
@@ -1650,7 +1617,6 @@ STYLECHANGED
 STYLECHANGING
 subkeys
 sublang
-Subdomain
 SUBMODULEUPDATE
 subresource
 Superbar
@@ -1721,7 +1687,6 @@ THH
 THICKFRAME
 THISCOMPONENT
 throughs
-thumbnailhotkey
 TILEDWINDOW
 TILLSON
 timedate
@@ -1736,7 +1701,6 @@ tlb
 tlbimp
 tlc
 TNP
-TOGGLEEASYMOUSE
 Toolhelp
 toolkitconverters
 toolwindow
@@ -1750,7 +1714,6 @@ tracelogging
 tracerpt
 trackbar
 trafficmanager
-transcodetomp
 transicc
 TRAYMOUSEMESSAGE
 triaging
@@ -1865,7 +1828,6 @@ VSINSTALLDIR
 VSM
 vso
 vsonline
-VSpeed
 vstemplate
 vstest
 VSTHRD
@@ -2002,13 +1964,10 @@ XNamespace
 Xoshiro
 XPels
 XPixel
-XPos
 XResource
 xsi
-XSpeed
 XStr
 xstyler
-XTimer
 XUP
 XVIRTUALSCREEN
 xxxxxx
@@ -2018,10 +1977,7 @@ YIncrement
 yinle
 yinyue
 YPels
-YPos
 YResolution
-YSpeed
-YTimer
 YStr
 YVIRTUALSCREEN
 ZEROINIT

.pipelines/verifyNoticeMdAgainstNugetPackages.ps1

@@ -57,19 +57,12 @@ $totalList = $projFiles | ForEach-Object -Parallel {
 
             $p = -split $p
             $p = $p[1, 2]
-            $tempString = $p[0]
+            $tempString = $p[0] + " " + $p[1]
 
-            if([string]::IsNullOrWhiteSpace($tempString))
+            if(![string]::IsNullOrWhiteSpace($tempString))
             {
-                Continue
+		   echo "- $tempString";
             }
-
-            if($tempString.StartsWith("Microsoft.") -Or $tempString.StartsWith("System."))
-            {
-                Continue
-            }
-
-            echo "- $tempString"
         }
 	$csproj = $null;
     }

.pipelines/verifyNugetPackages.ps1

@@ -21,13 +21,4 @@ if (-not $?)
     exit 1
 }
 
-# Ignore NU1503 on vcxproj files 
-dotnet restore $solution /nowarn:NU1503 
-if ($lastExitCode -ne 0)
-{
-    $result = $lastExitCode
-    Write-Error "Error running dotnet restore, with the exit code $lastExitCode. Please verify logs on the nuget package versions."
-    exit $result
-}
-
 exit 0

Directory.Packages.props

@@ -65,8 +65,7 @@
     <!-- Moq to stay below v4.20 due to behavior change. need to be sure fixed -->
     <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="MSTest" Version="3.8.3" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="NLog" Version="5.2.8" />
+    <PackageVersion Include="NLog" Version="5.0.4" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.8" />
     <PackageVersion Include="NLog.Schema" Version="5.2.8" />
     <PackageVersion Include="OpenAI" Version="2.0.0" />

NOTICE.md

@@ -1491,50 +1491,93 @@ SOFTWARE.
 
 ## NuGet Packages used by PowerToys
 
-- AdaptiveCards.ObjectModel.WinUI3
-- AdaptiveCards.Rendering.WinUI3
-- AdaptiveCards.Templating
-- Appium.WebDriver
-- Azure.AI.OpenAI
-- CoenM.ImageSharp.ImageHash
-- CommunityToolkit.Common
-- CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock
-- CommunityToolkit.Mvvm
-- CommunityToolkit.WinUI.Animations
-- CommunityToolkit.WinUI.Collections
-- CommunityToolkit.WinUI.Controls.Primitives
-- CommunityToolkit.WinUI.Controls.Segmented
-- CommunityToolkit.WinUI.Controls.SettingsControls
-- CommunityToolkit.WinUI.Controls.Sizers
-- CommunityToolkit.WinUI.Converters
-- CommunityToolkit.WinUI.Extensions
-- CommunityToolkit.WinUI.UI.Controls.DataGrid
-- CommunityToolkit.WinUI.UI.Controls.Markdown
-- ControlzEx
-- HelixToolkit
-- HelixToolkit.Core.Wpf
-- hyjiacan.pinyin4net
-- Interop.Microsoft.Office.Interop.OneNote
-- LazyCache
-- Mages
-- Markdig.Signed
-- MessagePack
-- ModernWpfUI
-- Moq
-- MSTest
-- NLog
-- NLog.Extensions.Logging
-- NLog.Schema
-- OpenAI
-- ReverseMarkdown
-- ScipBe.Common.Office.OneNote
-- SharpCompress
-- SkiaSharp.Views.WinUI
-- StreamJsonRpc
-- StyleCop.Analyzers
-- UnicodeInformation
-- UnitsNet
-- UTF.Unknown
-- WinUIEx
-- WPF-UI
-- WyHash
+- AdaptiveCards.ObjectModel.WinUI3 2.0.0-beta
+- AdaptiveCards.Rendering.WinUI3 2.1.0-beta
+- AdaptiveCards.Templating 2.0.5
+- Appium.WebDriver 4.4.5
+- Azure.AI.OpenAI 1.0.0-beta.17
+- CoenM.ImageSharp.ImageHash 1.3.6
+- CommunityToolkit.Common 8.4.0
+- CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock 0.1.250703-build.2173
+- CommunityToolkit.Mvvm 8.4.0
+- CommunityToolkit.WinUI.Animations 8.2.250402
+- CommunityToolkit.WinUI.Collections 8.2.250402
+- CommunityToolkit.WinUI.Controls.Primitives 8.2.250402
+- CommunityToolkit.WinUI.Controls.Segmented 8.2.250402
+- CommunityToolkit.WinUI.Controls.SettingsControls 8.2.250402
+- CommunityToolkit.WinUI.Controls.Sizers 8.2.250402
+- CommunityToolkit.WinUI.Converters 8.2.250402
+- CommunityToolkit.WinUI.Extensions 8.2.250402
+- CommunityToolkit.WinUI.UI.Controls.DataGrid 7.1.2
+- CommunityToolkit.WinUI.UI.Controls.Markdown 7.1.2
+- ControlzEx 6.0.0
+- HelixToolkit 2.24.0
+- HelixToolkit.Core.Wpf 2.24.0
+- hyjiacan.pinyin4net 4.1.1
+- Interop.Microsoft.Office.Interop.OneNote 1.1.0.2
+- LazyCache 2.4.0
+- Mages 3.0.0
+- Markdig.Signed 0.34.0
+- MessagePack 3.1.3
+- Microsoft.Bcl.AsyncInterfaces 9.0.8
+- Microsoft.Bot.AdaptiveExpressions.Core 4.23.0
+- Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
+- Microsoft.Data.Sqlite 9.0.8
+- Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16
+- Microsoft.DotNet.ILCompiler (A)
+- Microsoft.Extensions.DependencyInjection 9.0.8
+- Microsoft.Extensions.Hosting 9.0.8
+- Microsoft.Extensions.Hosting.WindowsServices 9.0.8
+- Microsoft.Extensions.Logging 9.0.8
+- Microsoft.Extensions.Logging.Abstractions 9.0.8
+- Microsoft.NET.ILLink.Tasks (A)
+- Microsoft.SemanticKernel 1.15.0
+- Microsoft.Toolkit.Uwp.Notifications 7.1.2
+- Microsoft.Web.WebView2 1.0.2903.40
+- Microsoft.Win32.SystemEvents 9.0.8
+- Microsoft.Windows.Compatibility 9.0.8
+- Microsoft.Windows.CsWin32 0.3.183
+- Microsoft.Windows.CsWinRT 2.2.0
+- Microsoft.Windows.SDK.BuildTools 10.0.26100.4188
+- Microsoft.WindowsAppSDK 1.7.250513003
+- Microsoft.WindowsPackageManager.ComInterop 1.10.340
+- Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
+- Microsoft.Xaml.Behaviors.Wpf 1.1.39
+- ModernWpfUI 0.9.4
+- Moq 4.18.4
+- MSTest 3.8.3
+- NLog.Extensions.Logging 5.3.8
+- NLog.Schema 5.2.8
+- OpenAI 2.0.0
+- ReverseMarkdown 4.1.0
+- ScipBe.Common.Office.OneNote 3.0.1
+- SharpCompress 0.37.2
+- SkiaSharp.Views.WinUI 2.88.9
+- StreamJsonRpc 2.21.69
+- StyleCop.Analyzers 1.2.0-beta.556
+- System.CodeDom 9.0.8
+- System.CommandLine 2.0.0-beta4.22272.1
+- System.ComponentModel.Composition 9.0.8
+- System.Configuration.ConfigurationManager 9.0.8
+- System.Data.OleDb 9.0.8
+- System.Data.SqlClient 4.9.0
+- System.Diagnostics.EventLog 9.0.8
+- System.Diagnostics.PerformanceCounter 9.0.8
+- System.Drawing.Common 9.0.8
+- System.IO.Abstractions 22.0.13
+- System.IO.Abstractions.TestingHelpers 22.0.13
+- System.Management 9.0.8
+- System.Net.Http 4.3.4
+- System.Private.Uri 4.3.2
+- System.Reactive 6.0.1
+- System.Runtime.Caching 9.0.8
+- System.ServiceProcess.ServiceController 9.0.8
+- System.Text.Encoding.CodePages 9.0.8
+- System.Text.Json 9.0.8
+- System.Text.RegularExpressions 4.3.1
+- UnicodeInformation 2.6.0
+- UnitsNet 5.56.0
+- UTF.Unknown 2.5.1
+- WinUIEx 2.2.0
+- WPF-UI 3.0.5
+- WyHash 1.0.5

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}
@@ -788,9 +790,11 @@ 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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Apps.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.Apps.UnitTests\Microsoft.CmdPal.Ext.Apps.UnitTests.csproj", "{E816D7B1-4688-4ECB-97CC-3D8E798F3830}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LightSwitch", "LightSwitch", "{5B201255-53C8-490B-A34F-01F05D48A477}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Bookmarks.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.Bookmarks.UnitTests\Microsoft.CmdPal.Ext.Bookmarks.UnitTests.csproj", "{E816D7B3-4688-4ECB-97CC-3D8E798F3832}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LightSwitchModuleInterface", "src\modules\LightSwitch\LightSwitchModuleInterface\LightSwitchModuleInterface.vcxproj", "{38177D56-6AD1-4ADF-88C9-2843A7932166}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LightModeService", "src\modules\LightSwitch\LightSwitchService\LightSwitchService.vcxproj", "{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -2854,22 +2858,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
-		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Debug|ARM64.Build.0 = Debug|ARM64
-		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Debug|x64.ActiveCfg = Debug|x64
-		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Debug|x64.Build.0 = Debug|x64
-		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Release|ARM64.ActiveCfg = Release|ARM64
-		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Release|ARM64.Build.0 = Release|ARM64
-		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Release|x64.ActiveCfg = Release|x64
-		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Release|x64.Build.0 = Release|x64
-		{E816D7B3-4688-4ECB-97CC-3D8E798F3832}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{E816D7B3-4688-4ECB-97CC-3D8E798F3832}.Debug|ARM64.Build.0 = Debug|ARM64
-		{E816D7B3-4688-4ECB-97CC-3D8E798F3832}.Debug|x64.ActiveCfg = Debug|x64
-		{E816D7B3-4688-4ECB-97CC-3D8E798F3832}.Debug|x64.Build.0 = Debug|x64
-		{E816D7B3-4688-4ECB-97CC-3D8E798F3832}.Release|ARM64.ActiveCfg = Release|ARM64
-		{E816D7B3-4688-4ECB-97CC-3D8E798F3832}.Release|ARM64.Build.0 = Release|ARM64
-		{E816D7B3-4688-4ECB-97CC-3D8E798F3832}.Release|x64.ActiveCfg = Release|x64
-		{E816D7B3-4688-4ECB-97CC-3D8E798F3832}.Release|x64.Build.0 = Release|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|ARM64.Build.0 = Debug|ARM64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|x64.ActiveCfg = Debug|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|x64.Build.0 = Debug|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|ARM64.ActiveCfg = Release|ARM64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|ARM64.Build.0 = Release|ARM64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|x64.ActiveCfg = Release|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|x64.Build.0 = Release|x64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Debug|ARM64.Build.0 = Debug|ARM64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Debug|x64.ActiveCfg = Debug|x64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Debug|x64.Build.0 = Debug|x64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Release|ARM64.ActiveCfg = Release|ARM64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Release|ARM64.Build.0 = Release|ARM64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Release|x64.ActiveCfg = Release|x64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3181,8 +3185,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}
-		{E816D7B1-4688-4ECB-97CC-3D8E798F3830} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{E816D7B3-4688-4ECB-97CC-3D8E798F3832} = {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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

doc/devdocs/core/settings/settings-implementation.md

@@ -71,41 +71,6 @@ When the user changes settings in the UI:
 3. The runner calls the `set_config` function on the appropriate module
 4. The module parses the JSON and applies the new settings
 
-# Shortcut Conflict Detection
-
-Steps to enable conflict detection for a hotkey:
-
-### 1. Implement module interface for hotkeys
-Ensure the module interface provides either `size_t get_hotkeys(Hotkey* hotkeys, size_t buffer_size)` or `std::optional<HotkeyEx> GetHotkeyEx()`.
-
-- If not yet implemented, you need to add it so that it returns all hotkeys used by the module.
-- **Important**: The order of the returned hotkeys matters. This order is used as an index to uniquely identify each hotkey for conflict detection and lookup.
-- For reference, see: `src/modules/AdvancedPaste/AdvancedPasteModuleInterface/dllmain.cpp`
-
-### 2. Implement IHotkeyConfig in the module settings (UI side)
-Make sure the module’s settings file inherits from `IHotkeyConfig` and implements `HotkeyAccessor[] GetAllHotkeyAccessors()`.
-
-- This method should return all hotkeys used in the module.
-- **Important**: The order of the returned hotkeys must be consistent with step 1 (`get_hotkeys()` or `GetHotkeyEx()`).
-- For reference, see: `src/settings-ui/Settings.UI.Library/AdvancedPasteSettings.cs`
-- **_Note:_** `HotkeyAccessor` is a wrapper around HotkeySettings. 
-It provides both `getter` and `setter` methods to read and update the corresponding hotkey.
-Additionally, each `HotkeyAccessor` requires a resource string that describes the purpose of the hotkey.
-This string is typically defined in: `src/settings-ui/Settings.UI/Strings/en-us/Resources.resw`
-
-### 3. Update the module’s ViewModel
-The corresponding ViewModel should inherit from `PageViewModelBase` and implement `Dictionary<string, HotkeySettings[]> GetAllHotkeySettings()`.
-
-- This method should return all hotkeys, maintaining the same order as in steps 1 and 2.
-- For reference, see: `src/settings-ui/Settings.UI/ViewModels/AdvancedPasteViewModel.cs`
-
-### 4. Ensure the module’s Views call `OnPageLoaded()`
-Once the module’s view is loaded, make sure to invoke the ViewModel’s `OnPageLoaded()` method:
-```cs
-Loaded += (s, e) => ViewModel.OnPageLoaded();
-```
-- For reference, see: `src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPaste.xaml.cs`
-
 ## Debugging Settings
 
 To debug settings issues:

nuget.config

@@ -2,11 +2,11 @@
 <configuration>
 	<packageSources>
 		<clear />
-		<add key="PowerToysPublicDependencies" value="https://pkgs.dev.azure.com/shine-oss/PowerToys/_packaging/PowerToysPublicDependencies/nuget/v3/index.json" />
+		<add key="PowerToysPublicDependencies" value="https://pkgs.dev.azure.com/shine-oss/PowerToys/_packaging/PowerToysPublicDependencies%40Local/nuget/v3/index.json" />
 	</packageSources>
 	<packageSourceMapping>
 		<packageSource key="PowerToysPublicDependencies">
 			<package pattern="*" />
 		</packageSource>
 	</packageSourceMapping>
-</configuration>
+</configuration>

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

@@ -12,6 +12,7 @@ namespace ManagedCommon
         ColorPicker,
         CmdPal,
         CropAndLock,
+        LightSwitch,
         EnvironmentVariables,
         FancyZones,
         FileLocksmith,

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,10 @@ inline HANDLE run_elevated(const std::wstring& file, const std::wstring& params,
         exec_info.nShow = SW_HIDE;
     }
 
-    return ShellExecuteExW(&exec_info) ? exec_info.hProcess : nullptr;
+    // failing bc using "runas" with PowerToys.exe already running?
+    BOOL result = ShellExecuteExW(&exec_info);
+
+    return result  ? exec_info.hProcess : nullptr;
 }
 
 // Run command as non-elevated user, returns true if succeeded, puts the process id into returnPid if returnPid != NULL

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/common/utils/logger_helper.h

@@ -3,6 +3,7 @@
 #include <filesystem>
 #include <common/version/version.h>
 #include <common/SettingsAPI/settings_helpers.h>
+#include <common/logger/logger_settings.h>
 
 namespace LoggerHelpers
 {

src/gpo/assets/PowerToys.admx

@@ -137,6 +137,16 @@
         <decimal value="0" />
       </disabledValue>
     </policy>
+    <policy name="ConfigureEnabledUtilityLightSwitch" class="Both" displayName="$(string.ConfigureEnabledUtilityLightSwitch)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityLightSwitch">
+      <parentCategory ref="PowerToys" />
+      <supportedOn ref="SUPPORTED_POWERTOYS_0_90_0" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
     <policy name="ConfigureEnabledUtilityEnvironmentVariables" class="Both" displayName="$(string.ConfigureEnabledUtilityEnvironmentVariables)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityEnvironmentVariables">
       <parentCategory ref="PowerToys" />
       <supportedOn ref="SUPPORTED_POWERTOYS_0_75_0" />

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/AdvancedPaste/AdvancedPasteModuleInterface/dllmain.cpp

@@ -112,7 +112,7 @@ private:
         return {};
     }
 
-    static Hotkey parse_single_hotkey(const winrt::Windows::Data::Json::JsonObject& jsonHotkeyObject, bool isShown = true)
+    static Hotkey parse_single_hotkey(const winrt::Windows::Data::Json::JsonObject& jsonHotkeyObject)
     {
         try
         {
@@ -122,7 +122,6 @@ private:
             hotkey.shift = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_SHIFT);
             hotkey.ctrl = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_CTRL);
             hotkey.key = static_cast<unsigned char>(jsonHotkeyObject.GetNamedNumber(JSON_KEY_CODE));
-            hotkey.isShown = isShown;
             return hotkey;
         }
         catch (...)
@@ -232,10 +231,8 @@ private:
         return false;
     }
 
-    void process_additional_action(const winrt::hstring& actionName, const winrt::Windows::Data::Json::IJsonValue& actionValue, bool actionsGroupIsShown = true)
+    void process_additional_action(const winrt::hstring& actionName, const winrt::Windows::Data::Json::IJsonValue& actionValue)
     {
-        bool actionIsShown = true;
-
         if (actionValue.ValueType() != winrt::Windows::Data::Json::JsonValueType::Object)
         {
             return;
@@ -243,9 +240,9 @@ private:
 
         const auto action = actionValue.GetObjectW();
 
-        if (!action.GetNamedBoolean(JSON_KEY_IS_SHOWN, false) || !actionsGroupIsShown)
+        if (!action.GetNamedBoolean(JSON_KEY_IS_SHOWN, false))
         {
-            actionIsShown = false;
+            return;
         }
 
         if (action.HasKey(JSON_KEY_SHORTCUT))
@@ -253,7 +250,7 @@ private:
             const AdditionalAction additionalAction
             {
                 actionName.c_str(),
-                parse_single_hotkey(action.GetNamedObject(JSON_KEY_SHORTCUT), actionIsShown)
+                parse_single_hotkey(action.GetNamedObject(JSON_KEY_SHORTCUT))
             };
 
             m_additional_actions.push_back(additionalAction);
@@ -262,12 +259,12 @@ private:
         {
             for (const auto& [subActionName, subAction] : action)
             {
-                process_additional_action(subActionName, subAction, actionIsShown);
+                process_additional_action(subActionName, subAction);
             }
         }
     }
 
-        void read_settings(PowerToysSettings::PowerToyValues& settings)
+    void read_settings(PowerToysSettings::PowerToyValues& settings)
     {
         const auto settingsObject = settings.get_raw_json();
 
@@ -320,21 +317,9 @@ private:
                     {
                         const auto additionalActions = propertiesObject.GetNamedObject(JSON_KEY_ADDITIONAL_ACTIONS);
 
-                        // Define the expected order to ensure consistent hotkey ID assignment
-                        const std::vector<winrt::hstring> expectedOrder = {
-                            L"image-to-text",
-                            L"paste-as-file",
-                            L"transcode"
-                        };
-
-                        // Process actions in the predefined order
-                        for (auto& actionKey : expectedOrder)
+                        for (const auto& [actionName, additionalAction] : additionalActions)
                         {
-                            if (additionalActions.HasKey(actionKey))
-                            {
-                                const auto actionValue = additionalActions.GetNamedValue(actionKey);
-                                process_additional_action(actionKey, actionValue);
-                            }
+                            process_additional_action(actionName, additionalAction);
                         }
                     }
 
@@ -346,14 +331,17 @@ private:
                             for (const auto& customAction : customActions)
                             {
                                 const auto object = customAction.GetObjectW();
-                                bool actionIsShown = object.GetNamedBoolean(JSON_KEY_IS_SHOWN, false);
 
-                                const CustomAction customActionData{
-                                    static_cast<int>(object.GetNamedNumber(JSON_KEY_ID)),
-                                    parse_single_hotkey(object.GetNamedObject(JSON_KEY_SHORTCUT), actionIsShown)
-                                };
+                                if (object.GetNamedBoolean(JSON_KEY_IS_SHOWN, false))
+                                {
+                                    const CustomAction customActionData
+                                    {
+                                        static_cast<int>(object.GetNamedNumber(JSON_KEY_ID)),
+                                        parse_single_hotkey(object.GetNamedObject(JSON_KEY_SHORTCUT))
+                                    };
 
-                                m_custom_actions.push_back(customActionData);
+                                    m_custom_actions.push_back(customActionData);
+                                }
                             }
                         }
                     }

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.sln

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.14.36127.28 d17.14
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LightSwitchModuleInterface", "LightSwitchModuleInterface.vcxproj", "{38177D56-6AD1-4ADF-88C9-2843A7932166}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|x64.ActiveCfg = Debug|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|x64.Build.0 = Debug|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|x64.ActiveCfg = Release|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {FAF634A3-0D98-4A45-B082-D93B59782572}
+	EndGlobalSection
+EndGlobal

src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj

@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{38177d56-6ad1-4adf-88c9-2843a7932166}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>LightSwitchModuleInterface</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>LightSwitchModuleInterface</ProjectName>
+    <TargetName>PowerToys.LightSwitchModuleInterface</TargetName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>
+        $(SolutionDir)src\;
+        $(SolutionDir)src\modules;
+        $(SolutionDir)src\common\Telemetry;
+        %(AdditionalIncludeDirectories)
+      </AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(CoreLibraryDependencies);%(AdditionalDependencies);advapi32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="ThemeHelper.h" />
+    <ClInclude Include="trace.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="dllmain.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <ClCompile Include="ThemeHelper.cpp" />
+    <ClCompile Include="trace.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="LightSwitchModuleInterface.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
+      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj">
+      <Project>{4aed67b6-55fd-486f-b917-e543dee2cb3c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="..\..\..\..\deps\spdlog.props" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
+</Project>

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 == 0; // 0 = dark, 1 = light
+}
+
+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"SystemUsesLightTheme", nullptr, nullptr, reinterpret_cast<LPBYTE>(&value), &size);
+        RegCloseKey(hKey);
+    }
+
+    return value == 0;
+}

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,669 @@
+#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_FORCE_LIGHT_HOTKEY[] = L"force-light-mode-hotkey";
+    const wchar_t JSON_KEY_FORCE_DARK_HOTKEY[] = L"force-dark-mode-hotkey";
+    const wchar_t JSON_KEY_VALUE[] = L"value";
+}
+
+BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
+{
+    switch (ul_reason_for_call)
+    {
+    case DLL_PROCESS_ATTACH:
+        Trace::RegisterProvider();
+        break;
+    case DLL_THREAD_ATTACH:
+    case DLL_THREAD_DETACH:
+        break;
+    case DLL_PROCESS_DETACH:
+        Trace::UnregisterProvider();
+        break;
+    }
+    return TRUE;
+}
+
+// The PowerToy name that will be shown in the settings.
+const static wchar_t* MODULE_NAME = L"LightSwitch";
+// Add a description that will we shown in the module settings page.
+const static wchar_t* MODULE_DESC = L"This is a module that allows you to control light/dark theming via set times, sun rise, or directly invoking the change.";
+
+enum class ScheduleMode
+{
+    FixedHours,
+    SunsetToSunriseGeo,
+    SunsetToSunriseUser
+    // add more later
+};
+
+inline std::wstring ToString(ScheduleMode mode)
+{
+    switch (mode)
+    {
+    case ScheduleMode::SunsetToSunriseGeo:
+        return L"SunsetToSunriseGeo";
+    case ScheduleMode::SunsetToSunriseUser:
+        return L"SunsetToSunriseUser";
+    case ScheduleMode::FixedHours:
+    default:
+        return L"FixedHours";
+    }
+}
+
+inline ScheduleMode FromString(const std::wstring& str)
+{
+    if (str == L"SunsetToSunriseGeo")
+        return ScheduleMode::SunsetToSunriseGeo;
+    if (str == L"SunsetToSunriseUser")
+        return ScheduleMode::SunsetToSunriseUser;
+    return ScheduleMode::FixedHours;
+}
+
+// These are the properties shown in the Settings page.
+struct ModuleSettings
+{
+    bool m_changeSystem = true;
+    bool m_changeApps = true;
+    ScheduleMode m_scheduleMode = ScheduleMode::FixedHours;
+    int m_lightTime = 480;
+    int m_darkTime = 1200;
+    int m_offset = 0;
+    std::wstring m_latitude = L"0.0";
+    std::wstring m_longitude = L"0.0";
+} g_settings;
+
+// Implement the PowerToy Module Interface and all the required methods.
+class LightSwitchInterface : public PowertoyModuleIface
+{
+private:
+    // The PowerToy state.
+    bool m_enabled = false;
+
+    HANDLE m_process{ nullptr };
+    HANDLE m_force_light_event_handle;
+    HANDLE m_force_dark_event_handle;
+
+    static const constexpr int NUM_DEFAULT_HOTKEYS = 4;
+
+    Hotkey m_force_light_mode_hotkey = { .win = true, .ctrl = true, .shift = true, .alt = false, .key = 'L' };
+    Hotkey m_force_dark_mode_hotkey = { .win = true, .ctrl = true, .shift = true, .alt = false, .key = 'D' };
+
+    // Load initial settings from the persisted values.
+    void init_settings();
+
+public:
+    // Constructor
+    LightSwitchInterface()
+    {
+        LoggerHelpers::init_logger(L"LightSwitch", L"ModuleInterface", LogSettings::lightSwitchLoggerName);
+
+        m_force_light_event_handle = CreateDefaultEvent(L"POWEROYS_LIGHTSWITCH_FORCE_LIGHT");
+        m_force_dark_event_handle = CreateDefaultEvent(L"POWEROYS_LIGHTSWITCH_FORCE_DARK");
+
+        init_settings();
+    };
+
+    virtual const wchar_t* get_key() override
+    {
+        return L"LightSwitch"; // your unique key string
+    }
+
+    // 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 array of the names of all events that this powertoy listens for, with
+    // nullptr as the last element of the array. Nullptr can also be retured for empty
+    // list.
+    //virtual const wchar_t** get_events() override
+    //{
+    //    static const wchar_t* events[] = { nullptr };
+    //    // Available events:
+    //    // - ll_keyboard
+    //    // - win_hook_event
+    //    //
+    //    // static const wchar_t* events[] = { ll_keyboard,
+    //    //                                   win_hook_event,
+    //    //                                   nullptr };
+
+    //    return events;
+    //}
+
+    // Return JSON with the configuration options.
+    virtual bool get_config(wchar_t* buffer, int* buffer_size) override
+    {
+        HINSTANCE hinstance = reinterpret_cast<HINSTANCE>(&__ImageBase);
+
+        // Create a Settings object with your module name
+        PowerToysSettings::Settings settings(hinstance, get_name());
+        settings.set_description(MODULE_DESC);
+        settings.set_overview_link(L"https://aka.ms/powertoys");
+
+        // Boolean toggles
+        settings.add_bool_toggle(
+            L"changeSystem",
+            L"Change System Theme",
+            g_settings.m_changeSystem);
+
+        settings.add_bool_toggle(
+            L"changeApps",
+            L"Change Apps Theme",
+            g_settings.m_changeApps);
+
+        settings.add_choice_group(
+            L"scheduleMode",
+            L"Theme schedule mode",
+            ToString(g_settings.m_scheduleMode),
+            { { L"FixedHours", L"Set hours manually" },
+              { L"SunsetToSunriseGeo", L"Use sunrise/sunset times (Geolocation)" },
+              { L"SunsetToSunriseUser", L"Use sunrise/sunset times (User selected)" } });
+
+        // Integer spinners (for time in minutes since midnight)
+        settings.add_int_spinner(
+            L"lightTime",
+            L"Time to switch to light theme (minutes after midnight).",
+            g_settings.m_lightTime,
+            0,
+            1439,
+            1);
+
+        settings.add_int_spinner(
+            L"darkTime",
+            L"Time to switch to dark theme (minutes after midnight).",
+            g_settings.m_darkTime,
+            0,
+            1439,
+            1);
+
+        settings.add_int_spinner(
+            L"offset",
+            L"Time to offset turning on your light/dark themes.",
+            g_settings.m_offset,
+            0,
+            1439,
+            1);
+
+        // Strings for latitude and longitude
+        settings.add_string(
+            L"latitude",
+            L"Your latitude in decimal degrees (e.g. 39.95).",
+            g_settings.m_latitude);
+
+        settings.add_string(
+            L"longitude",
+            L"Your longitude in decimal degrees (e.g. -75.16).",
+            g_settings.m_longitude);
+
+        // One-shot actions (buttons)
+        settings.add_custom_action(
+            L"forceLight",
+            L"Switch immediately to light theme",
+            L"Force Light",
+            L"{}");
+
+        settings.add_custom_action(
+            L"forceDark",
+            L"Switch immediately to dark theme",
+            L"Force Dark",
+            L"{}");
+
+        PowerToysSettings::HotkeyObject lm_hk = PowerToysSettings::HotkeyObject::from_settings(
+            m_force_light_mode_hotkey.win,
+            m_force_light_mode_hotkey.ctrl,
+            m_force_light_mode_hotkey.alt,
+            m_force_light_mode_hotkey.shift,
+            m_force_light_mode_hotkey.key);
+
+        settings.add_hotkey(
+            L"force-light-hotkey",
+            L"Shortcut to force light theme immediately",
+            lm_hk);
+
+        PowerToysSettings::HotkeyObject dm_hk = PowerToysSettings::HotkeyObject::from_settings(
+            m_force_dark_mode_hotkey.win,
+            m_force_dark_mode_hotkey.ctrl,
+            m_force_dark_mode_hotkey.alt,
+            m_force_dark_mode_hotkey.shift,
+            m_force_dark_mode_hotkey.key);
+
+        settings.add_hotkey(
+            L"force-dark-hotkey",
+            L"Shortcut to force dark theme immediately",
+            dm_hk);
+
+        // Serialize to buffer for the PowerToys runner
+        return settings.serialize_to_buffer(buffer, buffer_size);
+    }
+
+    // Signal from the Settings editor to call a custom action.
+    // This can be used to spawn more complex editors.
+    void call_custom_action(const wchar_t* action) override
+    {
+        try
+        {
+            auto action_object = PowerToysSettings::CustomActionObject::from_json_string(action);
+
+            if (action_object.get_name() == L"forceLight")
+            {
+                Logger::info(L"[Light Switch] Custom action triggered: Force Light");
+                SetSystemTheme(true);
+                SetAppsTheme(true);
+            }
+            else if (action_object.get_name() == L"forceDark")
+            {
+                Logger::info(L"[Light Switch] Custom action triggered: Force Dark");
+                SetSystemTheme(false);
+                SetAppsTheme(false);
+            }
+        }
+        catch (...)
+        {
+            Logger::error(L"[Light Switch] Invalid custom action JSON");
+        }
+    }
+
+    // Called by the runner to pass the updated settings values as a serialized JSON.
+    virtual void set_config(const wchar_t* config) override
+    {
+        try
+        {
+            auto values = PowerToysSettings::PowerToyValues::from_json_string(config, get_key());
+
+            parse_hotkey(values);
+
+            if (auto v = values.get_bool_value(L"changeSystem"))
+            {
+                g_settings.m_changeSystem = *v;
+            }
+
+            if (auto v = values.get_bool_value(L"changeApps"))
+            {
+                g_settings.m_changeApps = *v;
+            }
+
+            if (auto v = values.get_string_value(L"scheduleMode"))
+            {
+                g_settings.m_scheduleMode = FromString(*v);
+            }
+
+            if (auto v = values.get_int_value(L"lightTime"))
+            {
+                g_settings.m_lightTime = *v;
+            }
+
+            if (auto v = values.get_int_value(L"darkTime"))
+            {
+                g_settings.m_darkTime = *v;
+            }
+
+            if (auto v = values.get_int_value(L"offset"))
+            {
+                g_settings.m_offset = *v;
+            }
+
+            if (auto v = values.get_string_value(L"latitude"))
+            {
+                g_settings.m_latitude = *v;
+            }
+            if (auto v = values.get_string_value(L"longitude"))
+            {
+                g_settings.m_longitude = *v;
+            }
+            
+
+            values.save_to_settings_file();
+        }
+        catch (const std::exception&)
+        {
+            Logger::error("[Light Switch] set_config: Failed to parse or apply config.");
+        }
+    }
+
+    virtual void enable()
+    {
+        m_enabled = true;
+        Logger::info(L"Enabling Light Switch module...");
+
+        unsigned long powertoys_pid = GetCurrentProcessId();
+        std::wstring args = L"--pid " + std::to_wstring(powertoys_pid);
+        std::wstring exe_name = L"LightSwitchService\\PowerToys.LightSwitchService.exe";
+
+        // Resolve the executable path
+        std::wstring resolved_path(MAX_PATH, L'\0');
+        DWORD result = SearchPathW(
+            nullptr,
+            exe_name.c_str(),
+            nullptr,
+            static_cast<DWORD>(resolved_path.size()),
+            resolved_path.data(),
+            nullptr);
+
+        if (result == 0 || result >= resolved_path.size())
+        {
+            Logger::error(L"Failed to locate Light Switch executable: '{}'", exe_name);
+            return;
+        }
+
+        resolved_path.resize(result);
+        Logger::debug(L"Resolved executable path: {}", resolved_path);
+
+        std::wstring command_line = L"\"" + resolved_path + L"\" " + args;
+
+        STARTUPINFO si = { sizeof(si) };
+        PROCESS_INFORMATION pi;
+
+        if (!CreateProcessW(
+                resolved_path.c_str(), // lpApplicationName
+                command_line.data(), // lpCommandLine (must be mutable)
+                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)
+        {
+            // Try waiting briefly to allow graceful exit, if needed
+            constexpr DWORD timeout_ms = 1500;
+            DWORD result = WaitForSingleObject(m_process, timeout_ms);
+
+            if (result == WAIT_TIMEOUT)
+            {
+                // Force kill if it didn<64>t exit in time
+                Logger::warn("Light Switch: Process didn't exit in time. Forcing termination.");
+                TerminateProcess(m_process, 0);
+            }
+
+            // Always clean up the handle
+            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_force_light;
+                auto jsonHotkeyObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_FORCE_LIGHT_HOTKEY).GetNamedObject(JSON_KEY_VALUE);
+                _temp_force_light.win = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_WIN);
+                _temp_force_light.alt = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_ALT);
+                _temp_force_light.shift = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_SHIFT);
+                _temp_force_light.ctrl = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_CTRL);
+                _temp_force_light.key = static_cast<unsigned char>(jsonHotkeyObject.GetNamedNumber(JSON_KEY_CODE));
+                m_force_light_mode_hotkey = _temp_force_light;
+            }
+            catch (...)
+            {
+                Logger::error("Failed to initialize Light Switch force light mode shortcut from settings. Value will keep unchanged.");
+            }
+            try
+            {
+                Hotkey _temp_force_dark;
+                auto jsonHotkeyObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_FORCE_DARK_HOTKEY).GetNamedObject(JSON_KEY_VALUE);
+                _temp_force_dark.win = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_WIN);
+                _temp_force_dark.alt = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_ALT);
+                _temp_force_dark.shift = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_SHIFT);
+                _temp_force_dark.ctrl = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_CTRL);
+                _temp_force_dark.key = static_cast<unsigned char>(jsonHotkeyObject.GetNamedNumber(JSON_KEY_CODE));
+                m_force_dark_mode_hotkey = _temp_force_dark;
+            }
+            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 >= 2)
+        {
+            hotkeys[0] = m_force_light_mode_hotkey;
+            hotkeys[1] = m_force_dark_mode_hotkey;
+        }
+        return 2;
+    }
+
+    virtual bool on_hotkey(size_t hotkeyId) override
+    {
+        if (m_enabled)
+        {
+            Logger::trace(L"Light Switch hotkey pressed");
+            if (!is_process_running())
+            {
+                enable();
+            }
+
+            if (hotkeyId == 0)
+            {
+                Logger::info(L"[Light Switch] Hotkey triggered: Force Light");
+                SetSystemTheme(true);
+                SetAppsTheme(true);
+            }
+            else if (hotkeyId == 1)
+            {
+                Logger::info(L"[Light Switch] Hotkey triggered: Force Dark");
+                SetSystemTheme(false);
+                SetAppsTheme(false);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    bool is_process_running()
+    {
+        return WaitForSingleObject(m_process, 0) == WAIT_TIMEOUT;
+    }
+
+    // Handle incoming event, data is event-specific
+    //virtual intptr_t signal_event(const wchar_t* name, intptr_t data) override
+    //{
+    //    if (wcscmp(name, ll_keyboard) == 0)
+    //    {
+    //        auto& event = *(reinterpret_cast<LowlevelKeyboardEvent*>(data));
+    //        // Return 1 if the keypress is to be suppressed (not forwarded to Windows),
+    //        // otherwise return 0.
+    //        return 0;
+    //    }
+    //    else if (wcscmp(name, win_hook_event) == 0)
+    //    {
+    //        auto& event = *(reinterpret_cast<WinHookEvent*>(data));
+    //        // Return value is ignored
+    //        return 0;
+    //    }
+    //    return 0;
+    //}
+
+    //// This methods are part of an experimental features not fully supported yet
+    //virtual void register_system_menu_helper(PowertoySystemMenuIface* helper) override
+    //{
+    //}
+
+    //virtual void signal_system_menu_action(const wchar_t* name) override
+    //{
+    //}
+};
+
+std::wstring utf8_to_wstring(const std::string& str)
+{
+    if (str.empty())
+        return std::wstring();
+
+    int size_needed = MultiByteToWideChar(
+        CP_UTF8,
+        0,
+        str.c_str(),
+        static_cast<int>(str.size()),
+        nullptr,
+        0);
+
+    std::wstring wstr(size_needed, 0);
+
+    MultiByteToWideChar(
+        CP_UTF8,
+        0,
+        str.c_str(),
+        static_cast<int>(str.size()),
+        &wstr[0],
+        size_needed);
+
+    return wstr;
+}
+
+// Load the settings file.
+void LightSwitchInterface::init_settings()
+{
+    Logger::info(L"[Light Switch] init_settings: starting to load settings for module");
+
+    try
+    {
+        PowerToysSettings::PowerToyValues settings =
+            PowerToysSettings::PowerToyValues::load_from_settings_file(get_name());
+
+        parse_hotkey(settings);
+
+        if (auto v = settings.get_bool_value(L"changeSystem"))
+            g_settings.m_changeSystem = *v;
+        if (auto v = settings.get_bool_value(L"changeApps"))
+            g_settings.m_changeApps = *v;
+        if (auto v = settings.get_string_value(L"scheduleMode"))
+            g_settings.m_scheduleMode = FromString(*v);
+        if (auto v = settings.get_int_value(L"lightTime"))
+            g_settings.m_lightTime = *v;
+        if (auto v = settings.get_int_value(L"darkTime"))
+            g_settings.m_darkTime = *v;
+        if (auto v = settings.get_int_value(L"offset"))
+            g_settings.m_offset = *v;
+        if (auto v = settings.get_string_value(L"latitude"))
+            g_settings.m_latitude = *v;
+        if (auto v = settings.get_string_value(L"longitude"))
+            g_settings.m_longitude = *v;
+
+        Logger::info(L"[Light Switch] init_settings: loaded successfully");
+    }
+    catch (const winrt::hresult_error& e)
+    {
+        Logger::error(L"[Light Switch] init_settings: hresult_error 0x{:08X} - {}", e.code(), e.message().c_str());
+    }
+    catch (const std::exception& e)
+    {
+        std::wstring whatStr = utf8_to_wstring(e.what());
+        Logger::error(L"[Light Switch] init_settings: std::exception - {}", whatStr);
+    }
+    catch (...)
+    {
+        Logger::error(L"[Light Switch] init_settings: unknown exception while loading settings");
+    }
+}
+
+// This method of saving the module settings is only required if you need to do any
+// custom processing of the settings before saving them to disk.
+//void $projectname$::save_settings() {
+//  try {
+//    // Create a PowerToyValues object for this PowerToy
+//    PowerToysSettings::PowerToyValues values(get_name());
+//
+//    // Save a bool property.
+//    //values.add_property(
+//    //  L"bool_toggle_1", // property name
+//    //  g_settings.bool_prop // property value
+//    //  g_settings.bool_prop // property value
+//    //);
+//
+//    // Save an int property.
+//    //values.add_property(
+//    //  L"int_spinner_1", // property name
+//    //  g_settings.int_prop // property value
+//    //);
+//
+//    // Save a string property.
+//    //values.add_property(
+//    //  L"string_text_1", // property name
+//    //  g_settings.string_prop // property value
+//    );
+//
+//    // Save a color property.
+//    //values.add_property(
+//    //  L"color_picker_1", // property name
+//    //  g_settings.color_prop // property value
+//    //);
+//
+//    // Save the PowerToyValues JSON to the power toy settings file.
+//    values.save_to_settings_file();
+//  }
+//  catch (std::exception ex) {
+//    // Couldn't save the 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,258 @@
+#include <windows.h>
+#include <tchar.h>
+#include "ThemeScheduler.h"
+#include "ThemeHelper.h"
+#include <stdio.h>
+#include <string>
+#include <LightSwitchSettings.h>
+#include <common/utils/gpo.h>
+
+// Global service variables
+SERVICE_STATUS g_ServiceStatus = {};
+SERVICE_STATUS_HANDLE g_StatusHandle = nullptr;
+HANDLE g_ServiceStopEvent = nullptr;
+
+// Forward declarations of service functions (we<77>ll define them later)
+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[])
+{
+    // Parse args
+    DWORD parentPid = 0;
+    bool debug = false;
+    for (int i = 1; i < argc; ++i)
+    {
+        if (_tcscmp(argv[i], _T("--debug")) == 0)
+            debug = true;
+        else if (_tcscmp(argv[i], _T("--pid")) == 0 && i + 1 < argc)
+            parentPid = _tstoi(argv[++i]);
+    }
+
+    if (debug)
+    {
+        // Create a console window for debug output
+        AllocConsole();
+        FILE* f;
+        freopen_s(&f, "CONOUT$", "w", stdout);
+        freopen_s(&f, "CONOUT$", "w", stderr);
+
+        // Optional: set a title so you can find it easily
+        SetConsoleTitle(L"LightSwitchService Debug");
+
+        // Console mode (debug)
+        g_ServiceStopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr);
+        ServiceWorkerThread(reinterpret_cast<void*>(static_cast<ULONG_PTR>(parentPid)));
+        CloseHandle(g_ServiceStopEvent);
+
+        // Keep window open until a key is pressed (optional)
+        // system("pause");
+
+        FreeConsole();
+        return 0;
+    }
+
+    // Try to connect to SCM
+    wchar_t serviceName[] = L"LightSwitchService";
+    SERVICE_TABLE_ENTRYW table[] = { { serviceName, ServiceMain }, { nullptr, nullptr } };
+
+    if (!StartServiceCtrlDispatcherW(table))
+    {
+        DWORD err = GetLastError();
+        if (err == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) // not launched by SCM
+        {
+            g_ServiceStopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr);
+            HANDLE hThread = CreateThread(
+                nullptr, 0, ServiceWorkerThread, reinterpret_cast<void*>(static_cast<ULONG_PTR>(parentPid)), 0, nullptr);
+
+            // Wait so the process stays alive
+            WaitForSingleObject(hThread, INFINITE);
+            CloseHandle(hThread);
+            CloseHandle(g_ServiceStopEvent);
+            return 0;
+        }
+        return static_cast<int>(err);
+    }
+
+    return 0;
+}
+
+// Called when the service is launched by Windows
+VOID WINAPI ServiceMain(DWORD, LPTSTR*)
+{
+    g_StatusHandle = RegisterServiceCtrlHandler(_T("LightSwitchService"), ServiceCtrlHandler);
+    if (!g_StatusHandle)
+        return;
+
+    g_ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
+    g_ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
+    g_ServiceStatus.dwCurrentState = SERVICE_START_PENDING;
+    SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
+
+    g_ServiceStopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr);
+    if (!g_ServiceStopEvent)
+    {
+        g_ServiceStatus.dwCurrentState = SERVICE_STOPPED;
+        g_ServiceStatus.dwWin32ExitCode = GetLastError();
+        SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
+        return;
+    }
+
+    SECURITY_ATTRIBUTES sa{ sizeof(sa) };
+    sa.bInheritHandle = FALSE;
+    sa.lpSecurityDescriptor = nullptr;
+
+    g_ServiceStatus.dwCurrentState = SERVICE_RUNNING;
+    SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
+
+    HANDLE hThread = CreateThread(nullptr, 0, ServiceWorkerThread, nullptr, 0, nullptr);
+    WaitForSingleObject(hThread, INFINITE);
+    CloseHandle(hThread);
+
+    CloseHandle(g_ServiceStopEvent);
+    g_ServiceStatus.dwCurrentState = SERVICE_STOPPED;
+    g_ServiceStatus.dwWin32ExitCode = 0;
+    SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
+}
+
+VOID WINAPI ServiceCtrlHandler(DWORD dwCtrl)
+{
+    switch (dwCtrl)
+    {
+    case SERVICE_CONTROL_STOP:
+        if (g_ServiceStatus.dwCurrentState != SERVICE_RUNNING)
+            break;
+
+        g_ServiceStatus.dwCurrentState = SERVICE_STOP_PENDING;
+        SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
+
+        // Signal the service to stop
+        SetEvent(g_ServiceStopEvent);
+        break;
+
+    default:
+        break;
+    }
+}
+
+DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
+{
+    DWORD parentPid = static_cast<DWORD>(reinterpret_cast<ULONG_PTR>(lpParam));
+    HANDLE hParent = nullptr;
+    if (parentPid)
+        hParent = OpenProcess(SYNCHRONIZE, FALSE, parentPid);
+
+    OutputDebugString(L"[LightSwitchService] Worker thread starting...\n");
+
+    // Initialize settings system
+    LightSwitchSettings::instance().InitFileWatcher();
+
+    auto applyTheme = [](int nowMinutes, int lightMinutes, int darkMinutes, const auto& settings) {
+        bool isLightActive = false;
+
+        if (lightMinutes < darkMinutes)
+        {
+            // Normal case: sunrise < sunset
+            isLightActive = (nowMinutes >= lightMinutes && nowMinutes < darkMinutes);
+        }
+        else
+        {
+            // Wraparound case: e.g. light at 21:00, dark at 06:00
+            isLightActive = (nowMinutes >= lightMinutes || nowMinutes < darkMinutes);
+        }
+
+        if (isLightActive)
+        {
+            if (settings.changeSystem)
+                SetSystemTheme(true);
+            if (settings.changeApps)
+                SetAppsTheme(true);
+        }
+        else
+        {
+            if (settings.changeSystem)
+                SetSystemTheme(false);
+            if (settings.changeApps)
+                SetAppsTheme(false);
+        }
+    };
+
+    // --- At service start: immediately honor the schedule ---
+    {
+        SYSTEMTIME st;
+        GetLocalTime(&st);
+        int nowMinutes = st.wHour * 60 + st.wMinute;
+
+        LightSwitchSettings::instance().LoadSettings();
+        const auto& settings = LightSwitchSettings::instance().settings();
+
+        applyTheme(nowMinutes, settings.lightTime + settings.offset, settings.darkTime + settings.offset, settings);
+    }
+
+    // --- Main loop: wakes once per minute or stop/parent death ---
+    for (;;)
+    {
+        HANDLE waits[2] = { g_ServiceStopEvent, hParent };
+        DWORD count = hParent ? 2 : 1;
+
+        SYSTEMTIME st;
+        GetLocalTime(&st);
+        int nowMinutes = st.wHour * 60 + st.wMinute;
+
+        LightSwitchSettings::instance().LoadSettings();
+        const auto& settings = LightSwitchSettings::instance().settings();
+
+        // Debug print
+        wchar_t msg[160];
+        swprintf_s(msg,
+                   L"[LightSwitchService] now=%02d:%02d | light=%02d:%02d | dark=%02d:%02d\n",
+                   st.wHour,
+                   st.wMinute,
+                   settings.lightTime / 60,
+                   settings.lightTime % 60,
+                   settings.darkTime / 60,
+                   settings.darkTime % 60);
+        OutputDebugString(msg);
+
+        // Apply theme logic
+        applyTheme(nowMinutes, settings.lightTime + settings.offset, settings.darkTime + settings.offset, settings);
+
+        // Sleep until next minute, wake early if stop/parent dies
+        GetLocalTime(&st);
+        int msToNextMinute = (60 - st.wSecond) * 1000 - st.wMilliseconds;
+        if (msToNextMinute < 50)
+            msToNextMinute = 50;
+
+        DWORD wait = WaitForMultipleObjects(count, waits, FALSE, msToNextMinute);
+        if (wait == WAIT_OBJECT_0) // stop event
+            break;
+        if (hParent && wait == WAIT_OBJECT_0 + 1) // parent exited
+            break;
+    }
+
+    if (hParent)
+        CloseHandle(hParent);
+
+    return 0;
+}
+
+int APIENTRY wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
+{
+    if (powertoys_gpo::getConfiguredLightSwitchEnabledValue() == powertoys_gpo::gpo_rule_configured_disabled)
+    {
+        wchar_t msg[160];
+        swprintf_s(
+            msg,
+            L"Tried to start with a GPO policy setting the utility to always be disabled. Please contact your systems administrator.\n");
+        OutputDebugString(msg);
+        return 0;
+    }
+
+    int argc = 0;
+    LPWSTR* argv = CommandLineToArgvW(GetCommandLineW(), &argc);
+    int rc = _tmain(argc, argv); // reuse your existing logic
+    LocalFree(argv);
+    return rc;
+}

src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj

@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{08e71c67-6a7e-4ca1-b04e-2fb336410bac}</ProjectGuid>
+    <RootNamespace>LightSwitchService</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.26100.0</WindowsTargetPlatformVersion>
+    <ProjectName>LightSwitchService</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
+    <TargetName>PowerToys.LightSwitchService</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <AdditionalIncludeDirectories>
+        ./../;
+        $(SolutionDir)src\common\Telemetry;
+        $(SolutionDir)src\common;
+        $(SolutionDir)src\;
+        $(SolutionDir)deps\spdlog\include;
+        ./;
+        %(AdditionalIncludeDirectories)
+      </AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
+      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\notifications\notifications.vcxproj">
+      <Project>{1d5be09d-78c0-4fd7-af00-ae7c1af7c525}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\Telemetry\EtwTrace\EtwTrace.vcxproj">
+      <Project>{8f021b46-362b-485c-bfba-ccf83e820cbd}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\common\SettingsAPI\FileWatcher.cpp" />
+    <ClCompile Include="..\..\..\common\SettingsAPI\settings_helpers.cpp" />
+    <ClCompile Include="..\..\..\common\SettingsAPI\settings_objects.cpp" />
+    <ClCompile Include="LightSwitchService.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="LightSwitchSettings.cpp" />
+    <ClCompile Include="SettingsConstants.cpp" />
+    <ClCompile Include="ThemeHelper.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="ThemeScheduler.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="WinHookEventIDs.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="LightSwitchSettings.h" />
+    <ClInclude Include="SettingsConstants.h" />
+    <ClInclude Include="SettingsObserver.h" />
+    <ClInclude Include="ThemeHelper.h" />
+    <ClInclude Include="ThemeScheduler.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="WinHookEventIDs.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="..\..\..\..\deps\spdlog.props" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
+</Project>

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,148 @@
+#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()
+{
+    // Mirrors AlwaysOnTop: <module name>.json
+    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);
+            }
+        }
+
+        // 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 (...)
+    {
+        //Logger::error(L"[LightSwitchSettings] Failed to read settings file");
+        // Keeps defaults if load fails
+    }
+}

src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.h

@@ -0,0 +1,87 @@
+#pragma once
+
+#include <unordered_set>
+#include <string>
+#include <vector>
+#include <memory>
+#include <windows.h>
+
+#include <common/SettingsAPI/FileWatcher.h>
+#include <common/SettingsAPI/settings_objects.h>
+#include <SettingsConstants.h>
+
+class SettingsObserver;
+
+enum class ScheduleMode
+{
+    FixedHours,
+    SunsetToSunrise
+    // Add more in the future
+};
+
+inline std::wstring ToString(ScheduleMode mode)
+{
+    switch (mode)
+    {
+    case ScheduleMode::FixedHours:
+        return L"FixedHours";
+    case ScheduleMode::SunsetToSunrise:
+        return L"SunsetToSunrise";
+    default:
+        return L"FixedHours";
+    }
+}
+
+inline ScheduleMode FromString(const std::wstring& str)
+{
+    if (str == L"SunsetToSunrise")
+        return ScheduleMode::SunsetToSunrise;
+    else
+        return ScheduleMode::FixedHours;
+}
+
+struct LightSwitchConfig
+{
+    ScheduleMode scheduleMode = ScheduleMode::FixedHours;
+
+    std::wstring latitude = L"0.0";
+    std::wstring longitude = L"0.0";
+
+    // Stored as minutes since midnight
+    int lightTime = 8 * 60; // 08:00 default
+    int darkTime = 20 * 60; // 20:00 default
+
+    int offset = 0; // offset in minutes to apply to calculated times
+
+    bool changeSystem = false;
+    bool changeApps = false;
+};
+
+class LightSwitchSettings
+{
+public:
+    static LightSwitchSettings& instance();
+
+    static inline const LightSwitchConfig& settings()
+    {
+        return instance().m_settings;
+    }
+
+    void InitFileWatcher();
+    static std::wstring GetSettingsFileName();
+
+    void AddObserver(SettingsObserver& observer);
+    void RemoveObserver(SettingsObserver& observer);
+
+    void LoadSettings();
+
+private:
+    LightSwitchSettings();
+    ~LightSwitchSettings() = default;
+
+    LightSwitchConfig m_settings;
+    std::unique_ptr<FileWatcher> m_settingsFileWatcher;
+    std::unordered_set<SettingsObserver*> m_observers;
+
+    void NotifyObservers(SettingId id) const;
+};

src/modules/LightSwitch/LightSwitchService/SettingsConstants.cpp

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

src/modules/LightSwitch/LightSwitchService/SettingsConstants.h

@@ -0,0 +1,12 @@
+#pragma once
+
+enum class SettingId
+{
+    ScheduleMode = 0,
+    Latitude,
+    Longitude,
+    LightTime,
+    DarkTime,
+    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,80 @@
+#include <windows.h>
+#include "ThemeHelper.h"
+
+// Controls changing the themes.
+
+void SetAppsTheme(bool mode)
+{
+    HKEY hKey;
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_SET_VALUE,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        DWORD value = mode;
+        RegSetValueEx(hKey, L"AppsUseLightTheme", 0, REG_DWORD, reinterpret_cast<const BYTE*>(&value), sizeof(value));
+        RegCloseKey(hKey);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, reinterpret_cast<LPARAM>(L"ImmersiveColorSet"), SMTO_ABORTIFHUNG, 5000, nullptr);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_THEMECHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);
+    }
+}
+
+void SetSystemTheme(bool mode)
+{
+    HKEY hKey;
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_SET_VALUE,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        DWORD value = mode;
+        RegSetValueEx(hKey, L"SystemUsesLightTheme", 0, REG_DWORD, reinterpret_cast<const BYTE*>(&value), sizeof(value));
+        RegCloseKey(hKey);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, reinterpret_cast<LPARAM>(L"ImmersiveColorSet"), SMTO_ABORTIFHUNG, 5000, nullptr);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_THEMECHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);
+    }
+}
+
+bool GetCurrentSystemTheme()
+{
+    HKEY hKey;
+    DWORD value = 1; // default = light
+    DWORD size = sizeof(value);
+
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_READ,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        RegQueryValueEx(hKey, L"SystemUsesLightTheme", nullptr, nullptr, reinterpret_cast<LPBYTE>(&value), &size);
+        RegCloseKey(hKey);
+    }
+
+    return value == 0; // 0 = dark, 1 = light
+}
+
+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"SystemUsesLightTheme", nullptr, nullptr, reinterpret_cast<LPBYTE>(&value), &size);
+        RegCloseKey(hKey);
+    }
+
+    return value == 0;
+}

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/MouseUtils/MousePointerCrosshairs/InclusiveCrosshairs.cpp

@@ -27,73 +27,6 @@ struct InclusiveCrosshairs
     void SwitchActivationMode();
     void ApplySettings(InclusiveCrosshairsSettings& settings, bool applyToRuntimeObjects);
 
-public:
-    // Allow external callers to request a position update (thread-safe enqueue)
-    static void RequestUpdatePosition()
-    {
-        if (instance != nullptr)
-        {
-            auto dispatcherQueue = instance->m_dispatcherQueueController.DispatcherQueue();
-            dispatcherQueue.TryEnqueue([]() {
-                if (instance != nullptr)
-                {
-                    instance->UpdateCrosshairsPosition();
-                }
-            });
-        }
-    }
-
-    static void EnsureOn()
-    {
-        if (instance != nullptr)
-        {
-            auto dispatcherQueue = instance->m_dispatcherQueueController.DispatcherQueue();
-            dispatcherQueue.TryEnqueue([]() {
-                if (instance != nullptr && !instance->m_drawing)
-                {
-                    instance->StartDrawing();
-                }
-            });
-        }
-    }
-
-    static void EnsureOff()
-    {
-        if (instance != nullptr)
-        {
-            auto dispatcherQueue = instance->m_dispatcherQueueController.DispatcherQueue();
-            dispatcherQueue.TryEnqueue([]() {
-                if (instance != nullptr && instance->m_drawing)
-                {
-                    instance->StopDrawing();
-                }
-            });
-        }
-    }
-
-    static void SetExternalControl(bool enabled)
-    {
-        if (instance != nullptr)
-        {
-            auto dispatcherQueue = instance->m_dispatcherQueueController.DispatcherQueue();
-            dispatcherQueue.TryEnqueue([enabled]() {
-                if (instance != nullptr)
-                {
-                    instance->m_externalControl = enabled;
-                    if (enabled && instance->m_mouseHook)
-                    {
-                        UnhookWindowsHookEx(instance->m_mouseHook);
-                        instance->m_mouseHook = NULL;
-                    }
-                    else if (!enabled && instance->m_drawing && !instance->m_mouseHook)
-                    {
-                        instance->m_mouseHook = SetWindowsHookEx(WH_MOUSE_LL, MouseHookProc, instance->m_hinstance, 0);
-                    }
-                }
-            });
-        }
-    }
-
 private:
     enum class MouseButton
     {
@@ -136,7 +69,6 @@ private:
     bool m_drawing = false;
     bool m_destroyed = false;
     bool m_hiddenCursor = false;
-    bool m_externalControl = false;
     void SetAutoHideTimer() noexcept;
 
     // Configurable Settings
@@ -332,12 +264,9 @@ LRESULT CALLBACK InclusiveCrosshairs::MouseHookProc(int nCode, WPARAM wParam, LP
     if (nCode >= 0)
     {
         MSLLHOOKSTRUCT* hookData = reinterpret_cast<MSLLHOOKSTRUCT*>(lParam);
-        if (instance && !instance->m_externalControl)
+        if (wParam == WM_MOUSEMOVE)
         {
-            if (wParam == WM_MOUSEMOVE)
-            {
-                instance->UpdateCrosshairsPosition();
-            }
+            instance->UpdateCrosshairsPosition();
         }
     }
     return CallNextHookEx(0, nCode, wParam, lParam);
@@ -598,26 +527,6 @@ bool InclusiveCrosshairsIsEnabled()
     return (InclusiveCrosshairs::instance != nullptr);
 }
 
-void InclusiveCrosshairsRequestUpdatePosition()
-{
-    InclusiveCrosshairs::RequestUpdatePosition();
-}
-
-void InclusiveCrosshairsEnsureOn()
-{
-    InclusiveCrosshairs::EnsureOn();
-}
-
-void InclusiveCrosshairsEnsureOff()
-{
-    InclusiveCrosshairs::EnsureOff();
-}
-
-void InclusiveCrosshairsSetExternalControl(bool enabled)
-{
-    InclusiveCrosshairs::SetExternalControl(enabled);
-}
-
 int InclusiveCrosshairsMain(HINSTANCE hInstance, InclusiveCrosshairsSettings& settings)
 {
     Logger::info("Starting a crosshairs instance.");

src/modules/MouseUtils/MousePointerCrosshairs/InclusiveCrosshairs.h

@@ -31,7 +31,3 @@ void InclusiveCrosshairsDisable();
 bool InclusiveCrosshairsIsEnabled();
 void InclusiveCrosshairsSwitch();
 void InclusiveCrosshairsApplySettings(InclusiveCrosshairsSettings& settings);
-void InclusiveCrosshairsRequestUpdatePosition();
-void InclusiveCrosshairsEnsureOn();
-void InclusiveCrosshairsEnsureOff();
-void InclusiveCrosshairsSetExternalControl(bool enabled);

src/modules/MouseUtils/MousePointerCrosshairs/dllmain.cpp

@@ -4,15 +4,6 @@
 #include "trace.h"
 #include "InclusiveCrosshairs.h"
 #include "common/utils/color.h"
-#include <atomic>
-#include <thread>
-#include <chrono>
-#include <memory>
-
-extern void InclusiveCrosshairsRequestUpdatePosition();
-extern void InclusiveCrosshairsEnsureOn();
-extern void InclusiveCrosshairsEnsureOff();
-extern void InclusiveCrosshairsSetExternalControl(bool enabled);
 
 // Non-Localizable strings
 namespace
@@ -20,7 +11,6 @@ namespace
     const wchar_t JSON_KEY_PROPERTIES[] = L"properties";
     const wchar_t JSON_KEY_VALUE[] = L"value";
     const wchar_t JSON_KEY_ACTIVATION_SHORTCUT[] = L"activation_shortcut";
-    const wchar_t JSON_KEY_GLIDING_ACTIVATION_SHORTCUT[] = L"gliding_cursor_activation_shortcut";
     const wchar_t JSON_KEY_CROSSHAIRS_COLOR[] = L"crosshairs_color";
     const wchar_t JSON_KEY_CROSSHAIRS_OPACITY[] = L"crosshairs_opacity";
     const wchar_t JSON_KEY_CROSSHAIRS_RADIUS[] = L"crosshairs_radius";
@@ -31,15 +21,13 @@ namespace
     const wchar_t JSON_KEY_CROSSHAIRS_IS_FIXED_LENGTH_ENABLED[] = L"crosshairs_is_fixed_length_enabled";
     const wchar_t JSON_KEY_CROSSHAIRS_FIXED_LENGTH[] = L"crosshairs_fixed_length";
     const wchar_t JSON_KEY_AUTO_ACTIVATE[] = L"auto_activate";
-    const wchar_t JSON_KEY_GLIDE_TRAVEL_SPEED[] = L"gliding_travel_speed";
-    const wchar_t JSON_KEY_GLIDE_DELAY_SPEED[] = L"gliding_delay_speed";
 }
 
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 
 HMODULE m_hModule;
 
-BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID /*lpReserved*/)
+BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
 {
     m_hModule = hModule;
     switch (ul_reason_for_call)
@@ -69,46 +57,8 @@ private:
     // The PowerToy state.
     bool m_enabled = false;
 
-    // Additional hotkeys (legacy API) to support multiple shortcuts
-    Hotkey m_activationHotkey{};    // Crosshairs toggle
-    Hotkey m_glidingHotkey{};       // Gliding cursor state machine
-
-    // Shared state for worker threads (decoupled from this lifetime)
-    struct State
-    {
-        std::atomic<bool> stopX{ false };
-        std::atomic<bool> stopY{ false };
-
-        // positions and speeds
-        int currentXPos{ 0 };
-        int currentYPos{ 0 };
-        int currentXSpeed{ 0 }; // pixels per base window
-        int currentYSpeed{ 0 }; // pixels per base window
-        int xPosSnapshot{ 0 };  // xPos captured at end of horizontal scan
-
-        // Fractional accumulators to spread movement across 10ms ticks
-        double xFraction{ 0.0 };
-        double yFraction{ 0.0 };
-
-        // Speeds represent pixels per 200ms (min 5, max 60 enforced by UI/settings)
-        int fastHSpeed{ 30 }; // pixels per base window
-        int slowHSpeed{ 5 };  // pixels per base window
-        int fastVSpeed{ 30 }; // pixels per base window
-        int slowVSpeed{ 5 };  // pixels per base window
-    };
-
-    std::shared_ptr<State> m_state;
-
-    // Worker threads
-    std::thread m_xThread;
-    std::thread m_yThread;
-
-    // Gliding cursor state machine
-    std::atomic<int> m_glideState{ 0 }; // 0..4 like the AHK script
-
-    // Timer configuration: 10ms tick, speeds are defined per 200ms base window
-    static constexpr int kTimerTickMs = 10;
-    static constexpr int kBaseSpeedTickMs = 200; // mapping period for configured pixel counts
+    // Hotkey to invoke the module
+    HotkeyEx m_hotkey;
 
     // Mouse Pointer Crosshairs specific settings
     InclusiveCrosshairsSettings m_inclusiveCrosshairsSettings;
@@ -118,17 +68,12 @@ public:
     MousePointerCrosshairs()
     {
         LoggerHelpers::init_logger(MODULE_NAME, L"ModuleInterface", LogSettings::mousePointerCrosshairsLoggerName);
-        m_state = std::make_shared<State>();
         init_settings();
     };
 
     // Destroy the powertoy and free memory
     virtual void destroy() override
     {
-        StopXTimer();
-        StopYTimer();
-        // Release shared state so worker threads (if any) exit when weak_ptr lock fails
-        m_state.reset();
         delete this;
     }
 
@@ -162,7 +107,9 @@ public:
 
     // Signal from the Settings editor to call a custom action.
     // This can be used to spawn more complex editors.
-    virtual void call_custom_action(const wchar_t* /*action*/) override {}
+    virtual void call_custom_action(const wchar_t* action) override
+    {
+    }
 
     // Called by the runner to pass the updated settings values as a serialized JSON.
     virtual void set_config(const wchar_t* config) override
@@ -196,9 +143,6 @@ public:
     {
         m_enabled = false;
         Trace::EnableMousePointerCrosshairs(false);
-        StopXTimer();
-        StopYTimer();
-        m_glideState = 0;
         InclusiveCrosshairsDisable();
     }
 
@@ -214,249 +158,15 @@ public:
         return false;
     }
 
-    // Legacy multi-hotkey support (like CropAndLock)
-    virtual size_t get_hotkeys(Hotkey* buffer, size_t buffer_size) override
+    virtual std::optional<HotkeyEx> GetHotkeyEx() override
     {
-        if (buffer && buffer_size >= 2)
-        {
-            buffer[0] = m_activationHotkey; // Crosshairs toggle
-            buffer[1] = m_glidingHotkey;    // Gliding cursor toggle
-        }
-        return 2;
+        return m_hotkey;
     }
 
-    virtual bool on_hotkey(size_t hotkeyId) override
+    virtual void OnHotkeyEx() override
     {
-        if (!m_enabled)
-        {
-            return false;
-        }
-
-        if (hotkeyId == 0)
-        {
-            InclusiveCrosshairsSwitch();
-            return true;
-        }
-        if (hotkeyId == 1)
-        {
-            HandleGlidingHotkey();
-            return true;
-        }
-        return false;
+        InclusiveCrosshairsSwitch();
     }
-
-private:
-    static void LeftClick()
-    {
-        INPUT inputs[2]{};
-        inputs[0].type = INPUT_MOUSE;
-        inputs[0].mi.dwFlags = MOUSEEVENTF_LEFTDOWN;
-        inputs[1].type = INPUT_MOUSE;
-        inputs[1].mi.dwFlags = MOUSEEVENTF_LEFTUP;
-        SendInput(2, inputs, sizeof(INPUT));
-    }
-
-    // Stateless helpers operating on shared State
-    static void PositionCursorX(const std::shared_ptr<State>& s)
-    {
-        int screenW = GetSystemMetrics(SM_CXVIRTUALSCREEN);
-        int screenH = GetSystemMetrics(SM_CYVIRTUALSCREEN);
-        s->currentYPos = screenH / 2;
-
-        // Distribute movement over 10ms ticks to match pixels-per-base-window speeds
-        const double perTick = (static_cast<double>(s->currentXSpeed) * kTimerTickMs) / static_cast<double>(kBaseSpeedTickMs);
-        s->xFraction += perTick;
-        int step = static_cast<int>(s->xFraction);
-        if (step > 0)
-        {
-            s->xFraction -= step;
-            s->currentXPos += step;
-        }
-
-        s->xPosSnapshot = s->currentXPos;
-        if (s->currentXPos >= screenW)
-        {
-            s->currentXPos = 0;
-            s->currentXSpeed = s->fastHSpeed;
-            s->xPosSnapshot = 0;
-            s->xFraction = 0.0; // reset fractional remainder on wrap
-        }
-        SetCursorPos(s->currentXPos, s->currentYPos);
-        // Ensure overlay crosshairs follow immediately
-        InclusiveCrosshairsRequestUpdatePosition();
-    }
-
-    static void PositionCursorY(const std::shared_ptr<State>& s)
-    {
-        int screenH = GetSystemMetrics(SM_CYVIRTUALSCREEN);
-        // Keep X at snapshot
-        // Use s->xPosSnapshot captured during X pass
-
-        // Distribute movement over 10ms ticks to match pixels-per-base-window speeds
-        const double perTick = (static_cast<double>(s->currentYSpeed) * kTimerTickMs) / static_cast<double>(kBaseSpeedTickMs);
-        s->yFraction += perTick;
-        int step = static_cast<int>(s->yFraction);
-        if (step > 0)
-        {
-            s->yFraction -= step;
-            s->currentYPos += step;
-        }
-
-        if (s->currentYPos >= screenH)
-        {
-            s->currentYPos = 0;
-            s->currentYSpeed = s->fastVSpeed;
-            s->yFraction = 0.0; // reset fractional remainder on wrap
-        }
-        SetCursorPos(s->xPosSnapshot, s->currentYPos);
-        // Ensure overlay crosshairs follow immediately
-        InclusiveCrosshairsRequestUpdatePosition();
-    }
-
-    void StartXTimer()
-    {
-        auto s = m_state;
-        if (!s)
-        {
-            return;
-        }
-        s->stopX = false;
-        std::weak_ptr<State> wp = s;
-        m_xThread = std::thread([wp]() {
-            while (true)
-            {
-                auto sp = wp.lock();
-                if (!sp || sp->stopX.load())
-                {
-                    break;
-                }
-                PositionCursorX(sp);
-                std::this_thread::sleep_for(std::chrono::milliseconds(kTimerTickMs));
-            }
-        });
-    }
-
-    void StopXTimer()
-    {
-        auto s = m_state;
-        if (s)
-        {
-            s->stopX = true;
-        }
-        if (m_xThread.joinable())
-        {
-            m_xThread.join();
-        }
-    }
-
-    void StartYTimer()
-    {
-        auto s = m_state;
-        if (!s)
-        {
-            return;
-        }
-        s->stopY = false;
-        std::weak_ptr<State> wp = s;
-        m_yThread = std::thread([wp]() {
-            while (true)
-            {
-                auto sp = wp.lock();
-                if (!sp || sp->stopY.load())
-                {
-                    break;
-                }
-                PositionCursorY(sp);
-                std::this_thread::sleep_for(std::chrono::milliseconds(kTimerTickMs));
-            }
-        });
-    }
-
-    void StopYTimer()
-    {
-        auto s = m_state;
-        if (s)
-        {
-            s->stopY = true;
-        }
-        if (m_yThread.joinable())
-        {
-            m_yThread.join();
-        }
-    }
-
-    void HandleGlidingHotkey()
-    {
-        auto s = m_state;
-        if (!s)
-        {
-            return;
-        }
-        // Simulate the AHK state machine
-        int state = m_glideState.load();
-        switch (state)
-        {
-        case 0:
-        {
-            // Ensure crosshairs on (do not toggle off if already on)
-            InclusiveCrosshairsEnsureOn();
-            // Disable internal mouse hook so we control position updates explicitly
-            InclusiveCrosshairsSetExternalControl(true);
-
-            s->currentXPos = 0;
-            s->currentXSpeed = s->fastHSpeed;
-            s->xFraction = 0.0;
-            s->yFraction = 0.0;
-            int y = GetSystemMetrics(SM_CYVIRTUALSCREEN) / 2;
-            SetCursorPos(0, y);
-            InclusiveCrosshairsRequestUpdatePosition();
-            m_glideState = 1;
-            StartXTimer();
-            break;
-        }
-        case 1:
-        {
-            // Slow horizontal
-            s->currentXSpeed = s->slowHSpeed;
-            m_glideState = 2;
-            break;
-        }
-        case 2:
-        {
-            // Stop horizontal, start vertical (fast)
-            StopXTimer();
-            s->currentYSpeed = s->fastVSpeed;
-            s->currentYPos = 0;
-            s->yFraction = 0.0;
-            SetCursorPos(s->xPosSnapshot, s->currentYPos);
-            InclusiveCrosshairsRequestUpdatePosition();
-            m_glideState = 3;
-            StartYTimer();
-            break;
-        }
-        case 3:
-        {
-            // Slow vertical
-            s->currentYSpeed = s->slowVSpeed;
-            m_glideState = 4;
-            break;
-        }
-        case 4:
-        default:
-        {
-            // Stop vertical, click, turn crosshairs off, re-enable internal tracking, reset state
-            StopYTimer();
-            m_glideState = 0;
-            LeftClick();
-            InclusiveCrosshairsEnsureOff();
-            InclusiveCrosshairsSetExternalControl(false);
-            s->xFraction = 0.0;
-            s->yFraction = 0.0;
-            break;
-        }
-        }
-    }
-
     // Load the settings file.
     void init_settings()
     {
@@ -482,44 +192,37 @@ private:
         {
             try
             {
-                // Parse primary activation HotKey (for centralized hook)
+                // Parse HotKey
                 auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_ACTIVATION_SHORTCUT);
                 auto hotkey = PowerToysSettings::HotkeyObject::from_json(jsonPropertiesObject);
+                m_hotkey = HotkeyEx();
+                if (hotkey.win_pressed())
+                {
+                    m_hotkey.modifiersMask |= MOD_WIN;
+                }
 
-                // Map to legacy Hotkey for multi-hotkey API
-                m_activationHotkey.win = hotkey.win_pressed();
-                m_activationHotkey.ctrl = hotkey.ctrl_pressed();
-                m_activationHotkey.shift = hotkey.shift_pressed();
-                m_activationHotkey.alt = hotkey.alt_pressed();
-                m_activationHotkey.key = static_cast<unsigned char>(hotkey.get_code());
+                if (hotkey.ctrl_pressed())
+                {
+                    m_hotkey.modifiersMask |= MOD_CONTROL;
+                }
+
+                if (hotkey.shift_pressed())
+                {
+                    m_hotkey.modifiersMask |= MOD_SHIFT;
+                }
+
+                if (hotkey.alt_pressed())
+                {
+                    m_hotkey.modifiersMask |= MOD_ALT;
+                }
+
+                m_hotkey.vkCode = hotkey.get_code();
             }
             catch (...)
             {
                 Logger::warn("Failed to initialize Mouse Pointer Crosshairs activation shortcut");
             }
             try
-            {
-                // Parse Gliding Cursor HotKey
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_GLIDING_ACTIVATION_SHORTCUT);
-                auto hotkey = PowerToysSettings::HotkeyObject::from_json(jsonPropertiesObject);
-                m_glidingHotkey.win = hotkey.win_pressed();
-                m_glidingHotkey.ctrl = hotkey.ctrl_pressed();
-                m_glidingHotkey.shift = hotkey.shift_pressed();
-                m_glidingHotkey.alt = hotkey.alt_pressed();
-                m_glidingHotkey.key = static_cast<unsigned char>(hotkey.get_code());
-            }
-            catch (...)
-            {
-                // note that this is also defined in src\settings-ui\Settings.UI.Library\MousePointerCrosshairsProperties.cs, DefaultGlidingCursorActivationShortcut
-                // both need to be kept in sync!
-                Logger::warn("Failed to initialize Gliding Cursor activation shortcut. Using default Win+Alt+.");
-                m_glidingHotkey.win = true;
-                m_glidingHotkey.alt = true;
-                m_glidingHotkey.ctrl = false;
-                m_glidingHotkey.shift = false;
-                m_glidingHotkey.key = VK_OEM_PERIOD;
-            }
-            try
             {
                 // Parse Opacity
                 auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_CROSSHAIRS_OPACITY);
@@ -569,6 +272,7 @@ private:
                 {
                     throw std::runtime_error("Invalid Radius value");
                 }
+                
             }
             catch (...)
             {
@@ -587,6 +291,7 @@ private:
                 {
                     throw std::runtime_error("Invalid Thickness value");
                 }
+                
             }
             catch (...)
             {
@@ -615,7 +320,7 @@ private:
             {
                 // Parse border size
                 auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_CROSSHAIRS_BORDER_SIZE);
-                int value = static_cast<int>(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE));
+                int value = static_cast <int>(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE));
                 if (value >= 0)
                 {
                     inclusiveCrosshairsSettings.crosshairsBorderSize = value;
@@ -678,86 +383,20 @@ private:
             {
                 Logger::warn("Failed to initialize auto activate from settings. Will use default value");
             }
-            try
-            {
-                // Parse Travel speed (fast speed mapping)
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_GLIDE_TRAVEL_SPEED);
-                int value = static_cast<int>(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE));
-                if (value >= 5 && value <= 60)
-                {
-                    m_state->fastHSpeed = value;
-                    m_state->fastVSpeed = value;
-                }
-                else if (value < 5)
-                {
-                    m_state->fastHSpeed = 5; m_state->fastVSpeed = 5;
-                }
-                else
-                {
-                    m_state->fastHSpeed = 60; m_state->fastVSpeed = 60;
-                }
-            }
-            catch (...)
-            {
-                Logger::warn("Failed to initialize gliding travel speed from settings. Using default 25.");
-                if (m_state)
-                {
-                    m_state->fastHSpeed = 25;
-                    m_state->fastVSpeed = 25;
-                }
-            }
-            try
-            {
-                // Parse Delay speed (slow speed mapping)
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_GLIDE_DELAY_SPEED);
-                int value = static_cast<int>(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE));
-                if (value >= 5 && value <= 60)
-                {
-                    m_state->slowHSpeed = value;
-                    m_state->slowVSpeed = value;
-                }
-                else if (value < 5)
-                {
-                    m_state->slowHSpeed = 5; m_state->slowVSpeed = 5;
-                }
-                else
-                {
-                    m_state->slowHSpeed = 60; m_state->slowVSpeed = 60;
-                }
-            }
-            catch (...)
-            {
-                Logger::warn("Failed to initialize gliding delay speed from settings. Using default 5.");
-                if (m_state)
-                {
-                    m_state->slowHSpeed = 5;
-                    m_state->slowVSpeed = 5;
-                }
-            }
         }
         else
         {
             Logger::info("Mouse Pointer Crosshairs settings are empty");
         }
-        
-        if (m_activationHotkey.key == 0)
+        if (!m_hotkey.modifiersMask)
         {
-            m_activationHotkey.win = true;
-            m_activationHotkey.alt = true;
-            m_activationHotkey.ctrl = false;
-            m_activationHotkey.shift = false;
-            m_activationHotkey.key = 'P';
-        }
-        if (m_glidingHotkey.key == 0)
-        {
-            m_glidingHotkey.win = true;
-            m_glidingHotkey.alt = true;
-            m_glidingHotkey.ctrl = false;
-            m_glidingHotkey.shift = false;
-            m_glidingHotkey.key = VK_OEM_PERIOD;
+            Logger::info("Mouse Pointer Crosshairs  is going to use default shortcut");
+            m_hotkey.modifiersMask = MOD_WIN | MOD_ALT;
+            m_hotkey.vkCode = 0x50; // P key
         }
         m_inclusiveCrosshairsSettings = inclusiveCrosshairsSettings;
     }
+
 };
 
 extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()

src/modules/MouseWithoutBorders/ModuleInterface/dllmain.cpp

@@ -556,61 +556,6 @@ public:
         return m_enabled;
     }
 
-    virtual size_t get_hotkeys(Hotkey* hotkeys, size_t buffer_size) override
-    {
-        constexpr size_t num_hotkeys = 4; // We have 4 hotkeys
-
-        if (hotkeys && buffer_size >= num_hotkeys)
-        {
-            PowerToysSettings::PowerToyValues values = PowerToysSettings::PowerToyValues::load_from_settings_file(MODULE_NAME);
-
-            // Cache the raw JSON object to avoid multiple parsing
-            json::JsonObject root_json = values.get_raw_json();
-            json::JsonObject properties_json = root_json.GetNamedObject(L"properties", json::JsonObject{});
-
-            size_t hotkey_index = 0;
-
-            // Helper lambda to extract hotkey from JSON properties
-            auto extract_hotkey = [&](const wchar_t* property_name) -> Hotkey {
-                if (properties_json.HasKey(property_name))
-                {
-                    try
-                    {
-                        json::JsonObject hotkey_json = properties_json.GetNamedObject(property_name);
-
-                        // Extract hotkey properties directly from JSON
-                        bool win = hotkey_json.GetNamedBoolean(L"win", false);
-                        bool ctrl = hotkey_json.GetNamedBoolean(L"ctrl", false);
-                        bool alt = hotkey_json.GetNamedBoolean(L"alt", false);
-                        bool shift = hotkey_json.GetNamedBoolean(L"shift", false);
-                        unsigned char key = static_cast<unsigned char>(
-                            hotkey_json.GetNamedNumber(L"code", 0));
-
-                        return { win, ctrl, shift, alt, key };
-                    }
-                    catch (...)
-                    {
-                        // If parsing individual hotkey fails, use defaults
-                        return { false, false, false, false, 0 };
-                    }
-                }
-                else
-                {
-                    // Property doesn't exist, use defaults
-                    return { false, false, false, false, 0 };
-                }
-            };
-
-            // Extract all hotkeys using the optimized helper
-            hotkeys[hotkey_index++] = extract_hotkey(L"ToggleEasyMouseShortcut"); // [0] Toggle Easy Mouse
-            hotkeys[hotkey_index++] = extract_hotkey(L"LockMachineShortcut");     // [1] Lock Machine
-            hotkeys[hotkey_index++] = extract_hotkey(L"Switch2AllPCShortcut");    // [2] Switch to All PCs
-            hotkeys[hotkey_index++] = extract_hotkey(L"ReconnectShortcut");       // [3] Reconnect
-        }
-
-        return num_hotkeys;
-    }
-
     void launch_add_firewall_process()
     {
         Logger::trace(L"Starting Process to add firewall rule");

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

@@ -141,9 +141,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
         // see 9806fe5d8 for the last commit that had this with sections
         _isFetching = true;
 
-        // Collect all the items into new viewmodels
-        Collection<ListItemViewModel> newViewModels = [];
-
         try
         {
             // Check for cancellation before starting expensive operations
@@ -154,6 +151,9 @@ public partial class ListViewModel : PageViewModel, IDisposable
             // Check for cancellation after getting items from extension
             cancellationToken.ThrowIfCancellationRequested();
 
+            // Collect all the items into new viewmodels
+            Collection<ListItemViewModel> newViewModels = [];
+
             // TODO we can probably further optimize this by also keeping a
             // HashSet of every ExtensionObject we currently have, and only
             // building new viewmodels for the ones we haven't already built.
@@ -187,22 +187,11 @@ public partial class ListViewModel : PageViewModel, IDisposable
             // Check for cancellation before updating the list
             cancellationToken.ThrowIfCancellationRequested();
 
-            List<ListItemViewModel> removedItems = [];
             lock (_listLock)
             {
                 // Now that we have new ViewModels for everything from the
                 // extension, smartly update our list of VMs
-                ListHelpers.InPlaceUpdateList(Items, newViewModels, out removedItems);
-
-                // DO NOT ThrowIfCancellationRequested AFTER THIS! If you do,
-                // you'll clean up list items that we've now transferred into
-                // .Items
-            }
-
-            // If we removed items, we need to clean them up, to remove our event handlers
-            foreach (var removedItem in removedItems)
-            {
-                removedItem.SafeCleanup();
+                ListHelpers.InPlaceUpdateList(Items, newViewModels);
             }
 
             // TODO: Iterate over everything in Items, and prune items from the
@@ -211,15 +200,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
         catch (OperationCanceledException)
         {
             // Cancellation is expected, don't treat as error
-
-            // However, if we were cancelled, we didn't actually add these items to
-            // our Items list. Before we release them to the GC, make sure we clean
-            // them up
-            foreach (var vm in newViewModels)
-            {
-                vm.SafeCleanup();
-            }
-
             return;
         }
         catch (Exception ex)

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

@@ -2,7 +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.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using AdaptiveCards.ObjectModel.WinUI3;
 using AdaptiveCards.Templating;
@@ -97,40 +96,109 @@ public partial class ContentFormViewModel(IFormContent _form, WeakReference<IPag
         UpdateProperty(nameof(Card));
     }
 
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(AdaptiveOpenUrlAction))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(AdaptiveSubmitAction))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(AdaptiveExecuteAction))]
     public void HandleSubmit(IAdaptiveActionElement action, JsonObject inputs)
     {
-        if (action is AdaptiveOpenUrlAction openUrlAction)
-        {
-            WeakReferenceMessenger.Default.Send<LaunchUriMessage>(new(openUrlAction.Url));
-            return;
-        }
+        // BODGY circa GH #40979
+        // Usually, you're supposed to try to cast the action to a specific
+        // type, and use those objects to get the data you need.
+        // However, there's something weird with AdaptiveCards and the way it
+        // works when we consume it when built in Release, with AOT (and
+        // trimming) enabled. Any sort of `action.As<IAdaptiveSubmitAction>()`
+        // or similar will throw a System.InvalidCastException.
+        //
+        // Instead we have this horror show.
+        //
+        // The `action.ToJson()` blob ACTUALLY CONTAINS THE `type` field, which
+        // we can use to determine what kind of action it is. Then we can parse
+        // the JSON manually based on the type.
+        var actionJson = action.ToJson();
 
-        if (action is AdaptiveSubmitAction or AdaptiveExecuteAction)
+        if (actionJson.TryGetValue("type", out var actionTypeValue))
         {
-            // Get the data and inputs
-            var dataString = (action as AdaptiveSubmitAction)?.DataJson.Stringify() ?? string.Empty;
-            var inputString = inputs.Stringify();
+            var actionTypeString = actionTypeValue.GetString();
+            Logger.LogTrace($"atString={actionTypeString}");
 
-            _ = Task.Run(() =>
+            var actionType = actionTypeString switch
             {
-                try
-                {
-                    var model = _formModel.Unsafe!;
-                    if (model != null)
+                "Action.Submit" => ActionType.Submit,
+                "Action.Execute" => ActionType.Execute,
+                "Action.OpenUrl" => ActionType.OpenUrl,
+                _ => ActionType.Unsupported,
+            };
+
+            Logger.LogDebug($"{actionTypeString}->{actionType}");
+
+            switch (actionType)
+            {
+                case ActionType.OpenUrl:
                     {
-                        var result = model.SubmitForm(inputString, dataString);
-                        WeakReferenceMessenger.Default.Send<HandleCommandResultMessage>(new(new(result)));
+                        HandleOpenUrlAction(action, actionJson);
                     }
-                }
-                catch (Exception ex)
-                {
-                    ShowException(ex);
-                }
-            });
+
+                    break;
+                case ActionType.Submit:
+                case ActionType.Execute:
+                    {
+                        HandleSubmitAction(action, actionJson, inputs);
+                    }
+
+                    break;
+                default:
+                    Logger.LogError($"{actionType} was an unexpected action `type`");
+                    break;
+            }
         }
+        else
+        {
+            Logger.LogError($"actionJson.TryGetValue(type) failed");
+        }
+    }
+
+    private void HandleOpenUrlAction(IAdaptiveActionElement action, JsonObject actionJson)
+    {
+        if (actionJson.TryGetValue("url", out var actionUrlValue))
+        {
+            var actionUrl = actionUrlValue.GetString() ?? string.Empty;
+            if (Uri.TryCreate(actionUrl, default(UriCreationOptions), out var uri))
+            {
+                WeakReferenceMessenger.Default.Send<LaunchUriMessage>(new(uri));
+            }
+            else
+            {
+                Logger.LogError($"Failed to produce URI for {actionUrlValue}");
+            }
+        }
+    }
+
+    private void HandleSubmitAction(
+        IAdaptiveActionElement action,
+        JsonObject actionJson,
+        JsonObject inputs)
+    {
+        var dataString = string.Empty;
+        if (actionJson.TryGetValue("data", out var actionDataValue))
+        {
+            dataString = actionDataValue.Stringify() ?? string.Empty;
+        }
+
+        var inputString = inputs.Stringify();
+        _ = Task.Run(() =>
+        {
+            try
+            {
+                var model = _formModel.Unsafe!;
+                if (model != null)
+                {
+                    var result = model.SubmitForm(inputString, dataString);
+                    Logger.LogDebug($"SubmitForm() returned {result}");
+                    WeakReferenceMessenger.Default.Send<HandleCommandResultMessage>(new(new(result)));
+                }
+            }
+            catch (Exception ex)
+            {
+                ShowException(ex);
+            }
+        });
     }
 
     private static readonly string ErrorCardJson = """

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

@@ -41,18 +41,14 @@
                 <Style.Setters>
                     <Setter Property="Margin" Value="0" />
                     <Setter Property="Padding" Value="0" />
-                    <Setter Property="Background" Value="{ThemeResource DesktopAcrylicTransparentBrush}" />
-                    <Setter Property="BorderBrush" Value="{ThemeResource DividerStrokeColorDefaultBrush}" />
                 </Style.Setters>
             </Style>
 
-            <!--  Backdrop requires ShouldConstrainToRootBounds="False"  -->
             <Flyout
                 x:Name="ContextMenuFlyout"
                 FlyoutPresenterStyle="{StaticResource ContextMenuFlyoutStyle}"
                 Opened="ContextMenuFlyout_Opened"
-                ShouldConstrainToRootBounds="False"
-                SystemBackdrop="{ThemeResource AcrylicBackgroundFillColorDefaultBackdrop}">
+                ShouldConstrainToRootBounds="False">
                 <cpcontrols:ContextMenu x:Name="ContextControl" />
             </Flyout>
 

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

@@ -92,7 +92,7 @@ internal sealed partial class TrayIconService
             {
                 _popupMenu = PInvoke.CreatePopupMenu_SafeHandle();
                 PInvoke.InsertMenu(_popupMenu, 0, MENU_ITEM_FLAGS.MF_BYPOSITION | MENU_ITEM_FLAGS.MF_STRING, PInvoke.WM_USER + 1, RS_.GetString("TrayMenu_Settings"));
-                PInvoke.InsertMenu(_popupMenu, 1, MENU_ITEM_FLAGS.MF_BYPOSITION | MENU_ITEM_FLAGS.MF_STRING, PInvoke.WM_USER + 2, RS_.GetString("TrayMenu_Close"));
+                PInvoke.InsertMenu(_popupMenu, 1, MENU_ITEM_FLAGS.MF_BYPOSITION | MENU_ITEM_FLAGS.MF_STRING, PInvoke.WM_USER + 2, RS_.GetString("TrayMenu_Exit"));
             }
         }
         else

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

@@ -419,9 +419,8 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="TrayMenu_Settings" xml:space="preserve">
     <value>Settings</value>
   </data>
-  <data name="TrayMenu_Close" xml:space="preserve">
-    <value>Close</value>
-    <comment>Close as a verb, as in Close the application</comment>
+  <data name="TrayMenu_Exit" xml:space="preserve">
+    <value>Exit</value>
   </data>
   <data name="Settings_ExtensionPage_Alias_ToggleSwitch.OnContent" xml:space="preserve">
     <value>Direct</value>

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Apps.UnitTests/AllAppsCommandProviderTests.cs

@@ -1,119 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Apps.UnitTests;
-
-[TestClass]
-public class AllAppsCommandProviderTests : AppsTestBase
-{
-    [TestMethod]
-    public void ProviderHasDisplayName()
-    {
-        // Setup
-        var provider = new AllAppsCommandProvider();
-
-        // Assert
-        Assert.IsNotNull(provider.DisplayName);
-        Assert.IsTrue(provider.DisplayName.Length > 0);
-    }
-
-    [TestMethod]
-    public void ProviderHasIcon()
-    {
-        // Setup
-        var provider = new AllAppsCommandProvider();
-
-        // Assert
-        Assert.IsNotNull(provider.Icon);
-    }
-
-    [TestMethod]
-    public void TopLevelCommandsNotEmpty()
-    {
-        // Setup
-        var provider = new AllAppsCommandProvider();
-
-        // Act
-        var commands = provider.TopLevelCommands();
-
-        // Assert
-        Assert.IsNotNull(commands);
-        Assert.IsTrue(commands.Length > 0);
-    }
-
-    [TestMethod]
-    public void LookupAppWithEmptyNameReturnsNotNull()
-    {
-        // Setup
-        var mockApp = TestDataHelper.CreateTestWin32Program("Notepad", "C:\\Windows\\System32\\notepad.exe");
-        MockCache.AddWin32Program(mockApp);
-        var page = new AllAppsPage(MockCache);
-
-        var provider = new AllAppsCommandProvider(page);
-
-        // Act
-        var result = provider.LookupApp(string.Empty);
-
-        // Assert
-        Assert.IsNotNull(result);
-    }
-
-    [TestMethod]
-    public async Task ProviderWithMockData_LookupApp_ReturnsCorrectApp()
-    {
-        // Arrange
-        var testApp = TestDataHelper.CreateTestWin32Program("TestApp", "C:\\TestApp.exe");
-        MockCache.AddWin32Program(testApp);
-
-        var provider = new AllAppsCommandProvider(Page);
-
-        // Wait for initialization to complete
-        await WaitForPageInitializationAsync();
-
-        // Act
-        var result = provider.LookupApp("TestApp");
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual("TestApp", result.Title);
-    }
-
-    [TestMethod]
-    public async Task ProviderWithMockData_LookupApp_ReturnsNullForNonExistentApp()
-    {
-        // Arrange
-        var testApp = TestDataHelper.CreateTestWin32Program("TestApp", "C:\\TestApp.exe");
-        MockCache.AddWin32Program(testApp);
-
-        var provider = new AllAppsCommandProvider(Page);
-
-        // Wait for initialization to complete
-        await WaitForPageInitializationAsync();
-
-        // Act
-        var result = provider.LookupApp("NonExistentApp");
-
-        // Assert
-        Assert.IsNull(result);
-    }
-
-    [TestMethod]
-    public void ProviderWithMockData_TopLevelCommands_IncludesListItem()
-    {
-        // Arrange
-        var provider = new AllAppsCommandProvider(Page);
-
-        // Act
-        var commands = provider.TopLevelCommands();
-
-        // Assert
-        Assert.IsNotNull(commands);
-        Assert.IsTrue(commands.Length >= 1); // At least the list item should be present
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Apps.UnitTests/AllAppsPageTests.cs

@@ -1,97 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Apps.UnitTests;
-
-[TestClass]
-public class AllAppsPageTests : AppsTestBase
-{
-    [TestMethod]
-    public void AllAppsPage_Constructor_ThrowsOnNullAppCache()
-    {
-        // Act & Assert
-        Assert.ThrowsException<ArgumentNullException>(() => new AllAppsPage(null!));
-    }
-
-    [TestMethod]
-    public void AllAppsPage_WithMockCache_InitializesSuccessfully()
-    {
-        // Arrange
-        var mockCache = new MockAppCache();
-
-        // Act
-        var page = new AllAppsPage(mockCache);
-
-        // Assert
-        Assert.IsNotNull(page);
-        Assert.IsNotNull(page.Name);
-        Assert.IsNotNull(page.Icon);
-    }
-
-    [TestMethod]
-    public async Task AllAppsPage_GetItems_ReturnsEmptyWithEmptyCache()
-    {
-        // Act - Wait for initialization to complete
-        await WaitForPageInitializationAsync();
-        var items = Page.GetItems();
-
-        // Assert
-        Assert.IsNotNull(items);
-        Assert.AreEqual(0, items.Length);
-    }
-
-    [TestMethod]
-    public async Task AllAppsPage_GetItems_ReturnsAppsFromCacheAsync()
-    {
-        // Arrange
-        var mockCache = new MockAppCache();
-        var win32App = TestDataHelper.CreateTestWin32Program("Notepad", "C:\\Windows\\System32\\notepad.exe");
-        var uwpApp = TestDataHelper.CreateTestUWPApplication("Calculator");
-
-        mockCache.AddWin32Program(win32App);
-        mockCache.AddUWPApplication(uwpApp);
-
-        var page = new AllAppsPage(mockCache);
-
-        // Wait a bit for initialization to complete
-        await Task.Delay(100);
-
-        // Act
-        var items = page.GetItems();
-
-        // Assert
-        Assert.IsNotNull(items);
-        Assert.AreEqual(2, items.Length);
-
-        // we need to loop the items to ensure we got the correct ones
-        Assert.IsTrue(items.Any(i => i.Title == "Notepad"));
-        Assert.IsTrue(items.Any(i => i.Title == "Calculator"));
-    }
-
-    [TestMethod]
-    public async Task AllAppsPage_GetPinnedApps_ReturnsEmptyWhenNoAppsArePinned()
-    {
-        // Arrange
-        var mockCache = new MockAppCache();
-        var app = TestDataHelper.CreateTestWin32Program("TestApp", "C:\\TestApp.exe");
-        mockCache.AddWin32Program(app);
-
-        var page = new AllAppsPage(mockCache);
-
-        // Wait a bit for initialization to complete
-        await Task.Delay(100);
-
-        // Act
-        var pinnedApps = page.GetPinnedApps();
-
-        // Assert
-        Assert.IsNotNull(pinnedApps);
-        Assert.AreEqual(0, pinnedApps.Length);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Apps.UnitTests/AppsTestBase.cs

@@ -1,67 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Threading.Tasks;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Apps.UnitTests;
-
-/// <summary>
-/// Base class for Apps unit tests that provides common setup and teardown functionality.
-/// </summary>
-public abstract class AppsTestBase
-{
-    /// <summary>
-    /// Gets the mock application cache used in tests.
-    /// </summary>
-    protected MockAppCache MockCache { get; private set; } = null!;
-
-    /// <summary>
-    /// Gets the AllAppsPage instance used in tests.
-    /// </summary>
-    protected AllAppsPage Page { get; private set; } = null!;
-
-    /// <summary>
-    /// Sets up the test environment before each test method.
-    /// </summary>
-    /// <returns>A task representing the asynchronous setup operation.</returns>
-    [TestInitialize]
-    public virtual async Task Setup()
-    {
-        MockCache = new MockAppCache();
-        Page = new AllAppsPage(MockCache);
-
-        // Ensure initialization is complete
-        await MockCache.RefreshAsync();
-    }
-
-    /// <summary>
-    /// Cleans up the test environment after each test method.
-    /// </summary>
-    [TestCleanup]
-    public virtual void Cleanup()
-    {
-        MockCache?.Dispose();
-    }
-
-    /// <summary>
-    /// Forces synchronous initialization of the page for testing.
-    /// </summary>
-    protected void EnsurePageInitialized()
-    {
-        // Trigger BuildListItems by accessing items
-        _ = Page.GetItems();
-    }
-
-    /// <summary>
-    /// Waits for page initialization with timeout.
-    /// </summary>
-    /// <param name="timeoutMs">The timeout in milliseconds.</param>
-    /// <returns>A task representing the asynchronous wait operation.</returns>
-    protected async Task WaitForPageInitializationAsync(int timeoutMs = 1000)
-    {
-        await MockCache.RefreshAsync();
-        EnsurePageInitialized();
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Apps.UnitTests/Microsoft.CmdPal.Ext.Apps.UnitTests.csproj

@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-    <RootNamespace>Microsoft.CmdPal.Ext.Apps.UnitTests</RootNamespace>
-    <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal\tests\</OutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Moq" />
-    <PackageReference Include="MSTest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\ext\Microsoft.CmdPal.Ext.Apps\Microsoft.CmdPal.Ext.Apps.csproj" />
-    <ProjectReference Include="..\Microsoft.CmdPal.Ext.UnitTestsBase\Microsoft.CmdPal.Ext.UnitTestBase.csproj" />
-  </ItemGroup>
-</Project>

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Apps.UnitTests/MockAppCache.cs

@@ -1,113 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.CmdPal.Ext.Apps.Programs;
-
-namespace Microsoft.CmdPal.Ext.Apps.UnitTests;
-
-/// <summary>
-/// Mock implementation of IAppCache for unit testing.
-/// </summary>
-public class MockAppCache : IAppCache
-{
-    private readonly List<Win32Program> _win32s = new();
-    private readonly List<IUWPApplication> _uwps = new();
-    private bool _disposed;
-    private bool _shouldReload;
-
-    /// <summary>
-    /// Gets the collection of Win32 programs.
-    /// </summary>
-    public IList<Win32Program> Win32s => _win32s.AsReadOnly();
-
-    /// <summary>
-    /// Gets the collection of UWP applications.
-    /// </summary>
-    public IList<IUWPApplication> UWPs => _uwps.AsReadOnly();
-
-    /// <summary>
-    /// Determines whether the cache should be reloaded.
-    /// </summary>
-    /// <returns>True if cache should be reloaded, false otherwise.</returns>
-    public bool ShouldReload() => _shouldReload;
-
-    /// <summary>
-    /// Resets the reload flag.
-    /// </summary>
-    public void ResetReloadFlag() => _shouldReload = false;
-
-    /// <summary>
-    /// Asynchronously refreshes the cache.
-    /// </summary>
-    /// <returns>A task representing the asynchronous refresh operation.</returns>
-    public async Task RefreshAsync()
-    {
-        // Simulate minimal async operation for testing
-        await Task.Delay(1);
-    }
-
-    /// <summary>
-    /// Adds a Win32 program to the cache.
-    /// </summary>
-    /// <param name="program">The Win32 program to add.</param>
-    /// <exception cref="ArgumentNullException">Thrown when program is null.</exception>
-    public void AddWin32Program(Win32Program program)
-    {
-        ArgumentNullException.ThrowIfNull(program);
-
-        _win32s.Add(program);
-    }
-
-    /// <summary>
-    /// Adds a UWP application to the cache.
-    /// </summary>
-    /// <param name="app">The UWP application to add.</param>
-    /// <exception cref="ArgumentNullException">Thrown when app is null.</exception>
-    public void AddUWPApplication(IUWPApplication app)
-    {
-        ArgumentNullException.ThrowIfNull(app);
-
-        _uwps.Add(app);
-    }
-
-    /// <summary>
-    /// Clears all applications from the cache.
-    /// </summary>
-    public void ClearAll()
-    {
-        _win32s.Clear();
-        _uwps.Clear();
-    }
-
-    /// <summary>
-    /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-    /// </summary>
-    public void Dispose()
-    {
-        Dispose(disposing: true);
-        GC.SuppressFinalize(this);
-    }
-
-    /// <summary>
-    /// Releases unmanaged and - optionally - managed resources.
-    /// </summary>
-    /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-    protected virtual void Dispose(bool disposing)
-    {
-        if (!_disposed)
-        {
-            if (disposing)
-            {
-                // Clean up managed resources
-                _win32s.Clear();
-                _uwps.Clear();
-            }
-
-            _disposed = true;
-        }
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Apps.UnitTests/MockUWPApplication.cs

@@ -1,140 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-using Microsoft.CmdPal.Ext.Apps.Programs;
-using Microsoft.CmdPal.Ext.Apps.Utils;
-using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.Apps.UnitTests;
-
-/// <summary>
-/// Mock implementation of IUWPApplication for unit testing.
-/// </summary>
-public class MockUWPApplication : IUWPApplication
-{
-    /// <summary>
-    /// Gets or sets the app list entry.
-    /// </summary>
-    public string AppListEntry { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Gets or sets the unique identifier.
-    /// </summary>
-    public string UniqueIdentifier { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Gets or sets the display name.
-    /// </summary>
-    public string DisplayName { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Gets or sets the description.
-    /// </summary>
-    public string Description { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Gets or sets the user model ID.
-    /// </summary>
-    public string UserModelId { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Gets or sets the background color.
-    /// </summary>
-    public string BackgroundColor { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Gets or sets the entry point.
-    /// </summary>
-    public string EntryPoint { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the application is enabled.
-    /// </summary>
-    public bool Enabled { get; set; } = true;
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the application can run elevated.
-    /// </summary>
-    public bool CanRunElevated { get; set; }
-
-    /// <summary>
-    /// Gets or sets the logo path.
-    /// </summary>
-    public string LogoPath { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Gets or sets the logo type.
-    /// </summary>
-    public LogoType LogoType { get; set; } = LogoType.Colored;
-
-    /// <summary>
-    /// Gets or sets the UWP package.
-    /// </summary>
-    public UWP Package { get; set; } = null!;
-
-    /// <summary>
-    /// Gets the name of the application.
-    /// </summary>
-    public string Name => DisplayName;
-
-    /// <summary>
-    /// Gets the location of the application.
-    /// </summary>
-    public string Location => Package?.Location ?? string.Empty;
-
-    /// <summary>
-    /// Gets the localized location of the application.
-    /// </summary>
-    public string LocationLocalized => Package?.LocationLocalized ?? string.Empty;
-
-    /// <summary>
-    /// Gets the application identifier.
-    /// </summary>
-    /// <returns>The user model ID of the application.</returns>
-    public string GetAppIdentifier()
-    {
-        return UserModelId;
-    }
-
-    /// <summary>
-    /// Gets the commands available for this application.
-    /// </summary>
-    /// <returns>A list of context items.</returns>
-    public List<IContextItem> GetCommands()
-    {
-        return new List<IContextItem>();
-    }
-
-    /// <summary>
-    /// Updates the logo path based on the specified theme.
-    /// </summary>
-    /// <param name="theme">The theme to use for the logo.</param>
-    public void UpdateLogoPath(Theme theme)
-    {
-        // Mock implementation - no-op for testing
-    }
-
-    /// <summary>
-    /// Converts this UWP application to an AppItem.
-    /// </summary>
-    /// <returns>An AppItem representation of this UWP application.</returns>
-    public AppItem ToAppItem()
-    {
-        var iconPath = LogoType != LogoType.Error ? LogoPath : string.Empty;
-        return new AppItem()
-        {
-            Name = Name,
-            Subtitle = Description,
-            Type = "Packaged Application", // Equivalent to UWPApplication.Type()
-            IcoPath = iconPath,
-            DirPath = Location,
-            UserModelId = UserModelId,
-            IsPackaged = true,
-            Commands = GetCommands(),
-            AppIdentifier = GetAppIdentifier(),
-        };
-    }
-}

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

@@ -1,45 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Linq;
-using Microsoft.CmdPal.Ext.UnitTestBase;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Apps.UnitTests;
-
-[TestClass]
-public class QueryTests : CommandPaletteUnitTestBase
-{
-    [TestMethod]
-    public void QueryReturnsExpectedResults()
-    {
-        // Arrange
-        var mockCache = new MockAppCache();
-        var win32App = TestDataHelper.CreateTestWin32Program("Notepad", "C:\\Windows\\System32\\notepad.exe");
-        var uwpApp = TestDataHelper.CreateTestUWPApplication("Calculator");
-        mockCache.AddWin32Program(win32App);
-        mockCache.AddUWPApplication(uwpApp);
-
-        for (var i = 0; i < 10; i++)
-        {
-            mockCache.AddWin32Program(TestDataHelper.CreateTestWin32Program($"App{i}"));
-            mockCache.AddUWPApplication(TestDataHelper.CreateTestUWPApplication($"UWP App {i}"));
-        }
-
-        var page = new AllAppsPage(mockCache);
-        var provider = new AllAppsCommandProvider(page);
-
-        // Act
-        var allItems = page.GetItems();
-
-        // Assert
-        var notepadResult = Query("notepad", allItems).FirstOrDefault();
-        Assert.IsNotNull(notepadResult);
-        Assert.AreEqual("Notepad", notepadResult.Title);
-
-        var calculatorResult = Query("cal", allItems).FirstOrDefault();
-        Assert.IsNotNull(calculatorResult);
-        Assert.AreEqual("Calculator", calculatorResult.Title);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Apps.UnitTests/Settings.cs

@@ -1,58 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-using Microsoft.CmdPal.Ext.Apps.Helpers;
-
-namespace Microsoft.CmdPal.Ext.Apps.UnitTests;
-
-public class Settings : ISettingsInterface
-{
-    private readonly bool enableStartMenuSource;
-    private readonly bool enableDesktopSource;
-    private readonly bool enableRegistrySource;
-    private readonly bool enablePathEnvironmentVariableSource;
-    private readonly List<string> programSuffixes;
-    private readonly List<string> runCommandSuffixes;
-
-    public Settings(
-        bool enableStartMenuSource = true,
-        bool enableDesktopSource = true,
-        bool enableRegistrySource = true,
-        bool enablePathEnvironmentVariableSource = true,
-        List<string> programSuffixes = null,
-        List<string> runCommandSuffixes = null)
-    {
-        this.enableStartMenuSource = enableStartMenuSource;
-        this.enableDesktopSource = enableDesktopSource;
-        this.enableRegistrySource = enableRegistrySource;
-        this.enablePathEnvironmentVariableSource = enablePathEnvironmentVariableSource;
-        this.programSuffixes = programSuffixes ?? new List<string> { "bat", "appref-ms", "exe", "lnk", "url" };
-        this.runCommandSuffixes = runCommandSuffixes ?? new List<string> { "bat", "appref-ms", "exe", "lnk", "url", "cpl", "msc" };
-    }
-
-    public bool EnableStartMenuSource => enableStartMenuSource;
-
-    public bool EnableDesktopSource => enableDesktopSource;
-
-    public bool EnableRegistrySource => enableRegistrySource;
-
-    public bool EnablePathEnvironmentVariableSource => enablePathEnvironmentVariableSource;
-
-    public List<string> ProgramSuffixes => programSuffixes;
-
-    public List<string> RunCommandSuffixes => runCommandSuffixes;
-
-    public static Settings CreateDefaultSettings() => new Settings();
-
-    public static Settings CreateDisabledSourcesSettings() => new Settings(
-        enableStartMenuSource: false,
-        enableDesktopSource: false,
-        enableRegistrySource: false,
-        enablePathEnvironmentVariableSource: false);
-
-    public static Settings CreateCustomSuffixesSettings() => new Settings(
-        programSuffixes: new List<string> { "exe", "bat" },
-        runCommandSuffixes: new List<string> { "exe", "bat", "cmd" });
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Apps.UnitTests/TestDataHelper.cs

@@ -1,128 +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.CmdPal.Ext.Apps.Programs;
-
-namespace Microsoft.CmdPal.Ext.Apps.UnitTests;
-
-/// <summary>
-/// Helper class to create test data for unit tests.
-/// </summary>
-public static class TestDataHelper
-{
-    /// <summary>
-    /// Creates a test Win32 program with the specified parameters.
-    /// </summary>
-    /// <param name="name">The name of the application.</param>
-    /// <param name="fullPath">The full path to the application executable.</param>
-    /// <param name="enabled">A value indicating whether the application is enabled.</param>
-    /// <param name="valid">A value indicating whether the application is valid.</param>
-    /// <returns>A new Win32Program instance with the specified parameters.</returns>
-    public static Win32Program CreateTestWin32Program(
-        string name = "Test App",
-        string fullPath = "C:\\TestApp\\app.exe",
-        bool enabled = true,
-        bool valid = true)
-    {
-        return new Win32Program
-        {
-            Name = name,
-            FullPath = fullPath,
-            Enabled = enabled,
-            Valid = valid,
-            UniqueIdentifier = $"win32_{name}",
-            Description = $"Test description for {name}",
-            ExecutableName = "app.exe",
-            ParentDirectory = "C:\\TestApp",
-            AppType = Win32Program.ApplicationType.Win32Application,
-        };
-    }
-
-    /// <summary>
-    /// Creates a test UWP application with the specified parameters.
-    /// </summary>
-    /// <param name="displayName">The display name of the application.</param>
-    /// <param name="userModelId">The user model ID of the application.</param>
-    /// <param name="enabled">A value indicating whether the application is enabled.</param>
-    /// <returns>A new IUWPApplication instance with the specified parameters.</returns>
-    public static IUWPApplication CreateTestUWPApplication(
-        string displayName = "Test UWP App",
-        string userModelId = "TestPublisher.TestUWPApp_1.0.0.0_neutral__8wekyb3d8bbwe",
-        bool enabled = true)
-    {
-        return new MockUWPApplication
-        {
-            DisplayName = displayName,
-            UserModelId = userModelId,
-            Enabled = enabled,
-            UniqueIdentifier = $"uwp_{userModelId}",
-            Description = $"Test UWP description for {displayName}",
-            AppListEntry = "default",
-            BackgroundColor = "#000000",
-            EntryPoint = "TestApp.App",
-            CanRunElevated = false,
-            LogoPath = string.Empty,
-            Package = CreateMockUWPPackage(displayName, userModelId),
-        };
-    }
-
-    /// <summary>
-    /// Creates a mock UWP package for testing purposes.
-    /// </summary>
-    /// <param name="displayName">The display name of the package.</param>
-    /// <param name="userModelId">The user model ID of the package.</param>
-    /// <returns>A new UWP package instance.</returns>
-    private static UWP CreateMockUWPPackage(string displayName, string userModelId)
-    {
-        var mockPackage = new MockPackage
-        {
-            Name = displayName,
-            FullName = userModelId,
-            FamilyName = $"{displayName}_8wekyb3d8bbwe",
-            InstalledLocation = $"C:\\Program Files\\WindowsApps\\{displayName}",
-        };
-
-        return new UWP(mockPackage)
-        {
-            Location = mockPackage.InstalledLocation,
-            LocationLocalized = mockPackage.InstalledLocation,
-        };
-    }
-
-    /// <summary>
-    /// Mock implementation of IPackage for testing purposes.
-    /// </summary>
-    private sealed class MockPackage : IPackage
-    {
-        /// <summary>
-        /// Gets or sets the name of the package.
-        /// </summary>
-        public string Name { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets the full name of the package.
-        /// </summary>
-        public string FullName { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets the family name of the package.
-        /// </summary>
-        public string FamilyName { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the package is a framework package.
-        /// </summary>
-        public bool IsFramework { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the package is in development mode.
-        /// </summary>
-        public bool IsDevelopmentMode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the installed location of the package.
-        /// </summary>
-        public string InstalledLocation { get; set; } = string.Empty;
-    }
-}

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

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

@@ -1,535 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
-
-[TestClass]
-public class BookmarkJsonParserTests
-{
-    private BookmarkJsonParser _parser;
-
-    [TestInitialize]
-    public void Setup()
-    {
-        _parser = new BookmarkJsonParser();
-    }
-
-    [TestMethod]
-    public void ParseBookmarks_ValidJson_ReturnsBookmarks()
-    {
-        // Arrange
-        var json = """
-        {
-            "Data": [
-                {
-                    "Name": "Google",
-                    "Bookmark": "https://www.google.com"
-                },
-                {
-                    "Name": "Local File",
-                    "Bookmark": "C:\\temp\\file.txt"
-                }
-            ]
-        }
-        """;
-
-        // Act
-        var result = _parser.ParseBookmarks(json);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(2, result.Data.Count);
-        Assert.AreEqual("Google", result.Data[0].Name);
-        Assert.AreEqual("https://www.google.com", result.Data[0].Bookmark);
-        Assert.AreEqual("Local File", result.Data[1].Name);
-        Assert.AreEqual("C:\\temp\\file.txt", result.Data[1].Bookmark);
-    }
-
-    [TestMethod]
-    public void ParseBookmarks_EmptyJson_ReturnsEmptyBookmarks()
-    {
-        // Arrange
-        var json = "{}";
-
-        // Act
-        var result = _parser.ParseBookmarks(json);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(0, result.Data.Count);
-    }
-
-    [TestMethod]
-    public void ParseBookmarks_NullJson_ReturnsEmptyBookmarks()
-    {
-        // Act
-        var result = _parser.ParseBookmarks(null);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(0, result.Data.Count);
-    }
-
-    [TestMethod]
-    public void ParseBookmarks_WhitespaceJson_ReturnsEmptyBookmarks()
-    {
-        // Act
-        var result = _parser.ParseBookmarks("   ");
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(0, result.Data.Count);
-    }
-
-    [TestMethod]
-    public void ParseBookmarks_EmptyString_ReturnsEmptyBookmarks()
-    {
-        // Act
-        var result = _parser.ParseBookmarks(string.Empty);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(0, result.Data.Count);
-    }
-
-    [TestMethod]
-    public void ParseBookmarks_InvalidJson_ReturnsEmptyBookmarks()
-    {
-        // Arrange
-        var invalidJson = "{invalid json}";
-
-        // Act
-        var result = _parser.ParseBookmarks(invalidJson);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(0, result.Data.Count);
-    }
-
-    [TestMethod]
-    public void ParseBookmarks_MalformedJson_ReturnsEmptyBookmarks()
-    {
-        // Arrange
-        var malformedJson = """
-        {
-            "Data": [
-                {
-                    "Name": "Google",
-                    "Bookmark": "https://www.google.com"
-                },
-                {
-                    "Name": "Incomplete entry"
-        """;
-
-        // Act
-        var result = _parser.ParseBookmarks(malformedJson);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(0, result.Data.Count);
-    }
-
-    [TestMethod]
-    public void ParseBookmarks_JsonWithTrailingCommas_ParsesSuccessfully()
-    {
-        // Arrange - JSON with trailing commas (should be handled by AllowTrailingCommas option)
-        var json = """
-        {
-            "Data": [
-                {
-                    "Name": "Google",
-                    "Bookmark": "https://www.google.com",
-                },
-                {
-                    "Name": "Local File",
-                    "Bookmark": "C:\\temp\\file.txt",
-                },
-            ]
-        }
-        """;
-
-        // Act
-        var result = _parser.ParseBookmarks(json);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(2, result.Data.Count);
-        Assert.AreEqual("Google", result.Data[0].Name);
-        Assert.AreEqual("https://www.google.com", result.Data[0].Bookmark);
-    }
-
-    [TestMethod]
-    public void ParseBookmarks_JsonWithDifferentCasing_ParsesSuccessfully()
-    {
-        // Arrange - JSON with different property name casing (should be handled by PropertyNameCaseInsensitive option)
-        var json = """
-        {
-            "data": [
-                {
-                    "name": "Google",
-                    "bookmark": "https://www.google.com"
-                }
-            ]
-        }
-        """;
-
-        // Act
-        var result = _parser.ParseBookmarks(json);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(1, result.Data.Count);
-        Assert.AreEqual("Google", result.Data[0].Name);
-        Assert.AreEqual("https://www.google.com", result.Data[0].Bookmark);
-    }
-
-    [TestMethod]
-    public void SerializeBookmarks_ValidBookmarks_ReturnsJsonString()
-    {
-        // Arrange
-        var bookmarks = new Bookmarks
-        {
-            Data = new List<BookmarkData>
-            {
-                new BookmarkData { Name = "Google", Bookmark = "https://www.google.com" },
-                new BookmarkData { Name = "Local File", Bookmark = "C:\\temp\\file.txt" },
-            },
-        };
-
-        // Act
-        var result = _parser.SerializeBookmarks(bookmarks);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.IsTrue(result.Contains("Google"));
-        Assert.IsTrue(result.Contains("https://www.google.com"));
-        Assert.IsTrue(result.Contains("Local File"));
-        Assert.IsTrue(result.Contains("C:\\\\temp\\\\file.txt")); // Escaped backslashes in JSON
-        Assert.IsTrue(result.Contains("Data"));
-    }
-
-    [TestMethod]
-    public void SerializeBookmarks_EmptyBookmarks_ReturnsValidJson()
-    {
-        // Arrange
-        var bookmarks = new Bookmarks();
-
-        // Act
-        var result = _parser.SerializeBookmarks(bookmarks);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.IsTrue(result.Contains("Data"));
-        Assert.IsTrue(result.Contains("[]"));
-    }
-
-    [TestMethod]
-    public void SerializeBookmarks_NullBookmarks_ReturnsEmptyString()
-    {
-        // Act
-        var result = _parser.SerializeBookmarks(null);
-
-        // Assert
-        Assert.AreEqual(string.Empty, result);
-    }
-
-    [TestMethod]
-    public void ParseBookmarks_RoundTripSerialization_PreservesData()
-    {
-        // Arrange
-        var originalBookmarks = new Bookmarks
-        {
-            Data = new List<BookmarkData>
-            {
-                new BookmarkData { Name = "Google", Bookmark = "https://www.google.com" },
-                new BookmarkData { Name = "Local File", Bookmark = "C:\\temp\\file.txt" },
-                new BookmarkData { Name = "Placeholder", Bookmark = "Open {file} in editor" },
-            },
-        };
-
-        // Act - Serialize then parse
-        var serializedJson = _parser.SerializeBookmarks(originalBookmarks);
-        var parsedBookmarks = _parser.ParseBookmarks(serializedJson);
-
-        // Assert
-        Assert.IsNotNull(parsedBookmarks);
-        Assert.AreEqual(originalBookmarks.Data.Count, parsedBookmarks.Data.Count);
-
-        for (var i = 0; i < originalBookmarks.Data.Count; i++)
-        {
-            Assert.AreEqual(originalBookmarks.Data[i].Name, parsedBookmarks.Data[i].Name);
-            Assert.AreEqual(originalBookmarks.Data[i].Bookmark, parsedBookmarks.Data[i].Bookmark);
-            Assert.AreEqual(originalBookmarks.Data[i].IsPlaceholder, parsedBookmarks.Data[i].IsPlaceholder);
-        }
-    }
-
-    [TestMethod]
-    public void ParseBookmarks_JsonWithPlaceholderBookmarks_CorrectlyIdentifiesPlaceholders()
-    {
-        // Arrange
-        var json = """
-        {
-            "Data": [
-                {
-                    "Name": "Regular URL",
-                    "Bookmark": "https://www.google.com"
-                },
-                {
-                    "Name": "Placeholder Command",
-                    "Bookmark": "notepad {file}"
-                },
-                {
-                    "Name": "Multiple Placeholders",
-                    "Bookmark": "copy {source} {destination}"
-                }
-            ]
-        }
-        """;
-
-        // Act
-        var result = _parser.ParseBookmarks(json);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(3, result.Data.Count);
-
-        Assert.IsFalse(result.Data[0].IsPlaceholder);
-        Assert.IsTrue(result.Data[1].IsPlaceholder);
-        Assert.IsTrue(result.Data[2].IsPlaceholder);
-    }
-
-    [TestMethod]
-    public void ParseBookmarks_IsWebUrl_CorrectlyIdentifiesWebUrls()
-    {
-        // Arrange
-        var json = """
-        {
-            "Data": [
-                {
-                    "Name": "HTTPS Website",
-                    "Bookmark": "https://www.google.com"
-                },
-                {
-                    "Name": "HTTP Website",
-                    "Bookmark": "http://example.com"
-                },
-                {
-                    "Name": "Website without protocol",
-                    "Bookmark": "www.github.com"
-                },
-                {
-                    "Name": "Local File Path",
-                    "Bookmark": "C:\\Users\\test\\Documents\\file.txt"
-                },
-                {
-                    "Name": "Network Path",
-                    "Bookmark": "\\\\server\\share\\file.txt"
-                },
-                {
-                    "Name": "Executable",
-                    "Bookmark": "notepad.exe"
-                },
-                {
-                    "Name": "File URI",
-                    "Bookmark": "file:///C:/temp/file.txt"
-                }
-            ]
-        }
-        """;
-
-        // Act
-        var result = _parser.ParseBookmarks(json);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(7, result.Data.Count);
-
-        // Web URLs should return true
-        Assert.IsTrue(result.Data[0].IsWebUrl(), "HTTPS URL should be identified as web URL");
-        Assert.IsTrue(result.Data[1].IsWebUrl(), "HTTP URL should be identified as web URL");
-
-        // This case will fail. We need to consider if we need to support pure domain value in bookmark.
-        // Assert.IsTrue(result.Data[2].IsWebUrl(), "Domain without protocol should be identified as web URL");
-
-        // Non-web URLs should return false
-        Assert.IsFalse(result.Data[3].IsWebUrl(), "Local file path should not be identified as web URL");
-        Assert.IsFalse(result.Data[4].IsWebUrl(), "Network path should not be identified as web URL");
-        Assert.IsFalse(result.Data[5].IsWebUrl(), "Executable should not be identified as web URL");
-        Assert.IsFalse(result.Data[6].IsWebUrl(), "File URI should not be identified as web URL");
-    }
-
-    [TestMethod]
-    public void ParseBookmarks_IsPlaceholder_CorrectlyIdentifiesPlaceholders()
-    {
-        // Arrange
-        var json = """
-        {
-            "Data": [
-                {
-                    "Name": "Simple Placeholder",
-                    "Bookmark": "notepad {file}"
-                },
-                {
-                    "Name": "Multiple Placeholders",
-                    "Bookmark": "copy {source} to {destination}"
-                },
-                {
-                    "Name": "Web URL with Placeholder",
-                    "Bookmark": "https://search.com?q={query}"
-                },
-                {
-                    "Name": "Complex Placeholder",
-                    "Bookmark": "cmd /c echo {message} > {output_file}"
-                },
-                {
-                    "Name": "No Placeholder - Regular URL",
-                    "Bookmark": "https://www.google.com"
-                },
-                {
-                    "Name": "No Placeholder - Local File",
-                    "Bookmark": "C:\\temp\\file.txt"
-                },
-                {
-                    "Name": "False Positive - Only Opening Brace",
-                    "Bookmark": "test { incomplete"
-                },
-                {
-                    "Name": "False Positive - Only Closing Brace",
-                    "Bookmark": "test } incomplete"
-                },
-                {
-                    "Name": "Empty Placeholder",
-                    "Bookmark": "command {}"
-                }
-            ]
-        }
-        """;
-
-        // Act
-        var result = _parser.ParseBookmarks(json);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(9, result.Data.Count);
-
-        // Should be identified as placeholders
-        Assert.IsTrue(result.Data[0].IsPlaceholder, "Simple placeholder should be identified");
-        Assert.IsTrue(result.Data[1].IsPlaceholder, "Multiple placeholders should be identified");
-        Assert.IsTrue(result.Data[2].IsPlaceholder, "Web URL with placeholder should be identified");
-        Assert.IsTrue(result.Data[3].IsPlaceholder, "Complex placeholder should be identified");
-        Assert.IsTrue(result.Data[8].IsPlaceholder, "Empty placeholder should be identified");
-
-        // Should NOT be identified as placeholders
-        Assert.IsFalse(result.Data[4].IsPlaceholder, "Regular URL should not be placeholder");
-        Assert.IsFalse(result.Data[5].IsPlaceholder, "Local file should not be placeholder");
-        Assert.IsFalse(result.Data[6].IsPlaceholder, "Only opening brace should not be placeholder");
-        Assert.IsFalse(result.Data[7].IsPlaceholder, "Only closing brace should not be placeholder");
-    }
-
-    [TestMethod]
-    public void ParseBookmarks_MixedProperties_CorrectlyIdentifiesBothWebUrlAndPlaceholder()
-    {
-        // Arrange
-        var json = """
-        {
-            "Data": [
-                {
-                    "Name": "Web URL with Placeholder",
-                    "Bookmark": "https://google.com/search?q={query}"
-                },
-                {
-                    "Name": "Web URL without Placeholder",
-                    "Bookmark": "https://github.com"
-                },
-                {
-                    "Name": "Local File with Placeholder",
-                    "Bookmark": "notepad {file}"
-                },
-                {
-                    "Name": "Local File without Placeholder",
-                    "Bookmark": "C:\\Windows\\notepad.exe"
-                }
-            ]
-        }
-        """;
-
-        // Act
-        var result = _parser.ParseBookmarks(json);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(4, result.Data.Count);
-
-        // Web URL with placeholder
-        Assert.IsTrue(result.Data[0].IsWebUrl(), "Web URL with placeholder should be identified as web URL");
-        Assert.IsTrue(result.Data[0].IsPlaceholder, "Web URL with placeholder should be identified as placeholder");
-
-        // Web URL without placeholder
-        Assert.IsTrue(result.Data[1].IsWebUrl(), "Web URL without placeholder should be identified as web URL");
-        Assert.IsFalse(result.Data[1].IsPlaceholder, "Web URL without placeholder should not be identified as placeholder");
-
-        // Local file with placeholder
-        Assert.IsFalse(result.Data[2].IsWebUrl(), "Local file with placeholder should not be identified as web URL");
-        Assert.IsTrue(result.Data[2].IsPlaceholder, "Local file with placeholder should be identified as placeholder");
-
-        // Local file without placeholder
-        Assert.IsFalse(result.Data[3].IsWebUrl(), "Local file without placeholder should not be identified as web URL");
-        Assert.IsFalse(result.Data[3].IsPlaceholder, "Local file without placeholder should not be identified as placeholder");
-    }
-
-    [TestMethod]
-    public void ParseBookmarks_EdgeCaseUrls_CorrectlyIdentifiesWebUrls()
-    {
-        // Arrange
-        var json = """
-        {
-            "Data": [
-                {
-                    "Name": "FTP URL",
-                    "Bookmark": "ftp://files.example.com"
-                },
-                {
-                    "Name": "HTTPS with port",
-                    "Bookmark": "https://localhost:8080"
-                },
-                {
-                    "Name": "IP Address",
-                    "Bookmark": "http://192.168.1.1"
-                },
-                {
-                    "Name": "Subdomain",
-                    "Bookmark": "https://api.github.com"
-                },
-                {
-                    "Name": "Domain only",
-                    "Bookmark": "example.com"
-                },
-                {
-                    "Name": "Not a URL - no dots",
-                    "Bookmark": "localhost"
-                }
-            ]
-        }
-        """;
-
-        // Act
-        var result = _parser.ParseBookmarks(json);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(6, result.Data.Count);
-
-        Assert.IsFalse(result.Data[0].IsWebUrl(), "FTP URL should not be identified as web URL");
-        Assert.IsTrue(result.Data[1].IsWebUrl(), "HTTPS with port should be identified as web URL");
-        Assert.IsTrue(result.Data[2].IsWebUrl(), "IP Address with HTTP should be identified as web URL");
-        Assert.IsTrue(result.Data[3].IsWebUrl(), "Subdomain should be identified as web URL");
-
-        // This case will fail. We need to consider if we need to support pure domain value in bookmark.
-        // Assert.IsTrue(result.Data[4].IsWebUrl(), "Domain only should be identified as web URL");
-        Assert.IsFalse(result.Data[5].IsWebUrl(), "Single word without dots should not be identified as web URL");
-    }
-}

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

@@ -1,137 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.CmdPal.Ext.Bookmarks;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
-
-[TestClass]
-public class BookmarksCommandProviderTests
-{
-    [TestMethod]
-    public void ProviderHasCorrectId()
-    {
-        // Setup
-        var mockDataSource = new MockBookmarkDataSource();
-        var provider = new BookmarksCommandProvider(mockDataSource);
-
-        // Assert
-        Assert.AreEqual("Bookmarks", provider.Id);
-    }
-
-    [TestMethod]
-    public void ProviderHasDisplayName()
-    {
-        // Setup
-        var mockDataSource = new MockBookmarkDataSource();
-        var provider = new BookmarksCommandProvider(mockDataSource);
-
-        // Assert
-        Assert.IsNotNull(provider.DisplayName);
-        Assert.IsTrue(provider.DisplayName.Length > 0);
-    }
-
-    [TestMethod]
-    public void ProviderHasIcon()
-    {
-        // Setup
-        var provider = new BookmarksCommandProvider();
-
-        // Assert
-        Assert.IsNotNull(provider.Icon);
-    }
-
-    [TestMethod]
-    public void TopLevelCommandsNotEmpty()
-    {
-        // Setup
-        var provider = new BookmarksCommandProvider();
-
-        // Act
-        var commands = provider.TopLevelCommands();
-
-        // Assert
-        Assert.IsNotNull(commands);
-        Assert.IsTrue(commands.Length > 0);
-    }
-
-    [TestMethod]
-    public void ProviderWithMockData_LoadsBookmarksCorrectly()
-    {
-        // Arrange
-        var jsonData = @"{
-            ""Data"": [
-                {
-                    ""Name"": ""Test Bookmark"",
-                    ""Bookmark"": ""https://test.com""
-                },
-                {
-                    ""Name"": ""Another Bookmark"",
-                    ""Bookmark"": ""https://another.com""
-                }
-            ]
-        }";
-
-        var dataSource = new MockBookmarkDataSource(jsonData);
-        var provider = new BookmarksCommandProvider(dataSource);
-
-        // Act
-        var commands = provider.TopLevelCommands();
-
-        // Assert
-        Assert.IsNotNull(commands);
-
-        var addCommand = commands.Where(c => c.Title.Contains("Add bookmark")).FirstOrDefault();
-        var testBookmark = commands.Where(c => c.Title.Contains("Test Bookmark")).FirstOrDefault();
-
-        // Should have three commands：Add + two custom bookmarks
-        Assert.AreEqual(3, commands.Length);
-
-        Assert.IsNotNull(addCommand);
-        Assert.IsNotNull(testBookmark);
-    }
-
-    [TestMethod]
-    public void ProviderWithEmptyData_HasOnlyAddCommand()
-    {
-        // Arrange
-        var dataSource = new MockBookmarkDataSource(@"{ ""Data"": [] }");
-        var provider = new BookmarksCommandProvider(dataSource);
-
-        // Act
-        var commands = provider.TopLevelCommands();
-
-        // Assert
-        Assert.IsNotNull(commands);
-
-        // Only have Add command
-        Assert.AreEqual(1, commands.Length);
-
-        var addCommand = commands.Where(c => c.Title.Contains("Add bookmark")).FirstOrDefault();
-        Assert.IsNotNull(addCommand);
-    }
-
-    [TestMethod]
-    public void ProviderWithInvalidData_HandlesGracefully()
-    {
-        // Arrange
-        var dataSource = new MockBookmarkDataSource("invalid json");
-        var provider = new BookmarksCommandProvider(dataSource);
-
-        // Act
-        var commands = provider.TopLevelCommands();
-
-        // Assert
-        Assert.IsNotNull(commands);
-
-        // Only have one command. Will ignore json parse error.
-        Assert.AreEqual(1, commands.Length);
-
-        var addCommand = commands.Where(c => c.Title.Contains("Add bookmark")).FirstOrDefault();
-        Assert.IsNotNull(addCommand);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests.csproj

@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-    <RootNamespace>Microsoft.CmdPal.Ext.Bookmarks.UnitTests</RootNamespace>
-    <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal\tests\</OutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Moq" />
-    <PackageReference Include="MSTest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\ext\Microsoft.CmdPal.Ext.Bookmark\Microsoft.CmdPal.Ext.Bookmarks.csproj" />
-    <ProjectReference Include="..\Microsoft.CmdPal.Ext.UnitTestsBase\Microsoft.CmdPal.Ext.UnitTestBase.csproj" />
-  </ItemGroup>
-</Project>

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

@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
-
-internal sealed class MockBookmarkDataSource : IBookmarkDataSource
-{
-    private string _jsonData;
-
-    public MockBookmarkDataSource(string initialJsonData = "[]")
-    {
-        _jsonData = initialJsonData;
-    }
-
-    public string GetBookmarkData()
-    {
-        return _jsonData;
-    }
-
-    public void SaveBookmarkData(string jsonData)
-    {
-        _jsonData = jsonData;
-    }
-}

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

@@ -1,55 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Linq;
-using Microsoft.CmdPal.Ext.UnitTestBase;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
-
-[TestClass]
-public class QueryTests : CommandPaletteUnitTestBase
-{
-    [TestMethod]
-    public void ValidateBookmarksCreation()
-    {
-        // Setup
-        var bookmarks = Settings.CreateDefaultBookmarks();
-
-        // Assert
-        Assert.IsNotNull(bookmarks);
-        Assert.IsNotNull(bookmarks.Data);
-        Assert.AreEqual(2, bookmarks.Data.Count);
-    }
-
-    [TestMethod]
-    public void ValidateBookmarkData()
-    {
-        // Setup
-        var bookmarks = Settings.CreateDefaultBookmarks();
-
-        // Act
-        var microsoftBookmark = bookmarks.Data.FirstOrDefault(b => b.Name == "Microsoft");
-        var githubBookmark = bookmarks.Data.FirstOrDefault(b => b.Name == "GitHub");
-
-        // Assert
-        Assert.IsNotNull(microsoftBookmark);
-        Assert.AreEqual("https://www.microsoft.com", microsoftBookmark.Bookmark);
-
-        Assert.IsNotNull(githubBookmark);
-        Assert.AreEqual("https://github.com", githubBookmark.Bookmark);
-    }
-
-    [TestMethod]
-    public void ValidateWebUrlDetection()
-    {
-        // Setup
-        var bookmarks = Settings.CreateDefaultBookmarks();
-        var microsoftBookmark = bookmarks.Data.FirstOrDefault(b => b.Name == "Microsoft");
-
-        // Assert
-        Assert.IsNotNull(microsoftBookmark);
-        Assert.IsTrue(microsoftBookmark.IsWebUrl());
-    }
-}

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

@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
-
-public static class Settings
-{
-    public static Bookmarks CreateDefaultBookmarks()
-    {
-        var bookmarks = new Bookmarks();
-
-        // Add some test bookmarks
-        bookmarks.Data.Add(new BookmarkData
-        {
-            Name = "Microsoft",
-            Bookmark = "https://www.microsoft.com",
-        });
-
-        bookmarks.Data.Add(new BookmarkData
-        {
-            Name = "GitHub",
-            Bookmark = "https://github.com",
-        });
-
-        return bookmarks;
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Calc.UnitTests/CloseOnEnterTests.cs

@@ -1,60 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Globalization;
-using System.Linq;
-using Microsoft.CmdPal.Ext.Calc.Helper;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Windows.Foundation;
-
-namespace Microsoft.CmdPal.Ext.Calc.UnitTests;
-
-[TestClass]
-public class CloseOnEnterTests
-{
-    [TestMethod]
-    public void PrimaryIsCopy_WhenCloseOnEnterTrue()
-    {
-        var settings = new Settings(closeOnEnter: true);
-        TypedEventHandler<object, object> handleSave = (s, e) => { };
-
-        var item = ResultHelper.CreateResult(
-            4m,
-            CultureInfo.CurrentCulture,
-            CultureInfo.CurrentCulture,
-            "2+2",
-            settings,
-            handleSave);
-
-        Assert.IsNotNull(item);
-        Assert.IsInstanceOfType(item.Command, typeof(CopyTextCommand));
-
-        var firstMore = item.MoreCommands.First();
-        Assert.IsInstanceOfType(firstMore, typeof(CommandContextItem));
-        Assert.IsInstanceOfType(((CommandItem)firstMore).Command, typeof(SaveCommand));
-    }
-
-    [TestMethod]
-    public void PrimaryIsSave_WhenCloseOnEnterFalse()
-    {
-        var settings = new Settings(closeOnEnter: false);
-        TypedEventHandler<object, object> handleSave = (s, e) => { };
-
-        var item = ResultHelper.CreateResult(
-            4m,
-            CultureInfo.CurrentCulture,
-            CultureInfo.CurrentCulture,
-            "2+2",
-            settings,
-            handleSave);
-
-        Assert.IsNotNull(item);
-        Assert.IsInstanceOfType(item.Command, typeof(SaveCommand));
-
-        var firstMore = item.MoreCommands.First();
-        Assert.IsInstanceOfType(firstMore, typeof(CommandContextItem));
-        Assert.IsInstanceOfType(((CommandItem)firstMore).Command, typeof(CopyTextCommand));
-    }
-}

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

@@ -19,23 +19,16 @@ public partial class AllAppsCommandProvider : CommandProvider
 
     public static readonly AllAppsPage Page = new();
 
-    private readonly AllAppsPage _page;
     private readonly CommandItem _listItem;
 
     public AllAppsCommandProvider()
-        : this(Page)
     {
-    }
-
-    public AllAppsCommandProvider(AllAppsPage page)
-    {
-        _page = page ?? throw new ArgumentNullException(nameof(page));
         Id = WellKnownId;
         DisplayName = Resources.installed_apps;
         Icon = Icons.AllAppsIcon;
         Settings = AllAppsSettings.Instance.Settings;
 
-        _listItem = new(_page)
+        _listItem = new(Page)
         {
             Subtitle = Resources.search_installed_apps,
             MoreCommands = [new CommandContextItem(AllAppsSettings.Instance.Settings.SettingsPage)],
@@ -45,11 +38,11 @@ public partial class AllAppsCommandProvider : CommandProvider
         PinnedAppsManager.Instance.PinStateChanged += OnPinStateChanged;
     }
 
-    public override ICommandItem[] TopLevelCommands() => [_listItem, .._page.GetPinnedApps()];
+    public override ICommandItem[] TopLevelCommands() => [_listItem, ..Page.GetPinnedApps()];
 
     public ICommandItem? LookupApp(string displayName)
     {
-        var items = _page.GetItems();
+        var items = Page.GetItems();
 
         // We're going to do this search in two directions:
         // First, is this name a substring of any app...

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

@@ -2,7 +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;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -20,20 +19,13 @@ namespace Microsoft.CmdPal.Ext.Apps;
 public sealed partial class AllAppsPage : ListPage
 {
     private readonly Lock _listLock = new();
-    private readonly IAppCache _appCache;
 
     private AppItem[] allApps = [];
     private AppListItem[] unpinnedApps = [];
     private AppListItem[] pinnedApps = [];
 
     public AllAppsPage()
-        : this(AppCache.Instance.Value)
     {
-    }
-
-    public AllAppsPage(IAppCache appCache)
-    {
-        _appCache = appCache ?? throw new ArgumentNullException(nameof(appCache));
         this.Name = Resources.all_apps;
         this.Icon = Icons.AllAppsIcon;
         this.ShowDetails = true;
@@ -67,7 +59,7 @@ public sealed partial class AllAppsPage : ListPage
 
     private void BuildListItems()
     {
-        if (allApps.Length == 0 || _appCache.ShouldReload())
+        if (allApps.Length == 0 || AppCache.Instance.Value.ShouldReload())
         {
             lock (_listLock)
             {
@@ -83,7 +75,7 @@ public sealed partial class AllAppsPage : ListPage
 
                 this.IsLoading = false;
 
-                _appCache.ResetReloadFlag();
+                AppCache.Instance.Value.ResetReloadFlag();
 
                 stopwatch.Stop();
                 Logger.LogTrace($"{nameof(AllAppsPage)}.{nameof(BuildListItems)} took: {stopwatch.ElapsedMilliseconds} ms");
@@ -93,11 +85,11 @@ public sealed partial class AllAppsPage : ListPage
 
     private AppItem[] GetAllApps()
     {
-        var uwpResults = _appCache.UWPs
+        var uwpResults = AppCache.Instance.Value.UWPs
            .Where((application) => application.Enabled)
            .Select(app => app.ToAppItem());
 
-        var win32Results = _appCache.Win32s
+        var win32Results = AppCache.Instance.Value.Win32s
             .Where((application) => application.Enabled && application.Valid)
             .Select(app => app.ToAppItem());
 

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

@@ -5,14 +5,13 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Microsoft.CmdPal.Ext.Apps.Helpers;
 using Microsoft.CmdPal.Ext.Apps.Programs;
 using Microsoft.CmdPal.Ext.Apps.Properties;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.Apps;
 
-public class AllAppsSettings : JsonSettingsManager, ISettingsInterface
+public class AllAppsSettings : JsonSettingsManager
 {
     private static readonly string _namespace = "apps";
 

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

@@ -12,7 +12,7 @@ using Microsoft.CmdPal.Ext.Apps.Utils;
 
 namespace Microsoft.CmdPal.Ext.Apps;
 
-public sealed partial class AppCache : IAppCache, IDisposable
+public sealed partial class AppCache : IDisposable
 {
     private Win32ProgramFileSystemWatchers _win32ProgramRepositoryHelper;
 
@@ -24,7 +24,7 @@ public sealed partial class AppCache : IAppCache, IDisposable
 
     public IList<Win32Program> Win32s => _win32ProgramRepository.Items;
 
-    public IList<IUWPApplication> UWPs => _packageRepository.Items;
+    public IList<UWPApplication> UWPs => _packageRepository.Items;
 
     public static readonly Lazy<AppCache> Instance = new(() => new());
 

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

@@ -26,11 +26,6 @@ public sealed partial class AppCommand : InvokableCommand
 
         Name = Resources.run_command_action;
         Id = GenerateId();
-
-        if (!string.IsNullOrEmpty(app.IcoPath))
-        {
-            Icon = new(app.IcoPath);
-        }
     }
 
     internal static async Task StartApp(string aumid)

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

@@ -1,22 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-
-namespace Microsoft.CmdPal.Ext.Apps.Helpers;
-
-public interface ISettingsInterface
-{
-    public bool EnableStartMenuSource { get; }
-
-    public bool EnableDesktopSource { get; }
-
-    public bool EnableRegistrySource { get; }
-
-    public bool EnablePathEnvironmentVariableSource { get; }
-
-    public List<string> ProgramSuffixes { get; }
-
-    public List<string> RunCommandSuffixes { get; }
-}

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

@@ -1,37 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.CmdPal.Ext.Apps.Programs;
-
-namespace Microsoft.CmdPal.Ext.Apps;
-
-/// <summary>
-/// Interface for application cache that provides access to Win32 and UWP applications.
-/// </summary>
-public interface IAppCache : IDisposable
-{
-    /// <summary>
-    /// Gets the collection of Win32 programs.
-    /// </summary>
-    IList<Win32Program> Win32s { get; }
-
-    /// <summary>
-    /// Gets the collection of UWP applications.
-    /// </summary>
-    IList<IUWPApplication> UWPs { get; }
-
-    /// <summary>
-    /// Determines whether the cache should be reloaded.
-    /// </summary>
-    /// <returns>True if cache should be reloaded, false otherwise.</returns>
-    bool ShouldReload();
-
-    /// <summary>
-    /// Resets the reload flag.
-    /// </summary>
-    void ResetReloadFlag();
-}

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

@@ -1,43 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.Apps.Programs;
-
-/// <summary>
-/// Interface for UWP applications to enable testing and mocking
-/// </summary>
-public interface IUWPApplication : IProgram
-{
-    string AppListEntry { get; set; }
-
-    string DisplayName { get; set; }
-
-    string UserModelId { get; set; }
-
-    string BackgroundColor { get; set; }
-
-    string EntryPoint { get; set; }
-
-    bool CanRunElevated { get; set; }
-
-    string LogoPath { get; set; }
-
-    LogoType LogoType { get; set; }
-
-    UWP Package { get; set; }
-
-    string LocationLocalized { get; }
-
-    string GetAppIdentifier();
-
-    List<IContextItem> GetCommands();
-
-    void UpdateLogoPath(Utils.Theme theme);
-
-    AppItem ToAppItem();
-}

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

@@ -22,7 +22,7 @@ using Theme = Microsoft.CmdPal.Ext.Apps.Utils.Theme;
 namespace Microsoft.CmdPal.Ext.Apps.Programs;
 
 [Serializable]
-public class UWPApplication : IUWPApplication
+public class UWPApplication : IProgram
 {
     private static readonly IFileSystem FileSystem = new FileSystem();
     private static readonly IPath Path = FileSystem.Path;
@@ -517,7 +517,7 @@ public class UWPApplication : IUWPApplication
         }
     }
 
-    public AppItem ToAppItem()
+    internal AppItem ToAppItem()
     {
         var app = this;
         var iconPath = app.LogoType != LogoType.Error ? app.LogoPath : string.Empty;

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Properties/AssemblyInfo.cs

@@ -1,7 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("Microsoft.CmdPal.Ext.Apps.UnitTests")]

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/PackageRepository.cs

@@ -15,7 +15,7 @@ namespace Microsoft.CmdPal.Ext.Apps.Storage;
 /// A repository for storing packaged applications such as UWP apps or appx packaged desktop apps.
 /// This repository will also monitor for changes to the PackageCatalog and update the repository accordingly
 /// </summary>
-internal sealed partial class PackageRepository : ListRepository<IUWPApplication>, IProgramRepository
+internal sealed partial class PackageRepository : ListRepository<UWPApplication>, IProgramRepository
 {
     private readonly IPackageCatalog _packageCatalog;
 

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

@@ -1,45 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-using System.Text.Json;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.Bookmarks;
-
-public class BookmarkJsonParser
-{
-    public BookmarkJsonParser()
-    {
-    }
-
-    public Bookmarks ParseBookmarks(string json)
-    {
-        if (string.IsNullOrWhiteSpace(json))
-        {
-            return new Bookmarks();
-        }
-
-        try
-        {
-            var bookmarks = JsonSerializer.Deserialize<Bookmarks>(json, BookmarkSerializationContext.Default.Bookmarks);
-            return bookmarks ?? new Bookmarks();
-        }
-        catch (JsonException ex)
-        {
-            ExtensionHost.LogMessage($"parse bookmark data failed. ex: {ex.Message}");
-            return new Bookmarks();
-        }
-    }
-
-    public string SerializeBookmarks(Bookmarks? bookmarks)
-    {
-        if (bookmarks == null)
-        {
-            return string.Empty;
-        }
-
-        return JsonSerializer.Serialize(bookmarks, BookmarkSerializationContext.Default.Bookmarks);
-    }
-}

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

@@ -11,4 +11,34 @@ namespace Microsoft.CmdPal.Ext.Bookmarks;
 public sealed class Bookmarks
 {
     public List<BookmarkData> Data { get; set; } = [];
+
+    private static readonly JsonSerializerOptions _jsonOptions = new()
+    {
+        IncludeFields = true,
+    };
+
+    public static Bookmarks ReadFromFile(string path)
+    {
+        var data = new Bookmarks();
+
+        // if the file exists, load it and append the new item
+        if (File.Exists(path))
+        {
+            var jsonStringReading = File.ReadAllText(path);
+
+            if (!string.IsNullOrEmpty(jsonStringReading))
+            {
+                data = JsonSerializer.Deserialize<Bookmarks>(jsonStringReading, BookmarkSerializationContext.Default.Bookmarks) ?? new Bookmarks();
+            }
+        }
+
+        return data;
+    }
+
+    public static void WriteToFile(string path, Bookmarks data)
+    {
+        var jsonString = JsonSerializer.Serialize(data, BookmarkSerializationContext.Default.Bookmarks);
+
+        File.WriteAllText(BookmarksCommandProvider.StateJsonPath(), jsonString);
+    }
 }

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

@@ -20,20 +20,10 @@ public partial class BookmarksCommandProvider : CommandProvider
 
     private readonly AddBookmarkPage _addNewCommand = new(null);
 
-    private readonly IBookmarkDataSource _dataSource;
-    private readonly BookmarkJsonParser _parser;
     private Bookmarks? _bookmarks;
 
     public BookmarksCommandProvider()
-        : this(new FileBookmarkDataSource(StateJsonPath()))
     {
-    }
-
-    internal BookmarksCommandProvider(IBookmarkDataSource dataSource)
-    {
-        _dataSource = dataSource;
-        _parser = new BookmarkJsonParser();
-
         Id = "Bookmarks";
         DisplayName = Resources.bookmarks_display_name;
         Icon = Icons.PinIcon;
@@ -59,14 +49,10 @@ public partial class BookmarksCommandProvider : CommandProvider
 
     private void SaveAndUpdateCommands()
     {
-        try
+        if (_bookmarks is not null)
         {
-            var jsonData = _parser.SerializeBookmarks(_bookmarks);
-            _dataSource.SaveBookmarkData(jsonData);
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"Failed to save bookmarks: {ex.Message}");
+            var jsonPath = BookmarksCommandProvider.StateJsonPath();
+            Bookmarks.WriteToFile(jsonPath, _bookmarks);
         }
 
         LoadCommands();
@@ -96,8 +82,11 @@ public partial class BookmarksCommandProvider : CommandProvider
     {
         try
         {
-            var jsonData = _dataSource.GetBookmarkData();
-            _bookmarks = _parser.ParseBookmarks(jsonData);
+            var jsonFile = StateJsonPath();
+            if (File.Exists(jsonFile))
+            {
+                _bookmarks = Bookmarks.ReadFromFile(jsonFile);
+            }
         }
         catch (Exception ex)
         {

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

@@ -1,49 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.IO;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.Bookmarks;
-
-public class FileBookmarkDataSource : IBookmarkDataSource
-{
-    private readonly string _filePath;
-
-    public FileBookmarkDataSource(string filePath)
-    {
-        _filePath = filePath;
-    }
-
-    public string GetBookmarkData()
-    {
-        if (!File.Exists(_filePath))
-        {
-            return string.Empty;
-        }
-
-        try
-        {
-            return File.ReadAllText(_filePath);
-        }
-        catch (Exception ex)
-        {
-            ExtensionHost.LogMessage($"Read bookmark data failed. ex: {ex.Message}");
-            return string.Empty;
-        }
-    }
-
-    public void SaveBookmarkData(string jsonData)
-    {
-        try
-        {
-            File.WriteAllText(_filePath, jsonData);
-        }
-        catch (Exception ex)
-        {
-            ExtensionHost.LogMessage($"Failed to save bookmark data: {ex}");
-        }
-    }
-}

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

@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-namespace Microsoft.CmdPal.Ext.Bookmarks;
-
-public interface IBookmarkDataSource
-{
-    string GetBookmarkData();
-
-    void SaveBookmarkData(string jsonData);
-}

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

@@ -1,7 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("Microsoft.CmdPal.Ext.Bookmarks.UnitTests")]

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

@@ -1194,15 +1194,6 @@ namespace Microsoft.CmdPal.Ext.WindowsSettings.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Dark mode.
-        /// </summary>
-        internal static string DarkMode {
-            get {
-                return ResourceManager.GetString("DarkMode", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Data usage.
         /// </summary>
@@ -2130,6 +2121,15 @@ namespace Microsoft.CmdPal.Ext.WindowsSettings.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Light Switch.
+        /// </summary>
+        internal static string LightSwitch {
+            get {
+                return ResourceManager.GetString("LightSwitch", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Local Computer Policy.
         /// </summary>

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

@@ -572,8 +572,8 @@
   <data name="DarkColor" xml:space="preserve">
     <value>Dark color</value>
   </data>
-  <data name="DarkMode" xml:space="preserve">
-    <value>Dark mode</value>
+  <data name="LightSwitch" xml:space="preserve">
+    <value>Light Switch</value>
   </data>
   <data name="DataUsage" xml:space="preserve">
     <value>Data usage</value>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Pages/ProfilesListPage.cs

@@ -8,6 +8,7 @@ using Microsoft.CmdPal.Ext.WindowsTerminal.Helpers;
 using Microsoft.CmdPal.Ext.WindowsTerminal.Properties;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.UI.Xaml.Media.Imaging;
 
 namespace Microsoft.CmdPal.Ext.WindowsTerminal.Pages;
 
@@ -15,6 +16,7 @@ internal sealed partial class ProfilesListPage : ListPage
 {
     private readonly TerminalQuery _terminalQuery = new();
     private readonly SettingsManager _terminalSettings;
+    private readonly Dictionary<string, BitmapImage> _logoCache = [];
 
     private bool showHiddenProfiles;
     private bool openNewTab;
@@ -52,6 +54,14 @@ internal sealed partial class ProfilesListPage : ListPage
                 MoreCommands = [
                     new CommandContextItem(new LaunchProfileAsAdminCommand(profile.Terminal.AppUserModelId, profile.Name, openNewTab, openQuake)),
                 ],
+
+                // Icon = () => GetLogo(profile.Terminal),
+                // Action = _ =>
+                // {
+                //    Launch(profile.Terminal.AppUserModelId, profile.Name);
+                //    return true;
+                // },
+                // ContextData = profile,
 #pragma warning restore SA1108
             });
         }
@@ -60,4 +70,17 @@ internal sealed partial class ProfilesListPage : ListPage
     }
 
     public override IListItem[] GetItems() => Query().ToArray();
+
+    private BitmapImage GetLogo(TerminalPackage terminal)
+    {
+        var aumid = terminal.AppUserModelId;
+
+        if (!_logoCache.TryGetValue(aumid, out var value))
+        {
+            value = terminal.GetLogo();
+            _logoCache.Add(aumid, value);
+        }
+
+        return value;
+    }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/TerminalPackage.cs

@@ -5,6 +5,7 @@
 using System;
 using System.IO;
 using ManagedCommon;
+using Microsoft.UI.Xaml.Media.Imaging;
 
 // using Wox.Infrastructure.Image;
 namespace Microsoft.CmdPal.Ext.WindowsTerminal;
@@ -29,4 +30,23 @@ public class TerminalPackage
         SettingsPath = settingsPath;
         LogoPath = logoPath;
     }
+
+    public BitmapImage GetLogo()
+    {
+        var image = new BitmapImage();
+
+        if (File.Exists(LogoPath))
+        {
+            using var fileStream = File.OpenRead(LogoPath);
+            image.SetSource(fileStream.AsRandomAccessStream());
+        }
+        else
+        {
+            // Not using wox anymore, TODO: find the right new way to handle this
+            // image.UriSource = new Uri(ImageLoader.ErrorIconPath);
+            Logger.LogError($"Logo file not found: {LogoPath}");
+        }
+
+        return image;
+    }
 }

src/modules/cmdpal/ext/ProcessMonitorExtension/ProcessMonitorExtension.csproj

@@ -31,10 +31,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup>
-	<PackageReference Include="Microsoft.WindowsAppSDK" />
-  </ItemGroup>
-
   <!--
     Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
     Tools extension to be activated for this project even if the Windows App SDK Nuget

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

@@ -225,6 +225,11 @@ internal sealed partial class SampleContentForm : FormContent
                     }
                 ]
             }
+        },
+        {
+            "type": "Action.OpenUrl",
+            "title": "Action.OpenUrl",
+            "url": "https://adaptivecards.microsoft.com/"
         }
     ]
 }

src/modules/cmdpal/ext/SamplePagesExtension/SamplePagesExtension.csproj

@@ -34,7 +34,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" />
     <PackageReference Include="Microsoft.Windows.CsWin32">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

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

@@ -65,32 +65,12 @@ public partial class ListHelpers
     public static void InPlaceUpdateList<T>(IList<T> original, IEnumerable<T> newContents)
         where T : class
     {
-        InPlaceUpdateList(original, newContents, out _);
-    }
-
-    /// <summary>
-    /// Modifies the contents of `original` in-place, to match those of
-    /// `newContents`. The canonical use being:
-    /// ```cs
-    /// ListHelpers.InPlaceUpdateList(FilteredItems, FilterList(ItemsToFilter, TextToFilterOn));
-    /// ```
-    /// </summary>
-    /// <typeparam name="T">Any type that can be compared for equality</typeparam>
-    /// <param name="original">Collection to modify</param>
-    /// <param name="newContents">The enumerable which `original` should match</param>
-    /// <param name="removedItems">List of items that were removed from the original collection</param>
-    public static void InPlaceUpdateList<T>(IList<T> original, IEnumerable<T> newContents, out List<T> removedItems)
-        where T : class
-    {
-        removedItems = [];
-
         // we're not changing newContents - stash this so we don't re-evaluate it every time
         var numberOfNew = newContents.Count();
 
         // Short circuit - new contents should just be empty
         if (numberOfNew == 0)
         {
-            removedItems.AddRange(original);
             original.Clear();
             return;
         }
@@ -112,7 +92,6 @@ public partial class ListHelpers
                     for (var k = i; k < j; k++)
                     {
                         // This item from the original list was not in the new list. Remove it.
-                        removedItems.Add(original[i]);
                         original.RemoveAt(i);
                     }
 
@@ -141,7 +120,6 @@ public partial class ListHelpers
         while (original.Count > numberOfNew)
         {
             // RemoveAtEnd
-            removedItems.Add(original[original.Count - 1]);
             original.RemoveAt(original.Count - 1);
         }
 

src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Microsoft.CommandPalette.Extensions.Toolkit.csproj

@@ -41,6 +41,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.WindowsAppSDK" />
+    <PackageReference Include="Microsoft.Web.WebView2" />
     <PackageReference Include="System.Drawing.Common" />
     <!-- This line forces the WebView2 version used by Windows App SDK to be the one we expect from Directory.Packages.props . -->
   </ItemGroup>