schema change

2025-12-30 17:07:23 +01:00 · 2025-07-29 09:33:22 +08:00
427 changed files with 3582 additions and 22276 deletions
--- a/.github/actions/spell-check/allow/code.txt
+++ b/.github/actions/spell-check/allow/code.txt
@@ -288,6 +288,3 @@ CACHEWRITE
 MRUCMPPROC
 MRUINFO
 REGSTR
-
-# Misc Win32 APIs and PInvokes
-INVOKEIDLIST
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -115,7 +115,6 @@ bigbar
 bigobj
 binlog
 binres
-binskim
 BITMAPFILEHEADER
 bitmapimage
 BITMAPINFO
@@ -256,7 +255,6 @@ Corpor
 cotaskmem
 COULDNOT
 countof
-covrun
 cpcontrols
 cph
 cplusplus
@@ -637,7 +635,6 @@ hmodule
 hmonitor
 homies
 homljgmgpmcbpjbnjpfijnhipfkiclkd
-HOOKPROC
 HORZRES
 HORZSIZE
 Hostbackdropbrush
@@ -972,7 +969,6 @@ msc
 mscorlib
 msctls
 msdata
-msdia
 MSDL
 MSGFLT
 MSHCTX
@@ -1444,7 +1440,6 @@ secpol
 securestring
 SEEMASKINVOKEIDLIST
 SELCHANGE
-selfhost
 SENDCHANGE
 sendvirtualinput
 serverside
@@ -1884,7 +1879,6 @@ winexe
 winforms
 winget
 wingetcreate
-wingetpkgs
 Winhook
 WINL
 winlogon
--- a/.github/workflows/msstore-submissions.yml
+++ b/.github/workflows/msstore-submissions.yml
@@ -17,7 +17,7 @@ jobs:
    steps:
      - name: BODGY - Set up Gnome Keyring for future Cert Auth
        run: |-
-          sudo apt-get update && sudo apt-get install -y gnome-keyring
+          sudo apt-get install -y gnome-keyring
          export $(dbus-launch --sh-syntax)
          export $(echo 'anypass_just_to_unlock' | gnome-keyring-daemon --unlock)
          export $(echo 'anypass_just_to_unlock' | gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh)
--- a/.pipelines/v2/release.yml
+++ b/.pipelines/v2/release.yml
@@ -64,10 +64,6 @@ extends:
      tsa:
        enabled: true
        configFile: '$(Build.SourcesDirectory)\.pipelines\tsa.json'
-      binskim:
-        enabled: true
-        # Exclude every dll/exe in tests/*, as well as all msdia*, covrun* and vcruntime*
-        analyzeTargetGlob: +:file|$(Build.ArtifactStagingDirectory)/**/*.dll;+:file|$(Build.ArtifactStagingDirectory)/**/*.exe;-:file:regex|tests.*\.(dll|exe)$;-:file:regex|(covrun.*)\.dll$;-:file:regex|(msdia.*)\.dll$;-:file:regex|(vcruntime.*)\.dll$

    stages:
      - stage: Build
--- a/.pipelines/v2/templates/job-build-ui-tests.yml
+++ b/.pipelines/v2/templates/job-build-ui-tests.yml
@@ -123,7 +123,7 @@ jobs:
    displayName: Stage UI Test Build Outputs
    inputs:
      sourceFolder: '$(Build.SourcesDirectory)'
-      contents: '**/$(BuildPlatform)/$(BuildConfiguration)/tests/**/*'
+      contents: '$(BuildPlatform)/$(BuildConfiguration)/**/*'
      targetFolder: '$(JobOutputDirectory)\$(BuildPlatform)\$(BuildConfiguration)'

  - publish: $(JobOutputDirectory)
--- a/.pipelines/v2/templates/job-test-project.yml
+++ b/.pipelines/v2/templates/job-test-project.yml
@@ -11,14 +11,12 @@ parameters:
  - name: useLatestWebView2
    type: boolean
    default: false
-  - name: buildSource
-    type: string
-    default: "latestMainOfficialBuild"
-    displayName: "Build Source"
-  - name: specificBuildId
-    type: string
-    default: "xxxx"
-    displayName: "Build ID (for specific builds)"
+  - name: useLatestOfficialBuild
+    type: boolean
+    default: true
+  - name: useCurrentBranchBuild
+    type: boolean
+    default: false
  - name: uiTestModules
    type: object
    default: []
@@ -115,17 +113,16 @@ jobs:
      & '$(build.sourcesdirectory)\.pipelines\InstallWinAppDriver.ps1'
    displayName: Download and install WinAppDriver

-  - ${{ if ne(parameters.buildSource, 'buildNow') }}:
+  - ${{ if eq(parameters.useLatestOfficialBuild, true) }}:
    - task: DownloadPipelineArtifact@2
      inputs:
        buildType: 'specific'
        project: 'Dart'
        definition: '76541'
-        ${{ if eq(parameters.buildSource, 'specificBuildId') }}:
-          buildVersionToDownload: 'specific'
-          buildId: '${{ parameters.specificBuildId }}'
+        buildVersionToDownload: 'latestFromBranch'
+        ${{ if eq(parameters.useCurrentBranchBuild, true) }}:
+          branchName: '$(Build.SourceBranch)'
        ${{ else }}:
-          buildVersionToDownload: 'latestFromBranch'
          branchName: 'refs/heads/main'
        artifactName: 'build-$(BuildPlatform)-Release'
        targetPath: '$(Build.ArtifactStagingDirectory)'
@@ -136,7 +133,7 @@ jobs:
          patterns: |
            **/PowerToysSetup*.exe

-  - ${{ if ne(parameters.buildSource, 'buildNow') }}:
+  - ${{ if eq(parameters.useLatestOfficialBuild, true) }}:
    - ${{ if eq(parameters.installMode, 'peruser') }}:
      - pwsh: |-
          & "$(build.sourcesdirectory)\.pipelines\installPowerToys.ps1" -InstallMode "PerUser"
@@ -172,7 +169,7 @@ jobs:
          !**\UITests-FancyZones\**\UITests-FancyZonesEditor.dll
      env:
        platform: '$(TestPlatform)'
-        useInstallerForTest: ${{ ne(parameters.buildSource, 'buildNow') }}
+        useInstallerForTest: ${{ parameters.useLatestOfficialBuild }}

  - ${{ if ne(length(parameters.uiTestModules), 0) }}:
    - ${{ each module in parameters.uiTestModules }}:
@@ -194,4 +191,4 @@ jobs:
            !**\UITests-FancyZones\**\UITests-FancyZonesEditor.dll
        env:
          platform: '$(TestPlatform)'
-          useInstallerForTest: ${{ ne(parameters.buildSource, 'buildNow') }}
+          useInstallerForTest: ${{ parameters.useLatestOfficialBuild }}
--- a/.pipelines/v2/templates/pipeline-ui-tests-automation.yml
+++ b/.pipelines/v2/templates/pipeline-ui-tests-automation.yml
@@ -19,40 +19,155 @@ parameters:
  - name: useLatestWebView2
    type: boolean
    default: false
-  - name: buildSource
-    type: string
-    default: "latestMainOfficialBuild"
-    displayName: "Build Source"
-    values:
-      - latestMainOfficialBuild
-      - buildNow
-      - specificBuildId
-  - name: specificBuildId
-    type: string
-    default: 'xxxx'
-    displayName: "Build ID (only used when Build Source = specificBuildId)"
+  - name: useLatestOfficialBuild
+    type: boolean
+    default: true
+  - name: testBothInstallModes
+    type: boolean
+    default: true
+  - name: useCurrentBranchBuild
+    type: boolean
+    default: false
  - name: uiTestModules
    type: object
    default: []

 stages:
  - ${{ each platform in parameters.buildPlatforms }}:
-    # Full build path: build PowerToys + UI tests + run tests
-    - ${{ if eq(parameters.buildSource, 'buildNow') }}:
-      - template: pipeline-ui-tests-full-build.yml
-        parameters:
-          platform: ${{ platform }}
-          enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
-          useVSPreview: ${{ parameters.useVSPreview }}
-          useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-          uiTestModules: ${{ parameters.uiTestModules }}
+    - ${{ if eq(parameters.useLatestOfficialBuild, false) }}:
+      - stage: Build_${{ platform }}
+        displayName: Build ${{ platform }}
+        dependsOn: []
+        jobs:
+          - template: job-build-project.yml
+            parameters:
+              pool:
+                ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
+                  name: SHINE-INT-L
+                ${{ else }}:
+                  name: SHINE-OSS-L
+                ${{ if eq(parameters.useVSPreview, true) }}:
+                  demands: ImageOverride -equals SHINE-VS17-Preview
+              buildPlatforms:
+                - ${{ platform }}
+              buildConfigurations: [Release]
+              enablePackageCaching: true
+              enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+              runTests: false
+              buildTests: true
+              useVSPreview: ${{ parameters.useVSPreview }}
+              timeoutInMinutes: 90

-    # Official build path: build UI tests only + download official build + run tests  
-    - ${{ if ne(parameters.buildSource, 'buildNow') }}:
-      - template: pipeline-ui-tests-official-build.yml
-        parameters:
-          platform: ${{ platform }}
-          buildSource: ${{ parameters.buildSource }}
-          specificBuildId: ${{ parameters.specificBuildId }}
-          useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-          uiTestModules: ${{ parameters.uiTestModules }}
+    - ${{ if eq(parameters.useLatestOfficialBuild, true) }}:
+      - stage: BuildUITests_${{ platform }}
+        displayName: Build UI Tests Only
+        dependsOn: []
+        jobs:
+          - template: job-build-ui-tests.yml
+            parameters:
+              pool:
+                ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
+                  name: SHINE-INT-L
+                ${{ else }}:
+                  name: SHINE-OSS-L
+                ${{ if eq(parameters.useVSPreview, true) }}:
+                  demands: ImageOverride -equals SHINE-VS17-Preview
+              buildPlatforms:
+                - ${{ platform }}
+              uiTestModules: ${{ parameters.uiTestModules }}
+
+    - ${{ if eq(platform, 'x64') }}:
+      - stage: Test_x64Win10
+        displayName: Test x64Win10
+        ${{ if eq(parameters.useLatestOfficialBuild, true) }}:
+          dependsOn:
+            - BuildUITests_${{ platform }}
+        ${{ else }}:
+          dependsOn:
+            - Build_${{ platform }}
+        jobs:
+            - template: job-test-project.yml
+              parameters:
+                platform: x64Win10
+                configuration: Release
+                useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+                useLatestOfficialBuild: ${{ parameters.useLatestOfficialBuild }}
+                useCurrentBranchBuild: ${{ parameters.useCurrentBranchBuild }}
+                uiTestModules: ${{ parameters.uiTestModules }}
+
+            # Additional per-user installation test (when both modes are enabled)
+            - ${{ if and(eq(parameters.useLatestOfficialBuild, true), eq(parameters.testBothInstallModes, true)) }}:
+              - template: job-test-project.yml
+                parameters:
+                  platform: x64Win10
+                  configuration: Release
+                  useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+                  useLatestOfficialBuild: ${{ parameters.useLatestOfficialBuild }}
+                  useCurrentBranchBuild: ${{ parameters.useCurrentBranchBuild }}
+                  uiTestModules: ${{ parameters.uiTestModules }}
+                  installMode: 'peruser'
+                  jobSuffix: '_PerUser'
+
+    - ${{ if eq(platform, 'x64') }}:
+      - stage: Test_x64Win11
+        displayName: Test x64Win11
+        ${{ if eq(parameters.useLatestOfficialBuild, true) }}:
+          dependsOn:
+            - BuildUITests_${{ platform }}
+        ${{ else }}:
+          dependsOn:
+            - Build_${{ platform }}
+        jobs:
+            - template: job-test-project.yml
+              parameters:
+                platform: x64Win11
+                configuration: Release
+                useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+                useLatestOfficialBuild: ${{ parameters.useLatestOfficialBuild }}
+                useCurrentBranchBuild: ${{ parameters.useCurrentBranchBuild }}
+                uiTestModules: ${{ parameters.uiTestModules }}
+
+            # Additional per-user installation test (when both modes are enabled)
+            - ${{ if and(eq(parameters.useLatestOfficialBuild, true), eq(parameters.testBothInstallModes, true)) }}:
+              - template: job-test-project.yml
+                parameters:
+                  platform: x64Win11
+                  configuration: Release
+                  useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+                  useLatestOfficialBuild: ${{ parameters.useLatestOfficialBuild }}
+                  useCurrentBranchBuild: ${{ parameters.useCurrentBranchBuild }}
+                  uiTestModules: ${{ parameters.uiTestModules }}
+                  installMode: 'peruser'
+                  jobSuffix: '_PerUser'
+
+    - ${{ if ne(platform, 'x64') }}:
+      - stage: Test_${{ platform }}
+        displayName: Test ${{ platform }}
+        ${{ if eq(parameters.useLatestOfficialBuild, true) }}:
+          dependsOn:
+            - BuildUITests_${{ platform }}
+        ${{ else }}:
+          dependsOn:
+            - Build_${{ platform }}
+        jobs:
+          - template: job-test-project.yml
+            parameters:
+              platform: ${{ platform }}
+              configuration: Release
+              useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+              useLatestOfficialBuild: ${{ parameters.useLatestOfficialBuild }}
+              useCurrentBranchBuild: ${{ parameters.useCurrentBranchBuild }}
+              uiTestModules: ${{ parameters.uiTestModules }}
+
+          # Additional per-user installation test (when both modes are enabled)
+          - ${{ if and(eq(parameters.useLatestOfficialBuild, true), eq(parameters.testBothInstallModes, true)) }}:
+            - template: job-test-project.yml
+              parameters:
+                platform: ${{ platform }}
+                configuration: Release
+                useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+                useLatestOfficialBuild: ${{ parameters.useLatestOfficialBuild }}
+                useCurrentBranchBuild: ${{ parameters.useCurrentBranchBuild }}
+                uiTestModules: ${{ parameters.uiTestModules }}
+                installMode: 'peruser'
+                jobSuffix: '_PerUser'
--- a/.pipelines/v2/templates/pipeline-ui-tests-full-build.yml
+++ b/.pipelines/v2/templates/pipeline-ui-tests-full-build.yml
@@ -1,80 +0,0 @@
-# Template for full build path: Build PowerToys + Build UI Tests + Run Tests
-parameters:
-  - name: platform
-    type: string
-  - name: enableMsBuildCaching
-    type: boolean
-    default: false
-  - name: useVSPreview
-    type: boolean
-    default: false
-  - name: useLatestWebView2
-    type: boolean
-    default: false
-  - name: uiTestModules
-    type: object
-    default: []
-
-stages:
-  # Stage 1: Build full PowerToys project
-  - stage: Build_${{ parameters.platform }}
-    displayName: Build PowerToys ${{ parameters.platform }}
-    dependsOn: []
-    jobs:
-      - template: job-build-project.yml
-        parameters:
-          pool:
-            ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
-              name: SHINE-INT-L
-            ${{ else }}:
-              name: SHINE-OSS-L
-            ${{ if eq(parameters.useVSPreview, true) }}:
-              demands: ImageOverride -equals SHINE-VS17-Preview
-          buildPlatforms:
-            - ${{ parameters.platform }}
-          buildConfigurations: [Release]
-          enablePackageCaching: true
-          enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
-          runTests: false
-          buildTests: true
-          useVSPreview: ${{ parameters.useVSPreview }}
-          timeoutInMinutes: 90
-
-  # Stage 2: Run UI Tests
-  - ${{ if eq(parameters.platform, 'x64') }}:
-    - stage: Test_x64Win10_FullBuild
-      displayName: Test x64Win10 (Full Build)
-      dependsOn: Build_${{ parameters.platform }}
-      jobs:
-        - template: job-test-project.yml
-          parameters:
-            platform: x64Win10
-            configuration: Release
-            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-            buildSource: 'buildNow'
-            uiTestModules: ${{ parameters.uiTestModules }}
-
-    - stage: Test_x64Win11_FullBuild
-      displayName: Test x64Win11 (Full Build)
-      dependsOn: Build_${{ parameters.platform }}
-      jobs:
-        - template: job-test-project.yml
-          parameters:
-            platform: x64Win11
-            configuration: Release
-            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-            buildSource: 'buildNow'
-            uiTestModules: ${{ parameters.uiTestModules }}
-
-  - ${{ if ne(parameters.platform, 'x64') }}:
-    - stage: Test_${{ parameters.platform }}_FullBuild
-      displayName: Test ${{ parameters.platform }} (Full Build)
-      dependsOn: Build_${{ parameters.platform }}
-      jobs:
-        - template: job-test-project.yml
-          parameters:
-            platform: ${{ parameters.platform }}
-            configuration: Release
-            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-            buildSource: 'buildNow'
-            uiTestModules: ${{ parameters.uiTestModules }}
--- a/.pipelines/v2/templates/pipeline-ui-tests-official-build.yml
+++ b/.pipelines/v2/templates/pipeline-ui-tests-official-build.yml
@@ -1,110 +0,0 @@
-# Template for official build path: Download Official Build + Build UI Tests Only + Run Tests
-parameters:
-  - name: platform
-    type: string
-  - name: buildSource
-    type: string
-  - name: specificBuildId
-    type: string
-    default: 'xxxx'
-  - name: useLatestWebView2
-    type: boolean
-    default: false
-  - name: uiTestModules
-    type: object
-    default: []
-
-stages:
-  # Stage 1: Build UI Tests Only
-  - stage: BuildUITests_${{ parameters.platform }}
-    displayName: Build UI Tests Only ${{ parameters.platform }}
-    dependsOn: []
-    jobs:
-      - template: job-build-ui-tests.yml
-        parameters:
-          pool:
-            ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
-              name: SHINE-INT-L
-            ${{ else }}:
-              name: SHINE-OSS-L
-          buildPlatforms:
-            - ${{ parameters.platform }}
-          uiTestModules: ${{ parameters.uiTestModules }}
-
-  # Stage 2: Run UI Tests with Official Build
-  - ${{ if eq(parameters.platform, 'x64') }}:
-    - stage: Test_x64Win10_OfficialBuild
-      displayName: Test x64Win10 (Official Build)
-      dependsOn: BuildUITests_${{ parameters.platform }}
-      jobs:
-        - template: job-test-project.yml
-          parameters:
-            platform: x64Win10
-            configuration: Release
-            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-            buildSource: ${{ parameters.buildSource }}
-            specificBuildId: ${{ parameters.specificBuildId }}
-            uiTestModules: ${{ parameters.uiTestModules }}
-
-        # Additional per-user installation test
-        - template: job-test-project.yml
-          parameters:
-            platform: x64Win10
-            configuration: Release
-            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-            buildSource: ${{ parameters.buildSource }}
-            specificBuildId: ${{ parameters.specificBuildId }}
-            uiTestModules: ${{ parameters.uiTestModules }}
-            installMode: 'peruser'
-            jobSuffix: '_PerUser'
-
-    - stage: Test_x64Win11_OfficialBuild
-      displayName: Test x64Win11 (Official Build)
-      dependsOn: BuildUITests_${{ parameters.platform }}
-      jobs:
-        - template: job-test-project.yml
-          parameters:
-            platform: x64Win11
-            configuration: Release
-            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-            buildSource: ${{ parameters.buildSource }}
-            specificBuildId: ${{ parameters.specificBuildId }}
-            uiTestModules: ${{ parameters.uiTestModules }}
-
-        # Additional per-user installation test
-        - template: job-test-project.yml
-          parameters:
-            platform: x64Win11
-            configuration: Release
-            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-            buildSource: ${{ parameters.buildSource }}
-            specificBuildId: ${{ parameters.specificBuildId }}
-            uiTestModules: ${{ parameters.uiTestModules }}
-            installMode: 'peruser'
-            jobSuffix: '_PerUser'
-
-  - ${{ if ne(parameters.platform, 'x64') }}:
-    - stage: Test_${{ parameters.platform }}_OfficialBuild
-      displayName: Test ${{ parameters.platform }} (Official Build)
-      dependsOn: BuildUITests_${{ parameters.platform }}
-      jobs:
-        - template: job-test-project.yml
-          parameters:
-            platform: ${{ parameters.platform }}
-            configuration: Release
-            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-            buildSource: ${{ parameters.buildSource }}
-            specificBuildId: ${{ parameters.specificBuildId }}
-            uiTestModules: ${{ parameters.uiTestModules }}
-
-        # Additional per-user installation test
-        - template: job-test-project.yml
-          parameters:
-            platform: ${{ parameters.platform }}
-            configuration: Release
-            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-            buildSource: ${{ parameters.buildSource }}
-            specificBuildId: ${{ parameters.specificBuildId }}
-            uiTestModules: ${{ parameters.uiTestModules }}
-            installMode: 'peruser'
-            jobSuffix: '_PerUser'
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -34,22 +34,22 @@
    <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
    <PackageVersion Include="MessagePack" Version="3.1.3" />
    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.7" />
    <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.7" />
    <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.7" />
    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.15.0" />
    <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
    <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.7" />
    <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.7" />
    <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.183" />
    <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
    <!-- 
@@ -78,28 +78,28 @@
    <PackageVersion Include="StreamJsonRpc" Version="2.21.69" />
    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
    <!-- Package System.CodeDom added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Management but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.CodeDom" Version="9.0.8" />
+    <PackageVersion Include="System.CodeDom" Version="9.0.7" />
    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.8" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.8" />
-    <PackageVersion Include="System.Data.OleDb" Version="9.0.8" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.7" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.7" />
+    <PackageVersion Include="System.Data.OleDb" Version="9.0.7" />
    <!-- Package System.Data.SqlClient added to force it as a dependency of Microsoft.Windows.Compatibility to the latest version available at this time. -->
    <PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
    <!-- Package System.Diagnostics.EventLog added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Data.OleDb but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.8" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.7" />
    <!-- Package System.Diagnostics.PerformanceCounter added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.11. -->
-    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.8" />
-    <PackageVersion Include="System.Drawing.Common" Version="9.0.8" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.7" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.7" />
    <PackageVersion Include="System.IO.Abstractions" Version="22.0.13" />
    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.13" />
-    <PackageVersion Include="System.Management" Version="9.0.8" />
+    <PackageVersion Include="System.Management" Version="9.0.7" />
    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
    <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
    <PackageVersion Include="System.Reactive" Version="6.0.1" />
-    <PackageVersion Include="System.Runtime.Caching" Version="9.0.8" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.8" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.8" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.8" />
+    <PackageVersion Include="System.Runtime.Caching" Version="9.0.7" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.7" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.7" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.7" />
    <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
    <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
    <PackageVersion Include="UnitsNet" Version="5.56.0" />
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1519,23 +1519,23 @@ SOFTWARE.
 - Mages 3.0.0
 - Markdig.Signed 0.34.0
 - MessagePack 3.1.3
- Microsoft.Bcl.AsyncInterfaces 9.0.8
+- Microsoft.Bcl.AsyncInterfaces 9.0.7
 - Microsoft.Bot.AdaptiveExpressions.Core 4.23.0
 - Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
- Microsoft.Data.Sqlite 9.0.8
+- Microsoft.Data.Sqlite 9.0.7
 - 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.Extensions.DependencyInjection 9.0.7
+- Microsoft.Extensions.Hosting 9.0.7
+- Microsoft.Extensions.Hosting.WindowsServices 9.0.7
+- Microsoft.Extensions.Logging 9.0.7
+- Microsoft.Extensions.Logging.Abstractions 9.0.7
 - 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.Win32.SystemEvents 9.0.7
+- Microsoft.Windows.Compatibility 9.0.7
 - Microsoft.Windows.CsWin32 0.3.183
 - Microsoft.Windows.CsWinRT 2.2.0
 - Microsoft.Windows.SDK.BuildTools 10.0.26100.4188
@@ -1555,25 +1555,25 @@ SOFTWARE.
 - SkiaSharp.Views.WinUI 2.88.9
 - StreamJsonRpc 2.21.69
 - StyleCop.Analyzers 1.2.0-beta.556
- System.CodeDom 9.0.8
+- System.CodeDom 9.0.7
 - 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.ComponentModel.Composition 9.0.7
+- System.Configuration.ConfigurationManager 9.0.7
+- System.Data.OleDb 9.0.7
 - 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.Diagnostics.EventLog 9.0.7
+- System.Diagnostics.PerformanceCounter 9.0.7
+- System.Drawing.Common 9.0.7
 - System.IO.Abstractions 22.0.13
 - System.IO.Abstractions.TestingHelpers 22.0.13
- System.Management 9.0.8
+- System.Management 9.0.7
 - 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.Runtime.Caching 9.0.7
+- System.ServiceProcess.ServiceController 9.0.7
+- System.Text.Encoding.CodePages 9.0.7
+- System.Text.Json 9.0.7
 - System.Text.RegularExpressions 4.3.1
 - UnicodeInformation 2.6.0
 - UnitsNet 5.56.0
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -5,13 +5,11 @@ 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}
@@ -463,8 +461,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Peek.Common", "src\modules\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Peek.FilePreviewer", "src\modules\peek\Peek.FilePreviewer\Peek.FilePreviewer.csproj", "{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Peek.UITests", "src\modules\peek\Peek.UITests\Peek.UITests.csproj", "{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MarkdownPreviewHandlerCpp", "src\modules\previewpane\MarkdownPreviewHandlerCpp\MarkdownPreviewHandlerCpp.vcxproj", "{ED9A1AC6-AEB0-4569-A6E9-E1696182B545}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GcodePreviewHandlerCpp", "src\modules\previewpane\GcodePreviewHandlerCpp\GcodePreviewHandlerCpp.vcxproj", "{5A5DD09D-723A-44D3-8F2B-293584C3D731}"
@@ -788,14 +784,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.TimeDa
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WindowWalker.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.WindowWalker.UnitTests\Microsoft.CmdPal.Ext.WindowWalker.UnitTests.csproj", "{E816D7B0-4688-4ECB-97CC-3D8E798F3829}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.UnitTestBase", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.UnitTestsBase\Microsoft.CmdPal.Ext.UnitTestBase.csproj", "{00D8659C-2068-40B6-8B86-759CD6284BBB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LightSwitch", "LightSwitch", "{5B201255-53C8-490B-A34F-01F05D48A477}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LightSwitchModuleInterface", "src\modules\LightSwitch\LightSwitchModuleInterface\LightSwitchModuleInterface.vcxproj", "{38177D56-6AD1-4ADF-88C9-2843A7932166}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LightModeService", "src\modules\LightSwitch\LightSwitchService\LightSwitchService.vcxproj", "{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -1864,14 +1852,6 @@ Global
 		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Release|ARM64.Build.0 = Release|ARM64
 		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Release|x64.ActiveCfg = Release|x64
 		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC}.Release|x64.Build.0 = Release|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Debug|ARM64.Build.0 = Debug|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Debug|x64.ActiveCfg = Debug|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Debug|x64.Build.0 = Debug|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Release|ARM64.ActiveCfg = Release|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Release|ARM64.Build.0 = Release|ARM64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Release|x64.ActiveCfg = Release|x64
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5}.Release|x64.Build.0 = Release|x64
 		{ED9A1AC6-AEB0-4569-A6E9-E1696182B545}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{ED9A1AC6-AEB0-4569-A6E9-E1696182B545}.Debug|ARM64.Build.0 = Debug|ARM64
 		{ED9A1AC6-AEB0-4569-A6E9-E1696182B545}.Debug|x64.ActiveCfg = Debug|x64
@@ -2850,30 +2830,6 @@ Global
 		{E816D7B0-4688-4ECB-97CC-3D8E798F3829}.Release|ARM64.Build.0 = Release|ARM64
 		{E816D7B0-4688-4ECB-97CC-3D8E798F3829}.Release|x64.ActiveCfg = Release|x64
 		{E816D7B0-4688-4ECB-97CC-3D8E798F3829}.Release|x64.Build.0 = Release|x64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Debug|ARM64.Build.0 = Debug|ARM64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Debug|x64.ActiveCfg = Debug|x64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Debug|x64.Build.0 = Debug|x64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|ARM64.ActiveCfg = Release|ARM64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|ARM64.Build.0 = Release|ARM64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|x64.ActiveCfg = Release|x64
-		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|x64.Build.0 = Release|x64
-		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|ARM64.Build.0 = Debug|ARM64
-		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|x64.ActiveCfg = Debug|x64
-		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|x64.Build.0 = Debug|x64
-		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|ARM64.ActiveCfg = Release|ARM64
-		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|ARM64.Build.0 = Release|ARM64
-		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|x64.ActiveCfg = Release|x64
-		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|x64.Build.0 = Release|x64
-		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Debug|ARM64.Build.0 = Debug|ARM64
-		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Debug|x64.ActiveCfg = Debug|x64
-		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Debug|x64.Build.0 = Debug|x64
-		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Release|ARM64.ActiveCfg = Release|ARM64
-		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Release|ARM64.Build.0 = Release|ARM64
-		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Release|x64.ActiveCfg = Release|x64
-		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3032,7 +2988,6 @@ Global
 		{9D7A6DE0-7D27-424D-ABAE-41B2161F9A03} = {17B4FA70-001E-4D33-BBBB-0D142DBC2E20}
 		{17A99C7C-0BFF-45BB-A9FD-63A0DDC105BB} = {17B4FA70-001E-4D33-BBBB-0D142DBC2E20}
 		{AA9F0AF8-7924-4D59-BAA1-E36F1304E0DC} = {17B4FA70-001E-4D33-BBBB-0D142DBC2E20}
-		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A5} = {17B4FA70-001E-4D33-BBBB-0D142DBC2E20}
 		{ED9A1AC6-AEB0-4569-A6E9-E1696182B545} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{5A5DD09D-723A-44D3-8F2B-293584C3D731} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{B3E869C4-8210-4EBD-A621-FF4C4AFCBFA9} = {2F305555-C296-497E-AC20-5FA1B237996A}
@@ -3162,6 +3117,11 @@ Global
 		{D9BD324E-1D80-44AA-8E7B-73EB00944434} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{8EF25507-2575-4ADE-BF7E-D23376903AB8} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{070AC093-C9F2-20AD-0BCD-F318FC2761EA} = {B1234567-1234-1234-1234-123456789ABC}
+		{E816D7AC-4688-4ECB-97CC-3D8E798F3825} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
+		{E816D7AD-4688-4ECB-97CC-3D8E798F3826} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
+		{E816D7AE-4688-4ECB-97CC-3D8E798F3827} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
+		{E816D7AF-4688-4ECB-97CC-3D8E798F3828} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
+		{E816D7B0-4688-4ECB-97CC-3D8E798F3829} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{2C318EC3-BA86-4372-B1BC-DB0F33C208B2} = {322566EF-20DC-43A6-B9F8-616AF942579A}
 		{BFFB607F-7C78-434B-86B9-DA4C8196A1B5} = {B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC}
 		{66E1534A-1587-42B2-912F-45C994D32904} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
@@ -3179,15 +3139,6 @@ Global
 		{806BF185-8B89-5BE1-9AA1-DA5BC9487DB9} = {264B412F-DB8B-4CF8-A74B-96998B183045}
 		{F93C2817-C846-4259-84D8-B39A6B57C8DE} = {3527BF37-DFC5-4309-A032-29278CA21328}
 		{8131151D-B0E9-4E18-84A5-E5F946C4480A} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
-		{E816D7AC-4688-4ECB-97CC-3D8E798F3825} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{E816D7AD-4688-4ECB-97CC-3D8E798F3826} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{E816D7AE-4688-4ECB-97CC-3D8E798F3827} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{E816D7AF-4688-4ECB-97CC-3D8E798F3828} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{E816D7B0-4688-4ECB-97CC-3D8E798F3829} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{00D8659C-2068-40B6-8B86-759CD6284BBB} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{5B201255-53C8-490B-A34F-01F05D48A477} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
-		{38177D56-6AD1-4ADF-88C9-2843A7932166} = {5B201255-53C8-490B-A34F-01F05D48A477}
-		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC} = {5B201255-53C8-490B-A34F-01F05D48A477}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 | [Color Picker](https://aka.ms/PowerToysOverview_ColorPicker) | [Command Not Found](https://aka.ms/PowerToysOverview_CmdNotFound) | [Command Palette](https://aka.ms/PowerToysOverview_CmdPal) |
 | [Crop And Lock](https://aka.ms/PowerToysOverview_CropAndLock) | [Environment Variables](https://aka.ms/PowerToysOverview_EnvironmentVariables) | [FancyZones](https://aka.ms/PowerToysOverview_FancyZones) |
 | [File Explorer Add-ons](https://aka.ms/PowerToysOverview_FileExplorerAddOns) | [File Locksmith](https://aka.ms/PowerToysOverview_FileLocksmith) | [Hosts File Editor](https://aka.ms/PowerToysOverview_HostsFileEditor) |
-| [Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) | [Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) | [Mouse Utilities](https://aka.ms/PowerToysOverview_MouseUtilities) |
+| [Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) | [Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) | [Mouse utilities](https://aka.ms/PowerToysOverview_MouseUtilities) |
 | [Mouse Without Borders](https://aka.ms/PowerToysOverview_MouseWithoutBorders) | [New+](https://aka.ms/PowerToysOverview_NewPlus) | [Paste as Plain Text](https://aka.ms/PowerToysOverview_PastePlain) |
 | [Peek](https://aka.ms/PowerToysOverview_Peek) | [PowerRename](https://aka.ms/PowerToysOverview_PowerRename) | [PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) |
 | [Quick Accent](https://aka.ms/PowerToysOverview_QuickAccent) | [Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) | [Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) |
@@ -35,19 +35,19 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 Go to the [Microsoft PowerToys GitHub releases page][github-release-link] and click on `Assets` at the bottom to show the files available in the release. Please use the appropriate PowerToys installer that matches your machine's architecture and install scope. For most, it is `x64` and per-user.

 <!-- items that need to be updated release to release -->
-[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.94%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.93%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysUserSetup-0.93.0-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysUserSetup-0.93.0-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysSetup-0.93.0-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysSetup-0.93.0-arm64.exe
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.93%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.92%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.92.1/PowerToysUserSetup-0.92.1-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.92.1/PowerToysUserSetup-0.92.1-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.92.1/PowerToysSetup-0.92.1-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.92.1/PowerToysSetup-0.92.1-arm64.exe
 
 |  Description   | Filename |
 |----------------|----------|
-| Per user - x64       | [PowerToysUserSetup-0.93.0-x64.exe][ptUserX64] |
-| Per user - ARM64     | [PowerToysUserSetup-0.93.0-arm64.exe][ptUserArm64] |
-| Machine wide - x64   | [PowerToysSetup-0.93.0-x64.exe][ptMachineX64] |
-| Machine wide - ARM64 | [PowerToysSetup-0.93.0-arm64.exe][ptMachineArm64] |
+| Per user - x64       | [PowerToysUserSetup-0.92.1-x64.exe][ptUserX64] |
+| Per user - ARM64     | [PowerToysUserSetup-0.92.1-arm64.exe][ptUserArm64] |
+| Machine wide - x64   | [PowerToysSetup-0.92.1-x64.exe][ptMachineX64] |
+| Machine wide - ARM64 | [PowerToysSetup-0.92.1-arm64.exe][ptMachineArm64] |

 This is our preferred method.

@@ -93,119 +93,139 @@ For guidance on developing for PowerToys, please read the [developer docs](./doc

 Our [prioritized roadmap][roadmap] of features and utilities that the core team is focusing on.

-### 0.93 - Aug 2025 Update
+### 0.92 - June 2025 Update

 In this release, we focused on new features, stability, optimization improvements, and automation.

 **✨Highlights**

- - PowerToys settings debuts a modern, card-based dashboard with clearer descriptions and faster navigation for a streamlined user experience.
- - Command Palette had over 99 issues resolved, including bringing back Clipboard History, adding context menu shortcuts, pinning favorite apps, and supporting history in Run.
- - Command Palette reduced its startup memory usage by ~15%, load time by ~40%, built-in extensions loading time by ~70%, and installation size by ~55%—all due to using the full Ahead-of-Time (AOT) compilation mode in Windows App SDK.
- - Peek now supports instant previews and embedded thumbnails for Binary G-code (.bgcode) 3D printing files, making it easy to inspect models at a glance. Thanks [@pedrolamas](https://github.com/pedrolamas)!
- - Mouse Utilities introduces a new spotlight highlighting mode that dims the screen and draws attention to your cursor, perfect for presentations.
- - Test coverage improvements for multiple PowerToys modules including Command Palette, Advanced Paste, Peek, Text Extractor, and PowerRename — ensuring better reliability and quality, with over 600 new unit tests (mostly for Command Palette) and doubled UI automation coverage.
+ - PowerToys settings now has a toggle for the system tray icon, giving users control over its visibility based on personal preference. Thanks [@BLM16](https://github.com/BLM16)!  
+ - Command Palette now has Ahead-of-Time ([AOT](https://learn.microsoft.com/en-us/dotnet/core/deploying/native-aot)) compatibility for all first-party extensions, improved extensibility, and core UX fixes, resulting in better performance and stability across commands.
+ - Color Picker now has customizable mouse button actions, enabling more personalized workflows by assigning functions to left, right, and middle clicks. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Bug Report Tool now has a faster and clearer reporting process, with progress indicators, improved compression, auto-cleanup of old trace logs, and inclusion of MSIX installer logs for more efficient diagnostics.
+ - File Explorer add-ons now have improved rendering stability, resolving issues with PDF previews, blank thumbnails, and text file crashes during file browsing.
+
+### Color Picker
+
+ - Added mouse button actions so you can choose what left, right, or middle click does. Thanks [@PesBandi](https://github.com/PesBandi)!  
+
+### Crop & Lock
+
+ - Aligned window styling with current Windows theme for a cleaner look. Thanks [@sadirano](https://github.com/sadirano)!  

 ### Command Palette

- - Ensured screen readers are notified when the selected item in the list changes for better accessibility.
- - Fixed command title changes not being properly notified to screen readers. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Made icon controls excluded from keyboard navigation by default for better accessibility. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Improved UI design with better text sizing and alignment.
- - Fixed keyboard shortcuts to work better in text boxes and context menus.
- - Added right-click context menus with critical command styling and separators.
- - Improved various context menu issues, improving item selection, handling of long titles, search bar text scaling, initial item behavior, and primary button functionality.
- - Fixed context menu crashes with better type handling.
- - Fixed "Reload" command to work with both uppercase and lowercase letters.
- - Added mouse back button support for easier navigation. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed Alt+Left Arrow navigation not working when search box contains text. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Updated back button tooltip to show keyboard shortcut information. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed Command Palette window not appearing properly when activated. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed Command Palette window staying hidden from taskbar after File Explorer restarts. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed window focus not returning to previous app properly.
- - Fixed Command Palette window to always appear on top when shown and move to bottom when hidden. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed window hiding to properly work on UI thread. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed crashes and improved stability with better synchronization of Command list updates. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Improved extension disposal with better error handling to prevent crashes. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Improved stability by fixing a UI threading issue when loading more results, preventing possible crashes and ensuring the loading state resets if loading fails. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Enhanced icon loading stability with better exception handling. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added thread safety to recent commands to prevent crashes. Thanks [@MaoShengelia](https://github.com/MaoShengelia)!
- - Fixed acrylic (frosted glass) system backdrop display issues by ensuring proper UI thread handling. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Enhanced performance by resolving a regression in page loading.
+ - Applied consistent hotkey handling across all Command Palette commands for a smoother user experience.
+ - Improved graceful closing of Command Palette. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Fixed consistency issue for extensions' alias with "Direct" setting and enabled localization for "Direct" and "Indirect" for better user understanding. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Improved visual clarity by styling critical context items correctly.
+ - Automatically focused the field when only one is present on the content page.
+ - Improved stability and efficiency when loading file icons in SDK ThumbnailHelper.cs by removing unnecessary operations. Thanks [@OldUser101](https://github.com/OldUser101)!
+ - Enhanced details view with commands implementation. (See [Extension sample](./src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleListPageWithDetails.cs))

 ### Command Palette extensions

- - Added settings to each provider to control which fallback commands are enabled. Thanks [@jiripolasek](https://github.com/jiripolasek)! for fixing a regression in this feature.
- - Added sample code showing how Command Palette extensions can track when their pages are loaded or unloaded. [Check it out here](./src/modules/cmdpal/ext/SamplePagesExtension/OnLoadPage.cs).
- - Fixed *Calculator* to accept regular spaces in numbers that use space separators. Thanks [@PesBandi](https://github.com/PesBandi)!
- - Added a new setting to *Calculator* to make "Copy" the primary button (replacing “Save”) and enable "Close on Enter", streamlining the workflow. Thanks [@PesBandi](https://github.com/PesBandi)!
- - Improved *Apps* indexing error handling and removed obsolete code. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Prevented apps from showing in search when the *Apps* extension is disabled. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added ability to pin/unpin *Apps* using Ctrl+P shortcut.
- - Added keyboard shortcuts to the *Apps* context menu items for faster access. 
- - Added all file context menu options to the *Apps* items context menu, making all file actions available there for better functionality.
- - Streamlined All *Apps* extension settings by removing redundant descriptions, making the UI clearer.
- - Added command history to the *Run* page for easier access to previous commands.
- - Fixed directory path handling in *Run* fallback for better file navigation.
- - Fixed URL fallback item hiding properly in *Web Search* extension when search query becomes invalid. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added proper empty state message for *Web Search* extension when no results found. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added fallback command to *Windows Settings* extension for better search results.
- - Re-enabled *Clipboard History* feature with proper window handling.
- - Improved *Add Bookmark* extension to automatically detect file, folder, or URL types without manual input.
- - Updated terminology from "Kill process" to "End task" in *Window Walker* for consistency with Windows.
- - Fixed minor grammar error in SamplePagesExtension code comments. Thanks [@purofle](https://github.com/purofle)!
+ - Added "Copy Path" command to *App* search results for convenience. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Improved *Calculator* input experience by ignoring leading equal signs. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Corrected input handling in the *Calculator* extension to avoid showing errors for input with only leading whitespace.
+ - Improved *New Extension* wizard by validating names to prevent namespace errors.
+ - Ensured consistent context items display for the *Run* extension between fallback and top-level results.
+ - Fixed missing *Time & Date* commands in fallback results. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Fixed outdated results in the *Time & Date* extension. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Fixed an issue where *Web Search* always opened Microsoft Edge instead of the user's default browser on Windows 11 24H2 and later. Thanks [@RuggMatt](https://github.com/RuggMatt)!
+ - Improved ordering of *Windows Settings* extension search results from alphabetical to relevance-based for quicker access.
+ - Added "Restart Windows Explorer" command to the *Windows System Commands* provider for gracefully terminate and relaunch explorer.exe. Thanks [@jiripolasek](https://github.com/jiripolasek)!

-### Mouse Utilities
+### Command Palette Ahead-of-Time (AOT) readiness

- - Added a new spotlight highlighting mode that creates a large transparent circle around your cursor with a backdrop effect, providing an alternative to the traditional circle highlight. Perfect for presentations where you want to focus attention on a specific area while dimming the rest of the screen.
+ - We’ve made foundational changes to prepare the Command Palette for future Ahead-of-Time (AOT) publishing. This includes replacing the calculator library with ExprTk, improving COM object handling, refining Win32 interop, and correcting trimming behavior—all to ensure compatibility, performance, and reliability under AOT constraints. All first-party extensions are now AOT-compatible. These improvements lay the groundwork for publishing Command Palette as an AOT application in the next release.
+ - Special thanks to [@Sergio0694](https://github.com/Sergio0694) for guidance on making COM APIs AOT-compatible, [@jtschuster](https://github.com/jtschuster) for fixing COM object handling, [@ArashPartow](https://github.com/ArashPartow) from ExprTk for integration suggestions, and [@tian-lt](https://github.com/tian-lt) from the Windows Calculator team for valuable suggestion throughout the migration journey and review.
+ - As part of the upcoming release, we’re also enabling AOT compatibility for key dependencies, including markdown rendering, Adaptive Cards, internal logging and telemetry library, and the core Command Palette UX.
+
+### FancyZones
+
+ - Fixed DPI-scaling issues to ensure FancyZones Editor displays crisply on high-resolution monitors. Thanks [@HO-COOH](https://github.com/HO-COOH)! This inspired us a broader review across other PowerToys modules, leading to DPI display optimizations in Awake, Color Picker, PowerAccent, and more.
+
+### File Explorer add-ons
+
+ - Fixed potential failures in PDF previewer and thumbnail generation, improving reliability when browsing PDF files. Thanks [@mohiuddin-khan-shiam](https://github.com/mohiuddin-khan-shiam)!  
+ - Prevented Monaco Preview Handler crash when opening UTF-8-BOM text files.  
+
+### Hosts File Editor
+
+ - Added an in-app *“Learn more”* link to warning dialogs for quick guidance. Thanks [@PesBandi](https://github.com/PesBandi)!  
+
+### Mouse Without Borders
+
+ - Fixed firewall rule so MWB now accepts connections from IPs outside your local subnet.
+ - Cleaned legacy logs to reduce disk usage and noise.  

 ### Peek

- - Added preview and thumbnail support for Binary G-code (.bgcode) files used in 3D printing. You can now see embedded thumbnails and preview these compressed 3D printing files directly in Peek and File Explorer. Thanks [@pedrolamas](https://github.com/pedrolamas)!
+ - Updated QOI reader so 3-channel QOI images preview correctly in Peek and File Explorer. Thanks [@mbartlett21](https://github.com/mbartlett21)!  
+ - Added codec detection with a clear warning when a video can’t be previewed, along with a link to the Microsoft Store to download the required codec.

-### Quick Accent
+### PowerRename

- - Added Vietnamese language support to Quick Accent, mappings for Vietnamese vowels (a, e, i, o, u, y) and the letter d. Thanks [@octastylos-pseudodipteros](https://github.com/octastylos-pseudodipteros)!
+ - Added support for $YY-$MM-$DD in ModificationTime and AccessTime to enable flexible date-based renaming.
+
+### PowerToys Run
+
+ - Suppressed error UI for known WPF-related crashes to reduce user confusion, while retaining diagnostic logging for analysis. This targets COMException 0xD0000701 and 0x80263001 caused by temporary DWM unavailability.
+
+### Registry Preview
+
+ - Added "Extended data preview" via magnifier icon and context menu in the Data Grid, enabled easier inspection of complex registry types like REG_BINARY, REG_EXPAND_SZ, and REG_MULTI_SZ, etc. Thanks [@htcfreek](https://github.com/htcfreek)! 
+ - Improved file-saving experience in Registry Preview by aligning with Notepad-like behavior, enhancing user prompts, error handling, and preventing crashes during unsaved or interrupted actions. Thanks [@htcfreek](https://github.com/htcfreek)!  

 ### Settings

- - Completely redesigned the Settings dashboard with a modern card-based layout featuring organized sections for quick actions and shortcuts overview, replacing the old module list.
- - Rewrote setting descriptions to be more concise and follow Windows writing style guidelines, making them easier to understand.
- - Improved formatting and readability of release notes in the "What's New" section with better typography and spacing.
- - Added missing deep link support for various settings pages (Peek, Quick Accent, PowerToys Run, etc.) so you can jump directly to specific settings.
- - Resolved an issue where the settings page header would drift away from its position when resizing the settings window.
- - Resolved a settings crash related to incompatible property names in ZoomIt configuration.
+ - Added an option to hide or show the PowerToys system tray icon. Thanks [@BLM16](https://github.com/BLM16)!
+ - Improved settings to show progress while a bug report package is being generated.
+
+### Workspaces
+
+ - Stored Workspaces icons in user AppData to ensure profile portability and prevent loss during temporary folder cleanup.
+ - Enabled capture and launch of PWAs on non-default Edge or Chrome profiles, ensuring consistent behavior during creation and execution.

 ### Documentation

- - Added detailed step-by-step instructions for first-time developers building the Command Palette module, including prerequisites and Visual Studio setup guidance. Thanks [@chatasweetie](https://github.com/chatasweetie)!
- - **Fixed Broken SDK Link**: Corrected a broken markdown link in the Command Palette SDK README that was pointing to an incorrect directory path. Thanks [@ChrisGuzak](https://github.com/ChrisGuzak)!
- - Added documentation for the "Open With Cursor" plugin that enables opening Visual Studio and VS Code recent files using Cursor AI. Thanks [@VictorNoxx](https://github.com/VictorNoxx)!
- - Added documentation for two new community plugins - Hotkeys plugin for creating custom keyboard shortcuts, and RandomGen plugin for generating random data like passwords, colors, and placeholder text. Thanks [@ruslanlap](https://github.com/ruslanlap)!
+ - Added SpeedTest and Dictionary Definition to the third-party plugins documentation for PowerToys Run. Thanks [@ruslanlap](https://github.com/ruslanlap)!
+ - Corrected sample links and typo in Command Palette documentation. Thanks [@daverayment](https://github.com/daverayment) and [@roycewilliams](https://github.com/roycewilliams)!

 ### Development

- - Updated .NET libraries to 9.0.8 for performance and security. Thanks [@snickler](https://github.com/snickler)!
- - Updated the spell check system to version 0.0.25 with better GitHub integration and SARIF reporting, plus fixed numerous spelling errors throughout the codebase including property names and documentation. Thanks [@jsoref](https://github.com/jsoref)!
- - Cleaned up spelling check configuration to eliminate false positives and excessive noise that was appearing in every pull request, making the development process smoother.
- - Replaced NuGet feed with Azure Artifacts for better package management.
- - Implemented configurable UI test pipeline that can use pre-built official releases instead of building everything from scratch, reducing test execution time from 2+ hours.
- - Replaced brittle pixel-by-pixel image comparison with perceptual hash (pHash) technology that's more robust to minor rendering differences - no more test failures due to anti-aliasing or compression artifacts.
- - Reduced CI/fuzzing/UI test timeouts from 4 hours to 90 minutes, dramatically improving developer feedback loops and preventing long waits when builds get stuck.
- - Standardized test project naming across the entire codebase and improved pipeline result identification by adding platform/install mode context to test run titles. Thanks [@khmyznikov](https://github.com/khmyznikov)!
- - Added comprehensive UI test suites for multiple PowerToys modules including Command Palette, Advanced Paste, Peek, Text Extractor, and PowerRename - ensuring better reliability and quality.
- - Enhanced UI test automation with command-line argument support, better session management, and improved element location methods using pattern matching to avoid failures from minor differences in exact matches.
+ - Updated .NET libraries to 9.0.6 for performance and security. Thanks [@snickler](https://github.com/snickler)!  
+ - Updated WinAppSDK to 1.7.2 for better stability and Windows support.  
+ - Introduced a one-step local build script that generates a signed installer, enhancing developer productivity.
+ - Generated portable PDBs so cross-platform debuggers can read symbol files, improving debugging experience in VSCode and other tools.
+ - Simplified WinGet configuration files by using the [Microsoft.Windows.Settings](https://www.powershellgallery.com/packages/Microsoft.Windows.Settings) module to enable Developer Mode. Thanks [@mdanish-kh](https://github.com/mdanish-kh)! 
+ - Adjusted build scripts for the latest Az.Accounts module to keep CI green.
+ - Streamlined release pipeline by removing hard-coded telemetry version numbers, and unified Command Palette versioning with Windows Terminal's versioning method for consistent updates.
+ - Enhanced the build validation step to show detailed differences between NOTICE.md and actual package dependencies and versions.
+ - Improved spell-checking accuracy across the repo. Thanks [@rovercoder](https://github.com/rovercoder)!  
+ - Upgraded CI to TouchdownBuild v5 for faster pipelines.  
+ - Added context comments to *Resources.resw* to help translators.
+ - Expanded fuzz testing coverage to include FancyZones.
+ - Integrated all unit tests into the CI pipeline, increasing from ~3,000 to ~5,000 tests.
+ - Enabled daily UI test automation on the main branch, now covering over 370 UI tests for end-to-end validation.
+ - Newly added unit tests for WorkspacesLib to improve reliability and maintainability.

-### What is being planned over the next few releases
+### General

-For [v0.94][github-next-release-work], we'll work on the items below:
+- Updated bug report compression library (cziplib 0.3.3) for faster and more reliable package creation. Thanks [@Chubercik](https://github.com/Chubercik)!
+- Included App Installer (“AppX Deployment Server”) event logs in bug reports for more thorough diagnostics.  
+
+### What is being planned for version 0.93
+
+For [v0.93][github-next-release-work], we'll work on the items below:

 - Continued Command Palette polish
- - Working on Shortcut Guide v2 (Thanks [@noraa-junker](https://github.com/noraa-junker)!)
- - Working on upgrading the installer to WiX 5
- - Working on shortcut conflict detection
- - Working on setting search
- - Upgrading Keyboard Manager's editor UI
 - New UI automation tests
+ - Working on installer upgrades
+ - Working on shortcut conflict detection
+ - Upgrading Keyboard Manager's editor UI
 - Stability, bug fixes

 ## PowerToys Community
--- a/doc/devdocs/UITests.md
+++ b/doc/devdocs/UITests.md
@@ -22,23 +22,23 @@ The PowerToys UI test pipeline provides flexible options for building and testin

 ### Pipeline Options

- **buildSource**: Select the build type for testing:
-  - `latestMainOfficialBuild`: Downloads and uses the latest official PowerToys build from main branch
-  - `buildNow`: Builds PowerToys from current source code and uses it for testing
-  - `specificBuildId`: Downloads a specific PowerToys build using the build ID specified in `specificBuildId` parameter
+- **useLatestOfficialBuild**: When checked, downloads the latest official PowerToys build and installs it for testing. This skips the full solution build and only builds UI test projects.

-  **Default value**: `latestMainOfficialBuild`
+- **useCurrentBranchBuild**: When checked along with `useLatestOfficialBuild`, downloads the official build from the current branch instead of main.

- **specificBuildId**: When `buildSource` is set to `specificBuildId`, specify the exact PowerToys build ID to download and test against.
-
-  **Default value**: `"xxxx"` (placeholder, enter actual build ID when using specificBuildId option)
+  **Default value**: `false` (downloads from main branch)
  
  **When to use this**:
-  - Testing against a specific known build for reproducibility
-  - Regression testing against a particular build version
-  - Validating fixes in a specific build before release
+  - **Default scenario**: The pipeline tests against the latest signed PowerToys build from the `main` branch, regardless of which branch your test code changes are from
+  - **Custom branch testing**: Only specify `true` when:
+    - Your branch has produced its own signed PowerToys build via the official build pipeline
+    - You want to test against that specific branch's PowerToys build instead of main
+    - You are testing PowerToys functionality changes that are only available in your branch's build
  
-  **Usage**: Enter the build ID number (e.g., `12345`) to download that specific build. Only used when `buildSource` is set to `specificBuildId`.
+  **Important notes**:
+  - The test pipeline itself runs from your specified branch, but by default tests against the main branch's PowerToys build
+  - Not all branches have signed builds available - only use this if you're certain your branch has a signed build
+  - If enabled but no build exists for your branch, the pipeline may fail or fall back to main

 - **uiTestModules**: Specify which UI test modules to build and run. This parameter controls both the `.csproj` projects to build and the `.dll` test assemblies to execute. Examples:
  - `['UITests-FancyZones']` - Only FancyZones UI tests
@@ -50,19 +50,19 @@ The PowerToys UI test pipeline provides flexible options for building and testin

 ### Build Modes

-1. **Official Build Testing** (`buildSource = latestMainOfficialBuild` or `specificBuildId`)
-   - Downloads and installs official PowerToys build (latest from main or specific build ID)
-   - Builds only UI test projects (all or specific based on `uiTestModules`)
-   - Runs UI tests against installed PowerToys
-   - Tests both machine-level and per-user installation modes automatically
+1. **Official Build + Selective Testing** (`useLatestOfficialBuild = true`)
+   - Downloads and installs official PowerToys build
+   - Builds only specified UI test projects
+   - Runs specified UI tests against installed PowerToys
+   - Controlled by `uiTestModules` parameter

-2. **Current Source Build Testing** (`buildSource = buildNow`)
-   - Builds entire PowerToys solution from current source code
+2. **Full Build + Testing** (`useLatestOfficialBuild = false`)
+   - Builds entire PowerToys solution
   - Builds UI test projects (all or specific based on `uiTestModules`)
-   - Runs UI tests against freshly built PowerToys
-   - Uses artifacts from current pipeline build
+   - Runs UI tests (all or specific based on `uiTestModules`)
+   - Uses freshly built PowerToys for testing

-> **Note**: All modes support the `uiTestModules` parameter to control which specific UI test modules to build and run. Both machine-level and per-user installation modes are tested automatically when using official builds.
+> **Note**: Both modes support the `uiTestModules` parameter to control which specific UI test modules to build and run.

 ### Pipeline Access
 - Pipeline: https://microsoft.visualstudio.com/Dart/_build?definitionId=161438&_a=summary
--- a/doc/devdocs/core/installer.md
+++ b/doc/devdocs/core/installer.md
@@ -87,13 +87,6 @@

 ### Building PowerToys Locally

-#### One stop script for building installer
-1. Open developer powershell for vs 2022
-2. Run tools\build\build-installer.ps1
-> For the first-time setup, please run the installer as an administrator. This ensures that the Wix tool can move wix.target to the desired location and trust the certificate used to sign the MSIX packages.
-
-The following manual steps will not install the MSIX apps (such as Command Palette) on your local installer.
-
 #### Prerequisites for building the MSI installer

 1. Install the [WiX Toolset Visual Studio 2022 Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2022Extension).
--- a/doc/devdocs/development/test-winget-install-locally.md
+++ b/doc/devdocs/development/test-winget-install-locally.md
@@ -1,33 +0,0 @@
-## If for any reason, you'd like to test winget install scenario, you can follow this doc:
-
-### Powertoys winget manifest definition:
-[winget repository](https://github.com/microsoft/winget-pkgs/tree/master/manifests/m/Microsoft/PowerToys)
-
-### How to test a winget installation locally:
-1. Get artifacts from release CI pipeline  Pipelines - Runs for PowerToys Signed YAML Release Build, or you can build one yourself by execute the 
- 'tools\build\build-installer.ps1' script
-
-2. Get the artifact hash, this is required to define winget manifest
-```powershell
-cd /path/to/your/directory/contains/installer
-Get-FileHash -Path ".\<Installer-name>.exe" -Algorithm SHA256
-```
- 3.  Host your installer.exe - Attention: staged github release artifacts or artifacts in release pipeline is not OK in this step
-You can self-host it or you can upload to a publicly available endpoint  
-**How to selfhost it** (A extremely simple way):
-```powershell
-python -m http.server 8000
-```
-
-4. Download a version folder from wingetpkgs like: [version 0.92.1](https://github.com/microsoft/winget-pkgs/tree/master/manifests/m/Microsoft/PowerToys/0.92.1)
-and you get **a folder contains 3 yml files**
->note: Do not put any files other than these three in this folder
-
-5. Modify the yml files based on your version and the self hosted artifact link, and modify the sha256 hash for the installer you'd like to use
-
-6. Start winget install:
-```powershell
-#execute as admin
-winget settings --enable LocalManifestFiles
-winget install --manifest "<folder_path_of_manifest_files>" --architecture x64 --scope user
-```
--- a/doc/devdocs/readme.md
+++ b/doc/devdocs/readme.md
@@ -52,7 +52,7 @@ Once you've discussed your proposed feature/fix/etc. with a team member, and an
 ## Rules

 - **Follow the pattern of what you already see in the code.**
- [Coding style](style.md).
+- [Coding style](development/style.md).
 - Try to package new functionality/components into libraries that have nicely defined interfaces.
 - Package new functionality into classes or refactor existing functionality into a class as you extend the code.
 - When adding new classes/methods/changing existing code, add new unit tests or update the existing tests.
--- a/doc/thirdPartyRunPlugins.md
+++ b/doc/thirdPartyRunPlugins.md
@@ -49,7 +49,6 @@ Contact the developers of a plugin directly for assistance with a specific plugi
 | [Definition](https://github.com/ruslanlap/PowerToysRun-Definition) | [ruslanlap](https://github.com/ruslanlap) | Lookup word definitions, phonetics, and synonyms directly in PowerToys Run. |
 | [Hotkeys](https://github.com/ruslanlap/PowerToysRun-Hotkeys) | [ruslanlap](https://github.com/ruslanlap) | Create, manage, and trigger custom keyboard shortcuts directly from PowerToys Run. |
 | [RandomGen](https://github.com/ruslanlap/PowerToysRun-RandomGen) | [ruslanlap](https://github.com/ruslanlap) | 🎲 Generate random data instantly with a single keystroke. Perfect for developers, testers, designers, and anyone who needs quick access to random data. Features include secure passwords, PINs, names, business data, dates, numbers, GUIDs, color codes, and more. Especially useful for designers who need random color codes and placeholder content. |
-| [Open With Cursor](https://github.com/VictorNoxx/PowerToys-Run-Cursor/) | [VictorNoxx](https://github.com/VictorNoxx) | Open Visual Studio, VS Code recents with Cursor AI |

 ## Extending software plugins

--- a/installer/PowerToysSetup/Resources.wxs
+++ b/installer/PowerToysSetup/Resources.wxs
@@ -11,7 +11,7 @@
  <Fragment>
    <!-- Resource directories should be added only if the installer is built on the build farm -->
    <?ifdef env.IsPipeline?>
-      <?foreach ParentDirectory in INSTALLFOLDER;WinUI3AppsInstallFolder;HistoryPluginFolder;CalculatorPluginFolder;FolderPluginFolder;ProgramPluginFolder;ShellPluginFolder;IndexerPluginFolder;UnitConverterPluginFolder;ValueGeneratorPluginFolder;UriPluginFolder;WindowWalkerPluginFolder;OneNotePluginFolder;RegistryPluginFolder;VSCodeWorkspacesPluginFolder;ServicePluginFolder;SystemPluginFolder;TimeDatePluginFolder;WindowsSettingsPluginFolder;WindowsTerminalPluginFolder;WebSearchPluginFolder;PowerToysPluginFolder?>
+      <?foreach ParentDirectory in INSTALLFOLDER;HistoryPluginFolder;CalculatorPluginFolder;FolderPluginFolder;ProgramPluginFolder;ShellPluginFolder;IndexerPluginFolder;UnitConverterPluginFolder;ValueGeneratorPluginFolder;UriPluginFolder;WindowWalkerPluginFolder;OneNotePluginFolder;RegistryPluginFolder;VSCodeWorkspacesPluginFolder;ServicePluginFolder;SystemPluginFolder;TimeDatePluginFolder;WindowsSettingsPluginFolder;WindowsTerminalPluginFolder;WebSearchPluginFolder;PowerToysPluginFolder?>
        <DirectoryRef Id="$(var.ParentDirectory)">
          <!-- Resource file directories -->
          <?foreach Language in $(var.LocLanguageList)?>
@@ -181,7 +181,7 @@
      </Component>
      <Component
          Id="ImageResizer_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)WinUI3AppsInstallFolder"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
          Guid="$(var.CompGUIDPrefix)02">
        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
          <RegistryValue Type="string" Name="ImageResizer_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
@@ -553,7 +553,6 @@
          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)HistoryPluginFolder" Directory="Resource$(var.IdSafeLanguage)HistoryPluginFolder" On="uninstall"/>
          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)PowerToysPluginFolder" Directory="Resource$(var.IdSafeLanguage)PowerToysPluginFolder" On="uninstall"/>
          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ValueGeneratorPluginFolder" Directory="Resource$(var.IdSafeLanguage)ValueGeneratorPluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WinUI3AppsInstallFolder" Directory="Resource$(var.IdSafeLanguage)WinUI3AppsInstallFolder" On="uninstall"/>
      <?undef IdSafeLanguage?>
        <?endforeach?>
      </Component>
--- a/nuget.config
+++ b/nuget.config
@@ -2,11 +2,11 @@
 <configuration>
 	<packageSources>
 		<clear />
-		<add key="PowerToysPublicDependencies" value="https://pkgs.dev.azure.com/shine-oss/PowerToys/_packaging/PowerToysPublicDependencies%40Local/nuget/v3/index.json" />
+		<add key="PowerToysPublicDependencies" value="https://pkgs.dev.azure.com/shine-oss/PowerToys/_packaging/PowerToysPublicDependencies/nuget/v3/index.json" />
 	</packageSources>
 	<packageSourceMapping>
 		<packageSource key="PowerToysPublicDependencies">
 			<package pattern="*" />
 		</packageSource>
 	</packageSourceMapping>
-</configuration>
+</configuration>
--- a/src/common/Common.UI/SettingsDeepLink.cs
+++ b/src/common/Common.UI/SettingsDeepLink.cs
@@ -17,7 +17,6 @@ namespace Common.UI
            Awake,
            ColorPicker,
            CmdNotFound,
-            LightSwitch,
            FancyZones,
            FileLocksmith,
            Run,
@@ -61,8 +60,6 @@ namespace Common.UI
                    return "ColorPicker";
                case SettingsWindow.CmdNotFound:
                    return "CmdNotFound";
-                case SettingsWindow.LightSwitch:
-                    return "LightSwitch";
                case SettingsWindow.FancyZones:
                    return "FancyZones";
                case SettingsWindow.FileLocksmith:
--- a/src/common/GPOWrapper/GPOWrapper.cpp
+++ b/src/common/GPOWrapper/GPOWrapper.cpp
@@ -28,10 +28,6 @@ namespace winrt::PowerToys::GPOWrapper::implementation
    {
        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredCropAndLockEnabledValue());
    }
-    GpoRuleConfigured GPOWrapper::GetConfiguredLightSwitchEnabledValue()
-    {
-        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredLightSwitchEnabledValue());
-    }
    GpoRuleConfigured GPOWrapper::GetConfiguredFancyZonesEnabledValue()
    {
        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredFancyZonesEnabledValue());
--- a/src/common/GPOWrapper/GPOWrapper.h
+++ b/src/common/GPOWrapper/GPOWrapper.h
@@ -13,7 +13,6 @@ namespace winrt::PowerToys::GPOWrapper::implementation
        static GpoRuleConfigured GetConfiguredCmdPalEnabledValue();
        static GpoRuleConfigured GetConfiguredColorPickerEnabledValue();
        static GpoRuleConfigured GetConfiguredCropAndLockEnabledValue();
-        static GpoRuleConfigured GetConfiguredLightSwitchEnabledValue();
        static GpoRuleConfigured GetConfiguredFancyZonesEnabledValue();
        static GpoRuleConfigured GetConfiguredFileLocksmithEnabledValue();
        static GpoRuleConfigured GetConfiguredSvgPreviewEnabledValue();
--- a/src/common/GPOWrapper/GPOWrapper.idl
+++ b/src/common/GPOWrapper/GPOWrapper.idl
@@ -17,7 +17,6 @@ namespace PowerToys
            static GpoRuleConfigured GetConfiguredCmdPalEnabledValue();
            static GpoRuleConfigured GetConfiguredColorPickerEnabledValue();
            static GpoRuleConfigured GetConfiguredCropAndLockEnabledValue();
-            static GpoRuleConfigured GetConfiguredLightSwitchEnabledValue();
            static GpoRuleConfigured GetConfiguredFancyZonesEnabledValue();
            static GpoRuleConfigured GetConfiguredFileLocksmithEnabledValue();
            static GpoRuleConfigured GetConfiguredSvgPreviewEnabledValue();
--- a/src/common/ManagedCommon/ModuleType.cs
+++ b/src/common/ManagedCommon/ModuleType.cs
@@ -12,7 +12,6 @@ namespace ManagedCommon
        ColorPicker,
        CmdPal,
        CropAndLock,
-        LightSwitch,
        EnvironmentVariables,
        FancyZones,
        FileLocksmith,
--- a/src/common/UITestAutomation/Element/TextBox.cs
+++ b/src/common/UITestAutomation/Element/TextBox.cs
@@ -2,8 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System.Threading.Tasks;
-
 namespace Microsoft.PowerToys.UITest
 {
    /// <summary>
@@ -27,9 +25,8 @@ namespace Microsoft.PowerToys.UITest
        /// </summary>
        /// <param name="value">The text to set.</param>
        /// <param name="clearText">A value indicating whether to clear the text before setting it. Default value is true</param>
-        /// <param name="charDelayMS">Delay in milliseconds between each character. Default is 0 (no delay).</param>
        /// <returns>The current TextBox instance.</returns>
-        public TextBox SetText(string value, bool clearText = true, int charDelayMS = 0)
+        public TextBox SetText(string value, bool clearText = true)
        {
            if (clearText)
            {
@@ -42,36 +39,10 @@ namespace Microsoft.PowerToys.UITest
                Task.Delay(500).Wait();
            }

-            // TODO: CmdPal bug – when inputting text, characters are swallowed too quickly.
-            // This should be fixed within CmdPal itself.
-            // Temporary workaround: introduce a delay between character inputs to avoid the issue
-            if (charDelayMS > 0 || EnvironmentConfig.IsInPipeline)
+            PerformAction((actions, windowElement) =>
            {
-                // Send text character by character with delay (if specified or in pipeline)
-                PerformAction((actions, windowElement) =>
-                {
-                    foreach (char c in value)
-                    {
-                        windowElement.SendKeys(c.ToString());
-                        if (charDelayMS > 0)
-                        {
-                            Task.Delay(charDelayMS).Wait();
-                        }
-                        else if (EnvironmentConfig.IsInPipeline)
-                        {
-                            Task.Delay(50).Wait();
-                        }
-                    }
-                });
-            }
-            else
-            {
-                // No character delay - send all text at once (original behavior)
-                PerformAction((actions, windowElement) =>
-                {
-                    windowElement.SendKeys(value);
-                });
-            }
+                windowElement.SendKeys(value);
+            });

            return this;
        }
--- a/src/common/UITestAutomation/EnvironmentConfig.cs
+++ b/src/common/UITestAutomation/EnvironmentConfig.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;
-
-namespace Microsoft.PowerToys.UITest
-{
-    /// <summary>
-    /// Centralized configuration for all environment variables used in UI tests.
-    /// </summary>
-    public static class EnvironmentConfig
-    {
-        private static readonly Lazy<bool> _isInPipeline = new(() =>
-            !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("platform")));
-
-        private static readonly Lazy<bool> _useInstallerForTest = new(() =>
-        {
-            string? envValue = Environment.GetEnvironmentVariable("useInstallerForTest") ??
-                              Environment.GetEnvironmentVariable("USEINSTALLERFORTEST");
-            return !string.IsNullOrEmpty(envValue) && bool.TryParse(envValue, out bool result) && result;
-        });
-
-        private static readonly Lazy<string?> _platform = new(() =>
-            Environment.GetEnvironmentVariable("platform"));
-
-        /// <summary>
-        /// Gets a value indicating whether the tests are running in a CI/CD pipeline.
-        /// Determined by the presence of the "platform" environment variable.
-        /// </summary>
-        public static bool IsInPipeline => _isInPipeline.Value;
-
-        /// <summary>
-        /// Gets a value indicating whether to use installer paths for testing.
-        /// Checks both "useInstallerForTest" and "USEINSTALLERFORTEST" environment variables.
-        /// </summary>
-        public static bool UseInstallerForTest => _useInstallerForTest.Value;
-
-        /// <summary>
-        /// Gets the platform name from the environment variable.
-        /// Typically used in CI/CD pipelines to identify the build platform.
-        /// </summary>
-        public static string? Platform => _platform.Value;
-    }
-}
--- a/src/common/UITestAutomation/ModuleConfigData.cs
+++ b/src/common/UITestAutomation/ModuleConfigData.cs
@@ -92,7 +92,9 @@ namespace Microsoft.PowerToys.UITest
        private ModuleConfigData()
        {
            // Check if we should use installer paths from environment variable
-            UseInstallerForTest = EnvironmentConfig.UseInstallerForTest;
+            string? useInstallerForTestEnv =
+                            Environment.GetEnvironmentVariable("useInstallerForTest") ?? Environment.GetEnvironmentVariable("USEINSTALLERFORTEST");
+            UseInstallerForTest = !string.IsNullOrEmpty(useInstallerForTestEnv) && bool.TryParse(useInstallerForTestEnv, out bool result) && result;

            // Module information including executable name, window name, and optional subdirectory
            ModuleInfo = new Dictionary<PowerToysModule, ModuleInfo>
--- a/src/common/UITestAutomation/SessionHelper.cs
+++ b/src/common/UITestAutomation/SessionHelper.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
-using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
@@ -38,9 +37,6 @@ namespace Microsoft.PowerToys.UITest
        private PowerToysModule scope;
        private string[]? commandLineArgs;

-        /// <summary>
-        /// Gets a value indicating whether to use installer paths for testing.
-        /// </summary>
        private bool UseInstallerForTest { get; }

        [UnconditionalSuppressMessage("SingleFile", "IL3000:Avoid accessing Assembly file path when publishing as a single file", Justification = "<Pending>")]
@@ -49,7 +45,9 @@ namespace Microsoft.PowerToys.UITest
            this.scope = scope;
            this.commandLineArgs = commandLineArgs;
            this.sessionPath = ModuleConfigData.Instance.GetModulePath(scope);
-            UseInstallerForTest = EnvironmentConfig.UseInstallerForTest;
+            string? useInstallerForTestEnv =
+                Environment.GetEnvironmentVariable("useInstallerForTest") ?? Environment.GetEnvironmentVariable("USEINSTALLERFORTEST");
+            UseInstallerForTest = !string.IsNullOrEmpty(useInstallerForTestEnv) && bool.TryParse(useInstallerForTestEnv, out bool result) && result;
            this.locationPath = UseInstallerForTest ? string.Empty : Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);

            CheckWinAppDriverAndRoot();
@@ -138,10 +136,6 @@ namespace Microsoft.PowerToys.UITest
            {
                TryLaunchPowerToysSettings(opts);
            }
-            else if (scope == PowerToysModule.CommandPalette && UseInstallerForTest)
-            {
-                TryLaunchCommandPalette(opts);
-            }
            else
            {
                opts.AddAdditionalCapability("app", appPath);
@@ -169,77 +163,48 @@ namespace Microsoft.PowerToys.UITest

        private void TryLaunchPowerToysSettings(AppiumOptions opts)
        {
-            try
+            CheckWinAppDriverAndRoot();
+
+            var runnerProcessInfo = new ProcessStartInfo
            {
-                var runnerProcessInfo = new ProcessStartInfo
-                {
-                    FileName = locationPath + runnerPath,
-                    Verb = "runas",
-                    Arguments = "--open-settings",
-                };
+                FileName = locationPath + runnerPath,
+                Verb = "runas",
+                Arguments = "--open-settings",
+            };

-                ExitExe(runnerProcessInfo.FileName);
-                runner = Process.Start(runnerProcessInfo);
+            ExitExe(runnerProcessInfo.FileName);
+            runner = Process.Start(runnerProcessInfo);
+            Thread.Sleep(5000);

-                WaitForWindowAndSetCapability(opts, "PowerToys Settings", 5000, 5);
+            // Exit CmdPal UI before launching new process if use installer for test
+            ExitExeByName("Microsoft.CmdPal.UI");

-                // Exit CmdPal UI before launching new process if use installer for test
-                ExitExeByName("Microsoft.CmdPal.UI");
-            }
-            catch (Exception ex)
+            if (root != null)
            {
-                throw new InvalidOperationException($"Failed to launch PowerToys Settings: {ex.Message}", ex);
-            }
-        }
+                const int maxRetries = 5;
+                const int delayMs = 5000;
+                var windowName = "PowerToys Settings";

-        private void TryLaunchCommandPalette(AppiumOptions opts)
-        {
-            try
-            {
-                // Exit any existing CmdPal UI process
-                ExitExeByName("Microsoft.CmdPal.UI");
-
-                var processStartInfo = new ProcessStartInfo
+                for (int attempt = 1; attempt <= maxRetries; attempt++)
                {
-                    FileName = "cmd.exe",
-                    Arguments = "/c start shell:appsFolder\\Microsoft.CommandPalette_8wekyb3d8bbwe!App",
-                    UseShellExecute = false,
-                    CreateNoWindow = true,
-                    WindowStyle = ProcessWindowStyle.Hidden,
-                };
+                    var settingsWindow = ApiHelper.FindDesktopWindowHandler(
+                        [windowName, AdministratorPrefix + windowName]);

-                var process = Process.Start(processStartInfo);
-                process?.WaitForExit();
+                    if (settingsWindow.Count > 0)
+                    {
+                        var hexHwnd = settingsWindow[0].HWnd.ToString("x");
+                        opts.AddAdditionalCapability("appTopLevelWindow", hexHwnd);
+                        return;
+                    }

-                WaitForWindowAndSetCapability(opts, "Command Palette", 5000, 10);
-            }
-            catch (Exception ex)
-            {
-                throw new InvalidOperationException($"Failed to launch Command Palette: {ex.Message}", ex);
-            }
-        }
-
-        private void WaitForWindowAndSetCapability(AppiumOptions opts, string windowName, int delayMs, int maxRetries)
-        {
-            for (int attempt = 1; attempt <= maxRetries; attempt++)
-            {
-                var window = ApiHelper.FindDesktopWindowHandler(
-                    [windowName, AdministratorPrefix + windowName]);
-
-                if (window.Count > 0)
-                {
-                    var hexHwnd = window[0].HWnd.ToString("x");
-                    opts.AddAdditionalCapability("appTopLevelWindow", hexHwnd);
-                    return;
-                }
-
-                if (attempt < maxRetries)
-                {
-                    Thread.Sleep(delayMs);
-                }
-                else
-                {
-                    throw new TimeoutException($"Failed to find {windowName} window after multiple attempts.");
+                    if (attempt < maxRetries)
+                    {
+                        Thread.Sleep(delayMs);
+                    }
+                    else
+                    {
+                        throw new TimeoutException("Failed to find PowerToys Settings window after multiple attempts.");
+                    }
                }
            }
        }
--- a/src/common/UITestAutomation/UITestBase.cs
+++ b/src/common/UITestAutomation/UITestBase.cs
@@ -5,7 +5,6 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
-using System.Text.RegularExpressions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium;

@@ -21,9 +20,6 @@ namespace Microsoft.PowerToys.UITest

        public required Session Session { get; set; }

-        /// <summary>
-        /// Gets a value indicating whether the tests are running in a CI/CD pipeline.
-        /// </summary>
        public bool IsInPipeline { get; }

        public string? ScreenshotDirectory { get; set; }
@@ -38,8 +34,8 @@ namespace Microsoft.PowerToys.UITest

        public UITestBase(PowerToysModule scope = PowerToysModule.PowerToysSettings, WindowSize size = WindowSize.UnSpecified, string[]? commandLineArgs = null)
        {
-            this.IsInPipeline = EnvironmentConfig.IsInPipeline;
-            Console.WriteLine($"Running tests on platform: {EnvironmentConfig.Platform}");
+            this.IsInPipeline = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("platform"));
+            Console.WriteLine($"Running tests on platform: {Environment.GetEnvironmentVariable("platform")}");
            if (IsInPipeline)
            {
                NativeMethods.ChangeDisplayResolution(1920, 1080);
@@ -60,7 +56,6 @@ namespace Microsoft.PowerToys.UITest
        [TestInitialize]
        public void TestInit()
        {
-            KeyboardHelper.SendKeys(Key.Win, Key.M);
            CloseOtherApplications();
            if (IsInPipeline)
            {
@@ -252,174 +247,6 @@ namespace Microsoft.PowerToys.UITest
            return this.Session.Has<Element>(name, timeoutMS, global);
        }

-        /// <summary>
-        /// Finds an element using partial name matching (contains).
-        /// Useful for finding windows with variable titles like "filename.txt - Notepad" or "filename - Notepad".
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="partialName">Part of the name to search for.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found element.</returns>
-        protected T FindByPartialName<T>(string partialName, int timeoutMS = 5000, bool global = false)
-            where T : Element, new()
-        {
-            return Session.Find<T>(By.XPath($"//*[contains(@Name, '{partialName}')]"), timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Finds an element using partial name matching (contains).
-        /// </summary>
-        /// <param name="partialName">Part of the name to search for.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found element.</returns>
-        protected Element FindByPartialName(string partialName, int timeoutMS = 5000, bool global = false)
-        {
-            return FindByPartialName<Element>(partialName, timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Base method for finding elements by selector and filtering by name pattern.
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="selector">The selector to find initial candidates.</param>
-        /// <param name="namePattern">Pattern to match against the Name attribute. Supports regex patterns.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <param name="errorMessage">Custom error message when no element is found.</param>
-        /// <returns>The found element.</returns>
-        private T FindByNamePattern<T>(By selector, string namePattern, int timeoutMS = 5000, bool global = false, string? errorMessage = null)
-            where T : Element, new()
-        {
-            var elements = Session.FindAll<T>(selector, timeoutMS, global);
-            var regex = new Regex(namePattern, RegexOptions.IgnoreCase);
-
-            foreach (var element in elements)
-            {
-                var name = element.GetAttribute("Name");
-                if (!string.IsNullOrEmpty(name) && regex.IsMatch(name))
-                {
-                    return element;
-                }
-            }
-
-            throw new NoSuchElementException(errorMessage ?? $"No element found matching pattern: {namePattern}");
-        }
-
-        /// <summary>
-        /// Finds an element using regular expression pattern matching.
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="pattern">Regular expression pattern to match against the Name attribute.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found element.</returns>
-        protected T FindByPattern<T>(string pattern, int timeoutMS = 5000, bool global = false)
-            where T : Element, new()
-        {
-            return FindByNamePattern<T>(By.XPath("//*[@Name]"), pattern, timeoutMS, global, $"No element found matching pattern: {pattern}");
-        }
-
-        /// <summary>
-        /// Finds an element using regular expression pattern matching.
-        /// </summary>
-        /// <param name="pattern">Regular expression pattern to match against the Name attribute.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found element.</returns>
-        protected Element FindByPattern(string pattern, int timeoutMS = 5000, bool global = false)
-        {
-            return FindByPattern<Element>(pattern, timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Finds an element by ClassName only.
-        /// Returns the first element found with the specified ClassName.
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="className">The ClassName to search for (e.g., "Notepad", "CabinetWClass").</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found element.</returns>
-        protected T FindByClassName<T>(string className, int timeoutMS = 5000, bool global = false)
-            where T : Element, new()
-        {
-            return Session.Find<T>(By.ClassName(className), timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Finds an element by ClassName only.
-        /// Returns the first element found with the specified ClassName.
-        /// </summary>
-        /// <param name="className">The ClassName to search for (e.g., "Notepad", "CabinetWClass").</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found element.</returns>
-        protected Element FindByClassName(string className, int timeoutMS = 5000, bool global = false)
-        {
-            return FindByClassName<Element>(className, timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Finds an element by ClassName and matches its Name attribute using regex pattern matching.
-        /// </summary>
-        /// <typeparam name="T">The class of the element, should be Element or its derived class.</typeparam>
-        /// <param name="className">The ClassName to search for (e.g., "Notepad", "CabinetWClass").</param>
-        /// <param name="namePattern">Pattern to match against the Name attribute. Supports regex patterns.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found element.</returns>
-        protected T FindByClassNameAndNamePattern<T>(string className, string namePattern, int timeoutMS = 5000, bool global = false)
-            where T : Element, new()
-        {
-            return FindByNamePattern<T>(By.ClassName(className), namePattern, timeoutMS, global, $"No element with ClassName '{className}' found matching name pattern: {namePattern}");
-        }
-
-        /// <summary>
-        /// Finds an element by ClassName and matches its Name attribute using regex pattern matching.
-        /// </summary>
-        /// <param name="className">The ClassName to search for (e.g., "Notepad", "CabinetWClass").</param>
-        /// <param name="namePattern">Pattern to match against the Name attribute. Supports regex patterns.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found element.</returns>
-        protected Element FindByClassNameAndNamePattern(string className, string namePattern, int timeoutMS = 5000, bool global = false)
-        {
-            return FindByClassNameAndNamePattern<Element>(className, namePattern, timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Finds a Notepad window regardless of whether the file extension is shown in the title.
-        /// Handles both "filename.txt - Notepad" and "filename - Notepad" formats.
-        /// Uses ClassName to efficiently find Notepad windows first, then matches the filename.
-        /// </summary>
-        /// <param name="baseFileName">The base filename without extension (e.g., "test" for "test.txt").</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found Notepad window element.</returns>
-        protected Element FindNotepadWindow(string baseFileName, int timeoutMS = 5000, bool global = false)
-        {
-            string pattern = $@"^{Regex.Escape(baseFileName)}(\.\w+)?(\s*-\s*|\s+)Notepad$";
-            return FindByClassNameAndNamePattern("Notepad", pattern, timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Finds an Explorer window regardless of the folder or file name display format.
-        /// Handles various Explorer window title formats like "FolderName", "FileName", "FolderName - File Explorer", etc.
-        /// Uses ClassName to efficiently find Explorer windows first, then matches the folder or file name.
-        /// </summary>
-        /// <param name="folderName">The folder or file name to search for (e.g., "Documents", "Desktop", "test.txt").</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found Explorer window element.</returns>
-        protected Element FindExplorerWindow(string folderName, int timeoutMS = 5000, bool global = false)
-        {
-            string pattern = $@"^{Regex.Escape(folderName)}(\s*-\s*(File\s+Explorer|Windows\s+Explorer))?$";
-            return FindByClassNameAndNamePattern("CabinetWClass", pattern, timeoutMS, global);
-        }
-
-        /// <summary>
-        /// Finds an Explorer window by partial folder path.
-        /// Useful when the full path might be displayed in the title.
-        /// </summary>
-        /// <param name="partialPath">Part of the folder path to search for.</param>
-        /// <param name="timeoutMS">The timeout in milliseconds (default is 5000).</param>
-        /// <returns>The found Explorer window element.</returns>
-        protected Element FindExplorerByPartialPath(string partialPath, int timeoutMS = 5000, bool global = false)
-        {
-            return FindByPartialName(partialPath, timeoutMS, global);
-        }
-
        /// <summary>
        /// Finds all elements by selector.
        /// Shortcut for this.Session.FindAll<T>(by, timeoutMS)
--- a/src/common/UITestAutomation/VisualAssert.cs
+++ b/src/common/UITestAutomation/VisualAssert.cs
@@ -27,8 +27,10 @@ namespace Microsoft.PowerToys.UITest
        [RequiresUnreferencedCode("This method uses reflection which may not be compatible with trimming.")]
        public static void AreEqual(TestContext? testContext, Element element, string scenarioSubname = "")
        {
+            var pipelinePlatform = Environment.GetEnvironmentVariable("platform");
+
            // Perform visual validation only in the pipeline
-            if (!EnvironmentConfig.IsInPipeline)
+            if (string.IsNullOrEmpty(pipelinePlatform))
            {
                Console.WriteLine("Skip visual validation in the local run.");
                return;
@@ -53,11 +55,11 @@ namespace Microsoft.PowerToys.UITest

            if (string.IsNullOrWhiteSpace(scenarioSubname))
            {
-                scenarioSubname = string.Join("_", callerClassName, callerName, EnvironmentConfig.Platform);
+                scenarioSubname = string.Join("_", callerClassName, callerName, pipelinePlatform);
            }
            else
            {
-                scenarioSubname = string.Join("_", callerClassName, callerName, scenarioSubname.Trim(), EnvironmentConfig.Platform);
+                scenarioSubname = string.Join("_", callerClassName, callerName, scenarioSubname.Trim(), pipelinePlatform);
            }

            var baselineImageResourceName = callerMethod!.DeclaringType!.Assembly.GetManifestResourceNames().Where(name => name.Contains(scenarioSubname)).FirstOrDefault();
--- a/src/common/logger/logger_settings.h
+++ b/src/common/logger/logger_settings.h
@@ -81,7 +81,6 @@ struct LogSettings
    inline const static std::string workspacesSnapshotToolLoggerName = "workspaces-snapshot-tool";
    inline const static std::wstring workspacesSnapshotToolLogPath = L"workspaces-snapshot-tool-log.log";
    inline const static std::string zoomItLoggerName = "zoom-it";
-    inline const static std::string lightSwitchLoggerName = "light-switch";
    inline const static int retention = 30;
    std::wstring logLevel;
    LogSettings();
--- a/src/common/utils/elevation.h
+++ b/src/common/utils/elevation.h
@@ -257,10 +257,7 @@ inline HANDLE run_elevated(const std::wstring& file, const std::wstring& params,
        exec_info.nShow = SW_HIDE;
    }

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

 // Run command as non-elevated user, returns true if succeeded, puts the process id into returnPid if returnPid != NULL
--- a/src/common/utils/gpo.h
+++ b/src/common/utils/gpo.h
@@ -30,7 +30,6 @@ 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";
@@ -296,11 +295,6 @@ namespace powertoys_gpo
        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_CROP_AND_LOCK);
    }

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

 namespace LoggerHelpers
 {
--- a/src/gpo/assets/PowerToys.admx
+++ b/src/gpo/assets/PowerToys.admx
@@ -137,16 +137,6 @@
        <decimal value="0" />
      </disabledValue>
    </policy>
-    <policy name="ConfigureEnabledUtilityLightSwitch" class="Both" displayName="$(string.ConfigureEnabledUtilityLightSwitch)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityLightSwitch">
-      <parentCategory ref="PowerToys" />
-      <supportedOn ref="SUPPORTED_POWERTOYS_0_90_0" />
-      <enabledValue>
-        <decimal value="1" />
-      </enabledValue>
-      <disabledValue>
-        <decimal value="0" />
-      </disabledValue>
-    </policy>
    <policy name="ConfigureEnabledUtilityEnvironmentVariables" class="Both" displayName="$(string.ConfigureEnabledUtilityEnvironmentVariables)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityEnvironmentVariables">
      <parentCategory ref="PowerToys" />
      <supportedOn ref="SUPPORTED_POWERTOYS_0_75_0" />
--- a/src/gpo/assets/en-US/PowerToys.adml
+++ b/src/gpo/assets/en-US/PowerToys.adml
@@ -245,7 +245,6 @@ If you don't configure this policy, the user will be able to control the setting
      <string id="ConfigureEnabledUtilityCmdNotFound">Command Not Found: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityCmdPal">CmdPal: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityCropAndLock">Crop And Lock: Configure enabled state</string>
-      <string id="ConfigureEnabledUtilityLightSwitch">Light Switch: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityEnvironmentVariables">Environment Variables: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityFancyZones">FancyZones: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityFileLocksmith">File Locksmith: Configure enabled state</string>
--- a/src/modules/Hosts/Hosts.Tests/HostsServiceTest.cs
+++ b/src/modules/Hosts/Hosts.Tests/HostsServiceTest.cs
@@ -298,34 +298,5 @@ namespace Hosts.Tests
            var hidden = fileSystem.FileInfo.New(service.HostsFilePath).Attributes.HasFlag(FileAttributes.Hidden);
            Assert.IsTrue(hidden);
        }
-
-        [TestMethod]
-        public async Task NoLeadingSpaces_Disabled_RemovesIndent()
-        {
-            var content =
-        @"10.1.1.1 host host.local # comment
-10.1.1.2 host2 host2.local # another comment
-";
-
-            var expected =
-        @"10.1.1.1  host host.local     # comment
-10.1.1.2  host2 host2.local   # another comment
-# 10.1.1.30 host30 host30.local # new entry
-";
-
-            var fs = new CustomMockFileSystem();
-            var settings = new Mock<IUserSettings>();
-            settings.Setup(s => s.NoLeadingSpaces).Returns(true);
-            var svc = new HostsService(fs, settings.Object, _elevationHelper.Object);
-            fs.AddFile(svc.HostsFilePath, new MockFileData(content));
-
-            var data = await svc.ReadAsync();
-            var entries = data.Entries.ToList();
-            entries.Add(new Entry(0, "10.1.1.30", "host30 host30.local", "new entry", false));
-            await svc.WriteAsync(data.AdditionalLines, entries);
-
-            var result = fs.GetFile(svc.HostsFilePath);
-            Assert.AreEqual(expected, result.TextContents);
-        }
    }
 }
--- a/src/modules/Hosts/Hosts/Settings/UserSettings.cs
+++ b/src/modules/Hosts/Hosts/Settings/UserSettings.cs
@@ -26,8 +26,6 @@ namespace Hosts.Settings

        private bool _loopbackDuplicates;

-        public bool NoLeadingSpaces { get; private set; }
-
        public bool LoopbackDuplicates
        {
            get => _loopbackDuplicates;
@@ -90,7 +88,6 @@ namespace Hosts.Settings
                            AdditionalLinesPosition = (HostsAdditionalLinesPosition)settings.Properties.AdditionalLinesPosition;
                            Encoding = (HostsEncoding)settings.Properties.Encoding;
                            LoopbackDuplicates = settings.Properties.LoopbackDuplicates;
-                            NoLeadingSpaces = settings.Properties.NoLeadingSpaces;
                        }

                        retry = false;
--- a/src/modules/Hosts/HostsUILib/Helpers/HostsService.cs
+++ b/src/modules/Hosts/HostsUILib/Helpers/HostsService.cs
@@ -157,7 +157,7 @@ namespace HostsUILib.Helpers
                        {
                            lineBuilder.Append('#').Append(' ');
                        }
-                        else if (anyDisabled && !_userSettings.NoLeadingSpaces)
+                        else if (anyDisabled)
                        {
                            lineBuilder.Append(' ').Append(' ');
                        }
--- a/src/modules/Hosts/HostsUILib/Settings/IUserSettings.cs
+++ b/src/modules/Hosts/HostsUILib/Settings/IUserSettings.cs
@@ -19,7 +19,5 @@ namespace HostsUILib.Settings
        event EventHandler LoopbackDuplicatesChanged;

        public delegate void OpenSettingsFunction();
-
-        public bool NoLeadingSpaces { get; }
    }
 }
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.rc
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.rc
@@ -1,32 +0,0 @@
-1 VERSIONINFO
- FILEVERSION 0,1,0,0
- PRODUCTVERSION 0,1,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "Company Name"
-            VALUE "FileDescription", "Light Switch Module"
-            VALUE "FileVersion", "0.1.0.0"
-            VALUE "InternalName", "Light Switch"
-            VALUE "LegalCopyright", "Copyright (C) 2019 Company Name"
-            VALUE "OriginalFilename", "PowerToys.LightSwitchModuleInterface.dll"
-            VALUE "ProductName", "Light Switch"
-            VALUE "ProductVersion", "0.1.0.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.sln
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.sln
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.14.36127.28 d17.14
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LightSwitchModuleInterface", "LightSwitchModuleInterface.vcxproj", "{38177D56-6AD1-4ADF-88C9-2843A7932166}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|x64.ActiveCfg = Debug|x64
-		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|x64.Build.0 = Debug|x64
-		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|x64.ActiveCfg = Release|x64
-		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {FAF634A3-0D98-4A45-B082-D93B59782572}
-	EndGlobalSection
-EndGlobal
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{38177d56-6ad1-4adf-88c9-2843a7932166}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>LightSwitchModuleInterface</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>LightSwitchModuleInterface</ProjectName>
-    <TargetName>PowerToys.LightSwitchModuleInterface</TargetName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LanguageStandard>stdcpplatest</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <LanguageStandard>stdcpplatest</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LanguageStandard>stdcpplatest</LanguageStandard>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <LanguageStandard>stdcpplatest</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>
-        $(SolutionDir)src\;
-        $(SolutionDir)src\modules;
-        $(SolutionDir)src\common\Telemetry;
-        %(AdditionalIncludeDirectories)
-      </AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(CoreLibraryDependencies);%(AdditionalDependencies);advapi32.lib</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="ThemeHelper.h" />
-    <ClInclude Include="trace.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="dllmain.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="ThemeHelper.cpp" />
-    <ClCompile Include="trace.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="LightSwitchModuleInterface.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
-      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj">
-      <Project>{4aed67b6-55fd-486f-b917-e543dee2cb3c}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
-      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="..\..\..\..\deps\spdlog.props" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
-  </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-  </Target>
-</Project>
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj.filters
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj.filters
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="dllmain.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="trace.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ThemeHelper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="trace.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ThemeHelper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{bbf22ac8-46f8-4206-b44b-9c3897e99ce5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{530ed784-9a70-46a0-8fb6-20d5dee4f7d3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{da1cb871-86d3-414c-adf5-a7e9f2077d2f}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="LightSwitchModuleInterface.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-</Project>
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/ThemeHelper.cpp
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/ThemeHelper.cpp
@@ -1,81 +0,0 @@
-#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;
-}
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/ThemeHelper.h
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/ThemeHelper.h
@@ -1,5 +0,0 @@
-#pragma once
-void SetSystemTheme(bool dark);
-void SetAppsTheme(bool dark);
-bool GetCurrentSystemTheme();
-bool GetCurrentAppsTheme();
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/dllmain.cpp
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/dllmain.cpp
@@ -1,669 +0,0 @@
-#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();
-}
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/pch.cpp
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/pch.cpp
@@ -1,2 +0,0 @@
-#include "pch.h"
-#pragma comment(lib, "windowsapp")
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/pch.h
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/pch.h
@@ -1,14 +0,0 @@
-#pragma once
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-#include <common/SettingsAPI/settings_helpers.h>
-#include <common/utils/gpo.h>
-#include <common/utils/winapi_error.h>
-#include <shlwapi.h>
-#include <shellapi.h>
-#include <winrt/Windows.Foundation.h>
-#include <winrt/Windows.System.h>
-#include <winrt/Windows.Globalization.h>
-#include <winrt/Windows.ApplicationModel.h>
-#include <winrt/Windows.ApplicationModel.Core.h>
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/resource.h
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/resource.h
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/trace.cpp
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/trace.cpp
@@ -1,30 +0,0 @@
-#include "pch.h"
-#include "trace.h"
-#include <TraceLoggingProvider.h>
-
-TRACELOGGING_DEFINE_PROVIDER(
-    g_hProvider,
-    "Microsoft.PowerToys",
-    // {38e8889b-9731-53f5-e901-e8a7c1753074}
-    (0x38e8889b, 0x9731, 0x53f5, 0xe9, 0x01, 0xe8, 0xa7, 0xc1, 0x75, 0x30, 0x74),
-    TraceLoggingOptionProjectTelemetry());
-
-void Trace::RegisterProvider()
-{
-    TraceLoggingRegister(g_hProvider);
-}
-
-void Trace::UnregisterProvider()
-{
-    TraceLoggingUnregister(g_hProvider);
-}
-
-void Trace::MyEvent()
-{
-    TraceLoggingWrite(
-        g_hProvider,
-        "PowerToyName_MyEvent",
-        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
-}
--- a/src/modules/LightSwitch/LightSwitchModuleInterface/trace.h
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/trace.h
@@ -1,15 +0,0 @@
-#pragma once
-
-#include <windows.h>
-#include <TraceLoggingActivity.h>
-#include <common/telemetry/ProjectTelemetry.h>
-
-TRACELOGGING_DECLARE_PROVIDER(g_hProvider);
-
-class Trace
-{
-public:
-    static void RegisterProvider();
-    static void UnregisterProvider();
-    static void MyEvent();
-};
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp
@@ -1,258 +0,0 @@
-#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;
-}
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>17.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{08e71c67-6a7e-4ca1-b04e-2fb336410bac}</ProjectGuid>
-    <RootNamespace>LightSwitchService</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.26100.0</WindowsTargetPlatformVersion>
-    <ProjectName>LightSwitchService</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
-    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
-    <TargetName>PowerToys.LightSwitchService</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>
-        ./../;
-        $(SolutionDir)src\common\Telemetry;
-        $(SolutionDir)src\common;
-        $(SolutionDir)src\;
-        $(SolutionDir)deps\spdlog\include;
-        ./;
-        %(AdditionalIncludeDirectories)
-      </AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
-      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
-      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\common\notifications\notifications.vcxproj">
-      <Project>{1d5be09d-78c0-4fd7-af00-ae7c1af7c525}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\common\Telemetry\EtwTrace\EtwTrace.vcxproj">
-      <Project>{8f021b46-362b-485c-bfba-ccf83e820cbd}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\common\SettingsAPI\FileWatcher.cpp" />
-    <ClCompile Include="..\..\..\common\SettingsAPI\settings_helpers.cpp" />
-    <ClCompile Include="..\..\..\common\SettingsAPI\settings_objects.cpp" />
-    <ClCompile Include="LightSwitchService.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="LightSwitchSettings.cpp" />
-    <ClCompile Include="SettingsConstants.cpp" />
-    <ClCompile Include="ThemeHelper.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="ThemeScheduler.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="WinHookEventIDs.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="LightSwitchSettings.h" />
-    <ClInclude Include="SettingsConstants.h" />
-    <ClInclude Include="SettingsObserver.h" />
-    <ClInclude Include="ThemeHelper.h" />
-    <ClInclude Include="ThemeScheduler.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</ExcludedFromBuild>
-    </ClInclude>
-    <ClInclude Include="WinHookEventIDs.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="..\..\..\..\deps\spdlog.props" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
-  </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-  </Target>
-</Project>
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj.filters
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj.filters
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="LightSwitchService.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ThemeScheduler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ThemeHelper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\common\SettingsAPI\settings_helpers.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\common\SettingsAPI\settings_objects.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\common\SettingsAPI\FileWatcher.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LightSwitchSettings.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SettingsConstants.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WinHookEventIDs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ThemeScheduler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ThemeHelper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LightSwitchSettings.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SettingsConstants.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SettingsObserver.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="WinHookEventIDs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
-  </ItemGroup>
-</Project>
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp
@@ -1,148 +0,0 @@
-#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
-    }
-}
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.h
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.h
@@ -1,87 +0,0 @@
-#pragma once
-
-#include <unordered_set>
-#include <string>
-#include <vector>
-#include <memory>
-#include <windows.h>
-
-#include <common/SettingsAPI/FileWatcher.h>
-#include <common/SettingsAPI/settings_objects.h>
-#include <SettingsConstants.h>
-
-class SettingsObserver;
-
-enum class ScheduleMode
-{
-    FixedHours,
-    SunsetToSunrise
-    // Add more in the future
-};
-
-inline std::wstring ToString(ScheduleMode mode)
-{
-    switch (mode)
-    {
-    case ScheduleMode::FixedHours:
-        return L"FixedHours";
-    case ScheduleMode::SunsetToSunrise:
-        return L"SunsetToSunrise";
-    default:
-        return L"FixedHours";
-    }
-}
-
-inline ScheduleMode FromString(const std::wstring& str)
-{
-    if (str == L"SunsetToSunrise")
-        return ScheduleMode::SunsetToSunrise;
-    else
-        return ScheduleMode::FixedHours;
-}
-
-struct LightSwitchConfig
-{
-    ScheduleMode scheduleMode = ScheduleMode::FixedHours;
-
-    std::wstring latitude = L"0.0";
-    std::wstring longitude = L"0.0";
-
-    // Stored as minutes since midnight
-    int lightTime = 8 * 60; // 08:00 default
-    int darkTime = 20 * 60; // 20:00 default
-
-    int offset = 0; // offset in minutes to apply to calculated times
-
-    bool changeSystem = false;
-    bool changeApps = false;
-};
-
-class LightSwitchSettings
-{
-public:
-    static LightSwitchSettings& instance();
-
-    static inline const LightSwitchConfig& settings()
-    {
-        return instance().m_settings;
-    }
-
-    void InitFileWatcher();
-    static std::wstring GetSettingsFileName();
-
-    void AddObserver(SettingsObserver& observer);
-    void RemoveObserver(SettingsObserver& observer);
-
-    void LoadSettings();
-
-private:
-    LightSwitchSettings();
-    ~LightSwitchSettings() = default;
-
-    LightSwitchConfig m_settings;
-    std::unique_ptr<FileWatcher> m_settingsFileWatcher;
-    std::unordered_set<SettingsObserver*> m_observers;
-
-    void NotifyObservers(SettingId id) const;
-};
--- a/src/modules/LightSwitch/LightSwitchService/SettingsConstants.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/SettingsConstants.cpp
@@ -1 +0,0 @@
-#include "SettingsConstants.h"
--- a/src/modules/LightSwitch/LightSwitchService/SettingsConstants.h
+++ b/src/modules/LightSwitch/LightSwitchService/SettingsConstants.h
@@ -1,12 +0,0 @@
-#pragma once
-
-enum class SettingId
-{
-    ScheduleMode = 0,
-    Latitude,
-    Longitude,
-    LightTime,
-    DarkTime,
-    ChangeSystem,
-    ChangeApps
-};
--- a/src/modules/LightSwitch/LightSwitchService/SettingsObserver.h
+++ b/src/modules/LightSwitch/LightSwitchService/SettingsObserver.h
@@ -1,32 +0,0 @@
-#pragma once
-
-#include <unordered_set>
-#include "SettingsConstants.h"
-
-class LightSwitchSettings;
-
-class SettingsObserver
-{
-public:
-    SettingsObserver(std::unordered_set<SettingId> observedSettings) :
-        m_observedSettings(std::move(observedSettings))
-    {
-        LightSwitchSettings::instance().AddObserver(*this);
-    }
-
-    virtual ~SettingsObserver()
-    {
-        LightSwitchSettings::instance().RemoveObserver(*this);
-    }
-
-    // Override this in your class to respond to updates
-    virtual void SettingsUpdate(SettingId type) {}
-
-    bool WantsToBeNotified(SettingId type) const noexcept
-    {
-        return m_observedSettings.contains(type);
-    }
-
-protected:
-    std::unordered_set<SettingId> m_observedSettings;
-};
--- a/src/modules/LightSwitch/LightSwitchService/ThemeHelper.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/ThemeHelper.cpp
@@ -1,80 +0,0 @@
-#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;
-}
--- a/src/modules/LightSwitch/LightSwitchService/ThemeHelper.h
+++ b/src/modules/LightSwitch/LightSwitchService/ThemeHelper.h
@@ -1,5 +0,0 @@
-#pragma once
-void SetSystemTheme(bool dark);
-void SetAppsTheme(bool dark);
-bool GetCurrentSystemTheme();
-bool GetCurrentAppsTheme();
--- a/src/modules/LightSwitch/LightSwitchService/ThemeScheduler.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/ThemeScheduler.cpp
@@ -1,89 +0,0 @@
-#include "ThemeScheduler.h"
-#include <utility>
-
-SunTimes CalculateSunriseSunset(double latitude, double longitude, int year, int month, int day)
-{
-    double zenith = 90.833;
-    int N1 = static_cast<int>(floor(275.0 * month / 9.0));
-    int N2 = static_cast<int>(floor((static_cast<double>(month) + 9) / 12.0));
-    int N3 = static_cast<int>(floor((1.0 + floor((year - 4.0 * floor(year / 4.0) + 2.0) / 3.0))));
-    int N = N1 - (N2 * N3) + day - 30;
-
-    auto calcTime = [&](bool sunrise) -> double {
-        double lngHour = longitude / 15.0;
-        double t = sunrise ? N + ((6 - lngHour) / 24) : N + ((18 - lngHour) / 24);
-
-        double M = (0.9856 * t) - 3.289;
-        double L = M + (1.916 * sin(deg2rad(M))) + (0.020 * sin(2 * deg2rad(M))) + 282.634;
-        if (L < 0)
-            L += 360;
-        if (L > 360)
-            L -= 360;
-
-        double RA = rad2deg(atan(0.91764 * tan(deg2rad(L))));
-        if (RA < 0)
-            RA += 360;
-        if (RA > 360)
-            RA -= 360;
-
-        double Lquadrant = floor(L / 90) * 90;
-        double RAquadrant = floor(RA / 90) * 90;
-        RA = RA + (Lquadrant - RAquadrant);
-        RA /= 15;
-
-        double sinDec = 0.39782 * sin(deg2rad(L));
-        double cosDec = cos(asin(sinDec));
-
-        double cosH = (cos(deg2rad(zenith)) - (sinDec * sin(deg2rad(latitude)))) / (cosDec * cos(deg2rad(latitude)));
-        if (cosH > 1 || cosH < -1)
-            return -1;
-
-        double H = sunrise ? 360 - rad2deg(acos(cosH)) : rad2deg(acos(cosH));
-        H /= 15;
-
-        double T = H + RA - (0.06571 * t) - 6.622;
-        double UT = T - lngHour;
-        while (UT < 0)
-            UT += 24;
-        while (UT >= 24)
-            UT -= 24;
-
-        return UT;
-    };
-
-    double riseUT = calcTime(true);
-    double setUT = calcTime(false);
-
-    auto toLocal = [](double UT) {
-        TIME_ZONE_INFORMATION tz;
-        DWORD state = GetTimeZoneInformation(&tz);
-        double totalBias = tz.Bias;
-
-        if (state == TIME_ZONE_ID_DAYLIGHT)
-            totalBias += tz.DaylightBias;
-        else if (state == TIME_ZONE_ID_STANDARD)
-            totalBias += tz.StandardBias;
-
-        double biasHours = -(totalBias / 60.0);
-        double localTime = UT + biasHours;
-
-        while (localTime < 0)
-            localTime += 24;
-        while (localTime >= 24)
-            localTime -= 24;
-
-        int hour = static_cast<int>(localTime);
-        int minute = static_cast<int>((localTime - hour) * 60);
-        return std::pair<int, int>{ hour, minute };
-    };
-
-    auto [riseHour, riseMinute] = toLocal(riseUT);
-    auto [setHour, setMinute] = toLocal(setUT);
-
-    SunTimes result;
-    result.sunriseHour = riseHour;
-    result.sunriseMinute = riseMinute;
-    result.sunsetHour = setHour;
-    result.sunsetMinute = setMinute;
-    return result;
-}
--- a/src/modules/LightSwitch/LightSwitchService/ThemeScheduler.h
+++ b/src/modules/LightSwitch/LightSwitchService/ThemeScheduler.h
@@ -1,25 +0,0 @@
-#pragma once
-#include <cmath>
-#include <ctime>
-#include <windows.h>
-
-// Struct to hold calculated sunrise/sunset times
-struct SunTimes
-{
-    int sunriseHour;
-    int sunriseMinute;
-    int sunsetHour;
-    int sunsetMinute;
-};
-
-constexpr double PI = 3.14159265358979323846;
-constexpr double deg2rad(double deg)
-{
-    return deg * PI / 180.0;
-}
-constexpr double rad2deg(double rad)
-{
-    return rad * 180.0 / PI;
-}
-
-SunTimes CalculateSunriseSunset(double latitude, double longitude, int year, int month, int day);
--- a/src/modules/LightSwitch/LightSwitchService/WinHookEventIDs.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/WinHookEventIDs.cpp
@@ -1,15 +0,0 @@
-
-#include "WinHookEventIDs.h"
-#include <wtypes.h>
-#include <mutex>
-
-UINT WM_PRIV_SETTINGS_CHANGED = 0;
-
-std::once_flag init_flag;
-
-void InitializeWinhookEventIds()
-{
-    std::call_once(init_flag, [&] {
-        WM_PRIV_SETTINGS_CHANGED = RegisterWindowMessage(L"{11978F7B-221A-4E65-B9A9-693F7D6E4B25}");
-    });
-}
--- a/src/modules/LightSwitch/LightSwitchService/WinHookEventIDs.h
+++ b/src/modules/LightSwitch/LightSwitchService/WinHookEventIDs.h
@@ -1,6 +0,0 @@
-#pragma once
-#include <Windows.h>
-
-extern UINT WM_PRIV_SETTINGS_CHANGED; // Scheduled when a watched settings file is updated
-
-void InitializeWinhookEventIds();
--- a/src/modules/LightSwitch/LightSwitchService/packages.config
+++ b/src/modules/LightSwitch/LightSwitchService/packages.config
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
-</packages>
--- a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.cpp
+++ b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.cpp
@@ -5,7 +5,6 @@
 #include "MouseHighlighter.h"
 #include "trace.h"
 #include <cmath>
-#include <algorithm>

 #ifdef COMPOSITION
 namespace winrt
@@ -50,9 +49,6 @@ private:
    void BringToFront();
    HHOOK m_mouseHook = NULL;
    static LRESULT CALLBACK MouseHookProc(int nCode, WPARAM wParam, LPARAM lParam) noexcept;
-    // Helpers for spotlight overlay
-    float GetDpiScale() const;
-    void UpdateSpotlightMask(float cx, float cy, float radius, bool show);

    static constexpr auto m_className = L"MouseHighlighter";
    static constexpr auto m_windowTitle = L"PowerToys Mouse Highlighter";
@@ -71,14 +67,7 @@ private:
    winrt::CompositionSpriteShape m_leftPointer{ nullptr };
    winrt::CompositionSpriteShape m_rightPointer{ nullptr };
    winrt::CompositionSpriteShape m_alwaysPointer{ nullptr };
-    // Spotlight overlay (mask with soft feathered edge)
-    winrt::SpriteVisual m_overlay{ nullptr };
-    winrt::CompositionMaskBrush m_spotlightMask{ nullptr };
-    winrt::CompositionRadialGradientBrush m_spotlightMaskGradient{ nullptr };
-    winrt::CompositionColorBrush m_spotlightSource{ nullptr };
-    winrt::CompositionColorGradientStop m_maskStopCenter{ nullptr };
-    winrt::CompositionColorGradientStop m_maskStopInner{ nullptr };
-    winrt::CompositionColorGradientStop m_maskStopOuter{ nullptr };
+    winrt::CompositionSpriteShape m_spotlightPointer{ nullptr };

    bool m_leftPointerEnabled = true;
    bool m_rightPointerEnabled = true;
@@ -134,35 +123,6 @@ bool Highlighter::CreateHighlighter()
        m_shape.RelativeSizeAdjustment({ 1.0f, 1.0f });
        m_root.Children().InsertAtTop(m_shape);

-        // Create spotlight overlay (soft feather, DPI-aware)
-        m_overlay = m_compositor.CreateSpriteVisual();
-        m_overlay.RelativeSizeAdjustment({ 1.0f, 1.0f });
-        m_spotlightSource = m_compositor.CreateColorBrush(m_alwaysColor);
-        m_spotlightMaskGradient = m_compositor.CreateRadialGradientBrush();
-        m_spotlightMaskGradient.MappingMode(winrt::CompositionMappingMode::Absolute);
-        // Center region fully transparent
-        m_maskStopCenter = m_compositor.CreateColorGradientStop();
-        m_maskStopCenter.Offset(0.0f);
-        m_maskStopCenter.Color(winrt::Windows::UI::ColorHelper::FromArgb(0, 0, 0, 0));
-        // Inner edge of feather (still transparent)
-        m_maskStopInner = m_compositor.CreateColorGradientStop();
-        m_maskStopInner.Offset(0.995f); // will be updated per-radius
-        m_maskStopInner.Color(winrt::Windows::UI::ColorHelper::FromArgb(0, 0, 0, 0));
-        // Outer edge (opaque mask -> overlay visible)
-        m_maskStopOuter = m_compositor.CreateColorGradientStop();
-        m_maskStopOuter.Offset(1.0f);
-        m_maskStopOuter.Color(winrt::Windows::UI::ColorHelper::FromArgb(255, 255, 255, 255));
-        m_spotlightMaskGradient.ColorStops().Append(m_maskStopCenter);
-        m_spotlightMaskGradient.ColorStops().Append(m_maskStopInner);
-        m_spotlightMaskGradient.ColorStops().Append(m_maskStopOuter);
-
-        m_spotlightMask = m_compositor.CreateMaskBrush();
-        m_spotlightMask.Source(m_spotlightSource);
-        m_spotlightMask.Mask(m_spotlightMaskGradient);
-        m_overlay.Brush(m_spotlightMask);
-        m_overlay.IsVisible(false);
-        m_root.Children().InsertAtTop(m_overlay);
-
        return true;
    }
    catch (...)
@@ -205,8 +165,12 @@ void Highlighter::AddDrawingPoint(MouseButton button)
        // always
        if (m_spotlightMode)
        {
-            UpdateSpotlightMask(static_cast<float>(pt.x), static_cast<float>(pt.y), m_radius, true);
-            return;
+            float borderThickness = static_cast<float>(std::hypot(GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN)));
+            circleGeometry.Radius({ static_cast<float>(borderThickness / 2.0 + m_radius), static_cast<float>(borderThickness / 2.0 + m_radius) });
+            circleShape.FillBrush(nullptr);
+            circleShape.StrokeBrush(m_compositor.CreateColorBrush(m_alwaysColor));
+            circleShape.StrokeThickness(borderThickness);
+            m_spotlightPointer = circleShape;
        }
        else
        {
@@ -245,14 +209,20 @@ void Highlighter::UpdateDrawingPointPosition(MouseButton button)
    }
    else
    {
-        // always / spotlight idle
+        // always
        if (m_spotlightMode)
        {
-            UpdateSpotlightMask(static_cast<float>(pt.x), static_cast<float>(pt.y), m_radius, true);
+            if (m_spotlightPointer)
+            {
+                m_spotlightPointer.Offset({ static_cast<float>(pt.x), static_cast<float>(pt.y) });
+            }
        }
-        else if (m_alwaysPointer)
+        else
        {
-            m_alwaysPointer.Offset({ static_cast<float>(pt.x), static_cast<float>(pt.y) });
+            if (m_alwaysPointer)
+            {
+                m_alwaysPointer.Offset({ static_cast<float>(pt.x), static_cast<float>(pt.y) });
+            }
        }
    }
 }
@@ -296,9 +266,9 @@ void Highlighter::ClearDrawingPoint()
 {
    if (m_spotlightMode)
    {
-        if (m_overlay)
+        if (m_spotlightPointer)
        {
-            m_overlay.IsVisible(false);
+            m_spotlightPointer.StrokeBrush().as<winrt::Windows::UI::Composition::CompositionColorBrush>().Color(winrt::Windows::UI::ColorHelper::FromArgb(0, 0, 0, 0));
        }
    }
    else
@@ -451,10 +421,7 @@ void Highlighter::StopDrawing()
    m_leftPointer = nullptr;
    m_rightPointer = nullptr;
    m_alwaysPointer = nullptr;
-    if (m_overlay)
-    {
-        m_overlay.IsVisible(false);
-    }
+    m_spotlightPointer = nullptr;
    ShowWindow(m_hwnd, SW_HIDE);
    UnhookWindowsHookEx(m_mouseHook);
    ClearDrawing();
@@ -485,16 +452,6 @@ void Highlighter::ApplySettings(MouseHighlighterSettings settings)
        m_rightPointerEnabled = false;
    }

-    // Keep spotlight overlay color updated
-    if (m_spotlightSource)
-    {
-        m_spotlightSource.Color(m_alwaysColor);
-    }
-    if (!m_spotlightMode && m_overlay)
-    {
-        m_overlay.IsVisible(false);
-    }
-
    if (instance->m_visible)
    {
        instance->StopDrawing();
@@ -606,43 +563,6 @@ void Highlighter::Terminate()
    }
 }

-float Highlighter::GetDpiScale() const
-{
-    return static_cast<float>(GetDpiForWindow(m_hwnd)) / 96.0f;
-}
-
-// Update spotlight radial mask center/radius with DPI-aware feather
-void Highlighter::UpdateSpotlightMask(float cx, float cy, float radius, bool show)
-{
-    if (!m_spotlightMaskGradient)
-    {
-        return;
-    }
-
-    m_spotlightMaskGradient.EllipseCenter({ cx, cy });
-    m_spotlightMaskGradient.EllipseRadius({ radius, radius });
-
-    const float dpiScale = GetDpiScale();
-    // Target a very fine edge: ~1 physical pixel, convert to DIPs: 1 / dpiScale
-    const float featherDip = 1.0f / (dpiScale > 0.0f ? dpiScale : 1.0f);
-    const float safeRadius = (std::max)(radius, 1.0f);
-    const float featherRel = (std::min)(0.25f, featherDip / safeRadius);
-
-    if (m_maskStopInner)
-    {
-        m_maskStopInner.Offset((std::max)(0.0f, 1.0f - featherRel));
-    }
-
-    if (m_spotlightSource)
-    {
-        m_spotlightSource.Color(m_alwaysColor);
-    }
-    if (m_overlay)
-    {
-        m_overlay.IsVisible(show);
-    }
-}
-
 #pragma region MouseHighlighter_API

 void MouseHighlighterApplySettings(MouseHighlighterSettings settings)
--- a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props
+++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props
@@ -12,6 +12,6 @@
    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
    <PackageVersion Include="Shmuelie.WinRTServer" Version="2.1.1" />
    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.8" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.7" />
  </ItemGroup>
 </Project>
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/DiagnosticsHelper.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/DiagnosticsHelper.cs
@@ -1,66 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace Microsoft.CmdPal.Common.Helpers;
-
-/// <summary>
-/// Provides utility methods for building diagnostic and error messages.
-/// </summary>
-public static class DiagnosticsHelper
-{
-    /// <summary>
-    /// Builds a comprehensive exception message with timestamp and detailed diagnostic information.
-    /// </summary>
-    /// <param name="exception">The exception that occurred.</param>
-    /// <param name="extensionHint">A hint about which extension caused the exception to help with debugging.</param>
-    /// <returns>A string containing the exception details, timestamp, and source information for diagnostic purposes.</returns>
-    public static string BuildExceptionMessage(Exception exception, string? extensionHint)
-    {
-        var locationHint = string.IsNullOrWhiteSpace(extensionHint) ? "application" : $"'{extensionHint}' extension";
-
-        // let's try to get a message from the exception or inferred it from the HRESULT
-        // to show at least something
-        var message = exception.Message;
-        if (string.IsNullOrWhiteSpace(message))
-        {
-            var temp = Marshal.GetExceptionForHR(exception.HResult)?.Message;
-            if (!string.IsNullOrWhiteSpace(temp))
-            {
-                message = temp + $" (inferred from HRESULT 0x{exception.HResult:X8})";
-            }
-        }
-
-        if (string.IsNullOrWhiteSpace(message))
-        {
-            message = "[No message available]";
-        }
-
-        // note: keep date time kind and format consistent with the log
-        return $"""
-                ============================================================
-                😢 An unexpected error occurred in the {locationHint}.
-
-                Summary:
-                  Message:    {message}
-                  Type:       {exception.GetType().FullName}
-                  Source:     {exception.Source ?? "N/A"}
-                  Time:       {DateTimeOffset.Now:yyyy-MM-dd HH:mm:ss.fffffff}
-                  HRESULT:    0x{exception.HResult:X8} ({exception.HResult})
-
-                Stack Trace:
-                {exception.StackTrace ?? "[No stack trace available]"}
-
-                ------------------ Full Exception Details ------------------
-                {exception}
-
-                ℹ️ If you need further assistance, please include this information in your support request.
-                ℹ️ Before sending, take a quick look to make sure it doesn't contain any personal or sensitive information.
-                ============================================================
-
-                """;
-    }
-}
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/ExtensionHostInstance.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/ExtensionHostInstance.cs
@@ -24,7 +24,7 @@ public partial class ExtensionHostInstance
    /// <param name="message">The log message to send</param>
    public void LogMessage(ILogMessage message)
    {
-        if (Host is not null)
+        if (Host != null)
        {
            _ = Task.Run(async () =>
            {
@@ -47,7 +47,7 @@ public partial class ExtensionHostInstance

    public void ShowStatus(IStatusMessage message, StatusContext context)
    {
-        if (Host is not null)
+        if (Host != null)
        {
            _ = Task.Run(async () =>
            {
@@ -64,7 +64,7 @@ public partial class ExtensionHostInstance

    public void HideStatus(IStatusMessage message)
    {
-        if (Host is not null)
+        if (Host != null)
        {
            _ = Task.Run(async () =>
            {
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/InterlockedBoolean.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/InterlockedBoolean.cs
@@ -1,46 +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;
-
-namespace Microsoft.CmdPal.Common.Helpers;
-
-/// <summary>
-/// Thread-safe boolean implementation using atomic operations
-/// </summary>
-public struct InterlockedBoolean(bool initialValue = false)
-{
-    private int _value = initialValue ? 1 : 0;
-
-    /// <summary>
-    /// Gets or sets the boolean value atomically
-    /// </summary>
-    public bool Value
-    {
-        get => Volatile.Read(ref _value) == 1;
-        set => Interlocked.Exchange(ref _value, value ? 1 : 0);
-    }
-
-    /// <summary>
-    /// Atomically sets the value to true
-    /// </summary>
-    /// <returns>True if the value was previously false, false if it was already true</returns>
-    public bool Set()
-    {
-        return Interlocked.Exchange(ref _value, 1) == 0;
-    }
-
-    /// <summary>
-    /// Atomically sets the value to false
-    /// </summary>
-    /// <returns>True if the value was previously true, false if it was already false</returns>
-    public bool Clear()
-    {
-        return Interlocked.Exchange(ref _value, 0) == 1;
-    }
-
-    public override int GetHashCode() => Value.GetHashCode();
-
-    public override string ToString() => Value.ToString();
-}
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/SupersedingAsyncGate.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/SupersedingAsyncGate.cs
@@ -1,139 +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.Threading;
-using System.Threading.Tasks;
-
-namespace Microsoft.CmdPal.Common.Helpers;
-
-/// <summary>
-/// An async gate that ensures only one operation runs at a time.
-/// If ExecuteAsync is called while already executing, it cancels the current execution
-/// and starts the operation again (superseding behavior).
-/// </summary>
-public class SupersedingAsyncGate : IDisposable
-{
-    private readonly Func<CancellationToken, Task> _action;
-    private readonly Lock _lock = new();
-    private int _callId;
-    private TaskCompletionSource<bool>? _currentTcs;
-    private CancellationTokenSource? _currentCancellationSource;
-    private Task? _executingTask;
-
-    public SupersedingAsyncGate(Func<CancellationToken, Task> action)
-    {
-        ArgumentNullException.ThrowIfNull(action);
-        _action = action;
-    }
-
-    /// <summary>
-    /// Executes the configured action. If another execution is running, this call will
-    /// cancel the current execution and restart the operation.
-    /// </summary>
-    /// <param name="cancellationToken">Optional external cancellation token</param>
-    public async Task ExecuteAsync(CancellationToken cancellationToken = default)
-    {
-        TaskCompletionSource<bool> tcs;
-
-        lock (_lock)
-        {
-            _currentCancellationSource?.Cancel();
-            _currentTcs?.TrySetException(new OperationCanceledException("Superseded by newer call"));
-
-            tcs = new();
-            _currentTcs = tcs;
-            _callId++;
-
-            var shouldStartExecution = _executingTask is null;
-            if (shouldStartExecution)
-            {
-                _executingTask = Task.Run(ExecuteLoop, CancellationToken.None);
-            }
-        }
-
-        await using var ctr = cancellationToken.Register(() => tcs.TrySetCanceled(cancellationToken));
-        await tcs.Task;
-    }
-
-    private async Task ExecuteLoop()
-    {
-        try
-        {
-            while (true)
-            {
-                TaskCompletionSource<bool>? currentTcs;
-                CancellationTokenSource? currentCts;
-                int currentCallId;
-
-                lock (_lock)
-                {
-                    currentTcs = _currentTcs;
-                    currentCallId = _callId;
-
-                    if (currentTcs is null)
-                    {
-                        break;
-                    }
-
-                    _currentCancellationSource?.Dispose();
-                    _currentCancellationSource = new();
-                    currentCts = _currentCancellationSource;
-                }
-
-                try
-                {
-                    await _action(currentCts.Token);
-                    CompleteIfCurrent(currentTcs, currentCallId, static t => t.TrySetResult(true));
-                }
-                catch (OperationCanceledException)
-                {
-                    CompleteIfCurrent(currentTcs, currentCallId, tcs => tcs.TrySetCanceled(currentCts.Token));
-                }
-                catch (Exception ex)
-                {
-                    CompleteIfCurrent(currentTcs, currentCallId, tcs => tcs.TrySetException(ex));
-                }
-            }
-        }
-        finally
-        {
-            lock (_lock)
-            {
-                _currentTcs = null;
-                _currentCancellationSource?.Dispose();
-                _currentCancellationSource = null;
-                _executingTask = null;
-            }
-        }
-    }
-
-    private void CompleteIfCurrent(
-        TaskCompletionSource<bool> candidate,
-        int id,
-        Action<TaskCompletionSource<bool>> complete)
-    {
-        lock (_lock)
-        {
-            if (_currentTcs == candidate && _callId == id)
-            {
-                complete(candidate);
-                _currentTcs = null;
-            }
-        }
-    }
-
-    public void Dispose()
-    {
-        lock (_lock)
-        {
-            _currentCancellationSource?.Cancel();
-            _currentCancellationSource?.Dispose();
-            _currentTcs?.TrySetException(new ObjectDisposedException(nameof(SupersedingAsyncGate)));
-            _currentTcs = null;
-        }
-
-        GC.SuppressFinalize(this);
-    }
-}
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Microsoft.CmdPal.Common.csproj
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Common/Microsoft.CmdPal.Common.csproj
@@ -28,24 +28,7 @@
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
-    <ProjectReference Include="..\..\..\common\ManagedCsWin32\ManagedCsWin32.csproj" />
    <ProjectReference Include="..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
  </ItemGroup>

-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
 </Project>
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/NativeMethods.txt
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Common/NativeMethods.txt
@@ -9,7 +9,3 @@ GetWindowRect
 GetMonitorInfo
 SetWindowPos
 MonitorFromWindow
-
-SHOW_WINDOW_CMD
-ShellExecuteEx
-SEE_MASK_INVOKEIDLIST 
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Common/Properties/Resources.Designer.cs
@@ -1,99 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Microsoft.CmdPal.Common.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.CmdPal.Common.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Open path in console.
-        /// </summary>
-        internal static string Indexer_Command_OpenPathInConsole {
-            get {
-                return ResourceManager.GetString("Indexer_Command_OpenPathInConsole", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Properties.
-        /// </summary>
-        internal static string Indexer_Command_OpenProperties {
-            get {
-                return ResourceManager.GetString("Indexer_Command_OpenProperties", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Open with.
-        /// </summary>
-        internal static string Indexer_Command_OpenWith {
-            get {
-                return ResourceManager.GetString("Indexer_Command_OpenWith", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Show in folder.
-        /// </summary>
-        internal static string Indexer_Command_ShowInFolder {
-            get {
-                return ResourceManager.GetString("Indexer_Command_ShowInFolder", resourceCulture);
-            }
-        }
-    }
-}
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Properties/Resources.resx
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Common/Properties/Resources.resx
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Indexer_Command_OpenPathInConsole" xml:space="preserve">
-    <value>Open path in console</value>
-  </data>
-  <data name="Indexer_Command_OpenProperties" xml:space="preserve">
-    <value>Properties</value>
-  </data>
-  <data name="Indexer_Command_OpenWith" xml:space="preserve">
-    <value>Open with</value>
-  </data>
-  <data name="Indexer_Command_ShowInFolder" xml:space="preserve">
-    <value>Show in folder</value>
-  </data>
-</root>
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/AppExtensionHost.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/AppExtensionHost.cs
@@ -36,7 +36,7 @@ public abstract partial class AppExtensionHost : IExtensionHost

    public IAsyncAction HideStatus(IStatusMessage? message)
    {
-        if (message is null)
+        if (message == null)
        {
            return Task.CompletedTask.AsAsyncAction();
        }
@@ -55,7 +55,7 @@ public abstract partial class AppExtensionHost : IExtensionHost

    public IAsyncAction LogMessage(ILogMessage? message)
    {
-        if (message is null)
+        if (message == null)
        {
            return Task.CompletedTask.AsAsyncAction();
        }
@@ -80,7 +80,7 @@ public abstract partial class AppExtensionHost : IExtensionHost
                try
                {
                    var vm = StatusMessages.Where(messageVM => messageVM.Model.Unsafe == message).FirstOrDefault();
-                    if (vm is not null)
+                    if (vm != null)
                    {
                        StatusMessages.Remove(vm);
                    }
@@ -113,7 +113,7 @@ public abstract partial class AppExtensionHost : IExtensionHost
    {
        // If this message is already in the list of messages, just bring it to the top
        var oldVm = StatusMessages.Where(messageVM => messageVM.Model.Unsafe == message).FirstOrDefault();
-        if (oldVm is not null)
+        if (oldVm != null)
        {
            Task.Factory.StartNew(
                () =>
@@ -142,7 +142,7 @@ public abstract partial class AppExtensionHost : IExtensionHost

    public IAsyncAction ShowStatus(IStatusMessage? message, StatusContext context)
    {
-        if (message is null)
+        if (message == null)
        {
            return Task.CompletedTask.AsAsyncAction();
        }
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandBarViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandBarViewModel.cs
@@ -2,6 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

+using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
@@ -34,13 +35,13 @@ public partial class CommandBarViewModel : ObservableObject,
    [NotifyPropertyChangedFor(nameof(HasPrimaryCommand))]
    public partial CommandItemViewModel? PrimaryCommand { get; set; }

-    public bool HasPrimaryCommand => PrimaryCommand is not null && PrimaryCommand.ShouldBeVisible;
+    public bool HasPrimaryCommand => PrimaryCommand != null && PrimaryCommand.ShouldBeVisible;

    [ObservableProperty]
    [NotifyPropertyChangedFor(nameof(HasSecondaryCommand))]
    public partial CommandItemViewModel? SecondaryCommand { get; set; }

-    public bool HasSecondaryCommand => SecondaryCommand is not null;
+    public bool HasSecondaryCommand => SecondaryCommand != null;

    [ObservableProperty]
    public partial bool ShouldShowContextMenu { get; set; } = false;
@@ -57,14 +58,14 @@ public partial class CommandBarViewModel : ObservableObject,

    private void SetSelectedItem(ICommandBarContext? value)
    {
-        if (value is not null)
+        if (value != null)
        {
            PrimaryCommand = value.PrimaryCommand;
            value.PropertyChanged += SelectedItemPropertyChanged;
        }
        else
        {
-            if (SelectedItem is not null)
+            if (SelectedItem != null)
            {
                SelectedItem.PropertyChanged -= SelectedItemPropertyChanged;
            }
@@ -87,7 +88,7 @@ public partial class CommandBarViewModel : ObservableObject,

    private void UpdateContextItems()
    {
-        if (SelectedItem is null)
+        if (SelectedItem == null)
        {
            SecondaryCommand = null;
            ShouldShowContextMenu = false;
@@ -126,13 +127,13 @@ public partial class CommandBarViewModel : ObservableObject,
    public ContextKeybindingResult CheckKeybinding(bool ctrl, bool alt, bool shift, bool win, VirtualKey key)
    {
        var keybindings = SelectedItem?.Keybindings();
-        if (keybindings is not null)
+        if (keybindings != null)
        {
            // Does the pressed key match any of the keybindings?
            var pressedKeyChord = KeyChordHelpers.FromModifiers(ctrl, alt, shift, win, key, 0);
            if (keybindings.TryGetValue(pressedKeyChord, out var matchedItem))
            {
-                return matchedItem is not null ? PerformCommand(matchedItem) : ContextKeybindingResult.Unhandled;
+                return matchedItem != null ? PerformCommand(matchedItem) : ContextKeybindingResult.Unhandled;
            }
        }

@@ -141,7 +142,7 @@ public partial class CommandBarViewModel : ObservableObject,

    private ContextKeybindingResult PerformCommand(CommandItemViewModel? command)
    {
-        if (command is null)
+        if (command == null)
        {
            return ContextKeybindingResult.Unhandled;
        }
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandContextItemViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandContextItemViewModel.cs
@@ -2,14 +2,11 @@
 // 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 Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;

 namespace Microsoft.CmdPal.Core.ViewModels;

-[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 public partial class CommandContextItemViewModel(ICommandContextItem contextItem, WeakReference<IPageContext> context) : CommandItemViewModel(new(contextItem), context), IContextItemViewModel
 {
    private readonly KeyChord nullKeyChord = new(0, 0, 0);
@@ -20,7 +17,7 @@ public partial class CommandContextItemViewModel(ICommandContextItem contextItem

    public KeyChord? RequestedShortcut { get; private set; }

-    public bool HasRequestedShortcut => RequestedShortcut is not null && (RequestedShortcut.Value != nullKeyChord);
+    public bool HasRequestedShortcut => RequestedShortcut != null && (RequestedShortcut.Value != nullKeyChord);

    public override void InitializeProperties()
    {
@@ -32,7 +29,7 @@ public partial class CommandContextItemViewModel(ICommandContextItem contextItem
        base.InitializeProperties();

        var contextItem = Model.Unsafe;
-        if (contextItem is null)
+        if (contextItem == null)
        {
            return; // throw?
        }
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandItemViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandItemViewModel.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 Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
@@ -10,7 +9,6 @@ using Microsoft.CommandPalette.Extensions.Toolkit;

 namespace Microsoft.CmdPal.Core.ViewModels;

-[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBarContext
 {
    public ExtensionObject<ICommandItem> Model => _commandItemModel;
@@ -68,7 +66,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
    {
        get
        {
-            List<IContextItemViewModel> l = _defaultCommandContextItem is null ?
+            List<IContextItemViewModel> l = _defaultCommandContextItem == null ?
                new() :
                [_defaultCommandContextItem];

@@ -100,7 +98,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
        }

        var model = _commandItemModel.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return;
        }
@@ -128,7 +126,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
        }

        var model = _commandItemModel.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return;
        }
@@ -136,7 +134,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
        Command.InitializeProperties();

        var listIcon = model.Icon;
-        if (listIcon is not null)
+        if (listIcon != null)
        {
            _listItemIcon = new(listIcon);
            _listItemIcon.InitializeProperties();
@@ -172,13 +170,13 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
        }

        var model = _commandItemModel.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return;
        }

        var more = model.MoreCommands;
-        if (more is not null)
+        if (more != null)
        {
            MoreCommands = more
                .Select(item =>
@@ -300,7 +298,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
    protected virtual void FetchProperty(string propertyName)
    {
        var model = this._commandItemModel.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return; // throw?
        }
@@ -308,17 +306,13 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
        switch (propertyName)
        {
            case nameof(Command):
-                if (Command is not null)
+                if (Command != null)
                {
                    Command.PropertyChanged -= Command_PropertyChanged;
                }

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

            case nameof(model.MoreCommands):
                var more = model.MoreCommands;
-                if (more is not null)
+                if (more != null)
                {
                    var newContextMenu = more
                        .Select(item =>
                        {
-                            if (item is ICommandContextItem contextItem)
+                            if (item is CommandContextItem contextItem)
                            {
                                return new CommandContextItemViewModel(contextItem, PageContext) as IContextItemViewModel;
                            }
@@ -391,14 +385,6 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
        switch (propertyName)
        {
            case nameof(Command.Name):
-                // Extensions based on Command Palette SDK < 0.3 CommandItem class won't notify when Title changes because Command
-                // or Command.Name change. This is a workaround to ensure that the Title is always up-to-date for extensions with old SDK.
-                var model = _commandItemModel.Unsafe;
-                if (model is not null)
-                {
-                    _itemTitle = model.Title;
-                }
-
                UpdateProperty(nameof(Title));
                UpdateProperty(nameof(Name));
                break;
@@ -430,7 +416,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
        Command.SafeCleanup();

        var model = _commandItemModel.Unsafe;
-        if (model is not null)
+        if (model != null)
        {
            model.PropChanged -= Model_PropChanged;
        }
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandViewModel.cs
@@ -44,7 +44,7 @@ public partial class CommandViewModel : ExtensionObjectViewModel
        }

        var model = Model.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return;
        }
@@ -67,13 +67,13 @@ public partial class CommandViewModel : ExtensionObjectViewModel
        }

        var model = Model.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return;
        }

        var ico = model.Icon;
-        if (ico is not null)
+        if (ico != null)
        {
            Icon = new(ico);
            Icon.InitializeProperties();
@@ -98,7 +98,7 @@ public partial class CommandViewModel : ExtensionObjectViewModel
    protected void FetchProperty(string propertyName)
    {
        var model = Model.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return; // throw?
        }
@@ -125,7 +125,7 @@ public partial class CommandViewModel : ExtensionObjectViewModel
        Icon = new(null); // necessary?

        var model = Model.Unsafe;
-        if (model is not null)
+        if (model != null)
        {
            model.PropChanged -= Model_PropChanged;
        }
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ConfirmResultViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ConfirmResultViewModel.cs
@@ -25,7 +25,7 @@ public partial class ConfirmResultViewModel(IConfirmationArgs _args, WeakReferen
    public override void InitializeProperties()
    {
        var model = Model.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return;
        }
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ContentPageViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ContentPageViewModel.cs
@@ -14,7 +14,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;

 namespace Microsoft.CmdPal.Core.ViewModels;

-public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarContext
+public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
 {
    private readonly ExtensionObject<IContentPage> _model;

@@ -28,7 +28,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
    public DetailsViewModel? Details { get; private set; }

    [MemberNotNullWhen(true, nameof(Details))]
-    public bool HasDetails => Details is not null;
+    public bool HasDetails => Details != null;

    /////// ICommandBarContext ///////
    public IEnumerable<IContextItemViewModel> MoreCommands => Commands.Skip(1);
@@ -67,7 +67,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
            foreach (var item in newItems)
            {
                var viewModel = ViewModelFromContent(item, PageContext);
-                if (viewModel is not null)
+                if (viewModel != null)
                {
                    viewModel.InitializeProperties();
                    newContent.Add(viewModel);
@@ -104,7 +104,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
        base.InitializeProperties();

        var model = _model.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return; // throw?
        }
@@ -113,7 +113,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
                .ToList()
                .Select<IContextItem, IContextItemViewModel>(item =>
                {
-                    if (item is ICommandContextItem contextItem)
+                    if (item is CommandContextItem contextItem)
                    {
                        return new CommandContextItemViewModel(contextItem, PageContext);
                    }
@@ -133,7 +133,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
            });

        var extensionDetails = model.Details;
-        if (extensionDetails is not null)
+        if (extensionDetails != null)
        {
            Details = new(extensionDetails, PageContext);
            Details.InitializeProperties();
@@ -156,7 +156,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
        base.FetchProperty(propertyName);

        var model = this._model.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return; // throw?
        }
@@ -166,13 +166,13 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
            case nameof(Commands):

                var more = model.Commands;
-                if (more is not null)
+                if (more != null)
                {
                    var newContextMenu = more
                            .ToList()
                            .Select(item =>
                            {
-                                if (item is ICommandContextItem contextItem)
+                                if (item is CommandContextItem contextItem)
                                {
                                    return new CommandContextItemViewModel(contextItem, PageContext) as IContextItemViewModel;
                                }
@@ -216,7 +216,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
                break;
            case nameof(Details):
                var extensionDetails = model.Details;
-                Details = extensionDetails is not null ? new(extensionDetails, PageContext) : null;
+                Details = extensionDetails != null ? new(extensionDetails, PageContext) : null;
                UpdateDetails();
                break;
        }
@@ -248,7 +248,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
    [RelayCommand]
    private void InvokePrimaryCommand(ContentPageViewModel page)
    {
-        if (PrimaryCommand is not null)
+        if (PrimaryCommand != null)
        {
            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(PrimaryCommand.Command.Model, PrimaryCommand.Model));
        }
@@ -258,7 +258,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
    [RelayCommand]
    private void InvokeSecondaryCommand(ContentPageViewModel page)
    {
-        if (SecondaryCommand is not null)
+        if (SecondaryCommand != null)
        {
            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(SecondaryCommand.Command.Model, SecondaryCommand.Model));
        }
@@ -285,7 +285,7 @@ public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarC
        Content.Clear();

        var model = _model.Unsafe;
-        if (model is not null)
+        if (model != null)
        {
            model.ItemsChanged -= Model_ItemsChanged;
        }
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ContextMenuViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ContextMenuViewModel.cs
@@ -8,12 +8,14 @@ using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.Diagnostics.Utilities;
 using Windows.System;

 namespace Microsoft.CmdPal.Core.ViewModels;

 public partial class ContextMenuViewModel : ObservableObject,
-    IRecipient<UpdateCommandBarMessage>
+    IRecipient<UpdateCommandBarMessage>,
+    IRecipient<OpenContextMenuMessage>
 {
    public ICommandBarContext? SelectedItem
    {
@@ -41,6 +43,7 @@ public partial class ContextMenuViewModel : ObservableObject,
    public ContextMenuViewModel()
    {
        WeakReferenceMessenger.Default.Register<UpdateCommandBarMessage>(this);
+        WeakReferenceMessenger.Default.Register<OpenContextMenuMessage>(this);
    }

    public void Receive(UpdateCommandBarMessage message)
@@ -48,9 +51,19 @@ public partial class ContextMenuViewModel : ObservableObject,
        SelectedItem = message.ViewModel;
    }

+    public void Receive(OpenContextMenuMessage message)
+    {
+        FilterOnTop = message.ContextMenuFilterLocation == ContextMenuFilterLocation.Top;
+
+        ResetContextMenu();
+
+        OnPropertyChanging(nameof(FilterOnTop));
+        OnPropertyChanged(nameof(FilterOnTop));
+    }
+
    public void UpdateContextItems()
    {
-        if (SelectedItem is not null)
+        if (SelectedItem != null)
        {
            if (SelectedItem.MoreCommands.Count() > 1)
            {
@@ -67,14 +80,14 @@ public partial class ContextMenuViewModel : ObservableObject,
            return;
        }

-        if (SelectedItem is null)
+        if (SelectedItem == null)
        {
            return;
        }

        _lastSearchText = searchText;

-        if (CurrentContextMenu is null)
+        if (CurrentContextMenu == null)
        {
            ListHelpers.InPlaceUpdateList(FilteredItems, []);
            return;
@@ -123,7 +136,7 @@ public partial class ContextMenuViewModel : ObservableObject,
    /// that have a shortcut key set.</returns>
    public Dictionary<KeyChord, CommandContextItemViewModel> Keybindings()
    {
-        if (CurrentContextMenu is null)
+        if (CurrentContextMenu == null)
        {
            return [];
        }
@@ -139,7 +152,7 @@ public partial class ContextMenuViewModel : ObservableObject,
    public ContextKeybindingResult? CheckKeybinding(bool ctrl, bool alt, bool shift, bool win, VirtualKey key)
    {
        var keybindings = Keybindings();
-        if (keybindings is not null)
+        if (keybindings != null)
        {
            // Does the pressed key match any of the keybindings?
            var pressedKeyChord = KeyChordHelpers.FromModifiers(ctrl, alt, shift, win, key, 0);
@@ -179,7 +192,7 @@ public partial class ContextMenuViewModel : ObservableObject,
        ListHelpers.InPlaceUpdateList(FilteredItems, [.. CurrentContextMenu!]);
    }

-    public void ResetContextMenu()
+    private void ResetContextMenu()
    {
        while (ContextMenuStack.Count > 1)
        {
@@ -189,7 +202,7 @@ public partial class ContextMenuViewModel : ObservableObject,
        OnPropertyChanging(nameof(CurrentContextMenu));
        OnPropertyChanged(nameof(CurrentContextMenu));

-        if (CurrentContextMenu is not null)
+        if (CurrentContextMenu != null)
        {
            ListHelpers.InPlaceUpdateList(FilteredItems, [.. CurrentContextMenu!]);
        }
@@ -197,7 +210,7 @@ public partial class ContextMenuViewModel : ObservableObject,

    public ContextKeybindingResult InvokeCommand(CommandItemViewModel? command)
    {
-        if (command is null)
+        if (command == null)
        {
            return ContextKeybindingResult.Unhandled;
        }
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsCommandsViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsCommandsViewModel.cs
@@ -22,7 +22,7 @@ public partial class DetailsCommandsViewModel(
    {
        base.InitializeProperties();
        var model = _dataModel.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return;
        }
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsElementViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsElementViewModel.cs
@@ -16,7 +16,7 @@ public abstract partial class DetailsElementViewModel(IDetailsElement _detailsEl
    public override void InitializeProperties()
    {
        var model = _model.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return;
        }
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsLinkViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsLinkViewModel.cs
@@ -18,7 +18,7 @@ public partial class DetailsLinkViewModel(

    public Uri? Link { get; private set; }

-    public bool IsLink => Link is not null;
+    public bool IsLink => Link != null;

    public bool IsText => !IsLink;

@@ -26,14 +26,14 @@ public partial class DetailsLinkViewModel(
    {
        base.InitializeProperties();
        var model = _dataModel.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return;
        }

        Text = model.Text ?? string.Empty;
        Link = model.Link;
-        if (string.IsNullOrEmpty(Text) && Link is not null)
+        if (string.IsNullOrEmpty(Text) && Link != null)
        {
            Text = Link.ToString();
        }
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsTagsViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsTagsViewModel.cs
@@ -22,7 +22,7 @@ public partial class DetailsTagsViewModel(
    {
        base.InitializeProperties();
        var model = _dataModel.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return;
        }
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsViewModel.cs
@@ -26,7 +26,7 @@ public partial class DetailsViewModel(IDetails _details, WeakReference<IPageCont
    public override void InitializeProperties()
    {
        var model = _detailsModel.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return;
        }
@@ -41,7 +41,7 @@ public partial class DetailsViewModel(IDetails _details, WeakReference<IPageCont
        UpdateProperty(nameof(HeroImage));

        var meta = model.Metadata;
-        if (meta is not null)
+        if (meta != null)
        {
            foreach (var element in meta)
            {
@@ -53,7 +53,7 @@ public partial class DetailsViewModel(IDetails _details, WeakReference<IPageCont
                    IDetailsTags => new DetailsTagsViewModel(element, this.PageContext),
                    _ => null,
                };
-                if (vm is not null)
+                if (vm != null)
                {
                    vm.InitializeProperties();
                    Metadata.Add(vm);
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IContextItemViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IContextItemViewModel.cs
@@ -4,14 +4,12 @@

 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;

 namespace Microsoft.CmdPal.Core.ViewModels;

-[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 public interface IContextItemViewModel
 {
 }
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IconDataViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IconDataViewModel.cs
@@ -16,7 +16,7 @@ public partial class IconDataViewModel : ObservableObject, IIconData
    // If the extension previously gave us a Data, then died, the data will
    // throw if we actually try to read it, but the pointer itself won't be
    // null, so this is relatively safe.
-    public bool HasIcon => !string.IsNullOrEmpty(Icon) || Data.Unsafe is not null;
+    public bool HasIcon => !string.IsNullOrEmpty(Icon) || Data.Unsafe != null;

    // Locally cached properties from IIconData.
    public string Icon { get; private set; } = string.Empty;
@@ -36,7 +36,7 @@ public partial class IconDataViewModel : ObservableObject, IIconData
    public void InitializeProperties()
    {
        var model = _model.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return;
        }
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IconInfoViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IconInfoViewModel.cs
@@ -26,7 +26,7 @@ public partial class IconInfoViewModel : ObservableObject, IIconInfo

    public bool HasIcon(bool light) => IconForTheme(light).HasIcon;

-    public bool IsSet => _model.Unsafe is not null;
+    public bool IsSet => _model.Unsafe != null;

    IIconData? IIconInfo.Dark => Dark;

@@ -43,7 +43,7 @@ public partial class IconInfoViewModel : ObservableObject, IIconInfo
    public void InitializeProperties()
    {
        var model = _model.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return;
        }
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ListItemViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ListItemViewModel.cs
@@ -27,7 +27,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
    public DetailsViewModel? Details { get; private set; }

    [MemberNotNullWhen(true, nameof(Details))]
-    public bool HasDetails => Details is not null;
+    public bool HasDetails => Details != null;

    public override void InitializeProperties()
    {
@@ -40,7 +40,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
        base.InitializeProperties();

        var li = Model.Unsafe;
-        if (li is null)
+        if (li == null)
        {
            return; // throw?
        }
@@ -50,7 +50,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
        TextToSuggest = li.TextToSuggest;
        Section = li.Section ?? string.Empty;
        var extensionDetails = li.Details;
-        if (extensionDetails is not null)
+        if (extensionDetails != null)
        {
            Details = new(extensionDetails, PageContext);
            Details.InitializeProperties();
@@ -67,7 +67,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
        base.FetchProperty(propertyName);

        var model = this.Model.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return; // throw?
        }
@@ -85,7 +85,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
                break;
            case nameof(Details):
                var extensionDetails = model.Details;
-                Details = extensionDetails is not null ? new(extensionDetails, PageContext) : null;
+                Details = extensionDetails != null ? new(extensionDetails, PageContext) : null;
                Details?.InitializeProperties();
                UpdateProperty(nameof(Details));
                UpdateProperty(nameof(HasDetails));
@@ -136,7 +136,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
        Details?.SafeCleanup();

        var model = Model.Unsafe;
-        if (model is not null)
+        if (model != null)
        {
            // We don't need to revoke the PropChanged event handler here,
            // because we are just overriding CommandItem's FetchProperty and
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ListViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ListViewModel.cs
@@ -6,7 +6,6 @@ using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.CmdPal.Common.Helpers;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
@@ -32,7 +31,7 @@ public partial class ListViewModel : PageViewModel, IDisposable

    private readonly Lock _listLock = new();

-    private InterlockedBoolean _isLoading;
+    private bool _isLoading;
    private bool _isFetching;

    public event TypedEventHandler<ListViewModel, object>? ItemsUpdated;
@@ -63,7 +62,6 @@ public partial class ListViewModel : PageViewModel, IDisposable

    private Task? _initializeItemsTask;
    private CancellationTokenSource? _cancellationTokenSource;
-    private CancellationTokenSource? _fetchItemsCancellationTokenSource;

    private ListItemViewModel? _lastSelectedItem;

@@ -123,34 +121,21 @@ public partial class ListViewModel : PageViewModel, IDisposable

            ItemsUpdated?.Invoke(this, EventArgs.Empty);
            UpdateEmptyContent();
-            _isLoading.Clear();
+            _isLoading = false;
        }
    }

    //// Run on background thread, from InitializeAsync or Model_ItemsChanged
    private void FetchItems()
    {
-        // Cancel any previous FetchItems operation
-        _fetchItemsCancellationTokenSource?.Cancel();
-        _fetchItemsCancellationTokenSource?.Dispose();
-        _fetchItemsCancellationTokenSource = new CancellationTokenSource();
-
-        var cancellationToken = _fetchItemsCancellationTokenSource.Token;
-
        // TEMPORARY: just plop all the items into a single group
        // see 9806fe5d8 for the last commit that had this with sections
        _isFetching = true;

        try
        {
-            // Check for cancellation before starting expensive operations
-            cancellationToken.ThrowIfCancellationRequested();
-
            var newItems = _model.Unsafe!.GetItems();

-            // Check for cancellation after getting items from extension
-            cancellationToken.ThrowIfCancellationRequested();
-
            // Collect all the items into new viewmodels
            Collection<ListItemViewModel> newViewModels = [];

@@ -159,9 +144,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
            // building new viewmodels for the ones we haven't already built.
            foreach (var item in newItems)
            {
-                // Check for cancellation during item processing
-                cancellationToken.ThrowIfCancellationRequested();
-
                ListItemViewModel viewModel = new(item, new(this));

                // If an item fails to load, silently ignore it.
@@ -171,22 +153,15 @@ public partial class ListViewModel : PageViewModel, IDisposable
                }
            }

-            // Check for cancellation before initializing first twenty items
-            cancellationToken.ThrowIfCancellationRequested();
-
            var firstTwenty = newViewModels.Take(20);
            foreach (var item in firstTwenty)
            {
-                cancellationToken.ThrowIfCancellationRequested();
                item?.SafeInitializeProperties();
            }

            // Cancel any ongoing search
            _cancellationTokenSource?.Cancel();

-            // Check for cancellation before updating the list
-            cancellationToken.ThrowIfCancellationRequested();
-
            lock (_listLock)
            {
                // Now that we have new ViewModels for everything from the
@@ -197,11 +172,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
            // TODO: Iterate over everything in Items, and prune items from the
            // cache if we don't need them anymore
        }
-        catch (OperationCanceledException)
-        {
-            // Cancellation is expected, don't treat as error
-            return;
-        }
        catch (Exception ex)
        {
            // TODO: Move this within the for loop, so we can catch issues with individual items
@@ -251,7 +221,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
                }

                ItemsUpdated?.Invoke(this, EventArgs.Empty);
-                _isLoading.Clear();
+                _isLoading = false;
            });
    }

@@ -327,11 +297,11 @@ public partial class ListViewModel : PageViewModel, IDisposable
    [RelayCommand]
    private void InvokeItem(ListItemViewModel? item)
    {
-        if (item is not null)
+        if (item != null)
        {
            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(item.Command.Model, item.Model));
        }
-        else if (ShowEmptyContent && EmptyContent.PrimaryCommand?.Model.Unsafe is not null)
+        else if (ShowEmptyContent && EmptyContent.PrimaryCommand?.Model.Unsafe != null)
        {
            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(
                EmptyContent.PrimaryCommand.Command.Model,
@@ -343,14 +313,14 @@ public partial class ListViewModel : PageViewModel, IDisposable
    [RelayCommand]
    private void InvokeSecondaryCommand(ListItemViewModel? item)
    {
-        if (item is not null)
+        if (item != null)
        {
-            if (item.SecondaryCommand is not null)
+            if (item.SecondaryCommand != null)
            {
                WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(item.SecondaryCommand.Command.Model, item.Model));
            }
        }
-        else if (ShowEmptyContent && EmptyContent.SecondaryCommand?.Model.Unsafe is not null)
+        else if (ShowEmptyContent && EmptyContent.SecondaryCommand?.Model.Unsafe != null)
        {
            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(
                EmptyContent.SecondaryCommand.Command.Model,
@@ -361,12 +331,12 @@ public partial class ListViewModel : PageViewModel, IDisposable
    [RelayCommand]
    private void UpdateSelectedItem(ListItemViewModel? item)
    {
-        if (_lastSelectedItem is not null)
+        if (_lastSelectedItem != null)
        {
            _lastSelectedItem.PropertyChanged -= SelectedItemPropertyChanged;
        }

-        if (item is not null)
+        if (item != null)
        {
            SetSelectedItem(item);
        }
@@ -412,7 +382,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
    private void SelectedItemPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
    {
        var item = _lastSelectedItem;
-        if (item is null)
+        if (item == null)
        {
            return;
        }
@@ -467,7 +437,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
        base.InitializeProperties();

        var model = _model.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return; // throw?
        }
@@ -494,43 +464,26 @@ public partial class ListViewModel : PageViewModel, IDisposable
    public void LoadMoreIfNeeded()
    {
        var model = this._model.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return;
        }

-        if (!_isLoading.Set())
+        if (model.HasMoreItems && !_isLoading)
        {
-            return;
-
-            // NOTE: May miss newly available items until next scroll if model
-            // state changes between our check and this reset
-        }
-
-        _ = Task.Run(() =>
-        {
-            // Execute all COM calls on background thread to avoid reentrancy issues with UI
-            // with the UI thread when COM starts inner message pump
-            try
+            _isLoading = true;
+            _ = Task.Run(() =>
            {
-                if (model.HasMoreItems)
+                try
                {
                    model.LoadMore();
-
-                    // _isLoading flag will be set as a result of LoadMore,
-                    // which must raise ItemsChanged to end the loading.
                }
-                else
+                catch (Exception ex)
                {
-                    _isLoading.Clear();
+                    ShowException(ex, model.Name);
                }
-            }
-            catch (Exception ex)
-            {
-                _isLoading.Clear();
-                ShowException(ex, model.Name);
-            }
-        });
+            });
+        }
    }

    protected override void FetchProperty(string propertyName)
@@ -538,7 +491,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
        base.FetchProperty(propertyName);

        var model = this._model.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return; // throw?
        }
@@ -569,7 +522,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
    private void UpdateEmptyContent()
    {
        UpdateProperty(nameof(ShowEmptyContent));
-        if (!ShowEmptyContent || EmptyContent.Model.Unsafe is null)
+        if (!ShowEmptyContent || EmptyContent.Model.Unsafe == null)
        {
            return;
        }
@@ -589,10 +542,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
        _cancellationTokenSource?.Cancel();
        _cancellationTokenSource?.Dispose();
        _cancellationTokenSource = null;
-
-        _fetchItemsCancellationTokenSource?.Cancel();
-        _fetchItemsCancellationTokenSource?.Dispose();
-        _fetchItemsCancellationTokenSource = null;
    }

    protected override void UnsafeCleanup()
@@ -603,7 +552,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
        EmptyContent = new(new(null), PageContext); // necessary?

        _cancellationTokenSource?.Cancel();
-        _fetchItemsCancellationTokenSource?.Cancel();

        lock (_listLock)
        {
@@ -622,7 +570,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
        }

        var model = _model.Unsafe;
-        if (model is not null)
+        if (model != null)
        {
            model.ItemsChanged -= Model_ItemsChanged;
        }
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/LogMessageViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/LogMessageViewModel.cs
@@ -22,7 +22,7 @@ public partial class LogMessageViewModel : ExtensionObjectViewModel
    public override void InitializeProperties()
    {
        var model = _model.Unsafe;
-        if (model is null)
+        if (model == null)
        {
            return; // throw?
        }
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/HotkeySummonMessage.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/HotkeySummonMessage.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-namespace Microsoft.CmdPal.UI.Messages;
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;

 public record HotkeySummonMessage(string CommandId, IntPtr Hwnd)
 {
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/OpenContextMenuMessage.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/OpenContextMenuMessage.cs
@@ -2,12 +2,11 @@
 // 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.Core.ViewModels.Messages;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls.Primitives;
 using Windows.Foundation;

-namespace Microsoft.CmdPal.UI.Messages;
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;

 /// <summary>
 /// Used to announce the context menu should open
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/OpenSettingsMessage.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/OpenSettingsMessage.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-namespace Microsoft.CmdPal.UI.Messages;
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;

 public record OpenSettingsMessage()
 {
--- a/Show More
+++ b/Show More