ci: reduce needless file copying; zip GPOs; reliability (#42446)

This pull request makes four main changes to the build.

1. GPOs are now emitted as a ZIP file, rather than a folder to be zipped
later.
2. PDB files are linked into the output folder by hard link, rather than
copy, to save disk space.
3. We no longer copy the entire build output folder into artifacts;
instead, we *move* it, to save disk space.
4. **Failed builds** will no longer produce `build-arch-release`
artifacts; instead, they will produce numbered failure artifacts. This
means that we can finally re-run a single leg of the build, and it will
not fail due to the artifact already existing!

I included a smaller change to the DSC build step to make sure it
doesn't accidentally run when everything else failed. Heh.

Altogether, this takes a couple minutes off the build and reduces the
demand on the agent's disk by 10-15GB.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -58,6 +58,7 @@ body:
       - Image Resizer
       - Installer
       - Keyboard Manager
+      - Light Switch
       - Mouse Utilities
       - Mouse Without Borders
       - New+

.github/ISSUE_TEMPLATE/translation_issue.yml

@@ -38,6 +38,7 @@ body:
     - Image Resizer
     - Installer
     - Keyboard Manager
+    - Light Switch
     - Mouse Utilities
     - Mouse Without Borders
     - New+

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

@@ -274,7 +274,7 @@ jobs:
   # Build PowerToys.DSC.exe for ARM64 (x64 uses existing binary from previous build)
   - task: VSBuild@1
     displayName: Build PowerToys.DSC.exe (x64 for generating manifests)
-    condition: ne(variables['BuildPlatform'], 'x64')
+    condition: and(succeeded(), ne(variables['BuildPlatform'], 'x64'))
     inputs:
       solution: src/dsc/v3/PowerToys.DSC/PowerToys.DSC.csproj
       msbuildArgs: /t:Build /m /restore
@@ -564,15 +564,16 @@ jobs:
       flattenFolders: True
       targetFolder: $(JobOutputDirectory)
 
-  - task: CopyFiles@2
-    displayName: Stage Symbols
-    inputs:
-      contents: |-
-        **\*.pdb
-        !**\vc143.pdb
-        !**\*test*.pdb
-      flattenFolders: True
-      targetFolder: $(JobOutputDirectory)/symbols-$(BuildPlatform)/
+  - pwsh: |-
+      $Symbols = Get-ChildItem "$(BuildPlatform)" -Recurse -Filter *.pdb -Exclude "vc143.pdb","*test*.pdb" |
+          Group-Object Name | ForEach-Object { $_.Group[0] }
+      $OutDir = "$(JobOutputDirectory)/symbols-$(BuildPlatform)"
+      New-Item -Type Directory $OutDir -EA:Ignore
+      Write-Host "Linking $($Symbols.Length) symbols into place at $OutDir"
+      ForEach($s in $Symbols) {
+        New-Item -Type HardLink -Target $s.FullName (Join-Path $OutDir $s.Name)
+      }
+    displayName: Stage Unique Symbols (as hard links)
 
   - pwsh: |-
       $p = "$(JobOutputDirectory)\"
@@ -621,21 +622,30 @@ jobs:
 
   # Publishing the GPO files
   - pwsh: |-
-      New-Item "$(JobOutputDirectory)/gpo" -Type Directory
-      Copy-Item src\gpo\assets\* "$(JobOutputDirectory)/gpo" -Recurse
+      $GpoArchive = "$(JobOutputDirectory)\GroupPolicyObjectFiles-${{ parameters.versionNumber }}.zip"
+      tar -c -v --format=zip -C .\src\gpo\assets -f $GpoArchive *
     displayName: Stage GPO files
 
-  # Running the tests may result in future jobs consuming artifacts out of this build
   - ${{ if or(eq(parameters.runTests, true), eq(parameters.buildTests, true)) }}:
-    - task: CopyFiles@2
-      displayName: Stage entire build output
-      inputs:
-        sourceFolder: '$(Build.SourcesDirectory)'
-        contents: '$(BuildPlatform)/$(BuildConfiguration)/**/*'
-        targetFolder: '$(JobOutputDirectory)\$(BuildPlatform)\$(BuildConfiguration)'
+    # Running the tests may result in future jobs consuming artifacts out of this build
+    # Instead of running an expensive file copy step, move everything over since the build is totally done.
+    - pwsh: |-
+        # It seems weird, but this is for compatibility. Our artifacts historically contained the folder x64/Release/x64/Release (for example).
+        $FinalOutputRoot = "$(JobOutputDirectory)\$(BuildPlatform)\$(BuildConfiguration)\$(BuildPlatform)"
+        $ProjectBuildRoot = "$(Build.SourcesDirectory)\$(BuildPlatform)"
+        $ProjectBuildDirectory = "$ProjectBuildRoot\$(BuildConfiguration)"
+
+        New-Item -Type Directory $FinalOutputRoot -EA:Ignore
+        Move-Item $ProjectBuildDirectory $FinalOutputRoot
+      displayName: Move entire output directory into artifacts
 
   - ${{ if eq(parameters.publishArtifacts, true) }}:
     - publish: $(JobOutputDirectory)
       artifact: $(JobOutputArtifactName)
       displayName: Publish all outputs
-      condition: always()
+      condition: succeeded()
+
+    - publish: $(JobOutputDirectory)
+      artifact: $(JobOutputArtifactName)-failure-$(System.JobAttempt)
+      displayName: Publish failure logs
+      condition: or(failed(), canceled())

src/common/interop/PowerToys.Interop.vcxproj

@@ -63,14 +63,14 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
     <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <UseDebugLibraries>true</UseDebugLibraries>
       <LinkIncremental>true</LinkIncremental>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
     <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <UseDebugLibraries>false</UseDebugLibraries>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <LinkIncremental>false</LinkIncremental>

src/modules/LightSwitch/LightSwitchModuleInterface/ThemeHelper.cpp

@@ -3,6 +3,26 @@
 #include "ThemeHelper.h"
 
 // Controls changing the themes.
+static void ResetColorPrevalence()
+{
+    HKEY hKey;
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_SET_VALUE,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        DWORD value = 0; // back to default value
+        RegSetValueEx(hKey, L"ColorPrevalence", 0, REG_DWORD, reinterpret_cast<const BYTE*>(&value), sizeof(value));
+        RegCloseKey(hKey);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, reinterpret_cast<LPARAM>(L"ImmersiveColorSet"), SMTO_ABORTIFHUNG, 5000, nullptr);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_THEMECHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_DWMCOLORIZATIONCOLORCHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);
+    }
+}
 
 void SetAppsTheme(bool mode)
 {
@@ -36,6 +56,11 @@ void SetSystemTheme(bool mode)
         RegSetValueEx(hKey, L"SystemUsesLightTheme", 0, REG_DWORD, reinterpret_cast<const BYTE*>(&value), sizeof(value));
         RegCloseKey(hKey);
 
+        if (mode) // if are changing to light mode
+        {
+            ResetColorPrevalence();
+        }
+
         SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, reinterpret_cast<LPARAM>(L"ImmersiveColorSet"), SMTO_ABORTIFHUNG, 5000, nullptr);
 
         SendMessageTimeout(HWND_BROADCAST, WM_THEMECHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);

src/modules/LightSwitch/LightSwitchModuleInterface/dllmain.cpp

@@ -47,6 +47,7 @@ const static wchar_t* MODULE_DESC = L"This is a module that allows you to contro
 
 enum class ScheduleMode
 {
+    Off,
     FixedHours,
     SunsetToSunrise,
     // add more later
@@ -59,8 +60,9 @@ inline std::wstring ToString(ScheduleMode mode)
     case ScheduleMode::SunsetToSunrise:
         return L"SunsetToSunrise";
     case ScheduleMode::FixedHours:
-    default:
         return L"FixedHours";
+    default:
+        return L"Off";
     }
 }
 
@@ -68,7 +70,9 @@ inline ScheduleMode FromString(const std::wstring& str)
 {
     if (str == L"SunsetToSunrise")
         return ScheduleMode::SunsetToSunrise;
-    return ScheduleMode::FixedHours;
+    if (str == L"FixedHours")
+        return ScheduleMode::FixedHours;
+    return ScheduleMode::Off;
 }
 
 // These are the properties shown in the Settings page.
@@ -76,7 +80,7 @@ struct ModuleSettings
 {
     bool m_changeSystem = true;
     bool m_changeApps = true;
-    ScheduleMode m_scheduleMode = ScheduleMode::FixedHours;
+    ScheduleMode m_scheduleMode = ScheduleMode::Off;
     int m_lightTime = 480;
     int m_darkTime = 1200;
     int m_sunrise_offset = 0;
@@ -161,7 +165,8 @@ public:
             L"scheduleMode",
             L"Theme schedule mode",
             ToString(g_settings.m_scheduleMode),
-            { { L"FixedHours", L"Set hours manually" },
+            { { L"Off", L"Disable the schedule" },
+              { L"FixedHours", L"Set hours manually" },
               { L"SunsetToSunrise", L"Use sunrise/sunset times" } });
 
         // Integer spinners
@@ -284,9 +289,20 @@ public:
                 g_settings.m_changeApps = *v;
             }
 
+            auto previousMode = g_settings.m_scheduleMode;
+
             if (auto v = values.get_string_value(L"scheduleMode"))
             {
-                g_settings.m_scheduleMode = FromString(*v);
+                auto newMode = FromString(*v);
+                if (newMode != g_settings.m_scheduleMode)
+                {
+                    Logger::info(L"[LightSwitchInterface] Schedule mode changed from {} to {}",
+                                 ToString(g_settings.m_scheduleMode),
+                                 ToString(newMode));
+                    g_settings.m_scheduleMode = newMode;
+
+                    start_service_if_needed();
+                }
             }
 
             if (auto v = values.get_int_value(L"lightTime"))
@@ -304,7 +320,7 @@ public:
                 g_settings.m_sunrise_offset = *v;
             }
 
-            if (auto v = values.get_int_value(L"m_sunset_offset"))
+            if (auto v = values.get_int_value(L"sunset_offset"))
             {
                 g_settings.m_sunset_offset = *v;
             }
@@ -326,6 +342,47 @@ public:
         }
     }
 
+    virtual void start_service_if_needed()
+    {
+        if (!m_process || WaitForSingleObject(m_process, 0) != WAIT_TIMEOUT)
+        {
+            Logger::info(L"[LightSwitchInterface] Starting LightSwitchService due to active schedule mode.");
+            enable();
+        }
+        else
+        {
+            Logger::debug(L"[LightSwitchInterface] Service already running, skipping start.");
+        }
+    }
+
+    /*virtual void stop_worker_only()
+    {
+        if (m_process)
+        {
+            Logger::info(L"[LightSwitchInterface] Stopping LightSwitchService (worker only).");
+            constexpr DWORD timeout_ms = 1500;
+            DWORD result = WaitForSingleObject(m_process, timeout_ms);
+
+            if (result == WAIT_TIMEOUT)
+            {
+                Logger::warn("Light Switch: Process didn't exit in time. Forcing termination.");
+                TerminateProcess(m_process, 0);
+            }
+
+            CloseHandle(m_process);
+            m_process = nullptr;
+        }
+    }*/
+
+    /*virtual void stop_service_if_running()
+    {
+        if (m_process)
+        {
+            Logger::info(L"[LightSwitchInterface] Stopping LightSwitchService due to schedule OFF.");
+            stop_worker_only();
+        }
+    }*/
+
     virtual void enable()
     {
         m_enabled = true;
@@ -413,6 +470,12 @@ public:
         return m_enabled;
     }
 
+    // Returns whether the PowerToys should be enabled by default
+    virtual bool is_enabled_by_default() const override
+    {
+        return false;
+    }
+
     void parse_hotkey(PowerToysSettings::PowerToyValues& settings)
     {
         auto settingsObject = settings.get_raw_json();
@@ -471,6 +534,15 @@ public:
                     SetAppsTheme(!GetCurrentAppsTheme());
                 }
 
+                if (!m_manual_override_event_handle)
+                {
+                    m_manual_override_event_handle = OpenEventW(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
+                    if (!m_manual_override_event_handle)
+                    {
+                        m_manual_override_event_handle = CreateEventW(nullptr, TRUE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
+                    }
+                }
+
                 if (m_manual_override_event_handle)
                 {
                     SetEvent(m_manual_override_event_handle);

src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp

@@ -186,61 +186,138 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
         {
             if (settings.changeSystem && !isSystemCurrentlyLight)
                 SetSystemTheme(true);
+                Logger::info(L"[LightSwitchService] Changing system theme to light mode.");
             if (settings.changeApps && !isAppsCurrentlyLight)
                 SetAppsTheme(true);
+                Logger::info(L"[LightSwitchService] Changing apps theme to light mode.");
         }
         else
         {
             if (settings.changeSystem && isSystemCurrentlyLight)
                 SetSystemTheme(false);
+                Logger::info(L"[LightSwitchService] Changing system theme to dark mode.");
             if (settings.changeApps && isAppsCurrentlyLight)
                 SetAppsTheme(false);
+                Logger::info(L"[LightSwitchService] Changing apps theme to light mode.");
         }
     };
 
-    // --- At service start: immediately honor the schedule ---
+    // --- Initial settings load ---
+    LightSwitchSettings::instance().LoadSettings();
+    auto& settings = LightSwitchSettings::instance().settings();
+
+    // --- Initial theme application (if schedule enabled) ---
+    if (settings.scheduleMode != ScheduleMode::Off)
     {
         SYSTEMTIME st;
         GetLocalTime(&st);
         int nowMinutes = st.wHour * 60 + st.wMinute;
-
-        LightSwitchSettings::instance().LoadSettings();
-        const auto& settings = LightSwitchSettings::instance().settings();
-
         applyTheme(nowMinutes, settings.lightTime + settings.sunrise_offset, settings.darkTime + settings.sunset_offset, settings);
     }
+    else
+    {
+        Logger::info(L"[LightSwitchService] Schedule mode is OFF - ticker suspended, waiting for manual action or mode change.");
+    }
 
-    // --- Main loop: wakes once per minute or stop/parent death ---
+    // --- Main loop ---
     for (;;)
     {
         HANDLE waits[2] = { g_ServiceStopEvent, hParent };
         DWORD count = hParent ? 2 : 1;
 
+        LightSwitchSettings::instance().LoadSettings();
+        const auto& settings = LightSwitchSettings::instance().settings();
+
+        // If schedule is off, idle but keep watching settings and manual override
+        if (settings.scheduleMode == ScheduleMode::Off)
+        {
+            Logger::info(L"[LightSwitchService] Schedule mode OFF - suspending scheduler but keeping service alive.");
+
+            if (!hManualOverride)
+            {
+                hManualOverride = OpenEventW(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
+            }
+
+            HANDLE waits[4];
+            DWORD count = 0;
+            waits[count++] = g_ServiceStopEvent;
+            if (hParent)
+                waits[count++] = hParent;
+            if (hManualOverride)
+                waits[count++] = hManualOverride;
+            waits[count++] = LightSwitchSettings::instance().GetSettingsChangedEvent();
+
+            for (;;)
+            {
+                DWORD wait = WaitForMultipleObjects(count, waits, FALSE, INFINITE);
+
+                // --- Handle exit signals ---
+                if (wait == WAIT_OBJECT_0) // stop event
+                {
+                    Logger::info(L"[LightSwitchService] Stop event triggered - exiting worker loop.");
+                    break;
+                }
+                if (hParent && wait == WAIT_OBJECT_0 + 1)
+                {
+                    Logger::info(L"[LightSwitchService] Parent exited - stopping service.");
+                    break;
+                }
+
+                // --- Manual override triggered ---
+                if (wait == WAIT_OBJECT_0 + (hParent ? 2 : 1))
+                {
+                    Logger::info(L"[LightSwitchService] Manual override received while schedule OFF.");
+                    ResetEvent(hManualOverride);
+                    continue;
+                }
+
+                // --- Settings file changed ---
+                if (wait == WAIT_OBJECT_0 + (hParent ? 3 : 2))
+                {
+                    Logger::trace(L"[LightSwitchService] Settings change event triggered, reloading settings...");
+
+                    ResetEvent(LightSwitchSettings::instance().GetSettingsChangedEvent());
+
+                    LightSwitchSettings::instance().LoadSettings();
+                    const auto& newSettings = LightSwitchSettings::instance().settings();
+
+                    if (newSettings.scheduleMode != ScheduleMode::Off)
+                    {
+                        Logger::info(L"[LightSwitchService] Schedule re-enabled, resuming normal loop.");
+                        break;
+                    }
+                }
+            }
+        }
+
+
+        // --- When schedule is active, run once per minute ---
         SYSTEMTIME st;
         GetLocalTime(&st);
         int nowMinutes = st.wHour * 60 + st.wMinute;
 
-        LightSwitchSettings::instance().LoadSettings();
-        const auto& settings = LightSwitchSettings::instance().settings();
-
         // Refresh suntimes at day boundary
-        if (g_lastUpdatedDay != st.wDay)
+        if ((g_lastUpdatedDay != st.wDay) && (settings.scheduleMode == ScheduleMode::SunsetToSunrise))
         {
             update_sun_times(settings);
             g_lastUpdatedDay = st.wDay;
-
             Logger::info(L"[LightSwitchService] Recalculated sun times at new day boundary.");
         }
 
+        // Have to do this again in case settings got updated in the refresh suntimes chunk
+        LightSwitchSettings::instance().LoadSettings();
+        const auto& currentSettings = LightSwitchSettings::instance().settings();
+
         wchar_t msg[160];
         swprintf_s(msg,
-                   L"[LightSwitchService] now=%02d:%02d | light=%02d:%02d | dark=%02d:%02d",
+                   L"[LightSwitchService] now=%02d:%02d | light=%02d:%02d | dark=%02d:%02d | mode=%d",
                    st.wHour,
                    st.wMinute,
-                   settings.lightTime / 60,
-                   settings.lightTime % 60,
-                   settings.darkTime / 60,
-                   settings.darkTime % 60);
+                   currentSettings.lightTime / 60,
+                   currentSettings.lightTime % 60,
+                   currentSettings.darkTime / 60,
+                   currentSettings.darkTime % 60,
+                   static_cast<int>(currentSettings.scheduleMode));
         Logger::info(msg);
 
         // --- Manual override check ---
@@ -252,22 +329,20 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
 
         if (manualOverrideActive)
         {
-            // Did we hit a scheduled boundary? (reset override at boundary)
-            if (nowMinutes == (settings.lightTime + settings.sunrise_offset) % 1440 ||
-                nowMinutes == (settings.darkTime + settings.sunset_offset) % 1440)
+            if (nowMinutes == (currentSettings.lightTime + currentSettings.sunrise_offset) % 1440 ||
+                nowMinutes == (currentSettings.darkTime + currentSettings.sunset_offset) % 1440)
             {
                 ResetEvent(hManualOverride);
-                Logger::info(L"[LightSwitchService] Manual override cleared at boundary\n");
+                Logger::info(L"[LightSwitchService] Manual override cleared at boundary");
             }
             else
             {
-                Logger::info(L"[LightSwitchService] Skipping schedule due to manual override\n");
+                Logger::info(L"[LightSwitchService] Skipping schedule due to manual override");
                 goto sleep_until_next_minute;
             }
         }
 
-        // Apply theme logic (only runs if no manual override or override just cleared)
-        applyTheme(nowMinutes, settings.lightTime + settings.sunrise_offset, settings.darkTime + settings.sunset_offset, settings);
+        applyTheme(nowMinutes, currentSettings.lightTime + currentSettings.sunrise_offset, currentSettings.darkTime + currentSettings.sunset_offset, currentSettings);
 
     sleep_until_next_minute:
         GetLocalTime(&st);
@@ -278,15 +353,14 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
         DWORD wait = WaitForMultipleObjects(count, waits, FALSE, msToNextMinute);
         if (wait == WAIT_OBJECT_0)
         {
-            Logger::info(L"[LightSwitchService] Stop event triggered <EFBFBD> exiting worker loop.");
+            Logger::info(L"[LightSwitchService] Stop event triggered - exiting worker loop.");
             break;
         }
-        if (hParent && wait == WAIT_OBJECT_0 + 1) // parent process exited
+        if (hParent && wait == WAIT_OBJECT_0 + 1)
         {
-            Logger::info(L"[LightSwitchService] Parent process exited <EFBFBD> stopping service.");
+            Logger::info(L"[LightSwitchService] Parent process exited - stopping service.");
             break;
         }
-
     }
 
     if (hManualOverride)
@@ -297,6 +371,7 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
     return 0;
 }
 
+
 int APIENTRY wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
 {
     if (powertoys_gpo::getConfiguredLightSwitchEnabledValue() == powertoys_gpo::gpo_rule_configured_disabled)

src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp

@@ -6,6 +6,7 @@
 #include <filesystem>
 #include <fstream>
 #include <WinHookEventIDs.h>
+#include <logger.h>
 
 using namespace std;
 
@@ -27,10 +28,20 @@ std::wstring LightSwitchSettings::GetSettingsFileName()
 
 void LightSwitchSettings::InitFileWatcher()
 {
-    const std::wstring& settingsFileName = GetSettingsFileName();
-    m_settingsFileWatcher = std::make_unique<FileWatcher>(settingsFileName, [&]() {
-        PostMessageW(HWND_BROADCAST, WM_PRIV_SETTINGS_CHANGED, NULL, NULL);
-    });
+    if (!m_settingsChangedEvent)
+    {
+        m_settingsChangedEvent = CreateEventW(nullptr, TRUE, FALSE, nullptr);
+    }
+
+    if (!m_settingsFileWatcher)
+    {
+        m_settingsFileWatcher = std::make_unique<FileWatcher>(
+            GetSettingsFileName(),
+            [this]() {
+                Logger::info(L"[LightSwitchSettings] Settings file changed, signaling event.");
+                SetEvent(m_settingsChangedEvent);
+            });
+    }
 }
 
 void LightSwitchSettings::AddObserver(SettingsObserver& observer)

src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.h

@@ -14,6 +14,7 @@ class SettingsObserver;
 
 enum class ScheduleMode
 {
+    Off,
     FixedHours,
     SunsetToSunrise
     // Add more in the future
@@ -28,7 +29,7 @@ inline std::wstring ToString(ScheduleMode mode)
     case ScheduleMode::SunsetToSunrise:
         return L"SunsetToSunrise";
     default:
-        return L"FixedHours";
+        return L"Off";
     }
 }
 
@@ -36,8 +37,10 @@ inline ScheduleMode FromString(const std::wstring& str)
 {
     if (str == L"SunsetToSunrise")
         return ScheduleMode::SunsetToSunrise;
-    else
+    if (str == L"FixedHours")
         return ScheduleMode::FixedHours;
+    else
+        return ScheduleMode::Off;
 }
 
 struct LightSwitchConfig
@@ -76,6 +79,8 @@ public:
 
     void LoadSettings();
 
+    HANDLE GetSettingsChangedEvent() const { return m_settingsChangedEvent; }
+
 private:
     LightSwitchSettings();
     ~LightSwitchSettings() = default;
@@ -85,4 +90,6 @@ private:
     std::unordered_set<SettingsObserver*> m_observers;
 
     void NotifyObservers(SettingId id) const;
+
+    HANDLE m_settingsChangedEvent = nullptr;
 };

src/modules/LightSwitch/LightSwitchService/ThemeHelper.cpp

@@ -1,8 +1,32 @@
 #include <windows.h>
+#include <logger/logger_settings.h>
+#include <logger/logger.h>
+#include <utils/logger_helper.h>
 #include "ThemeHelper.h"
 
 // Controls changing the themes.
 
+static void ResetColorPrevalence()
+{
+    HKEY hKey;
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_SET_VALUE,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        DWORD value = 0; // back to default value
+        RegSetValueEx(hKey, L"ColorPrevalence", 0, REG_DWORD, reinterpret_cast<const BYTE*>(&value), sizeof(value));
+        RegCloseKey(hKey);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, reinterpret_cast<LPARAM>(L"ImmersiveColorSet"), SMTO_ABORTIFHUNG, 5000, nullptr);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_THEMECHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_DWMCOLORIZATIONCOLORCHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);
+    }
+}
+
 void SetAppsTheme(bool mode)
 {
     HKEY hKey;
@@ -35,6 +59,12 @@ void SetSystemTheme(bool mode)
         RegSetValueEx(hKey, L"SystemUsesLightTheme", 0, REG_DWORD, reinterpret_cast<const BYTE*>(&value), sizeof(value));
         RegCloseKey(hKey);
 
+        if (mode) // if are changing to light mode 
+        {
+            ResetColorPrevalence();
+            Logger::info(L"[LightSwitchService] Reset ColorPrevalence to default when switching to light mode.");
+        }
+
         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);

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

@@ -2,8 +2,10 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Collections.Generic;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
@@ -13,6 +15,8 @@ public partial class FiltersViewModel : ExtensionObjectViewModel
 
     public string CurrentFilterId { get; private set; } = string.Empty;
 
+    public IFilterItemViewModel? CurrentFilter { get; private set; }
+
     public IFilterItemViewModel[] Filters { get; private set; } = [];
 
     public bool ShouldShowFilters => Filters.Length > 0;
@@ -30,11 +34,13 @@ public partial class FiltersViewModel : ExtensionObjectViewModel
             if (_filtersModel.Unsafe is not null)
             {
                 var filters = _filtersModel.Unsafe.GetFilters();
-                Filters = BuildFilters(filters ?? []);
-                UpdateProperty(nameof(Filters), nameof(ShouldShowFilters));
+                var currentFilterId = _filtersModel.Unsafe.CurrentFilterId ?? string.Empty;
 
-                CurrentFilterId = _filtersModel.Unsafe.CurrentFilterId ?? string.Empty;
-                UpdateProperty(nameof(CurrentFilterId));
+                var result = BuildFilters(filters ?? [], currentFilterId);
+                Filters = result.Items;
+                CurrentFilterId = currentFilterId;
+                CurrentFilter = result.Selected;
+                UpdateProperty(nameof(Filters), nameof(ShouldShowFilters), nameof(CurrentFilterId), nameof(CurrentFilter));
 
                 return;
             }
@@ -45,27 +51,48 @@ public partial class FiltersViewModel : ExtensionObjectViewModel
         }
 
         Filters = [];
-        UpdateProperty(nameof(Filters), nameof(ShouldShowFilters));
-
         CurrentFilterId = string.Empty;
-        UpdateProperty(nameof(CurrentFilterId));
+        CurrentFilter = null;
+        UpdateProperty(nameof(Filters), nameof(ShouldShowFilters), nameof(CurrentFilterId), nameof(CurrentFilter));
     }
 
-    private IFilterItemViewModel[] BuildFilters(IFilterItem[] filters)
+    private (IFilterItemViewModel[] Items, IFilterItemViewModel? Selected) BuildFilters(IFilterItem[] filters, string currentFilterId)
     {
-        return [..filters.Select<IFilterItem, IFilterItemViewModel>(filter =>
+        if (filters is null || filters.Length == 0)
+        {
+            return ([], null);
+        }
+
+        var items = new List<IFilterItemViewModel>(filters.Length);
+        FilterItemViewModel? firstFilterItem = null;
+        FilterItemViewModel? selectedFilterItem = null;
+
+        foreach (var filter in filters)
         {
             if (filter is IFilter filterItem)
             {
-                var filterItemViewModel = new FilterItemViewModel(filterItem!, PageContext);
+                var filterItemViewModel = new FilterItemViewModel(filterItem, PageContext);
                 filterItemViewModel.InitializeProperties();
-                return filterItemViewModel;
+
+                if (firstFilterItem is null)
+                {
+                    firstFilterItem = filterItemViewModel;
+                }
+
+                if (selectedFilterItem is null && filterItemViewModel.Id == currentFilterId)
+                {
+                    selectedFilterItem = filterItemViewModel;
+                }
+
+                items.Add(filterItemViewModel);
             }
             else
             {
-                return new SeparatorViewModel();
+                items.Add(new SeparatorViewModel());
             }
-        })];
+        }
+
+        return (items.ToArray(), selectedFilterItem ?? firstFilterItem);
     }
 
     public override void SafeCleanup()

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs

@@ -244,7 +244,36 @@ public partial class MainListPage : DynamicListPage,
         var commands = _tlcManager.TopLevelCommands;
         lock (commands)
         {
-            UpdateFallbacks(SearchText, commands.ToImmutableArray(), token);
+            if (token.IsCancellationRequested)
+            {
+                return;
+            }
+
+            // prefilter fallbacks
+            var specialFallbacks = new List<TopLevelViewModel>(_specialFallbacks.Length);
+            var commonFallbacks = new List<TopLevelViewModel>();
+
+            foreach (var s in commands)
+            {
+                if (!s.IsFallback)
+                {
+                    continue;
+                }
+
+                if (_specialFallbacks.Contains(s.CommandProviderId))
+                {
+                    specialFallbacks.Add(s);
+                }
+                else
+                {
+                    commonFallbacks.Add(s);
+                }
+            }
+
+            // start update of fallbacks; update special fallbacks separately,
+            // so they can finish faster
+            UpdateFallbacks(SearchText, specialFallbacks, token);
+            UpdateFallbacks(SearchText, commonFallbacks, token);
 
             if (token.IsCancellationRequested)
             {
@@ -316,15 +345,12 @@ public partial class MainListPage : DynamicListPage,
             // with a list of all our commands & apps.
             if (!newFilteredItems.Any() && !newApps.Any())
             {
-                // We're going to start over with our fallbacks
-                newFallbacks = Enumerable.Empty<IListItem>();
-
                 newFilteredItems = commands.Where(s => !s.IsFallback);
 
                 // Fallbacks are always included in the list, even if they
                 // don't match the search text. But we don't want to
                 // consider them when filtering the list.
-                newFallbacks = commands.Where(s => s.IsFallback && !_specialFallbacks.Contains(s.CommandProviderId));
+                newFallbacks = commonFallbacks;
 
                 if (token.IsCancellationRequested)
                 {

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

@@ -14,7 +14,6 @@
     xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
     xmlns:ui="using:CommunityToolkit.WinUI"
     xmlns:viewModels="using:Microsoft.CmdPal.UI.ViewModels"
-    Background="Transparent"
     PreviewKeyDown="UserControl_PreviewKeyDown"
     mc:Ignorable="d">
 
@@ -22,7 +21,7 @@
         <ResourceDictionary>
             <cmdpalUI:KeyChordToStringConverter x:Key="KeyChordToStringConverter" />
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-
+            <Thickness x:Key="DefaultContextMenuItemPadding">12,8,12,8</Thickness>
             <cmdpalUI:ContextItemTemplateSelector
                 x:Key="ContextItemTemplateSelector"
                 Critical="{StaticResource CriticalContextMenuViewModelTemplate}"
@@ -31,7 +30,7 @@
 
             <!--  Template for context items in the context item menu  -->
             <DataTemplate x:Key="DefaultContextMenuViewModelTemplate" x:DataType="coreViewModels:CommandContextItemViewModel">
-                <Grid AutomationProperties.Name="{x:Bind Title, Mode=OneWay}">
+                <Grid Padding="{StaticResource DefaultContextMenuItemPadding}" AutomationProperties.Name="{x:Bind Title, Mode=OneWay}">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="32" />
                         <ColumnDefinition Width="*" />
@@ -71,7 +70,7 @@
 
             <!--  Template for context items flagged as critical  -->
             <DataTemplate x:Key="CriticalContextMenuViewModelTemplate" x:DataType="coreViewModels:CommandContextItemViewModel">
-                <Grid AutomationProperties.Name="{x:Bind Title, Mode=OneWay}">
+                <Grid Padding="{StaticResource DefaultContextMenuItemPadding}" AutomationProperties.Name="{x:Bind Title, Mode=OneWay}">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="32" />
                         <ColumnDefinition Width="*" />
@@ -114,7 +113,7 @@
             <DataTemplate x:Key="SeparatorContextMenuViewModelTemplate" x:DataType="coreViewModels:SeparatorViewModel">
                 <Rectangle
                     Height="1"
-                    Margin="-16,-12,-12,-12"
+                    Margin="0,2,0,2"
                     Fill="{ThemeResource MenuFlyoutSeparatorBackground}" />
             </DataTemplate>
         </ResourceDictionary>
@@ -125,35 +124,39 @@
             <RowDefinition />
             <RowDefinition />
         </Grid.RowDefinitions>
-
-        <StackPanel x:Name="CommandsPanel">
-            <ListView
-                x:Name="CommandsDropdown"
-                MinWidth="248"
-                IsItemClickEnabled="True"
-                ItemClick="CommandsDropdown_ItemClick"
-                ItemTemplateSelector="{StaticResource ContextItemTemplateSelector}"
-                ItemsSource="{x:Bind ViewModel.FilteredItems, Mode=OneWay}"
-                PreviewKeyDown="CommandsDropdown_PreviewKeyDown"
-                SelectionMode="Single">
-                <ListView.ItemContainerStyle>
-                    <Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
-                        <Setter Property="MinHeight" Value="0" />
-                        <Setter Property="Padding" Value="12,8" />
-                    </Style>
-                </ListView.ItemContainerStyle>
-                <ListView.ItemContainerTransitions>
-                    <TransitionCollection />
-                </ListView.ItemContainerTransitions>
-            </ListView>
-        </StackPanel>
+        <ListView
+            x:Name="CommandsDropdown"
+            MinWidth="248"
+            Margin="0,4,0,2"
+            IsItemClickEnabled="True"
+            ItemClick="CommandsDropdown_ItemClick"
+            ItemTemplateSelector="{StaticResource ContextItemTemplateSelector}"
+            ItemsSource="{x:Bind ViewModel.FilteredItems, Mode=OneWay}"
+            PreviewKeyDown="CommandsDropdown_PreviewKeyDown"
+            SelectionMode="Single">
+            <ListView.ItemContainerStyle>
+                <Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
+                    <Setter Property="MinHeight" Value="0" />
+                    <Setter Property="Padding" Value="0" />
+                </Style>
+            </ListView.ItemContainerStyle>
+            <ListView.ItemContainerTransitions>
+                <TransitionCollection />
+            </ListView.ItemContainerTransitions>
+        </ListView>
+        <Border BorderBrush="{ThemeResource MenuFlyoutSeparatorBackground}" BorderThickness="0,0,0,1" />
         <TextBox
             x:Name="ContextFilterBox"
             x:Uid="ContextFilterBox"
-            Margin="4"
+            Margin="0"
+            Padding="10,7,6,8"
+            Background="{ThemeResource AcrylicBackgroundFillColorBaseBrush}"
+            BorderThickness="0,0,0,2"
+            CornerRadius="8, 8, 0, 0"
             IsTextScaleFactorEnabled="True"
             KeyDown="ContextFilterBox_KeyDown"
             PreviewKeyDown="ContextFilterBox_PreviewKeyDown"
+            Style="{StaticResource SearchTextBoxStyle}"
             TextChanged="ContextFilterBox_TextChanged" />
         <VisualStateManager.VisualStateGroups>
             <VisualStateGroup x:Name="ContextMenuOrder">
@@ -162,9 +165,11 @@
                         <ui:IsEqualStateTrigger Value="{x:Bind ViewModel.FilterOnTop, Mode=OneWay}" To="True" />
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
-                        <Setter Target="CommandsPanel.(Grid.Row)" Value="1" />
+                        <Setter Target="CommandsDropdown.(Grid.Row)" Value="1" />
                         <Setter Target="ContextFilterBox.(Grid.Row)" Value="0" />
-                        <Setter Target="CommandsDropdown.Margin" Value="0, 0, 0, 4" />
+                        <Setter Target="CommandsDropdown.Margin" Value="0, 3, 0, 4" />
+                        <Setter Target="ContextFilterBox.CornerRadius" Value="8, 8, 0, 0" />
+                        <Setter Target="ContextFilterBox.Margin" Value="0,0,0,-1" />
                     </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="FilterOnBottom">
@@ -172,9 +177,11 @@
                         <ui:IsEqualStateTrigger Value="{x:Bind ViewModel.FilterOnTop, Mode=OneWay}" To="False" />
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
-                        <Setter Target="CommandsPanel.(Grid.Row)" Value="0" />
+                        <Setter Target="CommandsDropdown.(Grid.Row)" Value="0" />
                         <Setter Target="ContextFilterBox.(Grid.Row)" Value="1" />
-                        <Setter Target="CommandsDropdown.Margin" Value="0, 4, 0, 0" />
+                        <Setter Target="CommandsDropdown.Margin" Value="0, 4, 0, 4" />
+                        <Setter Target="ContextFilterBox.CornerRadius" Value="0, 0, 8, 8" />
+                        <Setter Target="ContextFilterBox.Margin" Value="0,0,0,-2" />
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>

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

@@ -74,8 +74,7 @@
         ItemsSource="{x:Bind ViewModel.Filters, Mode=OneWay}"
         PlaceholderText="Filters"
         PreviewKeyDown="FiltersComboBox_PreviewKeyDown"
-        SelectedValue="{x:Bind ViewModel.CurrentFilterId, Mode=OneWay}"
-        SelectedValuePath="Id"
+        SelectedValue="{x:Bind ViewModel.CurrentFilter, Mode=OneWay}"
         SelectionChanged="FiltersComboBox_SelectionChanged"
         Style="{StaticResource ComboBoxStyle}"
         Visibility="{x:Bind ViewModel.ShouldShowFilters, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">

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

@@ -51,7 +51,12 @@ internal static class WindowExtensions
             currentStyle &= ~(int)style;
         }
 
-        return PInvoke.SetWindowLong(hWnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE, currentStyle) != 0;
+        var wasSet = PInvoke.SetWindowLong(hWnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE, currentStyle) != 0;
+
+        // SWP_FRAMECHANGED - invalidate cached window style
+        PInvoke.SetWindowPos(hWnd, new HWND(IntPtr.Zero), 0, 0, 0, 0, SET_WINDOW_POS_FLAGS.SWP_FRAMECHANGED | SET_WINDOW_POS_FLAGS.SWP_NOMOVE | SET_WINDOW_POS_FLAGS.SWP_NOSIZE | SET_WINDOW_POS_FLAGS.SWP_NOZORDER | SET_WINDOW_POS_FLAGS.SWP_NOOWNERZORDER);
+
+        return wasSet;
     }
 
     /// <summary>

src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj

@@ -11,6 +11,7 @@
   
   
   <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.MSIX.1.7.20250829.1\build\Microsoft.Windows.SDK.BuildTools.MSIX.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.MSIX.1.7.20250829.1\build\Microsoft.Windows.SDK.BuildTools.MSIX.props')" />
   <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')" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
@@ -214,7 +215,8 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets')" />
+        <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.MSIX.1.7.20250829.1\build\Microsoft.Windows.SDK.BuildTools.MSIX.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.MSIX.1.7.20250829.1\build\Microsoft.Windows.SDK.BuildTools.MSIX.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets')" />
@@ -235,6 +237,8 @@
     <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.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.MSIX.1.7.20250829.1\build\Microsoft.Windows.SDK.BuildTools.MSIX.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.MSIX.1.7.20250829.1\build\Microsoft.Windows.SDK.BuildTools.MSIX.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.MSIX.1.7.20250829.1\build\Microsoft.Windows.SDK.BuildTools.MSIX.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.MSIX.1.7.20250829.1\build\Microsoft.Windows.SDK.BuildTools.MSIX.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets'))" />

src/settings-ui/Settings.UI.Library/LightSwitchProperties.cs

@@ -16,7 +16,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         public const int DefaultSunsetOffset = 0;
         public const string DefaultLatitude = "0.0";
         public const string DefaultLongitude = "0.0";
-        public const string DefaultScheduleMode = "FixedHours";
+        public const string DefaultScheduleMode = "Off";
         public static readonly HotkeySettings DefaultToggleThemeHotkey = new HotkeySettings(true, true, false, true, 0x44); // Ctrl+Win+Shift+D
 
         public LightSwitchProperties()

src/settings-ui/Settings.UI.Library/LightSwitchSettings.cs

@@ -3,14 +3,17 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 using System.Reflection;
 using System.Text.Json.Serialization;
+using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
 namespace Settings.UI.Library
 {
-    public class LightSwitchSettings : BasePTModuleSettings, ISettingsConfig, ICloneable
+    public class LightSwitchSettings : BasePTModuleSettings, ISettingsConfig, ICloneable, IHotkeyConfig
     {
         public const string ModuleName = "LightSwitch";
 
@@ -24,6 +27,21 @@ namespace Settings.UI.Library
         [JsonPropertyName("properties")]
         public LightSwitchProperties Properties { get; set; }
 
+        public HotkeyAccessor[] GetAllHotkeyAccessors()
+        {
+            var hotkeyAccessors = new List<HotkeyAccessor>
+            {
+                new HotkeyAccessor(
+                    () => Properties.ToggleThemeHotkey.Value,
+                    value => Properties.ToggleThemeHotkey.Value = value ?? LightSwitchProperties.DefaultToggleThemeHotkey,
+                    "LightSwitch_ThemeToggle_Shortcut"),
+            };
+
+            return hotkeyAccessors.ToArray();
+        }
+
+        public ModuleType GetModuleType() => ModuleType.LightSwitch;
+
         public object Clone()
         {
             return new LightSwitchSettings()
@@ -41,6 +59,7 @@ namespace Settings.UI.Library
                     SunsetOffset = new IntProperty((int)Properties.SunsetOffset.Value),
                     Latitude = new StringProperty(Properties.Latitude.Value),
                     Longitude = new StringProperty(Properties.Longitude.Value),
+                    ToggleThemeHotkey = new KeyboardKeysProperty(Properties.ToggleThemeHotkey.Value),
                 },
             };
         }

src/settings-ui/Settings.UI/Converters/EnumToVisibilityConverter.cs

@@ -1,37 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Data;
-
-namespace Microsoft.PowerToys.Settings.UI.Converters
-{
-    public partial class EnumToVisibilityConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value == null || parameter == null)
-            {
-                return Visibility.Collapsed;
-            }
-
-            string enumString = value.ToString();
-            string targetString = parameter.ToString();
-
-            return enumString.Equals(targetString, StringComparison.OrdinalIgnoreCase)
-                ? Visibility.Visible
-                : Visibility.Collapsed;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

src/settings-ui/Settings.UI/SettingsXAML/Views/LightSwitchPage.xaml

@@ -17,143 +17,175 @@
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
     <Page.Resources>
-        <converters:EnumToVisibilityConverter x:Key="EnumToVisibilityConverter" />
         <converters:TimeSpanToFriendlyTimeConverter x:Key="TimeSpanToFriendlyTimeConverter" />
     </Page.Resources>
-    <controls:SettingsPageControl
-        x:Uid="LightSwitch"
-        IsTabStop="False"
-        ModuleImageSource="ms-appx:///Assets/Settings/Modules/LightSwitch.png">
-        <controls:SettingsPageControl.ModuleContent>
-            <StackPanel Orientation="Vertical">
-                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
-                    <tkcontrols:SettingsCard
-                        x:Uid="LightSwitch_EnableSettingsCard"
-                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/LightSwitch.png}"
-                        IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                        <ToggleSwitch AutomationProperties.AutomationId="Toggle_LightSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
-                </controls:GPOInfoControl>
+    <Grid>
+        <controls:SettingsPageControl
+            x:Uid="LightSwitch"
+            IsTabStop="False"
+            ModuleImageSource="ms-appx:///Assets/Settings/Modules/LightSwitch.png">
+            <controls:SettingsPageControl.ModuleContent>
+                <StackPanel Orientation="Vertical">
+                    <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                        <tkcontrols:SettingsCard
+                            x:Uid="LightSwitch_EnableSettingsCard"
+                            HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/LightSwitch.png}"
+                            IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
+                            <ToggleSwitch AutomationProperties.AutomationId="Toggle_LightSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                        </tkcontrols:SettingsCard>
+                    </controls:GPOInfoControl>
 
-                <controls:SettingsGroup x:Uid="LightSwitch_ShortcutsSettingsGroup" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
-                    <tkcontrols:SettingsCard x:Uid="LightSwitch_ThemeToggle_Shortcut" HeaderIcon="{ui:FontIcon Glyph=&#xE708;}">
-                        <controls:ShortcutControl
-                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                            AllowDisable="True"
-                            AutomationProperties.AutomationId="Shortcut_LightSwitch"
-                            HotkeySettings="{x:Bind Path=ViewModel.ToggleThemeActivationShortcut, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
-                </controls:SettingsGroup>
+                    <controls:SettingsGroup x:Uid="LightSwitch_ShortcutsSettingsGroup" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
+                        <tkcontrols:SettingsCard x:Uid="LightSwitch_ThemeToggle_Shortcut" HeaderIcon="{ui:FontIcon Glyph=&#xE708;}">
+                            <controls:ShortcutControl
+                                MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                AllowDisable="True"
+                                AutomationProperties.AutomationId="Shortcut_LightSwitch"
+                                HotkeySettings="{x:Bind Path=ViewModel.ToggleThemeActivationShortcut, Mode=TwoWay}" />
+                        </tkcontrols:SettingsCard>
+                    </controls:SettingsGroup>
 
-                <controls:SettingsGroup x:Uid="LightSwitch_ScheduleSettingsGroup" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
-                    <tkcontrols:SettingsExpander
-                        x:Uid="LightSwitch_ModeSettingsExpander"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xE823;}"
-                        IsExpanded="True">
-                        <ComboBox
-                            x:Name="ModeSelector"
-                            AutomationProperties.AutomationId="ModeSelection_LightSwitch"
-                            SelectedValue="{x:Bind ViewModel.ScheduleMode, Mode=TwoWay}"
-                            SelectedValuePath="Tag"
-                            SelectionChanged="ModeSelector_SelectionChanged">
-                            <ComboBoxItem
-                                x:Uid="LightSwitch_ModeManual"
-                                AutomationProperties.AutomationId="ManualCBItem_LightSwitch"
-                                Tag="FixedHours" />
-                            <ComboBoxItem
-                                x:Uid="LightSwitch_ModeSunsetToSunrise"
-                                AutomationProperties.AutomationId="SunCBItem_LightSwitch"
-                                Tag="SunsetToSunrise" />
-                        </ComboBox>
-                        <tkcontrols:SettingsExpander.Items>
-                            <tkcontrols:SettingsCard x:Uid="LightSwitch_TurnOnDarkMode" Visibility="{x:Bind ViewModel.ScheduleMode, Mode=OneWay, Converter={StaticResource EnumToVisibilityConverter}, ConverterParameter=FixedHours}">
-                                <TimePicker AutomationProperties.AutomationId="DarkTimePicker" Time="{x:Bind ViewModel.DarkTimePickerValue, Mode=TwoWay}" />
-                            </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard x:Uid="LightSwitch_TurnOffDarkMode" Visibility="{x:Bind ViewModel.ScheduleMode, Mode=OneWay, Converter={StaticResource EnumToVisibilityConverter}, ConverterParameter=FixedHours}">
-                                <TimePicker AutomationProperties.AutomationId="LightTimePicker" Time="{x:Bind ViewModel.LightTimePickerValue, Mode=TwoWay}" />
-                            </tkcontrols:SettingsCard>
-
-                            <tkcontrols:SettingsCard x:Uid="LightSwitch_LocationSettingsCard" Visibility="{x:Bind ViewModel.ScheduleMode, Mode=OneWay, Converter={StaticResource EnumToVisibilityConverter}, ConverterParameter=SunsetToSunrise}">
-                                <StackPanel Orientation="Horizontal" Spacing="8">
-                                    <TextBlock
-                                        VerticalAlignment="Center"
-                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="{x:Bind ViewModel.SyncButtonInformation, Mode=OneWay}" />
-                                    <Button
-                                        Padding="8"
-                                        AutomationProperties.AutomationId="SetLocationButton_LightSwitch"
-                                        Click="SyncLocationButton_Click"
-                                        Content="{ui:FontIcon Glyph=&#xECAF;,
-                                                              FontSize=16}" />
-                                </StackPanel>
-                            </tkcontrols:SettingsCard>
-
-                            <tkcontrols:SettingsCard x:Uid="LightSwitch_OffsetSettingsCard" Visibility="{x:Bind ViewModel.ScheduleMode, Mode=OneWay, Converter={StaticResource EnumToVisibilityConverter}, ConverterParameter=SunsetToSunrise}">
-                                <StackPanel Orientation="Horizontal" Spacing="20">
-                                    <StackPanel Orientation="Horizontal" Spacing="8">
-                                        <!--<FontIcon Glyph="&#xED39;" FontSize="16" />-->
-                                        <controls:IsEnabledTextBlock x:Uid="LightSwitch_SunriseText" VerticalAlignment="Center" />
-                                        <NumberBox
-                                            AutomationProperties.AutomationId="SunriseOffset_LightSwitch"
-                                            Maximum="60"
-                                            Minimum="-60"
-                                            SpinButtonPlacementMode="Compact"
-                                            Value="{x:Bind ViewModel.SunriseOffset, Mode=TwoWay}" />
-                                    </StackPanel>
-                                    <StackPanel Orientation="Horizontal" Spacing="8">
-                                        <controls:IsEnabledTextBlock x:Uid="LightSwitch_SunsetText" VerticalAlignment="Center" />
-                                        <NumberBox
-                                            AutomationProperties.AutomationId="SunsetOffset_LightSwitch"
-                                            Maximum="60"
-                                            Minimum="-60"
-                                            SpinButtonPlacementMode="Compact"
-                                            Value="{x:Bind ViewModel.SunsetOffset, Mode=TwoWay}" />
-                                    </StackPanel>
-                                </StackPanel>
-                            </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard
-                                x:Name="TimelineCard"
-                                HorizontalContentAlignment="Stretch"
-                                ContentAlignment="Vertical">
-                                <controls:Timeline
-                                    Margin="0,24,0,24"
-                                    AutomationProperties.AutomationId="Timeline_LightSwitch"
-                                    EndTime="{x:Bind ViewModel.DarkTimeTimeSpan, Mode=OneWay}"
-                                    StartTime="{x:Bind ViewModel.LightTimeTimeSpan, Mode=OneWay}"
-                                    Sunrise="{x:Bind ViewModel.SunriseTimeSpan, Mode=OneWay}"
-                                    Sunset="{x:Bind ViewModel.SunsetTimeSpan, Mode=OneWay}" />
-                            </tkcontrols:SettingsCard>
-                        </tkcontrols:SettingsExpander.Items>
-                    </tkcontrols:SettingsExpander>
-                    <InfoBar
-                        x:Name="LocationWarningBar"
-                        x:Uid="LightSwitch_LocationWarningBar"
-                        IsOpen="True"
-                        Severity="Informational"
-                        Visibility="Collapsed" />
-                    <controls:SettingsGroup x:Uid="LightSwitch_BehaviorSettingsGroup" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
+                    <controls:SettingsGroup x:Uid="LightSwitch_ScheduleSettingsGroup" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                         <tkcontrols:SettingsExpander
-                            x:Uid="LightSwitch_ApplyDarkModeExpander"
-                            HeaderIcon="{ui:FontIcon Glyph=&#xE790;}"
+                            x:Uid="LightSwitch_ModeSettingsExpander"
+                            HeaderIcon="{ui:FontIcon Glyph=&#xE823;}"
                             IsExpanded="True">
+                            <ComboBox
+                                x:Name="ModeSelector"
+                                AutomationProperties.AutomationId="ModeSelection_LightSwitch"
+                                SelectedValue="{x:Bind ViewModel.ScheduleMode, Mode=TwoWay}"
+                                SelectedValuePath="Tag"
+                                SelectionChanged="ModeSelector_SelectionChanged">
+                                <ComboBoxItem
+                                    x:Uid="LightSwitch_ModeOff"
+                                    AutomationProperties.AutomationId="OffCBItem_LightSwitch"
+                                    Tag="Off" />
+                                <ComboBoxItem
+                                    x:Uid="LightSwitch_ModeManual"
+                                    AutomationProperties.AutomationId="ManualCBItem_LightSwitch"
+                                    Tag="FixedHours" />
+                                <ComboBoxItem
+                                    x:Uid="LightSwitch_ModeSunsetToSunrise"
+                                    AutomationProperties.AutomationId="SunCBItem_LightSwitch"
+                                    Tag="SunsetToSunrise" />
+                            </ComboBox>
                             <tkcontrols:SettingsExpander.Items>
-                                <tkcontrols:SettingsCard HorizontalContentAlignment="Stretch" ContentAlignment="Left">
-                                    <controls:CheckBoxWithDescriptionControl
-                                        x:Uid="LightSwitch_SystemCheckbox"
-                                        AutomationProperties.AutomationId="ChangeSystemCheckbox_LightSwitch"
-                                        IsChecked="{x:Bind ViewModel.ChangeSystem, Mode=TwoWay}" />
+                                <tkcontrols:SettingsCard
+                                    x:Name="Fixed_TurnOnCard"
+                                    x:Uid="LightSwitch_TurnOnDarkMode"
+                                    Visibility="Collapsed">
+                                    <TimePicker AutomationProperties.AutomationId="DarkTimePicker" Time="{x:Bind ViewModel.DarkTimePickerValue, Mode=TwoWay}" />
                                 </tkcontrols:SettingsCard>
-                                <tkcontrols:SettingsCard HorizontalContentAlignment="Stretch" ContentAlignment="Left">
-                                    <controls:CheckBoxWithDescriptionControl
-                                        x:Uid="LightSwitch_AppsCheckbox"
-                                        AutomationProperties.AutomationId="ChangeAppsCheckbox_LightSwitch"
-                                        IsChecked="{x:Bind ViewModel.ChangeApps, Mode=TwoWay}" />
+                                <tkcontrols:SettingsCard
+                                    x:Name="Fixed_TurnOffCard"
+                                    x:Uid="LightSwitch_TurnOffDarkMode"
+                                    Visibility="Collapsed">
+                                    <TimePicker AutomationProperties.AutomationId="LightTimePicker" Time="{x:Bind ViewModel.LightTimePickerValue, Mode=TwoWay}" />
+                                </tkcontrols:SettingsCard>
+
+                                <tkcontrols:SettingsCard
+                                    x:Name="SunLocation_Card"
+                                    x:Uid="LightSwitch_LocationSettingsCard"
+                                    Visibility="Collapsed">
+                                    <StackPanel Orientation="Horizontal" Spacing="8">
+                                        <TextBlock
+                                            VerticalAlignment="Center"
+                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                            Text="{x:Bind ViewModel.SyncButtonInformation, Mode=OneWay}" />
+                                        <Button
+                                            Padding="8"
+                                            AutomationProperties.AutomationId="SetLocationButton_LightSwitch"
+                                            Click="SyncLocationButton_Click"
+                                            Content="{ui:FontIcon Glyph=&#xECAF;,
+                                                                  FontSize=16}" />
+                                    </StackPanel>
+                                </tkcontrols:SettingsCard>
+
+                                <tkcontrols:SettingsCard
+                                    x:Name="SunOffset_Card"
+                                    x:Uid="LightSwitch_OffsetSettingsCard"
+                                    Visibility="Collapsed">
+                                    <StackPanel Orientation="Horizontal" Spacing="20">
+                                        <StackPanel Orientation="Horizontal" Spacing="8">
+                                            <!--<FontIcon Glyph="&#xED39;" FontSize="16" />-->
+                                            <controls:IsEnabledTextBlock x:Uid="LightSwitch_SunriseText" VerticalAlignment="Center" />
+                                            <NumberBox
+                                                AutomationProperties.AutomationId="SunriseOffset_LightSwitch"
+                                                Maximum="60"
+                                                Minimum="-60"
+                                                SpinButtonPlacementMode="Compact"
+                                                Value="{x:Bind ViewModel.SunriseOffset, Mode=TwoWay}" />
+                                        </StackPanel>
+                                        <StackPanel Orientation="Horizontal" Spacing="8">
+                                            <controls:IsEnabledTextBlock x:Uid="LightSwitch_SunsetText" VerticalAlignment="Center" />
+                                            <NumberBox
+                                                AutomationProperties.AutomationId="SunsetOffset_LightSwitch"
+                                                Maximum="60"
+                                                Minimum="-60"
+                                                SpinButtonPlacementMode="Compact"
+                                                Value="{x:Bind ViewModel.SunsetOffset, Mode=TwoWay}" />
+                                        </StackPanel>
+                                    </StackPanel>
+                                </tkcontrols:SettingsCard>
+                                <tkcontrols:SettingsCard
+                                    x:Name="TimelineCard"
+                                    HorizontalContentAlignment="Stretch"
+                                    ContentAlignment="Vertical"
+                                    Visibility="Collapsed">
+                                    <controls:Timeline
+                                        Margin="0,24,0,24"
+                                        AutomationProperties.AutomationId="Timeline_LightSwitch"
+                                        EndTime="{x:Bind ViewModel.DarkTimeTimeSpan, Mode=OneWay}"
+                                        StartTime="{x:Bind ViewModel.LightTimeTimeSpan, Mode=OneWay}"
+                                        Sunrise="{x:Bind ViewModel.SunriseTimeSpan, Mode=OneWay}"
+                                        Sunset="{x:Bind ViewModel.SunsetTimeSpan, Mode=OneWay}" />
+                                </tkcontrols:SettingsCard>
+                                <tkcontrols:SettingsCard
+                                    x:Name="NoScheduleCard"
+                                    Padding="0"
+                                    HorizontalContentAlignment="Stretch"
+                                    Background="{ThemeResource InfoBarInformationalSeverityBackgroundBrush}"
+                                    ContentAlignment="Vertical"
+                                    Visibility="Visible">
+                                    <InfoBar
+                                        x:Uid="LightSwitch_ScheduleOffMessage"
+                                        Background="Transparent"
+                                        BorderThickness="0"
+                                        IsClosable="False"
+                                        IsOpen="True"
+                                        Severity="Informational" />
                                 </tkcontrols:SettingsCard>
                             </tkcontrols:SettingsExpander.Items>
                         </tkcontrols:SettingsExpander>
-                    </controls:SettingsGroup>
-                    <!--  Force mode buttons  -->
-                    <!--<tkcontrols:SettingsCard
+                        <InfoBar
+                            x:Name="LocationWarningBar"
+                            x:Uid="LightSwitch_LocationWarningBar"
+                            IsOpen="True"
+                            Severity="Informational"
+                            Visibility="Collapsed" />
+                        <controls:SettingsGroup x:Uid="LightSwitch_BehaviorSettingsGroup" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
+                            <tkcontrols:SettingsExpander
+                                x:Uid="LightSwitch_ApplyDarkModeExpander"
+                                HeaderIcon="{ui:FontIcon Glyph=&#xE790;}"
+                                IsExpanded="True">
+                                <tkcontrols:SettingsExpander.Items>
+                                    <tkcontrols:SettingsCard HorizontalContentAlignment="Stretch" ContentAlignment="Left">
+                                        <controls:CheckBoxWithDescriptionControl
+                                            x:Uid="LightSwitch_SystemCheckbox"
+                                            AutomationProperties.AutomationId="ChangeSystemCheckbox_LightSwitch"
+                                            IsChecked="{x:Bind ViewModel.ChangeSystem, Mode=TwoWay}" />
+                                    </tkcontrols:SettingsCard>
+                                    <tkcontrols:SettingsCard HorizontalContentAlignment="Stretch" ContentAlignment="Left">
+                                        <controls:CheckBoxWithDescriptionControl
+                                            x:Uid="LightSwitch_AppsCheckbox"
+                                            AutomationProperties.AutomationId="ChangeAppsCheckbox_LightSwitch"
+                                            IsChecked="{x:Bind ViewModel.ChangeApps, Mode=TwoWay}" />
+                                    </tkcontrols:SettingsCard>
+                                </tkcontrols:SettingsExpander.Items>
+                            </tkcontrols:SettingsExpander>
+                        </controls:SettingsGroup>
+                        <!--  Force mode buttons  -->
+                        <!--<tkcontrols:SettingsCard
         Header="Force mode now"
         HeaderIcon="{ui:FontIcon Glyph=&#xE706;}"
         Description="Apply light or dark mode immediately">
@@ -167,21 +199,21 @@
             </StackPanel>
           </tkcontrols:SettingsCard>-->
 
-                    <ContentDialog
-                        x:Name="LocationDialog"
-                        x:Uid="LightSwitch_LocationDialog"
-                        IsPrimaryButtonEnabled="True"
-                        IsSecondaryButtonEnabled="True"
-                        Opened="LocationDialog_Opened"
-                        PrimaryButtonClick="LocationDialog_PrimaryButtonClick"
-                        PrimaryButtonStyle="{StaticResource AccentButtonStyle}">
-                        <Grid RowSpacing="48">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-                            <TextBlock x:Uid="LightSwitch_LocationDialog_Description" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                            <!--<AutoSuggestBox
+                        <ContentDialog
+                            x:Name="LocationDialog"
+                            x:Uid="LightSwitch_LocationDialog"
+                            IsPrimaryButtonEnabled="True"
+                            IsSecondaryButtonEnabled="True"
+                            Opened="LocationDialog_Opened"
+                            PrimaryButtonClick="LocationDialog_PrimaryButtonClick"
+                            PrimaryButtonStyle="{StaticResource AccentButtonStyle}">
+                            <Grid RowSpacing="48">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="*" />
+                                </Grid.RowDefinitions>
+                                <TextBlock x:Uid="LightSwitch_LocationDialog_Description" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                <!--<AutoSuggestBox
                                 x:Name="CityAutoSuggestBox"
                                 Grid.Row="1"
                                 Margin="0,16,0,8"
@@ -208,113 +240,122 @@
                                     </DataTemplate>
                                 </AutoSuggestBox.ItemTemplate>
                             </AutoSuggestBox>-->
-                            <StackPanel
-                                Grid.Row="2"
-                                Margin="0,24,0,0"
-                                HorizontalAlignment="Center"
-                                Orientation="Vertical"
-                                Spacing="32">
-                                <Button
-                                    x:Name="SyncButton"
-                                    HorizontalAlignment="Stretch"
-                                    AutomationProperties.AutomationId="SyncLocationButton_LightSwitch"
-                                    Style="{StaticResource AccentButtonStyle}"
-                                    Visibility="Collapsed">
-                                    <StackPanel Orientation="Horizontal" Spacing="8">
-                                        <FontIcon FontSize="14" Glyph="&#xECAF;" />
-                                        <TextBlock x:Uid="LightSwitch_GetCurrentLocation" />
-                                    </StackPanel>
-                                </Button>
-                            </StackPanel>
-
-                            <ProgressRing
-                                x:Name="SyncLoader"
-                                Grid.Row="1"
-                                Width="40"
-                                Height="40"
-                                VerticalAlignment="Center"
-                                IsActive="False"
-                                Visibility="Collapsed" />
-
-                            <Grid
-                                x:Name="LocationResultPanel"
-                                Grid.Row="1"
-                                VerticalAlignment="Bottom"
-                                ColumnSpacing="16"
-                                RowSpacing="12"
-                                Visibility="Collapsed">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                </Grid.RowDefinitions>
-                                <FontIcon FontSize="16" Glyph="&#xECAF;">
-                                    <ToolTipService.ToolTip>
-                                        <TextBlock x:Uid="LightSwitch_LocationTooltip" />
-                                    </ToolTipService.ToolTip>
-                                </FontIcon>
-                                <TextBlock
-                                    Grid.Row="1"
-                                    AutomationProperties.AutomationId="LocationResultText_LightSwitch"
-                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                    TextAlignment="Center">
-                                    <Run Text="{x:Bind ViewModel.Latitude, Mode=OneWay}" /><Run Text="°, " />
-                                    <Run Text="{x:Bind ViewModel.Longitude, Mode=OneWay}" /><Run Text="°" />
-                                </TextBlock>
-                                <FontIcon
-                                    Grid.Column="1"
-                                    FontSize="20"
-                                    Glyph="&#xED39;">
-                                    <ToolTipService.ToolTip>
-                                        <TextBlock x:Uid="LightSwitch_SunriseTooltip" />
-                                    </ToolTipService.ToolTip>
-                                </FontIcon>
-                                <TextBlock
-                                    Grid.Row="1"
-                                    Grid.Column="1"
-                                    AutomationProperties.AutomationId="SunriseText_LightSwitch"
-                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                    Text="{x:Bind ViewModel.LightTimeTimeSpan, Converter={StaticResource TimeSpanToFriendlyTimeConverter}, Mode=OneWay}"
-                                    TextAlignment="Center" />
-                                <FontIcon
-                                    Grid.Column="2"
-                                    FontSize="20"
-                                    Glyph="&#xED3A;">
-                                    <ToolTipService.ToolTip>
-                                        <TextBlock x:Uid="LightSwitch_SunsetTooltip" />
-                                    </ToolTipService.ToolTip>
-                                </FontIcon>
-                                <TextBlock
+                                <StackPanel
                                     Grid.Row="2"
-                                    Grid.Column="2"
-                                    AutomationProperties.AutomationId="SunsetText_LightSwitch"
-                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                    Text="{x:Bind ViewModel.DarkTimeTimeSpan, Converter={StaticResource TimeSpanToFriendlyTimeConverter}, Mode=OneWay}"
-                                    TextAlignment="Center" />
-                            </Grid>
-                        </Grid>
-                    </ContentDialog>
-                </controls:SettingsGroup>
+                                    Margin="0,24,0,0"
+                                    HorizontalAlignment="Center"
+                                    Orientation="Vertical"
+                                    Spacing="32">
+                                    <Button
+                                        x:Name="SyncButton"
+                                        HorizontalAlignment="Stretch"
+                                        AutomationProperties.AutomationId="SyncLocationButton_LightSwitch"
+                                        Style="{StaticResource AccentButtonStyle}"
+                                        Visibility="Collapsed">
+                                        <StackPanel Orientation="Horizontal" Spacing="8">
+                                            <FontIcon FontSize="14" Glyph="&#xECAF;" />
+                                            <TextBlock x:Uid="LightSwitch_GetCurrentLocation" />
+                                        </StackPanel>
+                                    </Button>
+                                </StackPanel>
 
-            </StackPanel>
-        </controls:SettingsPageControl.ModuleContent>
-        <controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="LearnMore_LightSwitch" Link="https://aka.ms/PowerToysOverview_LightSwitch" />
-        </controls:SettingsPageControl.PrimaryLinks>
-    </controls:SettingsPageControl>
-    <VisualStateManager.VisualStateGroups>
-        <VisualStateGroup x:Name="LocationEnabledStates">
-            <VisualState x:Name="LocationSet" />
-            <VisualState x:Name="LocationNotSet">
-                <VisualState.Setters>
-                    <Setter Target="TimelineCard.Visibility" Value="Collapsed" />
-                    <Setter Target="LocationWarningBar.Visibility" Value="Visible" />
-                </VisualState.Setters>
-            </VisualState>
-        </VisualStateGroup>
-    </VisualStateManager.VisualStateGroups>
+                                <ProgressRing
+                                    x:Name="SyncLoader"
+                                    Grid.Row="1"
+                                    Width="40"
+                                    Height="40"
+                                    VerticalAlignment="Center"
+                                    IsActive="False"
+                                    Visibility="Collapsed" />
+
+                                <Grid
+                                    x:Name="LocationResultPanel"
+                                    Grid.Row="1"
+                                    VerticalAlignment="Bottom"
+                                    ColumnSpacing="16"
+                                    RowSpacing="12"
+                                    Visibility="Collapsed">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <FontIcon FontSize="16" Glyph="&#xECAF;">
+                                        <ToolTipService.ToolTip>
+                                            <TextBlock x:Uid="LightSwitch_LocationTooltip" />
+                                        </ToolTipService.ToolTip>
+                                    </FontIcon>
+                                    <TextBlock
+                                        Grid.Row="1"
+                                        AutomationProperties.AutomationId="LocationResultText_LightSwitch"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        TextAlignment="Center">
+                                        <Run Text="{x:Bind ViewModel.Latitude, Mode=OneWay}" /><Run Text="°, " />
+                                        <Run Text="{x:Bind ViewModel.Longitude, Mode=OneWay}" /><Run Text="°" />
+                                    </TextBlock>
+                                    <FontIcon
+                                        Grid.Column="1"
+                                        FontSize="20"
+                                        Glyph="&#xED39;">
+                                        <ToolTipService.ToolTip>
+                                            <TextBlock x:Uid="LightSwitch_SunriseTooltip" />
+                                        </ToolTipService.ToolTip>
+                                    </FontIcon>
+                                    <TextBlock
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        AutomationProperties.AutomationId="SunriseText_LightSwitch"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Text="{x:Bind ViewModel.LightTimeTimeSpan, Converter={StaticResource TimeSpanToFriendlyTimeConverter}, Mode=OneWay}"
+                                        TextAlignment="Center" />
+                                    <FontIcon
+                                        Grid.Column="2"
+                                        FontSize="20"
+                                        Glyph="&#xED3A;">
+                                        <ToolTipService.ToolTip>
+                                            <TextBlock x:Uid="LightSwitch_SunsetTooltip" />
+                                        </ToolTipService.ToolTip>
+                                    </FontIcon>
+                                    <TextBlock
+                                        Grid.Row="2"
+                                        Grid.Column="2"
+                                        AutomationProperties.AutomationId="SunsetText_LightSwitch"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Text="{x:Bind ViewModel.DarkTimeTimeSpan, Converter={StaticResource TimeSpanToFriendlyTimeConverter}, Mode=OneWay}"
+                                        TextAlignment="Center" />
+                                </Grid>
+                            </Grid>
+                        </ContentDialog>
+                    </controls:SettingsGroup>
+
+                </StackPanel>
+            </controls:SettingsPageControl.ModuleContent>
+            <controls:SettingsPageControl.PrimaryLinks>
+                <controls:PageLink x:Uid="LearnMore_LightSwitch" Link="https://aka.ms/PowerToysOverview_LightSwitch" />
+            </controls:SettingsPageControl.PrimaryLinks>
+        </controls:SettingsPageControl>
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="ScheduleModeStates">
+                <VisualState x:Name="OffState" />
+                <VisualState x:Name="SunsetToSunriseState">
+                    <VisualState.Setters>
+                        <Setter Target="SunLocation_Card.Visibility" Value="Visible" />
+                        <Setter Target="SunOffset_Card.Visibility" Value="Visible" />
+                        <Setter Target="NoScheduleCard.Visibility" Value="Collapsed" />
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="ManualState">
+                    <VisualState.Setters>
+                        <Setter Target="Fixed_TurnOnCard.Visibility" Value="Visible" />
+                        <Setter Target="Fixed_TurnOffCard.Visibility" Value="Visible" />
+                        <Setter Target="NoScheduleCard.Visibility" Value="Collapsed" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
+    </Grid>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/Views/LightSwitchPage.xaml.cs

@@ -73,6 +73,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
 
             this.InitializeComponent();
             this.Loaded += LightSwitchPage_Loaded;
+            this.Loaded += (s, e) => ViewModel.OnPageLoaded();
         }
 
         private void LightSwitchPage_Loaded(object sender, RoutedEventArgs e)
@@ -299,20 +300,20 @@ namespace Microsoft.PowerToys.Settings.UI.Views
 
         private void ModeSelector_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            SunriseModeChartState();
-        }
-
-        private void SunriseModeChartState()
-        {
-            if (ViewModel.Latitude == "0.0" && ViewModel.Longitude == "0.0" && ViewModel.ScheduleMode == "SunsetToSunrise")
+            switch (ViewModel.ScheduleMode)
             {
-                TimelineCard.Visibility = Visibility.Collapsed;
-                LocationWarningBar.Visibility = Visibility.Visible;
-            }
-            else
-            {
-                TimelineCard.Visibility = Visibility.Visible;
-                LocationWarningBar.Visibility = Visibility.Collapsed;
+                case "FixedHours":
+                    VisualStateManager.GoToState(this, "ManualState", true);
+                    TimelineCard.Visibility = Visibility.Visible;
+                    break;
+                case "SunsetToSunrise":
+                    VisualStateManager.GoToState(this, "SunsetToSunriseState", true);
+                    SunriseModeChartState();
+                    break;
+                default:
+                    VisualStateManager.GoToState(this, "OffState", true);
+                    TimelineCard.Visibility = Visibility.Collapsed;
+                    break;
             }
         }
 
@@ -320,5 +321,19 @@ namespace Microsoft.PowerToys.Settings.UI.Views
         {
             await GetGeoLocation();
         }
+
+        private void SunriseModeChartState()
+        {
+            if (ViewModel.Latitude != "0.0" && ViewModel.Longitude != "0.0")
+            {
+                TimelineCard.Visibility = Visibility.Visible;
+                LocationWarningBar.Visibility = Visibility.Collapsed;
+            }
+            else
+            {
+                TimelineCard.Visibility = Visibility.Collapsed;
+                LocationWarningBar.Visibility = Visibility.Visible;
+            }
+        }
     }
 }

src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml

@@ -177,6 +177,9 @@
                     AutomationProperties.AutomationId="SystemToolsNavItem"
                     Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/SystemTools.png}"
                     SelectsOnInvoked="False">
+                    <NavigationViewItem.InfoBadge>
+                        <InfoBadge Style="{StaticResource NewInfoBadge}" />
+                    </NavigationViewItem.InfoBadge>
                     <NavigationViewItem.MenuItems>
                         <NavigationViewItem
                             x:Name="AdvancedPasteNavigationItem"
@@ -207,7 +210,11 @@
                             x:Uid="Shell_LightSwitch"
                             helpers:NavHelper.NavigateTo="views:LightSwitchPage"
                             AutomationProperties.AutomationId="LightSwitchNavItem"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/LightSwitch.png}" />
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/LightSwitch.png}">
+                            <NavigationViewItem.InfoBadge>
+                                <InfoBadge Style="{StaticResource NewInfoBadge}" />
+                            </NavigationViewItem.InfoBadge>
+                        </NavigationViewItem>
                         <NavigationViewItem
                             x:Name="PowerLauncherNavigationItem"
                             x:Uid="Shell_PowerLauncher"

src/settings-ui/Settings.UI/Strings/en-us/Resources.resw

@@ -5269,12 +5269,18 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
   <data name="LightSwitch_ModeSettingsExpander.Description" xml:space="preserve">
     <value>Determine when dark mode should be turned on</value>
   </data>
+  <data name="LightSwitch_ModeOff.Content" xml:space="preserve">
+    <value>Off</value>
+  </data>
   <data name="LightSwitch_ModeManual.Content" xml:space="preserve">
-    <value>Manual</value>
+    <value>Fixed hours</value>
   </data>
   <data name="LightSwitch_ModeSunsetToSunrise.Content" xml:space="preserve">
     <value>Sunset to sunrise</value>
   </data>
+  <data name="LightSwitch_ScheduleOffMessage.Title" xml:space="preserve">
+    <value>Scheduling is turned off.</value>
+  </data>
   <data name="LightSwitch_TurnOnDarkMode.Header" xml:space="preserve">
     <value>Turn on dark mode</value>
   </data>

src/settings-ui/Settings.UI/ViewModels/LightSwitchViewModel.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Linq;
@@ -20,8 +21,10 @@ using Settings.UI.Library.Helpers;
 
 namespace Microsoft.PowerToys.Settings.UI.ViewModels
 {
-    public partial class LightSwitchViewModel : Observable
+    public partial class LightSwitchViewModel : PageViewModelBase
     {
+        protected override string ModuleName => LightSwitchSettings.ModuleName;
+
         private Func<string, int> SendConfigMSG { get; }
 
         public ObservableCollection<SearchLocation> SearchLocations { get; } = new();
@@ -35,14 +38,25 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             ForceDarkCommand = new RelayCommand(ForceDarkNow);
 
             AvailableScheduleModes = new ObservableCollection<string>
-        {
-            "FixedHours",
-            "SunsetToSunrise",
-        };
+            {
+                "Off",
+                "FixedHours",
+                "SunsetToSunrise",
+            };
 
             _toggleThemeHotkey = _moduleSettings.Properties.ToggleThemeHotkey.Value;
         }
 
+        public override Dictionary<string, HotkeySettings[]> GetAllHotkeySettings()
+        {
+            var hotkeysDict = new Dictionary<string, HotkeySettings[]>
+            {
+                [ModuleName] = [ToggleThemeActivationShortcut],
+            };
+
+            return hotkeysDict;
+        }
+
         private void ForceLightNow()
         {
             Logger.LogInfo("Sending custom action: forceLight");
@@ -395,22 +409,21 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
         public HotkeySettings ToggleThemeActivationShortcut
         {
-            get => _toggleThemeHotkey;
+            get => ModuleSettings.Properties.ToggleThemeHotkey.Value;
 
             set
             {
-                if (value != _toggleThemeHotkey)
+                if (value != ModuleSettings.Properties.ToggleThemeHotkey.Value)
                 {
                     if (value == null)
                     {
-                        _toggleThemeHotkey = LightSwitchProperties.DefaultToggleThemeHotkey;
+                        ModuleSettings.Properties.ToggleThemeHotkey.Value = LightSwitchProperties.DefaultToggleThemeHotkey;
                     }
                     else
                     {
-                        _toggleThemeHotkey = value;
+                        ModuleSettings.Properties.ToggleThemeHotkey.Value = value;
                     }
 
-                    _moduleSettings.Properties.ToggleThemeHotkey.Value = _toggleThemeHotkey;
                     NotifyPropertyChanged();
 
                     SendConfigMSG(
@@ -418,7 +431,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                             CultureInfo.InvariantCulture,
                             "{{ \"powertoys\": {{ \"{0}\": {1} }} }}",
                             LightSwitchSettings.ModuleName,
-                            JsonSerializer.Serialize(_moduleSettings, (System.Text.Json.Serialization.Metadata.JsonTypeInfo<LightSwitchSettings>)SourceGenerationContextContext.Default.LightSwitchSettings)));
+                            JsonSerializer.Serialize(_moduleSettings, SourceGenerationContextContext.Default.LightSwitchSettings)));
                 }
             }
         }

tools/BugReportTool/BugReportTool/XmlDocumentEx.cpp

@@ -19,13 +19,13 @@ void XmlDocumentEx::Print(winrt::Windows::Data::Xml::Dom::IXmlNode node, int ind
     PrintTagWithAttributes(node);
     if (!node.HasChildNodes())
     {
-        stream << L"<\\" << node.NodeName().c_str() << ">" << std::endl;
+        stream << L"</" << node.NodeName().c_str() << ">" << std::endl;
         return;
     }
 
     if (node.ChildNodes().Size() == 1 && !node.FirstChild().HasChildNodes())
     {
-        stream << node.InnerText().c_str() << L"<\\" << node.NodeName().c_str() << ">" << std::endl;
+        stream << node.InnerText().c_str() << L"</" << node.NodeName().c_str() << ">" << std::endl;
         return;
     }
 
@@ -40,7 +40,7 @@ void XmlDocumentEx::Print(winrt::Windows::Data::Xml::Dom::IXmlNode node, int ind
     {
         stream << " ";
     }
-    stream << L"<\\" << node.NodeName().c_str() << ">" << std::endl;
+    stream << L"</" << node.NodeName().c_str() << ">" << std::endl;
 }
 
 void XmlDocumentEx::PrintTagWithAttributes(winrt::Windows::Data::Xml::Dom::IXmlNode node)