Restore Quick access menu item in tray menu

Co-authored-by: davidegiacometti <25966642+davidegiacometti@users.noreply.github.com>

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

@@ -94,7 +94,6 @@ ASSOCSTR
 ASYNCWINDOWPLACEMENT
 ASYNCWINDOWPOS
 atl
-ATX
 ATRIOX
 aumid
 Authenticode
@@ -114,7 +113,6 @@ azman
 bbwe
 BCIE
 bck
-backticks
 BESTEFFORT
 bezelled
 bhid
@@ -270,7 +268,6 @@ countof
 covrun
 cpcontrols
 cph
-cppcoreguidelines
 cplusplus
 CPower
 cpptools

.github/copilot-instructions.md

@@ -1,59 +1,43 @@
----
-description: PowerToys AI contributor guidance.
-applyTo: pullRequests
----
-
-# PowerToys - Copilot guide (concise)
+# PowerToys – Copilot guide (concise)
 
 This is the top-level guide for AI changes. Keep edits small, follow existing patterns, and cite exact paths in PRs.
 
-# Repo map (1-line per area)
+Repo map (1‑line per area)
 - Core apps: `src/runner/**` (tray/loader), `src/settings-ui/**` (Settings app)
 - Shared libs: `src/common/**`
 - Modules: `src/modules/*` (one per utility; Command Palette in `src/modules/cmdpal/**`)
 - Build tools/docs: `tools/**`, `doc/devdocs/**`
 
-# Build and test (defaults)
+Build and test (defaults)
 - Prerequisites: Visual Studio 2022 17.4+, minimal Windows 10 1803+.
 - Build discipline:
-  - One terminal per operation (build -> test). Do not switch or open new ones mid-flow.
+  - One terminal per operation (build → test). Don’t switch/open new ones mid-flow.
   - After making changes, `cd` to the project folder that changed (`.csproj`/`.vcxproj`).
-  - Use scripts to build, synchronously block and wait in foreground for completion: `tools/build/build.ps1|.cmd` (current folder), `build-essentials.*` (once per brand new build for missing nuget packages).
-  - Treat build exit code 0 as success; any non-zero exit code is a failure. Read the errors log in the build folder (such as `build.*.*.errors.log`) and surface problems.
-  - Do not start tests or launch Runner until the previous step succeeded.
-- Tests (fast and targeted):
-  - Find the test project by product code prefix (for example FancyZones, AdvancedPaste). Look for a sibling folder or one to two levels up named like `<Product>*UnitTests` or `<Product>*UITests`.
-  - Build the test project, wait for exit, then run only those tests via VS Test Explorer or `vstest.console.exe` with filters. Avoid `dotnet test` in this repo.
-  - Add or adjust tests when changing behavior; if skipped, state why (for example comment-only or string rename).
+  - Use script(s) to build, synchronously block and wait in foreground for it to finish: `tools/build/build.ps1|.cmd` (current folder), `build-essentials.*` (once per brand new build for missing nuget packages)
+  - Treat build **exit code 0** as success; any non-zero exit code is a failure, have Copilot read the errors log in the build folder (e.g., `build.*.*.errors.log`) and surface problems.
+  - Don’t start tests or launch Runner until the previous step succeeded.
+- Tests (fast + targeted):
+  - Find the test project by product code prefix (e.g., FancyZones, AdvancedPaste). Look for a sibling folder or 1–2 levels up named like `<Product>*UnitTests` or `<Product>*UITests`.
+  - Build the test project, wait for **exit**, then run only those tests via VS Test Explorer or `vstest.console.exe` with filters. Avoid `dotnet test` in this repo.
+  - Add/adjust tests when changing behavior; if skipped, state why (e.g., comment-only, string rename).
 
-# Pull requests (expectations)
-- Atomic: one logical change; no drive-by refactors.
-- Describe: problem, approach, risk, test evidence.
+Pull requests (expectations)
+- Atomic: one logical change; no drive‑by refactors.
+- Describe: problem / approach / risk / test evidence.
 - List: touched paths if not obvious.
 
-# When to ask for clarification
+When to ask for clarification
 - Ambiguous spec after scanning relevant docs (see below).
-- Cross-module impact (shared enum or struct) not clear.
-- Security, elevation, or installer changes.
+- Cross-module impact (shared enum/struct) not clear.
+- Security / elevation / installer changes.
 
-# Logging (use existing stacks)
-- C++ logging lives in `src/common/logger/**` (`Logger::info`, `Logger::warn`, `Logger::error`, `Logger::debug`). Keep hot paths quiet (hooks, tight loops).
-- C# logging goes through `ManagedCommon.Logger` (`LogInfo`, `LogWarning`, `LogError`, `LogDebug`, `LogTrace`). Some UIs use injected `ILogger` via `LoggerInstance.Logger`.
+Logging (use existing stacks)
+- C++: `src/common/logger/**` (`Logger::info|warn|error|debug`). Keep hot paths quiet (hooks, tight loops).
+- C#: `ManagedCommon.Logger` (`LogInfo|LogWarning|LogError|LogDebug|LogTrace`). Some UIs use injected `ILogger` via `LoggerInstance.Logger`.
 
-# Docs to consult
+Docs to consult
 - `tools/build/BUILD-GUIDELINES.md`
-- `doc/devdocs/core/architecture.md`
-- `doc/devdocs/core/runner.md`
-- `doc/devdocs/core/settings/readme.md`
-- `doc/devdocs/modules/readme.md`
+- `doc/devdocs/core/architecture.md`, `doc/devdocs/core/runner.md`, `doc/devdocs/core/settings/readme.md`, `doc/devdocs/modules/readme.md`
 
-# Language style rules
-- Always enforce repo analyzers: root `.editorconfig` plus any `stylecop.json`.
-- C# code follows StyleCop.Analyzers and Microsoft.CodeAnalysis.NetAnalyzers.
-- C++ code honors `.clang-format` plus `.clang-tidy` (modernize/cppcoreguidelines/readability).
-- Markdown files wrap at 80 characters and use ATX headers with fenced code blocks that include language tags.
-- YAML files indent two spaces and add comments for complex settings while keeping keys clear.
-- PowerShell scripts use Verb-Noun names and prefer single-quoted literals while documenting parameters and satisfying PSScriptAnalyzer.
-
-# Done checklist (self review before finishing)
-- Build clean? Tests updated or passed? No unintended formatting? Any new dependency? Documented skips?
+Done checklist (self review before finishing)
+- Build clean? Tests updated/passed? No unintended formatting? Any new dependency? Documented skips?

.github/prompts/create-commit-title.prompt.md

@@ -1,16 +0,0 @@
----
-mode: 'agent'
-model: GPT-5-Codex (Preview)
-description: 'Generate an 80-character git commit title for the local diff.'
----
-
-**Goal:** Provide a ready-to-paste git commit title (<= 80 characters) that captures the most important local changes since `HEAD`.
-
-**Workflow:**
-1. Run a single command to view the local diff since the last commit:
-   ```@terminal
-   git diff HEAD
-   ```
-2. From that diff, identify the dominant area (reference key paths like `src/modules/*`, `doc/devdocs/**`, etc.), the type of change (bug fix, docs update, config tweak), and any notable impact.
-3. Draft a concise, imperative commit title summarizing the dominant change. Keep it plain ASCII, <= 80 characters, and avoid trailing punctuation. Mention the primary component when obvious (for example `FancyZones:` or `Docs:`).
-4. Respond with only the final commit title on a single line so it can be pasted directly into `git commit`.

.github/prompts/create-pr-summary.prompt.md

@@ -1,22 +0,0 @@
----
-mode: 'agent'
-model: GPT-5-Codex (Preview)
-description: 'Generate a PowerToys-ready pull request description from the local diff.'
----
-
-**Goal:** Produce a ready-to-paste PR title and description that follows PowerToys conventions by comparing the current branch against a user-selected target branch.
-
-**Repo guardrails:**
-- Treat `.github/pull_request_template.md` as the single source of truth; load it at runtime instead of embedding hardcoded content in this prompt.
-- Preserve section order from the template but only surface checklist lines that are relevant for the detected changes, filling them with `[x]`/`[ ]` as appropriate.
-- Cite touched paths with inline backticks, matching the guidance in `.github/copilot-instructions.md`.
-- Call out test coverage explicitly: list automated tests run (unit/UI) or state why they are not applicable.
-
-**Workflow:**
-1. Determine the target branch from user context; default to `main` when no branch is supplied.
-2. Run `git status --short` once to surface uncommitted files that may influence the summary.
-3. Run `git diff <target-branch>...HEAD` a single time to review the detailed changes. Only when confidence stays low dig deeper with focused calls such as `git diff <target-branch>...HEAD -- <path>`.
-4. From the diff, capture impacted areas, key file changes, behavioral risks, migrations, and noteworthy edge cases.
-5. Confirm validation: list tests executed with results or state why tests were skipped in line with repo guidance.
-6. Load `.github/pull_request_template.md`, mirror its section order, and populate it with the gathered facts. Include only relevant checklist entries, marking them `[x]/[ ]` and noting any intentional omissions as "N/A".
-7. Present the filled template inside a fenced ```markdown code block with no extra commentary so it is ready to paste into a PR, clearly flagging any placeholders that still need user input.

.github/prompts/fix-spelling.prompt.md

@@ -1,22 +0,0 @@
----
-mode: 'agent'
-model: GPT-5-Codex (Preview)
-description: 'Resolve Code scanning / check-spelling comments on the active PR.'
----
-
-**Goal:** Clear every outstanding GitHub pull request comment created by the `Code scanning / check-spelling` workflow by explicitly allowing intentional terms.
-
-**Guardrails:**
-- Update only discussion threads authored by `github-actions` or `github-actions[bot]` that mention `Code scanning results / check-spelling`.
-- Resolve findings solely by editing `.github/actions/spell-check/expect.txt`; reuse existing entries.
-- Leave all other files and topics untouched.
-
-**Prerequisites:**
-- Install GitHub CLI if it is not present: `winget install GitHub.cli`.
-- Run `gh auth login` once before the first CLI use.
-
-**Workflow:**
-1. Determine the active pull request with a single `gh pr view --json number` call (default to the current branch).
-2. Fetch all PR discussion data once via `gh pr view --json comments,reviews` and filter to check-spelling comments authored by `github-actions` or `github-actions[bot]` that are not minimized; when several remain, process only the most recent comment body.
-3. For each flagged token, review `.github/actions/spell-check/expect.txt` for an equivalent term (for example an existing lowercase variant); when found, reuse that normalized term rather than adding a new entry, even if the flagged token differs only by casing. Only add a new entry after confirming no equivalent already exists.
-4. Add any remaining missing token to `.github/actions/spell-check/expect.txt`, keeping surrounding formatting intact.

.pipelines/v2/release.yml

@@ -73,11 +73,10 @@ extends:
             parameters:
               pool:
                 name: SHINE-INT-L
-                demands:
-                  # Our INT agents have a large disk mounted at P:\
-                  - WorkFolder -equals P:\_work
-                  - ${{ if eq(parameters.useVSPreview, true) }}:
-                    - ImageOverride -equals SHINE-VS17-Preview
+                ${{ if eq(parameters.useVSPreview, true) }}:
+                  demands: ImageOverride -equals SHINE-VS17-Preview
+                ${{ else }}:
+                  image: SHINE-VS17-Latest
                 os: windows
               variables:
                 IsPipeline: 1 # The installer uses this to detect whether it should pick up localizations

README.md

@@ -48,7 +48,7 @@ Before you begin, make sure your device meets the system requirements:
 
 Choose one of the installation methods below:
 
-<details open>
+<details>
 <summary>Download .exe from GitHub</summary>
 
 Go to the [PowerToys GitHub releases][github-release-link], click Assets to reveal the downloads, and choose the installer that matches your architecture and install scope. For most devices, that's the x64 per-user installer.
@@ -56,17 +56,17 @@ Go to the [PowerToys GitHub releases][github-release-link], click Assets to reve
 <!-- items that need to be updated release to release -->
 [github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.96%22
 [github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.95%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysUserSetup-0.95.1-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysUserSetup-0.95.1-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysSetup-0.95.1-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysSetup-0.95.1-arm64.exe
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.0/PowerToysUserSetup-0.95.0-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.0/PowerToysUserSetup-0.95.0-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.0/PowerToysSetup-0.95.0-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.0/PowerToysSetup-0.95.0-arm64.exe
  
 |  Description   | Filename |
 |----------------|----------|
-| Per user - x64       | [PowerToysUserSetup-0.95.1-x64.exe][ptUserX64] |
-| Per user - ARM64     | [PowerToysUserSetup-0.95.1-arm64.exe][ptUserArm64] |
-| Machine wide - x64   | [PowerToysSetup-0.95.1-x64.exe][ptMachineX64] |
-| Machine wide - ARM64 | [PowerToysSetup-0.95.1-arm64.exe][ptMachineArm64] |
+| Per user - x64       | [PowerToysUserSetup-0.95.0-x64.exe][ptUserX64] |
+| Per user - ARM64     | [PowerToysUserSetup-0.95.0-arm64.exe][ptUserArm64] |
+| Machine wide - x64   | [PowerToysSetup-0.95.0-x64.exe][ptMachineX64] |
+| Machine wide - ARM64 | [PowerToysSetup-0.95.0-arm64.exe][ptMachineArm64] |
 
 </details>
 
@@ -281,4 +281,4 @@ The application logs basic diagnostic data (telemetry). For more privacy informa
 [roadmap]: https://github.com/microsoft/PowerToys/wiki/Roadmap
 [privacy-link]: http://go.microsoft.com/fwlink/?LinkId=521839 
 [loc-bug]: https://github.com/microsoft/PowerToys/issues/new?assignees=&labels=&template=translation_issue.md&title= 
-[usingPowerToys-docs-link]: https://aka.ms/powertoys-docs
+[usingPowerToys-docs-link]: https://aka.ms/powertoys-docs

src/modules/LightSwitch/LightSwitchModuleInterface/ThemeHelper.cpp

@@ -3,26 +3,6 @@
 #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)
 {
@@ -56,11 +36,6 @@ 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,7 +47,6 @@ 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
@@ -60,9 +59,8 @@ inline std::wstring ToString(ScheduleMode mode)
     case ScheduleMode::SunsetToSunrise:
         return L"SunsetToSunrise";
     case ScheduleMode::FixedHours:
-        return L"FixedHours";
     default:
-        return L"Off";
+        return L"FixedHours";
     }
 }
 
@@ -70,9 +68,7 @@ inline ScheduleMode FromString(const std::wstring& str)
 {
     if (str == L"SunsetToSunrise")
         return ScheduleMode::SunsetToSunrise;
-    if (str == L"FixedHours")
-        return ScheduleMode::FixedHours;
-    return ScheduleMode::Off;
+    return ScheduleMode::FixedHours;
 }
 
 // These are the properties shown in the Settings page.
@@ -80,7 +76,7 @@ struct ModuleSettings
 {
     bool m_changeSystem = true;
     bool m_changeApps = true;
-    ScheduleMode m_scheduleMode = ScheduleMode::Off;
+    ScheduleMode m_scheduleMode = ScheduleMode::FixedHours;
     int m_lightTime = 480;
     int m_darkTime = 1200;
     int m_sunrise_offset = 0;
@@ -165,8 +161,7 @@ public:
             L"scheduleMode",
             L"Theme schedule mode",
             ToString(g_settings.m_scheduleMode),
-            { { L"Off", L"Disable the schedule" },
-              { L"FixedHours", L"Set hours manually" },
+            { { L"FixedHours", L"Set hours manually" },
               { L"SunsetToSunrise", L"Use sunrise/sunset times" } });
 
         // Integer spinners
@@ -289,20 +284,9 @@ public:
                 g_settings.m_changeApps = *v;
             }
 
-            auto previousMode = g_settings.m_scheduleMode;
-
             if (auto v = values.get_string_value(L"scheduleMode"))
             {
-                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();
-                }
+                g_settings.m_scheduleMode = FromString(*v);
             }
 
             if (auto v = values.get_int_value(L"lightTime"))
@@ -320,7 +304,7 @@ public:
                 g_settings.m_sunrise_offset = *v;
             }
 
-            if (auto v = values.get_int_value(L"sunset_offset"))
+            if (auto v = values.get_int_value(L"m_sunset_offset"))
             {
                 g_settings.m_sunset_offset = *v;
             }
@@ -342,47 +326,6 @@ 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;
@@ -470,12 +413,6 @@ 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();
@@ -534,15 +471,6 @@ 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

@@ -16,8 +16,6 @@ SERVICE_STATUS g_ServiceStatus = {};
 SERVICE_STATUS_HANDLE g_StatusHandle = nullptr;
 HANDLE g_ServiceStopEvent = nullptr;
 static int g_lastUpdatedDay = -1;
-static ScheduleMode prevMode = ScheduleMode::Off;
-static std::wstring prevLat, prevLon;
 
 VOID WINAPI ServiceMain(DWORD argc, LPTSTR* argv);
 VOID WINAPI ServiceCtrlHandler(DWORD dwCtrl);
@@ -187,164 +185,62 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
         if (isLightActive)
         {
             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 dark mode.");
-            }
         }
     };
 
-    // --- Initial settings load ---
-    LightSwitchSettings::instance().LoadSettings();
-    auto& settings = LightSwitchSettings::instance().settings();
-
-    // --- Initial theme application (if schedule enabled) ---
-    if (settings.scheduleMode != ScheduleMode::Off)
+    // --- At service start: immediately honor the schedule ---
     {
         SYSTEMTIME st;
         GetLocalTime(&st);
         int nowMinutes = st.wHour * 60 + st.wMinute;
+
+        LightSwitchSettings::instance().LoadSettings();
+        const auto& settings = LightSwitchSettings::instance().settings();
+
         applyTheme(nowMinutes, settings.lightTime + settings.sunrise_offset, settings.darkTime + settings.sunset_offset, settings);
     }
-    else
-    {
-        Logger::info(L"[LightSwitchService] Schedule mode is OFF - ticker suspended, waiting for manual action or mode change.");
-    }
 
-    // --- Main loop ---
+    // --- Main loop: wakes once per minute or stop/parent death ---
     for (;;)
     {
         HANDLE waits[2] = { g_ServiceStopEvent, hParent };
         DWORD count = hParent ? 2 : 1;
 
-        LightSwitchSettings::instance().LoadSettings();
-        const auto& settings = LightSwitchSettings::instance().settings();
-
-        // Check for changes in schedule mode or coordinates
-        bool modeChangedToSunset = (prevMode != settings.scheduleMode &&
-                                    settings.scheduleMode == ScheduleMode::SunsetToSunrise);
-        bool coordsChanged = (prevLat != settings.latitude || prevLon != settings.longitude);
-
-        if ((modeChangedToSunset || coordsChanged) && settings.scheduleMode == ScheduleMode::SunsetToSunrise)
-        {
-            Logger::info(L"[LightSwitchService] Mode or coordinates changed, recalculating sun times.");
-            update_sun_times(settings);
-            SYSTEMTIME st;
-            GetLocalTime(&st);
-            g_lastUpdatedDay = st.wDay;
-            prevMode = settings.scheduleMode;
-            prevLat = settings.latitude;
-            prevLon = settings.longitude;
-        }
-
-        // 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) && (settings.scheduleMode == ScheduleMode::SunsetToSunrise))
+        if (g_lastUpdatedDay != st.wDay)
         {
             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 | mode=%d",
+                   L"[LightSwitchService] now=%02d:%02d | light=%02d:%02d | dark=%02d:%02d",
                    st.wHour,
                    st.wMinute,
-                   currentSettings.lightTime / 60,
-                   currentSettings.lightTime % 60,
-                   currentSettings.darkTime / 60,
-                   currentSettings.darkTime % 60,
-                   static_cast<int>(currentSettings.scheduleMode));
+                   settings.lightTime / 60,
+                   settings.lightTime % 60,
+                   settings.darkTime / 60,
+                   settings.darkTime % 60);
         Logger::info(msg);
 
         // --- Manual override check ---
@@ -356,20 +252,22 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
 
         if (manualOverrideActive)
         {
-            if (nowMinutes == (currentSettings.lightTime + currentSettings.sunrise_offset) % 1440 ||
-                nowMinutes == (currentSettings.darkTime + currentSettings.sunset_offset) % 1440)
+            // Did we hit a scheduled boundary? (reset override at boundary)
+            if (nowMinutes == (settings.lightTime + settings.sunrise_offset) % 1440 ||
+                nowMinutes == (settings.darkTime + settings.sunset_offset) % 1440)
             {
                 ResetEvent(hManualOverride);
-                Logger::info(L"[LightSwitchService] Manual override cleared at boundary");
+                Logger::info(L"[LightSwitchService] Manual override cleared at boundary\n");
             }
             else
             {
-                Logger::info(L"[LightSwitchService] Skipping schedule due to manual override");
+                Logger::info(L"[LightSwitchService] Skipping schedule due to manual override\n");
                 goto sleep_until_next_minute;
             }
         }
 
-        applyTheme(nowMinutes, currentSettings.lightTime + currentSettings.sunrise_offset, currentSettings.darkTime + currentSettings.sunset_offset, currentSettings);
+        // Apply theme logic (only runs if no manual override or override just cleared)
+        applyTheme(nowMinutes, settings.lightTime + settings.sunrise_offset, settings.darkTime + settings.sunset_offset, settings);
 
     sleep_until_next_minute:
         GetLocalTime(&st);
@@ -380,14 +278,15 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
         DWORD wait = WaitForMultipleObjects(count, waits, FALSE, msToNextMinute);
         if (wait == WAIT_OBJECT_0)
         {
-            Logger::info(L"[LightSwitchService] Stop event triggered - exiting worker loop.");
+            Logger::info(L"[LightSwitchService] Stop event triggered <EFBFBD> exiting worker loop.");
             break;
         }
-        if (hParent && wait == WAIT_OBJECT_0 + 1)
+        if (hParent && wait == WAIT_OBJECT_0 + 1) // parent process exited
         {
-            Logger::info(L"[LightSwitchService] Parent process exited - stopping service.");
+            Logger::info(L"[LightSwitchService] Parent process exited <EFBFBD> stopping service.");
             break;
         }
+
     }
 
     if (hManualOverride)
@@ -398,7 +297,6 @@ 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,7 +6,6 @@
 #include <filesystem>
 #include <fstream>
 #include <WinHookEventIDs.h>
-#include <logger.h>
 
 using namespace std;
 
@@ -28,20 +27,10 @@ std::wstring LightSwitchSettings::GetSettingsFileName()
 
 void LightSwitchSettings::InitFileWatcher()
 {
-    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);
-            });
-    }
+    const std::wstring& settingsFileName = GetSettingsFileName();
+    m_settingsFileWatcher = std::make_unique<FileWatcher>(settingsFileName, [&]() {
+        PostMessageW(HWND_BROADCAST, WM_PRIV_SETTINGS_CHANGED, NULL, NULL);
+    });
 }
 
 void LightSwitchSettings::AddObserver(SettingsObserver& observer)

src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.h

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

src/modules/LightSwitch/LightSwitchService/ThemeHelper.cpp

@@ -1,32 +1,8 @@
 #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;
@@ -59,12 +35,6 @@ 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/MouseUtils/FindMyMouse/FindMyMouse.cpp

@@ -269,10 +269,6 @@ LRESULT SuperSonar<D>::BaseWndProc(UINT message, WPARAM wParam, LPARAM lParam) n
 
     case WM_NCHITTEST:
         return HTTRANSPARENT;
-
-    case WM_SETCURSOR:
-        SetCursor(LoadCursor(nullptr, IDC_ARROW));
-        return TRUE;
     }
 
     if (message == WM_PRIV_SHORTCUT)
@@ -539,7 +535,7 @@ void SuperSonar<D>::StartSonar()
     Trace::MousePointerFocused();
     // Cover the entire virtual screen.
     // HACK: Draw with 1 pixel off. Otherwise, Windows glitches the task bar transparency when a transparent window fill the whole screen.
-    SetWindowPos(m_hwnd, HWND_TOPMOST, GetSystemMetrics(SM_XVIRTUALSCREEN) + 1, GetSystemMetrics(SM_YVIRTUALSCREEN) + 1, GetSystemMetrics(SM_CXVIRTUALSCREEN) - 2, GetSystemMetrics(SM_CYVIRTUALSCREEN) - 2, SWP_NOACTIVATE);
+    SetWindowPos(m_hwnd, HWND_TOPMOST, GetSystemMetrics(SM_XVIRTUALSCREEN) + 1, GetSystemMetrics(SM_YVIRTUALSCREEN) + 1, GetSystemMetrics(SM_CXVIRTUALSCREEN) - 2, GetSystemMetrics(SM_CYVIRTUALSCREEN) - 2, 0);
     m_sonarPos = ptNowhere;
     OnMouseTimer();
     UpdateMouseSnooping();

src/modules/MouseUtils/MousePointerCrosshairs/dllmain.cpp

@@ -14,9 +14,6 @@ extern void InclusiveCrosshairsRequestUpdatePosition();
 extern void InclusiveCrosshairsEnsureOn();
 extern void InclusiveCrosshairsEnsureOff();
 extern void InclusiveCrosshairsSetExternalControl(bool enabled);
-extern void InclusiveCrosshairsSetOrientation(CrosshairsOrientation orientation);
-extern bool InclusiveCrosshairsIsEnabled();
-extern void InclusiveCrosshairsSwitch();
 
 // Non-Localizable strings
 namespace
@@ -247,19 +244,12 @@ public:
             return false;
         }
 
-        if (hotkeyId == 0) // Crosshairs activation
+        if (hotkeyId == 0)
         {
-            // If gliding cursor is active, cancel it and activate crosshairs
-            if (m_glideState.load() != 0)
-            {
-                CancelGliding(true /*activateCrosshairs*/);
-                return true;
-            }
-            // Otherwise, normal crosshairs toggle
             InclusiveCrosshairsSwitch();
             return true;
         }
-        if (hotkeyId == 1) // Gliding cursor activation
+        if (hotkeyId == 1)
         {
             HandleGlidingHotkey();
             return true;
@@ -278,44 +268,25 @@ private:
         SendInput(2, inputs, sizeof(INPUT));
     }
 
-    // Cancel gliding with option to activate crosshairs in user's preferred orientation
-    void CancelGliding(bool activateCrosshairs)
+    // Cancel gliding without performing the final click (Escape handling)
+    void CancelGliding()
     {
         int state = m_glideState.load();
         if (state == 0)
         {
             return; // nothing to cancel
         }
-        
-        // Stop all gliding operations
         StopXTimer();
         StopYTimer();
         m_glideState = 0;
-        UninstallKeyboardHook();
-        
-        // Reset crosshairs control and restore user settings
+        InclusiveCrosshairsEnsureOff();
         InclusiveCrosshairsSetExternalControl(false);
-        InclusiveCrosshairsSetOrientation(m_inclusiveCrosshairsSettings.crosshairsOrientation);
-        
-        if (activateCrosshairs)
-        {
-            // User is switching to crosshairs mode - enable with their settings
-            InclusiveCrosshairsEnsureOn();
-        }
-        else
-        {
-            // User canceled (Escape) - turn off crosshairs completely
-            InclusiveCrosshairsEnsureOff();
-        }
-        
-        // Reset gliding state
         if (auto s = m_state)
         {
             s->xFraction = 0.0;
             s->yFraction = 0.0;
         }
-        
-        Logger::debug("Gliding cursor cancelled (activateCrosshairs={})", activateCrosshairs ? 1 : 0);
+        Logger::debug("Gliding cursor cancelled via Escape key");
     }
 
     // Stateless helpers operating on shared State
@@ -454,22 +425,21 @@ private:
         {
             return;
         }
-        
+        // Simulate the AHK state machine
         int state = m_glideState.load();
         switch (state)
         {
-        case 0: // Starting gliding
+        case 0:
         {
-            // Install keyboard hook for Escape cancellation
+            // For detect for cancel key
             InstallKeyboardHook();
-            
-            // Force crosshairs visible in BOTH orientation for gliding, regardless of user setting
-            // Set external control before enabling to prevent internal movement hook from attaching
+            // Ensure crosshairs on (do not toggle off if already on)
+            InclusiveCrosshairsEnsureOn();
+            // Disable internal mouse hook so we control position updates explicitly
             InclusiveCrosshairsSetExternalControl(true);
+            // Override crosshairs to show both for Gliding Cursor
             InclusiveCrosshairsSetOrientation(CrosshairsOrientation::Both);
-            InclusiveCrosshairsEnsureOn(); // Always ensure they are visible
 
-            // Initialize gliding state
             s->currentXPos = 0;
             s->currentXSpeed = s->fastHSpeed;
             s->xFraction = 0.0;
@@ -477,17 +447,20 @@ private:
             int y = GetSystemMetrics(SM_CYVIRTUALSCREEN) / 2;
             SetCursorPos(0, y);
             InclusiveCrosshairsRequestUpdatePosition();
-            
             m_glideState = 1;
             StartXTimer();
             break;
         }
-        case 1: // Slow horizontal
+        case 1:
+        {
+            // Slow horizontal
             s->currentXSpeed = s->slowHSpeed;
             m_glideState = 2;
             break;
-        case 2: // Switch to vertical fast
+        }
+        case 2:
         {
+            // Stop horizontal, start vertical (fast)
             StopXTimer();
             s->currentYSpeed = s->fastVSpeed;
             s->currentYPos = 0;
@@ -498,37 +471,33 @@ private:
             StartYTimer();
             break;
         }
-        case 3: // Slow vertical
+        case 3:
+        {
+            // Slow vertical
             s->currentYSpeed = s->slowVSpeed;
             m_glideState = 4;
             break;
-        case 4: // Finalize (click and end)
+        }
+        case 4:
         default:
         {
-            // Complete the gliding sequence
+            UninstallKeyboardHook();
+            // Stop vertical, click, turn crosshairs off, re-enable internal tracking, reset state
             StopYTimer();
             m_glideState = 0;
             LeftClick();
-            
-            // Restore normal crosshairs operation and turn them off
-            InclusiveCrosshairsSetExternalControl(false);
-            InclusiveCrosshairsSetOrientation(m_inclusiveCrosshairsSettings.crosshairsOrientation);
             InclusiveCrosshairsEnsureOff();
-            
-            UninstallKeyboardHook();
-            
-            // Reset state
-            if (auto sp = m_state)
-            {
-                sp->xFraction = 0.0;
-                sp->yFraction = 0.0;
-            }
+            InclusiveCrosshairsSetExternalControl(false);
+            // Restore original crosshairs orientation setting
+            InclusiveCrosshairsSetOrientation(m_inclusiveCrosshairsSettings.crosshairsOrientation);
+            s->xFraction = 0.0;
+            s->yFraction = 0.0;
             break;
         }
         }
     }
 
-    // Low-level keyboard hook for Escape cancellation
+    // Low-level keyboard hook procedures
     static LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
     {
         if (nCode == HC_ACTION)
@@ -540,11 +509,14 @@ private:
                 {
                     if (inst->m_enabled && inst->m_glideState.load() != 0)
                     {
-                        inst->CancelGliding(false); // Escape cancels without activating crosshairs
+                        inst->UninstallKeyboardHook();
+                        inst->CancelGliding();
                     }
                 }
             }
         }
+
+        // Do not swallow Escape; pass it through
         return CallNextHookEx(nullptr, nCode, wParam, lParam);
     }
 

src/modules/MouseWithoutBorders/App/Class/Common.VK.cs

@@ -112,7 +112,6 @@ namespace MouseWithoutBorders
         internal const int WM_RBUTTONDBLCLK = 0x206;
         internal const int WM_MBUTTONDBLCLK = 0x209;
         internal const int WM_MOUSEWHEEL = 0x020A;
-        internal const int WM_MOUSEHWHEEL = 0x020E;
 
         internal const int WM_KEYDOWN = 0x100;
         internal const int WM_KEYUP = 0x101;

src/modules/MouseWithoutBorders/App/Class/InputSimulation.cs

@@ -204,9 +204,6 @@ namespace MouseWithoutBorders.Class
                 case Common.WM_MOUSEWHEEL:
                     mouse_input.mi.dwFlags |= (int)NativeMethods.MOUSEEVENTF.WHEEL;
                     break;
-                case Common.WM_MOUSEHWHEEL:
-                    mouse_input.mi.dwFlags |= (int)NativeMethods.MOUSEEVENTF.HWHEEL;
-                    break;
                 case Common.WM_XBUTTONUP:
                     mouse_input.mi.dwFlags |= (int)NativeMethods.MOUSEEVENTF.XUP;
                     break;

src/modules/MouseWithoutBorders/App/Class/NativeMethods.cs

@@ -556,7 +556,6 @@ namespace MouseWithoutBorders.Class
             XDOWN = 0x0080,
             XUP = 0x0100,
             WHEEL = 0x0800,
-            HWHEEL = 0x1000,
             VIRTUALDESK = 0x4000,
             ABSOLUTE = 0x8000,
         }

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 = "Off";
+        public const string DefaultScheduleMode = "FixedHours";
         public static readonly HotkeySettings DefaultToggleThemeHotkey = new HotkeySettings(true, true, false, true, 0x44); // Ctrl+Win+Shift+D
 
         public LightSwitchProperties()

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

@@ -0,0 +1,37 @@
+// 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,175 +17,143 @@
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
     <Page.Resources>
+        <converters:EnumToVisibilityConverter x:Key="EnumToVisibilityConverter" />
         <converters:TimeSpanToFriendlyTimeConverter x:Key="TimeSpanToFriendlyTimeConverter" />
     </Page.Resources>
-    <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: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_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
-                                    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
-                                    x:Name="Fixed_TurnOffCard"
-                                    x:Uid="LightSwitch_TurnOffDarkMode"
-                                    Visibility="Collapsed">
-                                    <TimePicker AutomationProperties.AutomationId="LightTimePicker" Time="{x:Bind ViewModel.LightTimePickerValue, Mode=TwoWay}" />
-                                </tkcontrols:SettingsCard>
+                <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:Name="SunLocation_Card"
-                                    x:Uid="LightSwitch_LocationSettingsCard"
-                                    Visibility="Collapsed">
+                            <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">
-                                        <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}" />
+                                        <!--<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>
-                                </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 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}">
+                        <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
-                                    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 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>
-                        <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
+                    </controls:SettingsGroup>
+                    <!--  Force mode buttons  -->
+                    <!--<tkcontrols:SettingsCard
         Header="Force mode now"
         HeaderIcon="{ui:FontIcon Glyph=&#xE706;}"
         Description="Apply light or dark mode immediately">
@@ -199,21 +167,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"
@@ -240,122 +208,113 @@
                                     </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"
+                            <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">
-                                    <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 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="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>
+                            <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="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>
 </Page>

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

@@ -300,20 +300,20 @@ namespace Microsoft.PowerToys.Settings.UI.Views
 
         private void ModeSelector_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            switch (ViewModel.ScheduleMode)
+            SunriseModeChartState();
+        }
+
+        private void SunriseModeChartState()
+        {
+            if (ViewModel.Latitude == "0.0" && ViewModel.Longitude == "0.0" && ViewModel.ScheduleMode == "SunsetToSunrise")
             {
-                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;
+                TimelineCard.Visibility = Visibility.Collapsed;
+                LocationWarningBar.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                TimelineCard.Visibility = Visibility.Visible;
+                LocationWarningBar.Visibility = Visibility.Collapsed;
             }
         }
 
@@ -321,19 +321,5 @@ 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/Strings/en-us/Resources.resw

@@ -5269,18 +5269,12 @@ 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>Fixed hours</value>
+    <value>Manual</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

@@ -39,7 +39,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
             AvailableScheduleModes = new ObservableCollection<string>
             {
-                "Off",
                 "FixedHours",
                 "SunsetToSunrise",
             };