update tool

Merge branch 'main' of https://github.com/microsoft/PowerToys into leilzh/adclean
format
2026-01-01 09:56:32 +01:00 · 2025-11-11 12:57:36 +08:00 · 2025-11-11 10:14:02 +08:00 · 2025-11-10 22:27:17 +08:00 · 2025-11-10 22:24:40 +08:00
110 changed files with 1582 additions and 2852 deletions
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -141,7 +141,7 @@ bla
 BLACKFRAME
 BLENDFUNCTION
 Blockquotes
-blt
+Blt
 BLURBEHIND
 BLURREGION
 bmi
@@ -1873,7 +1873,6 @@ UPDATENOW
 UPDATEREGISTRY
 updown
 UPGRADINGPRODUCTCODE
-upscaling
 Uptool
 urld
 Usb
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@@ -291,7 +291,6 @@
                "Mono.Cecil.Rocks.dll",
                "Newtonsoft.Json.dll",
                "CommunityToolkit.WinUI.Controls.TitleBar.dll",
-                "CommunityToolkit.WinUI.Controls.OpacityMaskView.dll",

                "NLog.dll",
                "HtmlAgilityPack.dll",
--- a/Cpp.Build.props
+++ b/Cpp.Build.props
@@ -1,6 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0"
  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Hybrid CRT configuration -->
+  <PropertyGroup Condition="'$(HybridCrtConfiguration)'==''">
+    <HybridCrtConfiguration>$(Configuration)</HybridCrtConfiguration>
+  </PropertyGroup>
+
+  <!-- Skip Hybrid CRT for AppContainer/UWP projects as they require MultiThreadedDLL -->
+  <PropertyGroup Condition="'$(AppContainerApplication)'=='true' and '$(_VC_Target_Library_Platform)'!='Desktop'">
+    <HybridCrtConfiguration></HybridCrtConfiguration>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup Condition="'$(HybridCrtConfiguration)'=='Debug'">
+    <ClCompile>
+      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
+           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
+           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
+           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
+      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(HybridCrtConfiguration)'=='Release'">
+    <ClCompile>
+      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
+           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
+           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
+           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
+      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <!-- AppContainer/UWP projects must use MultiThreadedDLL -->
+  <ItemDefinitionGroup Condition="'$(AppContainerApplication)'=='true' and '$(_VC_Target_Library_Platform)'!='Desktop' And '$(Configuration)'=='Debug'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(AppContainerApplication)'=='true' and '$(_VC_Target_Library_Platform)'!='Desktop' And '$(Configuration)'=='Release'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>

  <!-- Project configurations -->
  <ItemGroup Label="ProjectConfigurations">
@@ -73,7 +123,6 @@
    <ClCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -83,7 +132,6 @@
    <ClCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
    </ClCompile>
--- a/DATA_AND_PRIVACY.md
+++ b/DATA_AND_PRIVACY.md
@@ -147,18 +147,6 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.AdvancedPasteSemanticKernelFormatEvent</td>
    <td>Triggered when Advanced Paste leverages the Semantic Kernel.</td>
  </tr> 
-  <tr>
-    <td>Microsoft.PowerToys.AdvancedPasteSemanticKernelErrorEvent</td>
-    <td>Occurs when the Semantic Kernel workflow encounters an error.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.AdvancedPasteEndpointUsageEvent</td>
-    <td>Logs the AI provider, model, and processing duration for each endpoint call.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.AdvancedPasteCustomActionErrorEvent</td>
-    <td>Records provider, model, and status details when a custom action fails.</td>
-  </tr>
 </table>

 ### Always on Top
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -7,7 +7,6 @@
    <PackageVersion Include="AdaptiveCards.ObjectModel.WinUI3" Version="2.0.0-beta" />
    <PackageVersion Include="AdaptiveCards.Rendering.WinUI3" Version="2.1.0-beta" />
    <PackageVersion Include="AdaptiveCards.Templating" Version="2.0.5" />
-    <PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView" Version="0.1.251101-build.2372" />
    <PackageVersion Include="Microsoft.Bot.AdaptiveExpressions.Core" Version="4.23.0" />
    <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
    <PackageVersion Include="CoenM.ImageSharp.ImageHash" Version="1.3.6" />
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1498,7 +1498,6 @@ SOFTWARE.
 - CoenM.ImageSharp.ImageHash
 - CommunityToolkit.Common
 - CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock
- CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView
 - CommunityToolkit.Mvvm
 - CommunityToolkit.WinUI.Animations
 - CommunityToolkit.WinUI.Collections
--- a/README.md
+++ b/README.md
@@ -7,9 +7,7 @@
 <h1 align="center">
  <span>Microsoft PowerToys</span>
 </h1>
-<p align="center">
-  <span align="center">Microsoft PowerToys is a collection of utilities that help you customize Windows and streamline everyday tasks.</span>
-</p>
+
 <h3 align="center">
  <a href="#-installation">Installation</a>
  <span> · </span>
@@ -20,10 +18,8 @@
  <a href="#-whats-new">Release notes</a>
 </h3>
 <br/><br/>
-
-## 🔨 Utilities
-
-PowerToys includes over 25 utilities to help you customize and optimize your Windows experience:
+Microsoft PowerToys is a collection of utilities that help you customize Windows and streamline everyday tasks.
+<br/><br/>

 |   |   |   |
 |---|---|---|
@@ -41,13 +37,20 @@ PowerToys includes over 25 utilities to help you customize and optimize your Win

 ## 📋 Installation

-For detailed installation instructions and system requirements, visit the [installation docs](https://learn.microsoft.com/windows/powertoys/install). 
+For detailed installation instructions, visit the [installation docs](https://learn.microsoft.com/windows/powertoys/install). 
+
+Before you begin, make sure your device meets the system requirements:
+
+> [!NOTE]
+> - Windows 11 or Windows 10 version 2004 (20H1 / build 19041) or newer
+> - 64-bit processor: x64 or ARM64
+> - Latest stable version of [Microsoft Edge WebView2 Runtime](https://go.microsoft.com/fwlink/p/?LinkId=2124703) is installed via the bootstrapper during setup
+
+Choose one of the installation methods below:

-But to get started quickly, choose one of the installation methods below:
-<br/><br/>
 <details open>
-<summary><strong>Download .exe from GitHub</strong></summary>
-<br/>
+<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.

 <!-- items that need to be updated release to release -->
@@ -64,11 +67,11 @@ Go to the [PowerToys GitHub releases][github-release-link], click Assets to reve
 | 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] |
+
 </details>

 <details>
-<summary><strong>Microsoft Store</strong></summary>
-<br/>
+<summary>Microsoft Store</summary>
 You can easily install PowerToys from the Microsoft Store:
 <p>
  <a style="text-decoration:none" href="https://aka.ms/getPowertoys">
@@ -79,9 +82,10 @@ You can easily install PowerToys from the Microsoft Store:
 </p>
 </details>

+
 <details>
-<summary><strong>WinGet</strong></summary>
-<br/>
+<summary>WinGet</summary>
+
 Download PowerToys from [WinGet][winget-link]. Updating PowerToys via winget will respect the current PowerToys installation scope. To install PowerToys, run the following command from the command line / PowerShell:

 *User scope installer [default]*
@@ -96,8 +100,8 @@ winget install --scope machine Microsoft.PowerToys -s winget
 </details>

 <details>
-<summary><strong>Other methods</strong></summary>
-<br/>
+<summary>Other methods</summary>
+
 There are [community driven install methods](./doc/unofficialInstallMethods.md) such as Chocolatey and Scoop. If these are your preferred install solutions, you can find the install instructions there.
 </details>

--- a/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp
+++ b/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp
@@ -4,7 +4,6 @@
 #include <ProjectTelemetry.h>
 #include <spdlog/sinks/base_sink.h>
 #include <filesystem>
-#include <string_view>

 #include "../../src/common/logger/logger.h"
 #include "../../src/common/utils/gpo.h"
@@ -857,69 +856,14 @@ UINT __stdcall UnsetAdvancedPasteAPIKeyCA(MSIHANDLE hInstall)

    try
    {
+        winrt::Windows::Security::Credentials::PasswordVault vault;
+        winrt::Windows::Security::Credentials::PasswordCredential cred;
+
        hr = WcaInitialize(hInstall, "UnsetAdvancedPasteAPIKey");
        ExitOnFailure(hr, "Failed to initialize");

-        winrt::Windows::Security::Credentials::PasswordVault vault;
-
-        auto hasPrefix = [](std::wstring_view value, wchar_t const* prefix) {
-            std::wstring_view prefixView{ prefix };
-            return value.compare(0, prefixView.size(), prefixView) == 0;
-        };
-
-        const wchar_t* resourcePrefixes[] = {
-            L"https://platform.openai.com/api-keys",
-            L"https://azure.microsoft.com/products/ai-services/openai-service",
-            L"https://azure.microsoft.com/products/ai-services/ai-inference",
-            L"https://console.mistral.ai/account/api-keys",
-            L"https://ai.google.dev/",
-        };
-
-        const wchar_t* usernamePrefixes[] = {
-            L"PowerToys_AdvancedPaste_",
-        };
-
-        auto credentials = vault.RetrieveAll();
-        for (auto const& credential : credentials)
-        {
-            bool shouldRemove = false;
-
-            std::wstring resource{ credential.Resource() };
-            for (auto const prefix : resourcePrefixes)
-            {
-                if (hasPrefix(resource, prefix))
-                {
-                    shouldRemove = true;
-                    break;
-                }
-            }
-
-            if (!shouldRemove)
-            {
-                std::wstring username{ credential.UserName() };
-                for (auto const prefix : usernamePrefixes)
-                {
-                    if (hasPrefix(username, prefix))
-                    {
-                        shouldRemove = true;
-                        break;
-                    }
-                }
-            }
-
-            if (!shouldRemove)
-            {
-                continue;
-            }
-
-            try
-            {
-                vault.Remove(credential);
-            }
-            catch (...)
-            {
-            }
-        }
+        cred = vault.Retrieve(L"https://platform.openai.com/api-keys", L"PowerToys_AdvancedPaste_OpenAIKey");
+        vault.Remove(cred);
    }
    catch (...)
    {
--- a/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj
+++ b/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj
@@ -110,7 +110,6 @@
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -123,7 +122,6 @@
      <Optimization>MaxSpeed</Optimization>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
    </ClCompile>
    <Link>
--- a/installer/PowerToysSetupVNext/Directory.Build.props
+++ b/installer/PowerToysSetupVNext/Directory.Build.props
@@ -1,4 +1,5 @@
 <Project>
+  <Import Project="..\..\Directory.Build.props" Condition="Exists('..\..\Directory.Build.props')" />
  <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
  <PropertyGroup>
    <!-- Set BaseIntermediateOutputPath for each project to avoid conflicts -->
@@ -8,4 +9,4 @@
    <!-- Set MSBuildProjectExtensionsPath to use the BaseIntermediateOutputPath -->
    <MSBuildProjectExtensionsPath Condition="'$(BaseIntermediateOutputPath)' != ''">$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
  </PropertyGroup>
-</Project>
+</Project>
--- a/installer/PowerToysSetupVNext/Product.wxs
+++ b/installer/PowerToysSetupVNext/Product.wxs
@@ -120,8 +120,8 @@

      <Custom Action="SetUnApplyModulesRegistryChangeSetsParam" Before="UnApplyModulesRegistryChangeSets" />
      <Custom Action="CheckGPO" After="InstallInitialize" Condition="NOT Installed" />
-      <Custom Action="SetBundleInstallLocationData" Before="SetBundleInstallLocation" Condition="NOT Installed OR WIX_UPGRADE_DETECTED" />
-      <Custom Action="SetBundleInstallLocation" After="InstallFiles" Condition="NOT Installed OR WIX_UPGRADE_DETECTED" />
+      <Custom Action="SetBundleInstallLocationData" Before="SetBundleInstallLocation" Condition="NOT Installed" />
+      <Custom Action="SetBundleInstallLocation" After="InstallFiles" Condition="NOT Installed" />
      <Custom Action="ApplyModulesRegistryChangeSets" After="InstallFiles" Condition="NOT Installed" />
      <Custom Action="InstallCmdPalPackage" After="InstallFiles" Condition="NOT Installed" />
      <Custom Action="InstallPackageIdentityMSIX" After="InstallFiles" Condition="NOT Installed" />
--- a/installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunction.vcxproj
+++ b/installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunction.vcxproj
@@ -1,30 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-
  <PropertyGroup Label="Globals">
    <ProjectGuid>{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}</ProjectGuid>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
    <TargetName>SilentFilesInUseBAFunction</TargetName>
    <ProjectName>PowerToysSetupCustomActionsVNext</ProjectName>
    <ProjectModuleDefinitionFile>bafunctions.def</ProjectModuleDefinitionFile>
@@ -33,7 +10,6 @@

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  
-  <!-- Configuration-specific property groups -->
  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
@@ -65,7 +41,10 @@
  </PropertyGroup>

  <ItemGroup>
-    <ClCompile Include="SilentFilesInUseBAFunctions.cpp" />
+    <ClCompile Include="SilentFilesInUseBAFunctions.cpp">
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
+    </ClCompile>
    <ClCompile Include="bafunctions.cpp">
      <PrecompiledHeader>Create</PrecompiledHeader>
      <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
@@ -92,31 +71,5 @@
    </Link>
  </ItemDefinitionGroup>

-  <!-- C++ source compile-specific things for Debug/Release configurations -->
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
--- a/installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunctions.cpp
+++ b/installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunctions.cpp
@@ -18,7 +18,6 @@ public: // IBootstrapperApplication

        BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "*** CUSTOM BA FUNCTION SYSTEM ACTIVE *** Running detect begin BA function. fCached=%d, registrationType=%d, cPackages=%u, fCancel=%d", fCached, registrationType, cPackages, *pfCancel);

-    LExit:
        return hr;
    }

@@ -32,12 +31,6 @@ public: // IBAFunctions

        BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "*** CUSTOM BA FUNCTION SYSTEM ACTIVE *** Running plan begin BA function. cPackages=%u, fCancel=%d", cPackages, *pfCancel);

-        //-------------------------------------------------------------------------------------------------
-        // YOUR CODE GOES HERE
-        // BalExitOnFailure(hr, "Change this message to represent real error handling.");
-        //-------------------------------------------------------------------------------------------------
-
-    LExit:
        return hr;
    }

@@ -63,6 +56,7 @@ public: // IBAFunctions
        )
    {
        HRESULT hr = S_OK;
+        UNREFERENCED_PARAMETER(source);

        BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "*** CUSTOM BA FUNCTION CALLED *** Running OnExecuteFilesInUse BA function. packageId=%ls, cFiles=%u, recommendation=%d", wzPackageId, cFiles, nRecommendation);
        
--- a/src/PackageIdentity/AppxManifest.xml
+++ b/src/PackageIdentity/AppxManifest.xml
@@ -42,8 +42,7 @@
        Description="PowerToys OCR Module"
        BackgroundColor="transparent"
        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png"
-        AppListEntry="none">
+        Square44x44Logo="Images\Square44x44Logo.png">
      </uap:VisualElements>
    </Application>
    <Application Id="PowerToys.SettingsUI" Executable="WinUI3Apps\PowerToys.Settings.exe" EntryPoint="Windows.FullTrustApplication">
@@ -52,8 +51,7 @@
        Description="PowerToys Settings UI"
        BackgroundColor="transparent"
        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png"
-        AppListEntry="none">
+        Square44x44Logo="Images\Square44x44Logo.png">
      </uap:VisualElements>
    </Application>
    <Application Id="PowerToys.ImageResizerUI" Executable="WinUI3Apps\PowerToys.ImageResizer.exe" EntryPoint="Windows.FullTrustApplication">
@@ -62,8 +60,7 @@
        Description="PowerToys Image Resizer UI"
        BackgroundColor="transparent"
        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png"
-        AppListEntry="none">
+        Square44x44Logo="Images\Square44x44Logo.png">
      </uap:VisualElements>
    </Application>
  </Applications>
--- a/src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj
+++ b/src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj
@@ -9,12 +9,6 @@
    <RootNamespace>CalculatorEngineCommon</RootNamespace>
    <AppxPackage>false</AppxPackage>
  </PropertyGroup>
-  <!-- BEGIN common.build.pre.props -->
-  <PropertyGroup Label="Configuration">
-    <EnableHybridCRT>true</EnableHybridCRT>
-    <UseCrtSDKReferenceStaticWarning Condition="'$(EnableHybridCRT)'=='true'">false</UseCrtSDKReferenceStaticWarning>
-  </PropertyGroup>
-  <!-- END common.build.pre.props -->
  <!-- BEGIN cppwinrt.build.pre.props -->
  <PropertyGroup Label="Globals">
    <CppWinRTEnabled>true</CppWinRTEnabled>
@@ -25,11 +19,9 @@
  </PropertyGroup>
  <PropertyGroup>
    <MinimalCoreWin>true</MinimalCoreWin>
-    <AppContainerApplication>true</AppContainerApplication>
+    <AppContainerApplication>false</AppContainerApplication>
    <WindowsStoreApp>true</WindowsStoreApp>
    <ApplicationType>Windows Store</ApplicationType>
-    <UseCrtSDKReference Condition="'$(EnableHybridCRT)'=='true'">false</UseCrtSDKReference>
-    <!-- The SDK reference breaks the Hybrid CRT -->
  </PropertyGroup>
  <PropertyGroup>
    <!-- We have to use the Desktop platform for Hybrid CRT to work. -->
@@ -148,43 +140,5 @@
    </PropertyGroup>
    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
    <Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-  </Target>
-  <!-- BEGIN common.build.post.props -->
-  <!--
-    The Hybrid CRT model statically links the runtime and STL and dynamically
-    links the UCRT instead of the VC++ CRT. The UCRT ships with Windows.
-    WinAppSDK asserts that this is "supported according to the CRT maintainer."
-
-    This must come before Microsoft.Cpp.targets because it manipulates ClCompile.RuntimeLibrary.
-  -->
-  <ItemDefinitionGroup Condition="'$(EnableHybridCRT)'=='true' and '$(Configuration)'=='Debug'">
-    <ClCompile>
-      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(EnableHybridCRT)'=='true' and ('$(Configuration)'=='Release' or '$(Configuration)'=='AuditMode')">
-    <ClCompile>
-      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <!-- END common.build.post.props -->
+  </Target>  <!-- END common.build.post.props -->
 </Project>
--- a/src/common/LanguageModelProvider/FoundryLocal/FoundryClient.cs
+++ b/src/common/LanguageModelProvider/FoundryLocal/FoundryClient.cs
@@ -10,23 +10,6 @@ namespace LanguageModelProvider.FoundryLocal;
 internal sealed class FoundryClient
 {
    public static async Task<FoundryClient?> CreateAsync()
-    {
-        // First attempt with current environment
-        var client = await TryCreateClientAsync().ConfigureAwait(false);
-        if (client != null)
-        {
-            return client;
-        }
-
-        // If failed, refresh PATH from registry and retry once
-        // This handles cases where PowerToys was launched by MSI installer.
-        Logger.LogInfo("[FoundryClient] First attempt failed, refreshing PATH and retrying");
-        RefreshEnvironmentPath();
-
-        return await TryCreateClientAsync().ConfigureAwait(false);
-    }
-
-    private static async Task<FoundryClient?> TryCreateClientAsync()
    {
        try
        {
@@ -185,95 +168,41 @@ internal sealed class FoundryClient
    }

    public async Task<bool> EnsureModelLoaded(string modelId)
-    {
-        Logger.LogInfo($"[FoundryClient] EnsureModelLoaded called with: {modelId}");
-
-        // Check if already loaded
-        if (await IsModelLoaded(modelId).ConfigureAwait(false))
-        {
-            Logger.LogInfo($"[FoundryClient] Model already loaded: {modelId}");
-            return true;
-        }
-
-        // Load the model
-        Logger.LogInfo($"[FoundryClient] Loading model: {modelId}");
-        await _foundryManager.LoadModelAsync(modelId).ConfigureAwait(false);
-
-        // Verify it's loaded
-        var loaded = await IsModelLoaded(modelId).ConfigureAwait(false);
-        Logger.LogInfo($"[FoundryClient] Model load result: {loaded}");
-        return loaded;
-    }
-
-    public async Task EnsureRunning()
-    {
-        if (!_foundryManager.IsServiceRunning)
-        {
-            await _foundryManager.StartServiceAsync();
-        }
-    }
-
-    /// <summary>
-    /// Refreshes the PATH environment variable from the system registry.
-    /// This is necessary when tools are installed while PowerToys is running,
-    /// as the installer updates the system PATH but running processes don't see the change.
-    /// </summary>
-    private static void RefreshEnvironmentPath()
    {
        try
        {
-            Logger.LogInfo("[FoundryClient] Refreshing PATH environment variable from system");
+            Logger.LogInfo($"[FoundryClient] EnsureModelLoaded called with: {modelId}");

-            var currentPath = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Process) ?? string.Empty;
-            var machinePath = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Machine) ?? string.Empty;
-            var userPath = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.User) ?? string.Empty;
-
-            var pathsToAdd = new List<string>();
-
-            if (!string.IsNullOrWhiteSpace(currentPath))
+            // Check if already loaded
+            if (await IsModelLoaded(modelId).ConfigureAwait(false))
            {
-                pathsToAdd.AddRange(currentPath.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries));
+                Logger.LogInfo($"[FoundryClient] Model already loaded: {modelId}");
+                return true;
            }

-            if (!string.IsNullOrWhiteSpace(userPath))
+            // Check if model exists in cache
+            var cachedModels = await ListCachedModels().ConfigureAwait(false);
+            Logger.LogInfo($"[FoundryClient] Cached models: {string.Join(", ", cachedModels.Select(m => m.Name))}");
+
+            if (!cachedModels.Any(m => m.Name == modelId))
            {
-                var userPaths = userPath.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
-                foreach (var path in userPaths)
-                {
-                    if (!pathsToAdd.Contains(path, StringComparer.OrdinalIgnoreCase))
-                    {
-                        pathsToAdd.Add(path);
-                    }
-                }
+                Logger.LogWarning($"[FoundryClient] Model not found in cache: {modelId}");
+                return false;
            }

-            if (!string.IsNullOrWhiteSpace(machinePath))
-            {
-                var machinePaths = machinePath.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
-                foreach (var path in machinePaths)
-                {
-                    if (!pathsToAdd.Contains(path, StringComparer.OrdinalIgnoreCase))
-                    {
-                        pathsToAdd.Add(path);
-                    }
-                }
-            }
+            // Load the model
+            Logger.LogInfo($"[FoundryClient] Loading model: {modelId}");
+            await _foundryManager.LoadModelAsync(modelId).ConfigureAwait(false);

-            var newPath = string.Join(Path.PathSeparator.ToString(), pathsToAdd);
-
-            if (currentPath != newPath)
-            {
-                Logger.LogInfo("[FoundryClient] Updating process PATH with latest system values");
-                Environment.SetEnvironmentVariable("PATH", newPath, EnvironmentVariableTarget.Process);
-            }
-            else
-            {
-                Logger.LogInfo("[FoundryClient] PATH is already up to date");
-            }
+            // Verify it's loaded
+            var loaded = await IsModelLoaded(modelId).ConfigureAwait(false);
+            Logger.LogInfo($"[FoundryClient] Model load result: {loaded}");
+            return loaded;
        }
        catch (Exception ex)
        {
-            Logger.LogError($"[FoundryClient] Failed to refresh PATH: {ex.Message}");
+            Logger.LogError($"[FoundryClient] EnsureModelLoaded exception: {ex.Message}");
+            return false;
        }
    }
 }
--- a/src/common/LanguageModelProvider/FoundryLocalModelProvider.cs
+++ b/src/common/LanguageModelProvider/FoundryLocalModelProvider.cs
@@ -12,8 +12,8 @@ namespace LanguageModelProvider;

 public sealed class FoundryLocalModelProvider : ILanguageModelProvider
 {
-    private FoundryClient? _foundryClient;
-    private IEnumerable<FoundryCatalogModel>? _catalogModels;
+    private IEnumerable<ModelDetails>? _downloadedModels;
+    private FoundryClient? _foundryManager;
    private string? _serviceUrl;

    public static FoundryLocalModelProvider Instance { get; } = new();
@@ -22,49 +22,70 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider

    public string ProviderDescription => "The model will run locally via Foundry Local";

-    public IChatClient? GetIChatClient(string modelId)
-    {
-        Logger.LogInfo($"[FoundryLocal] GetIChatClient called with url: {modelId}");
-        InitializeAsync().GetAwaiter().GetResult();
+    public string UrlPrefix => "fl://";

+    public IChatClient? GetIChatClient(string url)
+    {
+        try
+        {
+            Logger.LogInfo($"[FoundryLocal] GetIChatClient called with url: {url}");
+            InitializeAsync().GetAwaiter().GetResult();
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError($"[FoundryLocal] Failed to initialize: {ex.Message}");
+            return null;
+        }
+
+        if (string.IsNullOrWhiteSpace(_serviceUrl) || _foundryManager == null)
+        {
+            Logger.LogError("[FoundryLocal] Service URL or manager is null");
+            return null;
+        }
+
+        // Extract model ID from URL (format: fl://modelname)
+        var modelId = url.Replace(UrlPrefix, string.Empty).Trim('/');
        if (string.IsNullOrWhiteSpace(modelId))
        {
            Logger.LogError("[FoundryLocal] Model ID is empty after extraction");
            return null;
        }

-        // Check if model is in catalog
-        var isInCatalog = _catalogModels?.Any(m => m.Name == modelId) ?? false;
-        if (!isInCatalog)
-        {
-            var errorMessage = $"{modelId} is not supported in Foundry Local. Please configure supported models in Settings.";
-            Logger.LogError($"[FoundryLocal] {errorMessage}");
-            throw new InvalidOperationException(errorMessage);
-        }
+        Logger.LogInfo($"[FoundryLocal] Extracted model ID: {modelId}");

        // Ensure the model is loaded before returning chat client
-        var isLoaded = _foundryClient!.EnsureModelLoaded(modelId).GetAwaiter().GetResult();
-        if (!isLoaded)
+        try
        {
-            Logger.LogError($"[FoundryLocal] Failed to load model: {modelId}");
-            throw new InvalidOperationException($"Failed to load the model '{modelId}'.");
+            var isLoaded = _foundryManager.EnsureModelLoaded(modelId).GetAwaiter().GetResult();
+            if (!isLoaded)
+            {
+                Logger.LogError($"[FoundryLocal] Failed to load model: {modelId}");
+                return null;
+            }
+
+            Logger.LogInfo($"[FoundryLocal] Model is loaded: {modelId}");
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError($"[FoundryLocal] Exception ensuring model loaded: {ex.Message}");
+            return null;
        }

        // Use ServiceUri instead of Endpoint since Endpoint already includes /v1
-        var baseUri = _foundryClient.GetServiceUri();
+        var baseUri = _foundryManager.GetServiceUri();
        if (baseUri == null)
        {
-            const string message = "Foundry Local service URL is not available. Please make sure Foundry Local is installed and running.";
-            Logger.LogError($"[FoundryLocal] {message}");
-            throw new InvalidOperationException(message);
+            Logger.LogError("[FoundryLocal] Service URI is null");
+            return null;
        }

        var endpointUri = new Uri($"{baseUri.ToString().TrimEnd('/')}/v1");
        Logger.LogInfo($"[FoundryLocal] Creating OpenAI client with endpoint: {endpointUri}");
+        Logger.LogInfo($"[FoundryLocal] Model ID for chat client: {modelId}");

        return new OpenAIClient(
            new ApiKeyCredential("none"),
-            new OpenAIClientOptions { Endpoint = endpointUri, NetworkTimeout = TimeSpan.FromMinutes(5) })
+            new OpenAIClientOptions { Endpoint = endpointUri })
            .GetChatClient(modelId)
            .AsIChatClient();
    }
@@ -90,16 +111,48 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
        return $"new OpenAIClient(new ApiKeyCredential(\"none\"), new OpenAIClientOptions{{ Endpoint = new Uri(\"{_serviceUrl}/v1\") }}).GetChatClient(\"{modelId}\").AsIChatClient()";
    }

-    public async Task<IEnumerable<ModelDetails>> GetModelsAsync(CancellationToken cancelationToken = default)
+    public async Task<IEnumerable<ModelDetails>> GetModelsAsync(bool ignoreCached = false, CancellationToken cancelationToken = default)
    {
-        await InitializeAsync(cancelationToken);
-
-        if (_foundryClient == null)
+        if (ignoreCached)
        {
-            return Array.Empty<ModelDetails>();
+            Logger.LogInfo("[FoundryLocal] Ignoring cached models, resetting");
+            Reset();
        }

-        var cachedModels = await _foundryClient.ListCachedModels();
+        await InitializeAsync(cancelationToken);
+
+        Logger.LogInfo($"[FoundryLocal] Returning {_downloadedModels?.Count() ?? 0} downloaded models");
+        return _downloadedModels ?? [];
+    }
+
+    private void Reset()
+    {
+        _downloadedModels = null;
+        _ = InitializeAsync();
+    }
+
+    private async Task InitializeAsync(CancellationToken cancelationToken = default)
+    {
+        if (_foundryManager != null && _downloadedModels != null && _downloadedModels.Any())
+        {
+            return;
+        }
+
+        Logger.LogInfo("[FoundryLocal] Initializing provider");
+        _foundryManager ??= await FoundryClient.CreateAsync();
+
+        if (_foundryManager == null)
+        {
+            Logger.LogError("[FoundryLocal] Failed to create Foundry client");
+            return;
+        }
+
+        _serviceUrl ??= await _foundryManager.GetServiceUrl();
+        Logger.LogInfo($"[FoundryLocal] Service URL: {_serviceUrl}");
+
+        var cachedModels = await _foundryManager.ListCachedModels();
+        Logger.LogInfo($"[FoundryLocal] Found {cachedModels.Count} cached models");
+
        List<ModelDetails> downloadedModels = [];

        foreach (var model in cachedModels)
@@ -109,47 +162,23 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
            {
                Id = $"fl-{model.Name}",
                Name = model.Name,
-                Url = $"fl://{model.Name}",
+                Url = $"{UrlPrefix}{model.Name}",
                Description = $"{model.Name} running locally with Foundry Local",
                HardwareAccelerators = [HardwareAccelerator.FOUNDRYLOCAL],
+                SupportedOnQualcomm = true,
                ProviderModelDetails = model,
            });
        }

-        return downloadedModels;
-    }
-
-    private async Task InitializeAsync(CancellationToken cancelationToken = default)
-    {
-        if (_foundryClient != null && _catalogModels != null && _catalogModels.Any())
-        {
-            await _foundryClient.EnsureRunning().ConfigureAwait(false);
-            return;
-        }
-
-        Logger.LogInfo("[FoundryLocal] Initializing provider");
-        _foundryClient ??= await FoundryClient.CreateAsync();
-
-        if (_foundryClient == null)
-        {
-            const string message = "Foundry Local client could not be created. Please make sure Foundry Local is installed and running.";
-            Logger.LogError($"[FoundryLocal] {message}");
-            throw new InvalidOperationException(message);
-        }
-
-        _serviceUrl ??= await _foundryClient.GetServiceUrl();
-        Logger.LogInfo($"[FoundryLocal] Service URL: {_serviceUrl}");
-
-        var catalogModels = await _foundryClient.ListCatalogModels();
-        Logger.LogInfo($"[FoundryLocal] Found {catalogModels.Count} catalog models");
-        _catalogModels = catalogModels;
+        _downloadedModels = downloadedModels;
+        Logger.LogInfo($"[FoundryLocal] Initialization complete. Total downloaded models: {downloadedModels.Count}");
    }

    public async Task<bool> IsAvailable()
    {
        Logger.LogInfo("[FoundryLocal] Checking availability");
        await InitializeAsync();
-        var available = _foundryClient != null;
+        var available = _foundryManager != null;
        Logger.LogInfo($"[FoundryLocal] Available: {available}");
        return available;
    }
--- a/src/common/LanguageModelProvider/ILanguageModelProvider.cs
+++ b/src/common/LanguageModelProvider/ILanguageModelProvider.cs
@@ -10,11 +10,13 @@ public interface ILanguageModelProvider
 {
    string Name { get; }

+    string UrlPrefix { get; }
+
    string ProviderDescription { get; }

-    Task<IEnumerable<ModelDetails>> GetModelsAsync(CancellationToken cancelationToken = default);
+    Task<IEnumerable<ModelDetails>> GetModelsAsync(bool ignoreCached = false, CancellationToken cancelationToken = default);

-    IChatClient? GetIChatClient(string modelId);
+    IChatClient? GetIChatClient(string url);

    string GetIChatClientString(string url);
 }
--- a/src/common/LanguageModelProvider/LanguageModelService.cs
+++ b/src/common/LanguageModelProvider/LanguageModelService.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Concurrent;
+using Microsoft.Extensions.AI;
+
+namespace LanguageModelProvider;
+
+public sealed class LanguageModelService
+{
+    private readonly ConcurrentDictionary<string, ILanguageModelProvider> _providersByPrefix;
+
+    public LanguageModelService(IEnumerable<ILanguageModelProvider> providers)
+    {
+        ArgumentNullException.ThrowIfNull(providers);
+
+        _providersByPrefix = new ConcurrentDictionary<string, ILanguageModelProvider>(StringComparer.OrdinalIgnoreCase);
+
+        foreach (var provider in providers)
+        {
+            if (!string.IsNullOrWhiteSpace(provider.UrlPrefix))
+            {
+                _providersByPrefix[provider.UrlPrefix] = provider;
+            }
+        }
+    }
+
+    public static LanguageModelService CreateDefault()
+    {
+        return new LanguageModelService(new[]
+        {
+            FoundryLocalModelProvider.Instance,
+        });
+    }
+
+    public IReadOnlyCollection<ILanguageModelProvider> Providers => _providersByPrefix.Values.ToArray();
+
+    public bool RegisterProvider(ILanguageModelProvider provider)
+    {
+        ArgumentNullException.ThrowIfNull(provider);
+
+        if (string.IsNullOrWhiteSpace(provider.UrlPrefix))
+        {
+            throw new ArgumentException("Provider must supply a URL prefix.", nameof(provider));
+        }
+
+        _providersByPrefix[provider.UrlPrefix] = provider;
+        return true;
+    }
+
+    public ILanguageModelProvider? GetProviderFor(string? modelReference)
+    {
+        if (string.IsNullOrWhiteSpace(modelReference))
+        {
+            return null;
+        }
+
+        foreach (var provider in _providersByPrefix.Values)
+        {
+            if (modelReference.StartsWith(provider.UrlPrefix, StringComparison.OrdinalIgnoreCase))
+            {
+                return provider;
+            }
+        }
+
+        return null;
+    }
+
+    public async Task<IReadOnlyList<ModelDetails>> GetModelsAsync(bool refresh = false, CancellationToken cancellationToken = default)
+    {
+        List<ModelDetails> models = [];
+
+        foreach (var provider in _providersByPrefix.Values)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            var providerModels = await provider.GetModelsAsync(refresh, cancellationToken).ConfigureAwait(false);
+            models.AddRange(providerModels);
+        }
+
+        return models;
+    }
+
+    public IChatClient? GetClient(ModelDetails model)
+    {
+        if (model is null)
+        {
+            return null;
+        }
+
+        var reference = !string.IsNullOrWhiteSpace(model.Url) ? model.Url : model.Id;
+        return GetClient(reference);
+    }
+
+    public IChatClient? GetClient(string? modelReference)
+    {
+        if (string.IsNullOrWhiteSpace(modelReference))
+        {
+            return null;
+        }
+
+        var provider = GetProviderFor(modelReference);
+
+        return provider?.GetIChatClient(modelReference);
+    }
+}
--- a/src/common/LanguageModelProvider/ModelDetails.cs
+++ b/src/common/LanguageModelProvider/ModelDetails.cs
@@ -24,6 +24,8 @@ public class ModelDetails

    public List<HardwareAccelerator> HardwareAccelerators { get; set; } = [];

+    public bool SupportedOnQualcomm { get; set; }
+
    public string License { get; set; } = string.Empty;

    public object? ProviderModelDetails { get; set; }
--- a/src/common/interop/PowerToys.Interop.vcxproj
+++ b/src/common/interop/PowerToys.Interop.vcxproj
@@ -63,14 +63,12 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <UseDebugLibraries>true</UseDebugLibraries>
      <LinkIncremental>true</LinkIncremental>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <UseDebugLibraries>false</UseDebugLibraries>
      <WholeProgramOptimization>true</WholeProgramOptimization>
      <LinkIncremental>false</LinkIncremental>
--- a/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj
+++ b/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj
@@ -46,16 +46,6 @@
  <PropertyGroup>
    <TargetName>notifications</TargetName>
  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
  <ItemDefinitionGroup>
    <ClCompile>
      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
--- a/src/modules/AdvancedPaste/AdvancedPaste.UnitTests/Mocks/IntegrationTestUserSettings.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste.UnitTests/Mocks/IntegrationTestUserSettings.cs
@@ -49,8 +49,6 @@ internal sealed class IntegrationTestUserSettings : IUserSettings

    public bool CloseAfterLosingFocus => false;

-    public bool EnableClipboardPreview => true;
-
    public IReadOnlyList<AdvancedPasteCustomAction> CustomActions => _customActions;

    public IReadOnlyList<PasteFormats> AdditionalActions => _additionalActions;
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml.cs
@@ -112,7 +112,11 @@ namespace AdvancedPaste
        /// Invoked when the application is launched.
        /// </summary>
        /// <param name="args">Details about the launch request and process.</param>
+#if DEBUG
+        protected async override void OnLaunched(LaunchActivatedEventArgs args)
+#else
        protected override void OnLaunched(LaunchActivatedEventArgs args)
+#endif
        {
            var cmdArgs = Environment.GetCommandLineArgs();
            if (cmdArgs?.Length > 1)
@@ -134,6 +138,10 @@ namespace AdvancedPaste
            {
                ProcessNamedPipe(cmdArgs[2]);
            }
+
+#if DEBUG
+            await ShowWindow(); // This allows for direct access without using PowerToys Runner, not all functionality might work
+#endif
        }

        private void ProcessNamedPipe(string pipeName)
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml
@@ -558,7 +558,7 @@
                                <TextBlock
                                    x:Uid="AIProvidersFlyoutHeader"
                                    Grid.Row="0"
-                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                    Style="{StaticResource BodyStrongTextBlockStyle}" />
                                <ListView
                                    x:Name="AIProviderListView"
                                    Grid.Row="1"
@@ -611,10 +611,10 @@
                                                    CornerRadius="{StaticResource ControlCornerRadius}"
                                                    Visibility="{x:Bind IsLocalModel, Mode=OneWay}">
                                                    <TextBlock
-                                                        x:Uid="LocalModelBadge"
                                                        AutomationProperties.AccessibilityView="Raw"
                                                        FontSize="10"
-                                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                        Text="Local" />
                                                </Border>
                                                <!--<Border
                                                    Grid.Column="2"
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml
@@ -156,7 +156,7 @@
            BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
            BorderThickness="1"
            CornerRadius="20"
-            Visibility="{x:Bind ViewModel.ShowClipboardPreview, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+            Visibility="{x:Bind ViewModel.ClipboardHasData, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
            <Grid.ColumnDefinitions>
                <ColumnDefinition Width="*" />
                <ColumnDefinition Width="Auto" />
@@ -168,8 +168,7 @@
                Margin="0,0,4,0"
                VerticalAlignment="Center"
                IsEnabled="{x:Bind ViewModel.ClipboardHistoryEnabled, Mode=TwoWay}"
-                Style="{StaticResource SubtleButtonStyle}"
-                Visibility="{x:Bind ViewModel.ShowClipboardHistoryButton, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+                Style="{StaticResource SubtleButtonStyle}">
                <ToolTipService.ToolTip>
                    <TextBlock x:Uid="ClipboardHistoryButtonToolTip" />
                </ToolTipService.ToolTip>
@@ -264,17 +263,16 @@
                    <Button
                        Padding="0"
                        VerticalAlignment="Center"
-                        Style="{StaticResource SubtleButtonStyle}"
-                        Visibility="{x:Bind ViewModel.HasLegalLinks, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                        Style="{StaticResource SubtleButtonStyle}">
                        <FontIcon FontSize="12" Glyph="&#xE946;" />
                        <Button.Flyout>
                            <Flyout>
                                <StackPanel Spacing="8">
                                    <TextBlock TextWrapping="Wrap">
                                        <Run x:Uid="AIMistakeNote" /><LineBreak /><Run
-                                            x:Uid="CustomEndpointWarning"
                                            FontSize="12"
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                            Text="You are using a custom endpoint. Verify all answers." />
                                    </TextBlock>
                                    <StackPanel Orientation="Horizontal" Spacing="8">
                                        <HyperlinkButton
@@ -299,49 +297,47 @@
                </StackPanel>
            </controls:PromptBox.Footer>
        </controls:PromptBox>
-        <ScrollViewer Grid.Row="2">
-            <Grid RowSpacing="4">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="{x:Bind ViewModel.StandardPasteFormats.Count, Mode=OneWay, Converter={StaticResource standardPasteFormatsToHeightConverter}}" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="*" MinHeight="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource customActionsToMinHeightConverter}}" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <ListView
-                    x:Name="PasteOptionsListView"
-                    Grid.Row="0"
-                    VerticalAlignment="Bottom"
-                    IsItemClickEnabled="True"
-                    ItemClick="PasteFormat_ItemClick"
-                    ItemContainerTransitions="{x:Null}"
-                    ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
-                    ItemsSource="{x:Bind ViewModel.StandardPasteFormats, Mode=OneWay}"
-                    ScrollViewer.VerticalScrollBarVisibility="Disabled"
-                    ScrollViewer.VerticalScrollMode="Disabled"
-                    SelectionMode="None"
-                    TabIndex="1" />
-                <Rectangle
-                    Grid.Row="1"
-                    Height="1"
-                    HorizontalAlignment="Stretch"
-                    Fill="{ThemeResource DividerStrokeColorDefaultBrush}"
-                    Visibility="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource countToVisibilityConverter}}" />
+        <Grid Grid.Row="2" RowSpacing="4">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="{x:Bind ViewModel.StandardPasteFormats.Count, Mode=OneWay, Converter={StaticResource standardPasteFormatsToHeightConverter}}" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" MinHeight="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource customActionsToMinHeightConverter}}" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <ListView
+                x:Name="PasteOptionsListView"
+                Grid.Row="0"
+                VerticalAlignment="Bottom"
+                IsItemClickEnabled="True"
+                ItemClick="PasteFormat_ItemClick"
+                ItemContainerTransitions="{x:Null}"
+                ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
+                ItemsSource="{x:Bind ViewModel.StandardPasteFormats, Mode=OneWay}"
+                ScrollViewer.VerticalScrollBarVisibility="Visible"
+                ScrollViewer.VerticalScrollMode="Auto"
+                SelectionMode="None"
+                TabIndex="1" />
+            <Rectangle
+                Grid.Row="1"
+                Height="1"
+                HorizontalAlignment="Stretch"
+                Fill="{ThemeResource DividerStrokeColorDefaultBrush}"
+                Visibility="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource countToVisibilityConverter}}" />

-                <ListView
-                    x:Name="CustomActionsListView"
-                    Grid.Row="2"
-                    VerticalAlignment="Top"
-                    IsItemClickEnabled="True"
-                    ItemClick="PasteFormat_ItemClick"
-                    ItemContainerTransitions="{x:Null}"
-                    ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
-                    ItemsSource="{x:Bind ViewModel.CustomActionPasteFormats, Mode=OneWay}"
-                    ScrollViewer.VerticalScrollBarVisibility="Disabled"
-                    ScrollViewer.VerticalScrollMode="Disabled"
-                    SelectionMode="None"
-                    TabIndex="2" />
-            </Grid>
-        </ScrollViewer>
+            <ListView
+                x:Name="CustomActionsListView"
+                Grid.Row="2"
+                VerticalAlignment="Top"
+                IsItemClickEnabled="True"
+                ItemClick="PasteFormat_ItemClick"
+                ItemContainerTransitions="{x:Null}"
+                ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
+                ItemsSource="{x:Bind ViewModel.CustomActionPasteFormats, Mode=OneWay}"
+                ScrollViewer.VerticalScrollBarVisibility="Visible"
+                ScrollViewer.VerticalScrollMode="Auto"
+                SelectionMode="None"
+                TabIndex="2" />
+        </Grid>
    </Grid>
 </Page>
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/AIServiceFormatEvent.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/AIServiceFormatEvent.cs
@@ -18,7 +18,6 @@ namespace AdvancedPaste.Helpers
            PromptTokens = semanticKernelFormatEvent.PromptTokens;
            CompletionTokens = semanticKernelFormatEvent.CompletionTokens;
            ModelName = semanticKernelFormatEvent.ModelName;
-            ProviderType = semanticKernelFormatEvent.ProviderType;
            ActionChain = semanticKernelFormatEvent.ActionChain;
        }

@@ -39,8 +38,6 @@ namespace AdvancedPaste.Helpers

        public string ModelName { get; set; }

-        public string ProviderType { get; set; }
-
        public string ActionChain { get; set; }

        public string ToJsonString() => JsonSerializer.Serialize(this, SourceGenerationContext.Default.AIServiceFormatEvent);
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/IUserSettings.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/IUserSettings.cs
@@ -19,8 +19,6 @@ namespace AdvancedPaste.Settings

        public bool CloseAfterLosingFocus { get; }

-        public bool EnableClipboardPreview { get; }
-
        public IReadOnlyList<AdvancedPasteCustomAction> CustomActions { get; }

        public IReadOnlyList<PasteFormats> AdditionalActions { get; }
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs
@@ -40,8 +40,6 @@ namespace AdvancedPaste.Settings

        public bool CloseAfterLosingFocus { get; private set; }

-        public bool EnableClipboardPreview { get; private set; }
-
        public IReadOnlyList<PasteFormats> AdditionalActions => _additionalActions;

        public IReadOnlyList<AdvancedPasteCustomAction> CustomActions => _customActions;
@@ -55,7 +53,6 @@ namespace AdvancedPaste.Settings
            IsAIEnabled = false;
            ShowCustomPreview = true;
            CloseAfterLosingFocus = false;
-            EnableClipboardPreview = true;
            PasteAIConfiguration = new PasteAIConfiguration();
            _additionalActions = [];
            _customActions = [];
@@ -110,7 +107,6 @@ namespace AdvancedPaste.Settings
                                IsAIEnabled = properties.IsAIEnabled;
                                ShowCustomPreview = properties.ShowCustomPreview;
                                CloseAfterLosingFocus = properties.CloseAfterLosingFocus;
-                                EnableClipboardPreview = properties.EnableClipboardPreview;
                                PasteAIConfiguration = properties.PasteAIConfiguration ?? new PasteAIConfiguration();

                                var sourceAdditionalActions = properties.AdditionalActions;
@@ -167,134 +163,28 @@ namespace AdvancedPaste.Settings
                return false;
            }

-            var properties = settings.Properties;
-            bool legacyAdvancedAIConsumed = properties.TryConsumeLegacyAdvancedAIEnabled(out var advancedFlag);
-            bool legacyAdvancedAIEnabled = legacyAdvancedAIConsumed && advancedFlag;
-            PasswordCredential legacyCredential = TryGetLegacyOpenAICredential();
-
-            if (legacyCredential is null)
+            if (settings.Properties.IsAIEnabled || !LegacyOpenAIKeyExists())
            {
-                return legacyAdvancedAIConsumed;
+                return false;
            }

-            var configuration = properties.PasteAIConfiguration;
-
-            if (configuration is null)
-            {
-                configuration = new PasteAIConfiguration();
-                properties.PasteAIConfiguration = configuration;
-            }
-
-            bool configurationUpdated = false;
-
-            var ensureResult = AdvancedPasteMigrationHelper.EnsureOpenAIProvider(configuration);
-            PasteAIProviderDefinition openAIProvider = ensureResult.Provider;
-            configurationUpdated |= ensureResult.Updated;
-
-            if (legacyAdvancedAIConsumed && openAIProvider is not null && openAIProvider.EnableAdvancedAI != legacyAdvancedAIEnabled)
-            {
-                openAIProvider.EnableAdvancedAI = legacyAdvancedAIEnabled;
-                configurationUpdated = true;
-            }
-
-            if (openAIProvider is not null)
-            {
-                StoreMigratedOpenAICredential(openAIProvider.Id, openAIProvider.ServiceType, legacyCredential.Password);
-                RemoveLegacyOpenAICredential();
-            }
-
-            const bool shouldEnableAI = true;
-            bool enabledUpdated = false;
-            if (properties.IsAIEnabled != shouldEnableAI)
-            {
-                properties.IsAIEnabled = shouldEnableAI;
-                enabledUpdated = true;
-            }
-
-            return configurationUpdated || enabledUpdated || legacyAdvancedAIConsumed;
+            settings.Properties.IsAIEnabled = true;
+            return true;
        }

-        private static PasswordCredential TryGetLegacyOpenAICredential()
+        private static bool LegacyOpenAIKeyExists()
        {
            try
            {
                PasswordVault vault = new();
-                var credential = vault.Retrieve("https://platform.openai.com/api-keys", "PowerToys_AdvancedPaste_OpenAIKey");
-                credential?.RetrievePassword();
-                return credential;
+                return vault.Retrieve("https://platform.openai.com/api-keys", "PowerToys_AdvancedPaste_OpenAIKey") is not null;
            }
            catch (Exception)
            {
-                return null;
+                return false;
            }
        }

-        private static void RemoveLegacyOpenAICredential()
-        {
-            try
-            {
-                PasswordVault vault = new();
-                TryRemoveCredential(vault, "https://platform.openai.com/api-keys", "PowerToys_AdvancedPaste_OpenAIKey");
-            }
-            catch (Exception)
-            {
-            }
-        }
-
-        private static void StoreMigratedOpenAICredential(string providerId, string serviceType, string password)
-        {
-            if (string.IsNullOrWhiteSpace(password))
-            {
-                return;
-            }
-
-            try
-            {
-                var serviceKind = serviceType.ToAIServiceType();
-                if (serviceKind != AIServiceType.OpenAI)
-                {
-                    return;
-                }
-
-                string resource = "https://platform.openai.com/api-keys";
-                string username = $"PowerToys_AdvancedPaste_PasteAI_openai_{NormalizeProviderIdentifier(providerId)}";
-
-                PasswordVault vault = new();
-                TryRemoveCredential(vault, resource, username);
-
-                PasswordCredential credential = new(resource, username, password);
-                vault.Add(credential);
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("Failed to migrate legacy OpenAI credential", ex);
-            }
-        }
-
-        private static void TryRemoveCredential(PasswordVault vault, string credentialResource, string credentialUserName)
-        {
-            try
-            {
-                PasswordCredential existingCred = vault.Retrieve(credentialResource, credentialUserName);
-                vault.Remove(existingCred);
-            }
-            catch (Exception)
-            {
-                // Credential doesn't exist, which is fine
-            }
-        }
-
-        private static string NormalizeProviderIdentifier(string providerId)
-        {
-            if (string.IsNullOrWhiteSpace(providerId))
-            {
-                return "default";
-            }
-
-            var filtered = new string(providerId.Where(char.IsLetterOrDigit).ToArray());
-            return string.IsNullOrWhiteSpace(filtered) ? "default" : filtered.ToLowerInvariant();
-        }
-
        public async Task SetActiveAIProviderAsync(string providerId)
        {
            if (string.IsNullOrWhiteSpace(providerId))
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/AdvancedAIKernelService.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/AdvancedAIKernelService.cs
@@ -214,7 +214,8 @@ public sealed class AdvancedAIKernelService : KernelServiceBase
        var serviceType = GetRuntimeConfiguration().ServiceType;
        return new OpenAIPromptExecutionSettings
        {
-            FunctionChoiceBehavior = FunctionChoiceBehavior.Auto(),
+            FunctionChoiceBehavior = FunctionChoiceBehavior.Required(),
+            Temperature = 0.01,
        };
    }
 }
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/CustomActionTransformService.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/CustomActionTransformService.cs
@@ -83,39 +83,32 @@ namespace AdvancedPaste.Services.CustomActions
                    SystemPrompt = systemPrompt,
                };

-                var operationStart = DateTime.UtcNow;
-
                var providerContent = await provider.ProcessPasteAsync(
                    request,
                    cancellationToken,
                    progress);

-                var durationMs = (int)Math.Round((DateTime.UtcNow - operationStart).TotalMilliseconds);
-
                var usage = request.Usage;
                var content = providerContent ?? string.Empty;

-                // Log endpoint usage (custom action pipeline is not the advanced SK flow)
-                var endpointEvent = new AdvancedPasteEndpointUsageEvent(providerConfig.ProviderType, providerConfig.Model ?? string.Empty, isAdvanced: false, durationMs: durationMs);
+                // Log endpoint usage
+                var endpointEvent = new AdvancedPasteEndpointUsageEvent(providerConfig.ProviderType);
                PowerToysTelemetry.Log.WriteEvent(endpointEvent);

-                Logger.LogDebug($"{nameof(CustomActionTransformService)}.{nameof(TransformAsync)} complete; ModelName={providerConfig.Model ?? string.Empty}, PromptTokens={usage.PromptTokens}, CompletionTokens={usage.CompletionTokens}, DurationMs={durationMs}");
+                Logger.LogDebug($"{nameof(CustomActionTransformService)}.{nameof(TransformAsync)} complete; ModelName={providerConfig.Model ?? string.Empty}, PromptTokens={usage.PromptTokens}, CompletionTokens={usage.CompletionTokens}");

                return new CustomActionTransformResult(content, usage);
            }
            catch (Exception ex)
            {
                Logger.LogError($"{nameof(CustomActionTransformService)}.{nameof(TransformAsync)} failed", ex);
-                var statusCode = ExtractStatusCode(ex);
-                var modelName = providerConfig.Model ?? string.Empty;
-                AdvancedPasteCustomActionErrorEvent errorEvent = new(providerConfig.ProviderType, modelName, statusCode, ex is PasteActionModeratedException ? PasteActionModeratedException.ErrorDescription : ex.Message);
-                PowerToysTelemetry.Log.WriteEvent(errorEvent);

                if (ex is PasteActionException or OperationCanceledException)
                {
                    throw;
                }

+                var statusCode = ExtractStatusCode(ex);
                var failureMessage = providerConfig.ProviderType switch
                {
                    AIServiceType.OpenAI or AIServiceType.AzureOpenAI => ErrorHelpers.TranslateErrorText(statusCode),
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/FoundryLocalPasteProvider.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/FoundryLocalPasteProvider.cs
@@ -7,7 +7,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using AdvancedPaste.Helpers;
 using AdvancedPaste.Models;
 using LanguageModelProvider;
 using Microsoft.Extensions.AI;
@@ -24,7 +23,7 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider

    public static PasteAIProviderRegistration Registration { get; } = new(SupportedTypes, config => new FoundryLocalPasteProvider(config));

-    private static readonly FoundryLocalModelProvider _modelProvider = FoundryLocalModelProvider.Instance;
+    private static readonly LanguageModelService LanguageModels = LanguageModelService.CreateDefault();

    private readonly PasteAIConfig _config;

@@ -34,6 +33,10 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider
        _config = config;
    }

+    public string ProviderName => AIServiceType.FoundryLocal.ToNormalizedKey();
+
+    public string DisplayName => string.IsNullOrWhiteSpace(_config?.Model) ? "Foundry Local" : _config.Model;
+
    public async Task<bool> IsAvailableAsync(CancellationToken cancellationToken)
    {
        cancellationToken.ThrowIfCancellationRequested();
@@ -69,26 +72,22 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider
                throw new PasteActionException(
                    "No Foundry Local model selected",
                    new InvalidOperationException("Model identifier is required"),
-                    aiServiceMessage: "Please select a model in the AI provider settings.");
+                    aiServiceMessage: "Please select a model in the AI provider settings. Model identifier should be in the format 'fl://model-name'.");
            }

            cancellationToken.ThrowIfCancellationRequested();
-
-            IChatClient chatClient;
-            try
+            var chatClient = LanguageModels.GetClient(modelReference);
+            if (chatClient is null)
            {
-                chatClient = _modelProvider.GetIChatClient(modelReference);
-            }
-            catch (InvalidOperationException ex)
-            {
-                // GetIChatClient throws InvalidOperationException for user-facing errors
-                var errorMessage = string.Format(System.Globalization.CultureInfo.CurrentCulture, ResourceLoaderInstance.ResourceLoader.GetString("FoundryLocal_UnableToLoadModel"), modelReference);
                throw new PasteActionException(
-                    errorMessage,
-                    ex,
-                    aiServiceMessage: ex.Message);
+                    $"Unable to load Foundry Local model: {modelReference}",
+                    new InvalidOperationException("Chat client resolution failed"),
+                    aiServiceMessage: "The model may not be downloaded or the Foundry Local service may not be running. Please check the model status in settings.");
            }

+            // Extract actual model ID from the URL (format: fl://modelId)
+            var actualModelId = modelReference.Replace("fl://", string.Empty).Trim('/');
+
            var userMessageContent = $"""
                User instructions:
                {prompt}
@@ -105,7 +104,7 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider
                new(ChatRole.User, userMessageContent),
            };

-            var chatOptions = CreateChatOptions(_config?.SystemPrompt, modelReference);
+            var chatOptions = CreateChatOptions(_config?.SystemPrompt, actualModelId);

            progress?.Report(0.1);

@@ -146,7 +145,6 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider
        var options = new ChatOptions
        {
            ModelId = modelReference,
-            MaxOutputTokens = 2048,
        };

        if (!string.IsNullOrWhiteSpace(systemPrompt))
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/SemanticKernelPasteProvider.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/SemanticKernelPasteProvider.cs
@@ -157,6 +157,8 @@ namespace AdvancedPaste.Services.CustomActions
            {
                AIServiceType.OpenAI or AIServiceType.AzureOpenAI => new OpenAIPromptExecutionSettings
                {
+                    Temperature = 0.01,
+                    MaxTokens = 2000,
                    FunctionChoiceBehavior = null,
                },
                _ => new PromptExecutionSettings(),
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/KernelServiceBase.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/KernelServiceBase.cs
@@ -29,7 +29,6 @@ public abstract class KernelServiceBase(
    ICustomActionTransformService customActionTransformService) : IKernelService
 {
    private const string PromptParameterName = "prompt";
-    private const string DefaultSystemPrompt = "You are an agent who is tasked with helping users paste their clipboard data. You have functions available to help you with this task. Call function when necessary to help user finish the transformation task. You never need to ask permission, always try to do as the user asks. The user will only input one message and will not be available for further questions, so try your best. The user will put in a request to format their clipboard data and you will fulfill it. Do not output anything else besides the reformatted clipboard content.";

    private readonly IKernelQueryCacheService _queryCacheService = queryCacheService;
    private readonly IPromptModerationService _promptModerationService = promptModerationService;
@@ -145,8 +144,7 @@ public abstract class KernelServiceBase(

        ChatHistory chatHistory = [];

-        var systemPrompt = string.IsNullOrWhiteSpace(runtimeConfig.SystemPrompt) ? DefaultSystemPrompt : runtimeConfig.SystemPrompt;
-        chatHistory.AddSystemMessage(systemPrompt);
+        chatHistory.AddSystemMessage(runtimeConfig.SystemPrompt);
        chatHistory.AddSystemMessage($"Available clipboard formats: {await kernel.GetDataFormatsAsync()}");
        chatHistory.AddUserMessage(prompt);

@@ -188,20 +186,12 @@ public abstract class KernelServiceBase(

    private void LogResult(bool cacheUsed, bool isSavedQuery, IEnumerable<ActionChainItem> actionChain, AIServiceUsage usage)
    {
-        var runtimeConfig = GetRuntimeConfiguration();
-
-        AdvancedPasteSemanticKernelFormatEvent telemetryEvent = new(
-            cacheUsed,
-            isSavedQuery,
-            usage.PromptTokens,
-            usage.CompletionTokens,
-            AdvancedAIModelName,
-            runtimeConfig.ServiceType.ToString(),
-            AdvancedPasteSemanticKernelFormatEvent.FormatActionChain(actionChain));
+        AdvancedPasteSemanticKernelFormatEvent telemetryEvent = new(cacheUsed, isSavedQuery, usage.PromptTokens, usage.CompletionTokens, AdvancedAIModelName, AdvancedPasteSemanticKernelFormatEvent.FormatActionChain(actionChain));
        PowerToysTelemetry.Log.WriteEvent(telemetryEvent);

        // Log endpoint usage
-        var endpointEvent = new AdvancedPasteEndpointUsageEvent(runtimeConfig.ServiceType, AdvancedAIModelName, isAdvanced: true);
+        var runtimeConfig = GetRuntimeConfiguration();
+        var endpointEvent = new AdvancedPasteEndpointUsageEvent(runtimeConfig.ServiceType);
        PowerToysTelemetry.Log.WriteEvent(endpointEvent);

        var logEvent = new AIServiceFormatEvent(telemetryEvent);
--- a/src/modules/AdvancedPaste/AdvancedPaste/Strings/en-us/Resources.resw
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Strings/en-us/Resources.resw
@@ -160,10 +160,10 @@
    <value>Active provider: {0}</value>
  </data>
  <data name="AIProvidersFlyoutHeader.Text" xml:space="preserve">
-    <value>Configured models</value>
+    <value>AI providers</value>
  </data>
  <data name="AIProvidersEmptyText.Text" xml:space="preserve">
-    <value>No models configured</value>
+    <value>No AI providers configured</value>
  </data>
  <data name="AIProvidersManageButtonContent.Content" xml:space="preserve">
    <value>Configure models in Settings</value>
@@ -359,17 +359,6 @@
  </data>
  <data name="Relative_Date_TimeFormat" xml:space="preserve">
    <value>{0}, {1}</value>
-    <comment>(e.g., "10/20/2025, 17:05" in the user's locale)</comment>
-  </data>
-  <data name="CustomEndpointWarning" xml:space="preserve">
-    <value>You are using a custom endpoint. Verify all answers.</value>
-  </data>
-  <data name="LocalModelBadge.Text" xml:space="preserve">
-    <value>Local</value>
-    <comment>Badge label displayed next to local AI model providers (e.g., Ollama, Foundry Local) to indicate the model runs locally</comment>
-  </data>
-  <data name="FoundryLocal_UnableToLoadModel" xml:space="preserve">
-    <value>Unable to load Foundry Local model: {0}</value>
-    <comment>{0} is the model identifier. Do not translate {0}.</comment>
+    <comment>(e.g., “10/20/2025, 17:05” in the user’s locale)</comment>
  </data>
 </root>
--- a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteCustomActionErrorEvent.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteCustomActionErrorEvent.cs
@@ -1,34 +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.Diagnostics.CodeAnalysis;
-using System.Diagnostics.Tracing;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.PowerToys.Telemetry;
-using Microsoft.PowerToys.Telemetry.Events;
-
-namespace AdvancedPaste.Telemetry;
-
-[EventData]
-[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
-public sealed class AdvancedPasteCustomActionErrorEvent : EventBase, IEvent
-{
-    public AdvancedPasteCustomActionErrorEvent(AIServiceType providerType, string modelName, int statusCode, string error)
-    {
-        ProviderType = providerType.ToString();
-        ModelName = modelName;
-        StatusCode = statusCode;
-        Error = error;
-    }
-
-    public string ProviderType { get; set; }
-
-    public string ModelName { get; set; }
-
-    public int StatusCode { get; set; }
-
-    public string Error { get; set; }
-
-    public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
-}
--- a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteEndpointUsageEvent.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteEndpointUsageEvent.cs
@@ -19,27 +19,9 @@ public class AdvancedPasteEndpointUsageEvent : EventBase, IEvent
    /// </summary>
    public string ProviderType { get; set; }

-    /// <summary>
-    /// Gets or sets the configured model name.
-    /// </summary>
-    public string ModelName { get; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the advanced AI pipeline was used.
-    /// </summary>
-    public bool IsAdvanced { get; set; }
-
-    /// <summary>
-    /// Gets or sets the total duration in milliseconds, or -1 if unavailable.
-    /// </summary>
-    public int DurationMs { get; set; }
-
-    public AdvancedPasteEndpointUsageEvent(AIServiceType providerType, string modelName, bool isAdvanced, int durationMs = -1)
+    public AdvancedPasteEndpointUsageEvent(AIServiceType providerType)
    {
        ProviderType = providerType.ToString();
-        ModelName = modelName;
-        IsAdvanced = isAdvanced;
-        DurationMs = durationMs;
    }

    public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
--- a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteSemanticKernelFormatEvent.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteSemanticKernelFormatEvent.cs
@@ -14,7 +14,7 @@ namespace AdvancedPaste.Telemetry;

 [EventData]
 [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
-public class AdvancedPasteSemanticKernelFormatEvent(bool cacheUsed, bool isSavedQuery, int promptTokens, int completionTokens, string modelName, string providerType, string actionChain) : EventBase, IEvent
+public class AdvancedPasteSemanticKernelFormatEvent(bool cacheUsed, bool isSavedQuery, int promptTokens, int completionTokens, string modelName, string actionChain) : EventBase, IEvent
 {
    public static string FormatActionChain(IEnumerable<ActionChainItem> actionChain) => FormatActionChain(actionChain.Select(item => item.Format));

@@ -30,8 +30,6 @@ public class AdvancedPasteSemanticKernelFormatEvent(bool cacheUsed, bool isSaved

    public string ModelName { get; set; } = modelName;

-    public string ProviderType { get; set; } = providerType;
-
    /// <summary>
    /// Gets or sets a comma-separated list of paste formats used - in the same order they were executed.
    /// Conceptually an array but formatted this way to work around https://github.com/dotnet/runtime/issues/10428
--- a/src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs
@@ -63,7 +63,6 @@ namespace AdvancedPaste.ViewModels
        private ClipboardFormat _availableClipboardFormats;

        [ObservableProperty]
-        [NotifyPropertyChangedFor(nameof(ShowClipboardHistoryButton))]
        private bool _clipboardHistoryEnabled;

        [ObservableProperty]
@@ -77,7 +76,6 @@ namespace AdvancedPaste.ViewModels
        [NotifyPropertyChangedFor(nameof(PrivacyLinkUri))]
        [NotifyPropertyChangedFor(nameof(HasTermsLink))]
        [NotifyPropertyChangedFor(nameof(HasPrivacyLink))]
-        [NotifyPropertyChangedFor(nameof(HasLegalLinks))]
        private bool _isAllowedByGPO;

        [ObservableProperty]
@@ -223,16 +221,10 @@ namespace AdvancedPaste.ViewModels

        public bool HasPrivacyLink => GetActiveProviderMetadata().HasPrivacyLink;

-        public bool HasLegalLinks => HasTermsLink || HasPrivacyLink;
-
        public bool ClipboardHasData => AvailableClipboardFormats != ClipboardFormat.None;

        public bool ClipboardHasDataForCustomAI => PasteFormat.SupportsClipboardFormats(CustomAIFormat, AvailableClipboardFormats);

-        public bool ShowClipboardPreview => _userSettings.EnableClipboardPreview;
-
-        public bool ShowClipboardHistoryButton => ClipboardHistoryEnabled;
-
        public bool HasIndeterminateTransformProgress => double.IsNaN(TransformProgress);

        private PasteFormats CustomAIFormat =>
@@ -318,7 +310,6 @@ namespace AdvancedPaste.ViewModels
            OnPropertyChanged(nameof(IsAdvancedAIEnabled));
            OnPropertyChanged(nameof(AIProviders));
            OnPropertyChanged(nameof(AllowedAIProviders));
-            OnPropertyChanged(nameof(ShowClipboardPreview));

            NotifyActiveProviderChanged();

@@ -370,7 +361,6 @@ namespace AdvancedPaste.ViewModels
            OnPropertyChanged(nameof(PrivacyLinkUri));
            OnPropertyChanged(nameof(HasTermsLink));
            OnPropertyChanged(nameof(HasPrivacyLink));
-            OnPropertyChanged(nameof(HasLegalLinks));
        }

        private void RefreshPasteFormats()
--- a/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj
+++ b/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj
@@ -82,8 +82,6 @@
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">MultiThreadedDebug</RuntimeLibrary>
-      <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
@@ -95,8 +93,6 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MultiThreaded</RuntimeLibrary>
-      <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MultiThreaded</RuntimeLibrary>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
--- a/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj
+++ b/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj
@@ -39,7 +39,6 @@
  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
    <ClCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <UseDebugLibraries>true</UseDebugLibraries>
      <LinkIncremental>true</LinkIncremental>
    </ClCompile>
@@ -49,7 +48,6 @@
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <UseDebugLibraries>false</UseDebugLibraries>
      <WholeProgramOptimization>true</WholeProgramOptimization>
      <LinkIncremental>false</LinkIncremental>
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp
@@ -11,17 +11,19 @@
 #include <logger/logger_settings.h>
 #include <logger/logger.h>
 #include <utils/logger_helper.h>
-#include "LightSwitchStateManager.h"
-#include <LightSwitchUtils.h>

 SERVICE_STATUS g_ServiceStatus = {};
 SERVICE_STATUS_HANDLE g_StatusHandle = nullptr;
 HANDLE g_ServiceStopEvent = nullptr;
+extern int g_lastUpdatedDay = -1;
+static ScheduleMode prevMode = ScheduleMode::Off;
+static std::wstring prevLat, prevLon;
+static int prevMinutes = -1;
+static bool lastOverrideStatus = false;

 VOID WINAPI ServiceMain(DWORD argc, LPTSTR* argv);
 VOID WINAPI ServiceCtrlHandler(DWORD dwCtrl);
 DWORD WINAPI ServiceWorkerThread(LPVOID lpParam);
-void ApplyTheme(bool shouldBeLight);

 // Entry point for the executable
 int _tmain(int argc, TCHAR* argv[])
@@ -122,66 +124,31 @@ VOID WINAPI ServiceCtrlHandler(DWORD dwCtrl)
    }
 }

-void ApplyTheme(bool shouldBeLight)
+static void update_sun_times(auto& settings)
 {
-    const auto& s = LightSwitchSettings::settings();
-
-    if (s.changeSystem)
-    {
-        bool isSystemCurrentlyLight = GetCurrentSystemTheme();
-        if (shouldBeLight != isSystemCurrentlyLight)
-        {
-            SetSystemTheme(shouldBeLight);
-            Logger::info(L"[LightSwitchService] Changed system theme to {}.", shouldBeLight ? L"light" : L"dark");
-        }
-    }
-
-    if (s.changeApps)
-    {
-        bool isAppsCurrentlyLight = GetCurrentAppsTheme();
-        if (shouldBeLight != isAppsCurrentlyLight)
-        {
-            SetAppsTheme(shouldBeLight);
-            Logger::info(L"[LightSwitchService] Changed apps theme to {}.", shouldBeLight ? L"light" : L"dark");
-        }
-    }
-}
-
-static void DetectAndHandleExternalThemeChange(LightSwitchStateManager& stateManager)
-{
-    const auto& s = LightSwitchSettings::settings();
-    if (s.scheduleMode == ScheduleMode::Off)
-        return;
+    double latitude = std::stod(settings.latitude);
+    double longitude = std::stod(settings.longitude);

    SYSTEMTIME st;
    GetLocalTime(&st);
-    int nowMinutes = st.wHour * 60 + st.wMinute;

-    // Compute effective boundaries (with offsets if needed)
-    int effectiveLight = s.lightTime;
-    int effectiveDark = s.darkTime;
+    SunTimes newTimes = CalculateSunriseSunset(latitude, longitude, st.wYear, st.wMonth, st.wDay);

-    if (s.scheduleMode == ScheduleMode::SunsetToSunrise)
+    int newLightTime = newTimes.sunriseHour * 60 + newTimes.sunriseMinute;
+    int newDarkTime = newTimes.sunsetHour * 60 + newTimes.sunsetMinute;
+    try
    {
-        effectiveLight = (s.lightTime + s.sunrise_offset) % 1440;
-        effectiveDark = (s.darkTime + s.sunset_offset) % 1440;
+        auto values = PowerToysSettings::PowerToyValues::load_from_settings_file(L"LightSwitch");
+        values.add_property(L"lightTime", newLightTime);
+        values.add_property(L"darkTime", newDarkTime);
+        values.save_to_settings_file();
+
+        Logger::info(L"[LightSwitchService] Updated sun times and saved to config.");
    }
-
-    // Use shared helper (handles wraparound logic)
-    bool shouldBeLight = ShouldBeLight(nowMinutes, effectiveLight, effectiveDark);
-
-    // Compare current system/apps theme
-    bool currentSystemLight = GetCurrentSystemTheme();
-    bool currentAppsLight = GetCurrentAppsTheme();
-
-    bool systemMismatch = s.changeSystem && (currentSystemLight != shouldBeLight);
-    bool appsMismatch = s.changeApps && (currentAppsLight != shouldBeLight);
-
-    // Trigger manual override only if mismatch and not already active
-    if ((systemMismatch || appsMismatch) && !stateManager.GetState().isManualOverride)
+    catch (const std::exception& e)
    {
-        Logger::info(L"[LightSwitchService] External theme change detected (Windows Settings). Entering manual override mode.");
-        stateManager.OnManualOverride();
+        std::wstring wmsg(e.what(), e.what() + strlen(e.what()));
+        Logger::error(L"[LightSwitchService] Exception during sun time update: {}", wmsg);
    }
 }

@@ -195,98 +162,307 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
    Logger::info(L"[LightSwitchService] Worker thread starting...");
    Logger::info(L"[LightSwitchService] Parent PID: {}", parentPid);

-    // ────────────────────────────────────────────────────────────────
-    // Initialization
-    // ────────────────────────────────────────────────────────────────
-    static LightSwitchStateManager stateManager;
-
    LightSwitchSettings::instance().InitFileWatcher();

    HANDLE hManualOverride = OpenEventW(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
-    HANDLE hSettingsChanged = LightSwitchSettings::instance().GetSettingsChangedEvent();

    LightSwitchSettings::instance().LoadSettings();
-    const auto& settings = LightSwitchSettings::instance().settings();
+    auto& settings = LightSwitchSettings::instance().settings();

    SYSTEMTIME st;
    GetLocalTime(&st);
    int nowMinutes = st.wHour * 60 + st.wMinute;

-    Logger::info(L"[LightSwitchService] Initialized at {:02d}:{:02d}.", st.wHour, st.wMinute);
-    stateManager.SyncInitialThemeState();
-    stateManager.OnTick(nowMinutes);
+    // Handle initial theme application if necessary
+    if (settings.scheduleMode != ScheduleMode::Off)
+    {
+        Logger::info(L"[LightSwitchService] Schedule mode is set to {}. Applying theme if necessary.", settings.scheduleMode);
+        LightSwitchSettings::instance().ApplyThemeIfNecessary();
+    }
+    else
+    {
+        Logger::info(L"[LightSwitchService] Schedule mode is set to Off.");
+    }

-    // ────────────────────────────────────────────────────────────────
-    // Worker Loop
-    // ────────────────────────────────────────────────────────────────
+    g_lastUpdatedDay = st.wDay;
+    Logger::info(L"[LightSwitchService] Initializing g_lastUpdatedDay to {}.", g_lastUpdatedDay);
+    ULONGLONG lastSettingsReload = 0;
+
+    // ticker loop
    for (;;)
    {
-        HANDLE waits[4];
-        DWORD count = 0;
-        waits[count++] = g_ServiceStopEvent;
-        if (hParent)
-            waits[count++] = hParent;
-        if (hManualOverride)
-            waits[count++] = hManualOverride;
-        waits[count++] = hSettingsChanged;
+        HANDLE waits[2] = { g_ServiceStopEvent, hParent };
+        DWORD count = hParent ? 2 : 1;
+        bool skipRest = false;

-        // Wait for one of these to trigger or for a new minute tick
+        const auto& settings = LightSwitchSettings::instance().settings();
+
+        // If the mode is set to Off, suspend the scheduler and avoid extra work
+        if (settings.scheduleMode == ScheduleMode::Off)
+        {
+            Logger::info(L"[LightSwitchService] Schedule mode is OFF - suspending scheduler but keeping service alive.");
+
+            if (!hManualOverride)
+                hManualOverride = OpenEventW(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
+
+            HANDLE waitsOff[4];
+            DWORD countOff = 0;
+            waitsOff[countOff++] = g_ServiceStopEvent;
+            if (hParent)
+                waitsOff[countOff++] = hParent;
+            if (hManualOverride)
+                waitsOff[countOff++] = hManualOverride;
+            waitsOff[countOff++] = LightSwitchSettings::instance().GetSettingsChangedEvent();
+
+            for (;;)
+            {
+                DWORD wait = WaitForMultipleObjects(countOff, waitsOff, FALSE, INFINITE);
+
+                if (wait == WAIT_OBJECT_0)
+                {
+                    Logger::info(L"[LightSwitchService] Stop event triggered - exiting worker loop.");
+                    goto cleanup;
+                }
+                if (hParent && wait == WAIT_OBJECT_0 + 1)
+                {
+                    Logger::info(L"[LightSwitchService] Parent exited - stopping service.");
+                    goto cleanup;
+                }
+
+                if (wait == WAIT_OBJECT_0 + (hParent ? 2 : 1))
+                {
+                    Logger::info(L"[LightSwitchService] Manual override received while schedule OFF.");
+                    ResetEvent(hManualOverride);
+                    continue;
+                }
+
+                if (wait == WAIT_OBJECT_0 + (hParent ? 3 : 2))
+                {
+                    Logger::trace(L"[LightSwitchService] Settings change event triggered, reloading settings...");
+                    ResetEvent(LightSwitchSettings::instance().GetSettingsChangedEvent());
+                    const auto& newSettings = LightSwitchSettings::instance().settings();
+                    lastSettingsReload = GetTickCount64();
+
+                    if (newSettings.scheduleMode != ScheduleMode::Off)
+                    {
+                        Logger::info(L"[LightSwitchService] Schedule re-enabled, resuming normal loop.");
+                        break;
+                    }
+                }
+            }
+
+            continue;
+        }
+
+        bool scheduleJustEnabled = (prevMode == ScheduleMode::Off && settings.scheduleMode != ScheduleMode::Off);
+        prevMode = settings.scheduleMode;
+
+        ULONGLONG nowTick = GetTickCount64();
+        bool recentSettingsReload = (nowTick - lastSettingsReload < 2000);
+
+        Logger::debug(L"[LightSwitchService] Current g_lastUpdatedDay value = {}.", g_lastUpdatedDay);
+
+        // Manual Override Detection Logic
+        bool manualOverrideActive = (hManualOverride && WaitForSingleObject(hManualOverride, 0) == WAIT_OBJECT_0);
+
+        if (manualOverrideActive != lastOverrideStatus)
+        {
+            Logger::debug(L"[LightSwitchService] Manual override active = {}", manualOverrideActive);
+            lastOverrideStatus = manualOverrideActive;
+        }
+
+        if (settings.scheduleMode != ScheduleMode::Off && !recentSettingsReload && !scheduleJustEnabled && !manualOverrideActive)
+        {
+            bool currentSystemTheme = GetCurrentSystemTheme();
+            bool currentAppsTheme = GetCurrentAppsTheme();
+
+            SYSTEMTIME st;
+            GetLocalTime(&st);
+            int nowMinutes = st.wHour * 60 + st.wMinute;
+
+            int lightBoundary = 0;
+            int darkBoundary = 0;
+
+            if (settings.scheduleMode == ScheduleMode::SunsetToSunrise)
+            {
+                lightBoundary = (settings.lightTime + settings.sunrise_offset) % 1440;
+                darkBoundary = (settings.darkTime + settings.sunset_offset) % 1440;
+            }
+            else
+            {
+                lightBoundary = settings.lightTime;
+                darkBoundary = settings.darkTime;
+            }
+
+            bool shouldBeLight = (lightBoundary < darkBoundary) ? (nowMinutes >= lightBoundary && nowMinutes < darkBoundary) : (nowMinutes >= lightBoundary || nowMinutes < darkBoundary);
+
+            Logger::debug(L"[LightSwitchService] shouldBeLight = {}", shouldBeLight);
+
+            bool systemMismatch = settings.changeSystem && (currentSystemTheme != shouldBeLight);
+            bool appsMismatch = settings.changeApps && (currentAppsTheme != shouldBeLight);
+
+            if (systemMismatch || appsMismatch)
+            {
+              // Make sure this is not because we crossed a boundary
+              bool crossedBoundary = false;
+              if (prevMinutes != -1)
+              {
+                  if (nowMinutes < prevMinutes)
+                  {
+                      // wrapped around midnight
+                      crossedBoundary = (prevMinutes <= lightBoundary || nowMinutes >= lightBoundary) ||
+                                        (prevMinutes <= darkBoundary || nowMinutes >= darkBoundary);
+                  }
+                  else
+                  {
+                      crossedBoundary = (prevMinutes < lightBoundary && nowMinutes >= lightBoundary) ||
+                                        (prevMinutes < darkBoundary && nowMinutes >= darkBoundary);
+                  }
+              }
+
+              if (crossedBoundary)
+              {
+                  Logger::info(L"[LightSwitchService] Missed boundary detected. Applying theme instead of triggering manual override.");
+                  LightSwitchSettings::instance().ApplyThemeIfNecessary();
+              }
+              else
+              {
+                  Logger::info(L"[LightSwitchService] External {} theme change detected, enabling manual override.",
+                               systemMismatch && appsMismatch ? L"system/app" :
+                               systemMismatch                 ? L"system" :
+                                                                L"app");
+                  SetEvent(hManualOverride);
+                  skipRest = true;
+              }
+            }
+        }
+        else
+        {
+            Logger::debug(L"[LightSwitchService] Skipping external-change detection (schedule off, recent reload, or just enabled).");
+        }
+        
+        if (hManualOverride)
+            manualOverrideActive = (WaitForSingleObject(hManualOverride, 0) == WAIT_OBJECT_0);
+
+        if (manualOverrideActive)
+        {
+            int lightBoundary = (settings.lightTime + settings.sunrise_offset) % 1440;
+            int darkBoundary = (settings.darkTime + settings.sunset_offset) % 1440;
+
+            SYSTEMTIME st;
+            GetLocalTime(&st);
+            nowMinutes = st.wHour * 60 + st.wMinute;
+
+            bool crossedLight = false;
+            bool crossedDark = false;
+
+            if (prevMinutes != -1)
+            {
+                // this means we are in a new day cycle
+                if (nowMinutes < prevMinutes)
+                {
+                    crossedLight = (prevMinutes <= lightBoundary || nowMinutes >= lightBoundary);
+                    crossedDark = (prevMinutes <= darkBoundary || nowMinutes >= darkBoundary);
+                }
+                else
+                {
+                    crossedLight = (prevMinutes < lightBoundary && nowMinutes >= lightBoundary);
+                    crossedDark = (prevMinutes < darkBoundary && nowMinutes >= darkBoundary);
+                }
+            }
+
+            if (crossedLight || crossedDark)
+            {
+                ResetEvent(hManualOverride);
+                Logger::info(L"[LightSwitchService] Manual override cleared after crossing schedule boundary.");
+            }
+            else
+            {
+                Logger::debug(L"[LightSwitchService] Skipping schedule due to manual override");
+                skipRest = true;
+            }
+        }
+
+        // Apply theme if nothing has made us skip
+        if (!skipRest)
+        {
+            // Next two conditionals check for any updates necessary to the sun times.
+            bool modeChangedToSunset = (prevMode != settings.scheduleMode &&
+                                        settings.scheduleMode == ScheduleMode::SunsetToSunrise);
+            bool coordsChanged = (prevLat != settings.latitude || prevLon != settings.longitude);
+
+            if ((modeChangedToSunset || coordsChanged) && settings.scheduleMode == ScheduleMode::SunsetToSunrise)
+            {
+                SYSTEMTIME st;
+                GetLocalTime(&st);
+
+                Logger::info(L"[LightSwitchService] Mode or coordinates changed, recalculating sun times.");
+                update_sun_times(settings);
+                g_lastUpdatedDay = st.wDay;
+                prevMode = settings.scheduleMode;
+                prevLat = settings.latitude;
+                prevLon = settings.longitude;
+            }
+
+            SYSTEMTIME st;
+            GetLocalTime(&st);
+            int nowMinutes = st.wHour * 60 + st.wMinute;
+
+            if ((g_lastUpdatedDay != st.wDay) && (settings.scheduleMode == ScheduleMode::SunsetToSunrise))
+            {
+                update_sun_times(settings);
+                g_lastUpdatedDay = st.wDay;
+                prevMinutes = -1;
+                Logger::info(L"[LightSwitchService] Recalculated sun times at new day boundary.");
+            }
+
+            // settings after any necessary updates.
+            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=%s",
+                       st.wHour,
+                       st.wMinute,
+                       currentSettings.lightTime / 60,
+                       currentSettings.lightTime % 60,
+                       currentSettings.darkTime / 60,
+                       currentSettings.darkTime % 60,
+                       ToString(currentSettings.scheduleMode).c_str());
+            Logger::info(msg);
+
+            LightSwitchSettings::instance().ApplyThemeIfNecessary();
+        }
+
+        // ─── Wait For Next Minute Tick Or Stop Event ────────────────────────────────
        SYSTEMTIME st;
        GetLocalTime(&st);
        int msToNextMinute = (60 - st.wSecond) * 1000 - st.wMilliseconds;
        if (msToNextMinute < 50)
            msToNextMinute = 50;

+       prevMinutes = nowMinutes;
+
        DWORD wait = WaitForMultipleObjects(count, waits, FALSE, msToNextMinute);
-
-        if (wait == WAIT_TIMEOUT)
-        {
-            // regular minute tick
-            GetLocalTime(&st);
-            nowMinutes = st.wHour * 60 + st.wMinute;
-            DetectAndHandleExternalThemeChange(stateManager);
-            stateManager.OnTick(nowMinutes);
-            continue;
-        }
-
        if (wait == WAIT_OBJECT_0)
        {
-            Logger::info(L"[LightSwitchService] Stop event triggered — exiting.");
+            Logger::info(L"[LightSwitchService] Stop event triggered - exiting worker loop.");
            break;
        }
-
        if (hParent && wait == WAIT_OBJECT_0 + 1)
        {
-            Logger::info(L"[LightSwitchService] Parent process exited — stopping service.");
+            Logger::info(L"[LightSwitchService] Parent process exited - stopping service.");
            break;
        }
-
-        if (hManualOverride && wait == WAIT_OBJECT_0 + (hParent ? 2 : 1))
-        {
-            Logger::info(L"[LightSwitchService] Manual override event detected.");
-            stateManager.OnManualOverride();
-            ResetEvent(hManualOverride);
-            continue;
-        }
-
-        if (wait == WAIT_OBJECT_0 + (hParent ? (hManualOverride ? 3 : 2) : 2))
-        {
-            ResetEvent(hSettingsChanged);
-            LightSwitchSettings::instance().LoadSettings();
-            stateManager.OnSettingsChanged();
-            continue;
-        }
    }

-    // ────────────────────────────────────────────────────────────────
-    // Cleanup
-    // ────────────────────────────────────────────────────────────────
+cleanup:
    if (hManualOverride)
        CloseHandle(hManualOverride);
    if (hParent)
        CloseHandle(hParent);

-    Logger::info(L"[LightSwitchService] Worker thread exiting cleanly.");
    return 0;
 }

--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj
@@ -75,7 +75,6 @@
  <ItemGroup>
    <ClCompile Include="LightSwitchService.cpp" />
    <ClCompile Include="LightSwitchSettings.cpp" />
-    <ClCompile Include="LightSwitchStateManager.cpp" />
    <ClCompile Include="SettingsConstants.cpp" />
    <ClCompile Include="ThemeHelper.cpp" />
    <ClCompile Include="ThemeScheduler.cpp" />
@@ -86,8 +85,6 @@
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="LightSwitchSettings.h" />
-    <ClInclude Include="LightSwitchStateManager.h" />
-    <ClInclude Include="LightSwitchUtils.h" />
    <ClInclude Include="SettingsConstants.h" />
    <ClInclude Include="SettingsObserver.h" />
    <ClInclude Include="ThemeHelper.h" />
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj.filters
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj.filters
@@ -33,9 +33,6 @@
    <ClCompile Include="WinHookEventIDs.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="LightSwitchStateManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="ThemeScheduler.h">
@@ -56,12 +53,6 @@
    <ClInclude Include="WinHookEventIDs.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="LightSwitchStateManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LightSwitchUtils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp
@@ -2,8 +2,10 @@
 #include <common/utils/json.h>
 #include <common/SettingsAPI/settings_helpers.h>
 #include "SettingsObserver.h"
+#include "ThemeHelper.h"
 #include <filesystem>
 #include <fstream>
+#include <WinHookEventIDs.h>
 #include <logger.h>

 using namespace std;
@@ -67,6 +69,7 @@ void LightSwitchSettings::InitFileWatcher()
                    try
                    {
                        LoadSettings();
+                        ApplyThemeIfNecessary();
                        SetEvent(m_settingsChangedEvent);
                    }
                    catch (const std::exception& e)
@@ -247,3 +250,48 @@ void LightSwitchSettings::LoadSettings()
        // Keeps defaults if load fails
    }
 }
+
+void LightSwitchSettings::ApplyThemeIfNecessary()
+{
+    std::lock_guard<std::mutex> guard(m_settingsMutex);
+
+    SYSTEMTIME st;
+    GetLocalTime(&st);
+    int nowMinutes = st.wHour * 60 + st.wMinute;
+
+    bool shouldBeLight = false;
+    if (m_settings.lightTime < m_settings.darkTime)
+        shouldBeLight = (nowMinutes >= m_settings.lightTime && nowMinutes < m_settings.darkTime);
+    else
+        shouldBeLight = (nowMinutes >= m_settings.lightTime || nowMinutes < m_settings.darkTime);
+
+    bool isSystemCurrentlyLight = GetCurrentSystemTheme();
+    bool isAppsCurrentlyLight = GetCurrentAppsTheme();
+
+    if (shouldBeLight)
+    {
+        if (m_settings.changeSystem && !isSystemCurrentlyLight)
+        {
+            SetSystemTheme(true);
+            Logger::info(L"[LightSwitchService] Changing system theme to light mode.");
+        }
+        if (m_settings.changeApps && !isAppsCurrentlyLight)
+        {
+            SetAppsTheme(true);
+            Logger::info(L"[LightSwitchService] Changing apps theme to light mode.");
+        }
+    }
+    else
+    {
+        if (m_settings.changeSystem && isSystemCurrentlyLight)
+        {
+            SetSystemTheme(false);
+            Logger::info(L"[LightSwitchService] Changing system theme to dark mode.");
+        }
+        if (m_settings.changeApps && isAppsCurrentlyLight)
+        {
+            SetAppsTheme(false);
+            Logger::info(L"[LightSwitchService] Changing apps theme to dark mode.");
+        }
+    }
+}
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.h
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.h
@@ -81,6 +81,7 @@ public:
    void RemoveObserver(SettingsObserver& observer);

    void LoadSettings();
+    void ApplyThemeIfNecessary();

    HANDLE GetSettingsChangedEvent() const;

--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchStateManager.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchStateManager.cpp
@@ -1,232 +0,0 @@
-#include "pch.h"
-#include "LightSwitchStateManager.h"
-#include <logger.h>
-#include <LightSwitchUtils.h>
-#include "ThemeScheduler.h"
-#include <ThemeHelper.h>
-
-void ApplyTheme(bool shouldBeLight);
-
-// Constructor
-LightSwitchStateManager::LightSwitchStateManager()
-{
-    Logger::info(L"[LightSwitchStateManager] Initialized");
-}
-
-// Called when settings.json changes
-void LightSwitchStateManager::OnSettingsChanged()
-{
-    std::lock_guard<std::mutex> lock(_stateMutex);
-
-    // If manual override was active, clear it so new settings take effect
-    if (_state.isManualOverride)
-    {
-        _state.isManualOverride = false;
-    }
-
-    EvaluateAndApplyIfNeeded();
-}
-
-// Called once per minute
-void LightSwitchStateManager::OnTick(int currentMinutes)
-{
-    std::lock_guard<std::mutex> lock(_stateMutex);
-    EvaluateAndApplyIfNeeded();
-}
-
-// Called when manual override is triggered
-void LightSwitchStateManager::OnManualOverride()
-{
-    std::lock_guard<std::mutex> lock(_stateMutex);
-    Logger::info(L"[LightSwitchStateManager] Manual override triggered");
-    _state.isManualOverride = !_state.isManualOverride;
-
-    // When entering manual override, sync internal theme state to match the current system
-    if (_state.isManualOverride)
-    {
-        _state.isSystemLightActive = GetCurrentSystemTheme();
-
-        _state.isAppsLightActive = GetCurrentAppsTheme();
-
-        Logger::debug(L"[LightSwitchStateManager] Synced internal theme state to current system theme ({}) and apps theme ({}).",
-                     (_state.isSystemLightActive ? L"light" : L"dark"),
-                     (_state.isAppsLightActive ? L"light" : L"dark"));
-    }
-
-    EvaluateAndApplyIfNeeded();
-}
-
-// Helpers
-bool LightSwitchStateManager::CoordinatesAreValid(const std::wstring& lat, const std::wstring& lon)
-{
-    try
-    {
-        double latVal = std::stod(lat);
-        double lonVal = std::stod(lon);
-        return !(latVal == 0 && lonVal == 0) && (latVal >= -90.0 && latVal <= 90.0) && (lonVal >= -180.0 && lonVal <= 180.0);
-    }
-    catch (...)
-    {
-        return false;
-    }
-}
-
-void LightSwitchStateManager::SyncInitialThemeState()
-{
-    std::lock_guard<std::mutex> lock(_stateMutex);
-    _state.isSystemLightActive = GetCurrentSystemTheme();
-    _state.isAppsLightActive = GetCurrentAppsTheme();
-    Logger::debug(L"[LightSwitchStateManager] Synced initial state to current system theme ({})",
-                 _state.isSystemLightActive ? L"light" : L"dark");
-    Logger::debug(L"[LightSwitchStateManager] Synced initial state to current apps theme ({})",
-                 _state.isAppsLightActive ? L"light" : L"dark");
-}
-
-static std::pair<int, int> update_sun_times(auto& settings)
-{
-    double latitude = std::stod(settings.latitude);
-    double longitude = std::stod(settings.longitude);
-
-    SYSTEMTIME st;
-    GetLocalTime(&st);
-
-    SunTimes newTimes = CalculateSunriseSunset(latitude, longitude, st.wYear, st.wMonth, st.wDay);
-
-    int newLightTime = newTimes.sunriseHour * 60 + newTimes.sunriseMinute;
-    int newDarkTime = newTimes.sunsetHour * 60 + newTimes.sunsetMinute;
-
-    try
-    {
-        auto values = PowerToysSettings::PowerToyValues::load_from_settings_file(L"LightSwitch");
-        values.add_property(L"lightTime", newLightTime);
-        values.add_property(L"darkTime", newDarkTime);
-        values.save_to_settings_file();
-
-        Logger::info(L"[LightSwitchService] Updated sun times and saved to config.");
-    }
-    catch (const std::exception& e)
-    {
-        std::string msg = e.what();
-        std::wstring wmsg(msg.begin(), msg.end());
-        Logger::error(L"[LightSwitchService] Exception during sun time update: {}", wmsg);
-    }
-
-    return { newLightTime, newDarkTime };
-}
-
-// Internal: decide what should happen now
-void LightSwitchStateManager::EvaluateAndApplyIfNeeded()
-{
-    LightSwitchSettings::instance().LoadSettings();
-    const auto& _currentSettings = LightSwitchSettings::settings();
-    auto now = GetNowMinutes();
-
-    // Early exit: OFF mode just pauses activity
-    if (_currentSettings.scheduleMode == ScheduleMode::Off)
-    {
-        _state.lastTickMinutes = now;
-        return;
-    }
-
-    bool coordsValid = CoordinatesAreValid(_currentSettings.latitude, _currentSettings.longitude);
-
-    // Handle Sun Mode recalculation
-    if (_currentSettings.scheduleMode == ScheduleMode::SunsetToSunrise && coordsValid)
-    {
-        SYSTEMTIME st;
-        GetLocalTime(&st);
-        bool newDay = (_state.lastEvaluatedDay != st.wDay);
-        bool modeChangedToSun = (_state.lastAppliedMode != ScheduleMode::SunsetToSunrise &&
-                                 _currentSettings.scheduleMode == ScheduleMode::SunsetToSunrise);
-
-        if (newDay || modeChangedToSun)
-        {
-            auto [newLightTime, newDarkTime] = update_sun_times(_currentSettings);
-            _state.lastEvaluatedDay = st.wDay;
-            _state.effectiveLightMinutes = newLightTime + _currentSettings.sunrise_offset;
-            _state.effectiveDarkMinutes = newDarkTime + _currentSettings.sunset_offset;
-        }
-        else
-        {
-            _state.effectiveLightMinutes = _currentSettings.lightTime + _currentSettings.sunrise_offset;
-            _state.effectiveDarkMinutes = _currentSettings.darkTime + _currentSettings.sunset_offset;
-        }
-    }
-    else if (_currentSettings.scheduleMode == ScheduleMode::FixedHours)
-    {
-        _state.effectiveLightMinutes = _currentSettings.lightTime;
-        _state.effectiveDarkMinutes = _currentSettings.darkTime;
-    }
-
-    // Handle manual override logic
-    if (_state.isManualOverride)
-    {
-        bool crossedBoundary = false;
-        if (_state.lastTickMinutes != -1)
-        {
-            int prev = _state.lastTickMinutes;
-
-            // Handle midnight wraparound safely
-            if (now < prev)
-            {
-                crossedBoundary =
-                    (prev <= _state.effectiveLightMinutes || now >= _state.effectiveLightMinutes) ||
-                    (prev <= _state.effectiveDarkMinutes || now >= _state.effectiveDarkMinutes);
-            }
-            else
-            {
-                crossedBoundary =
-                    (prev < _state.effectiveLightMinutes && now >= _state.effectiveLightMinutes) ||
-                    (prev < _state.effectiveDarkMinutes && now >= _state.effectiveDarkMinutes);
-            }
-        }
-
-        if (crossedBoundary)
-        {
-            _state.isManualOverride = false;
-        }
-        else
-        {
-            _state.lastTickMinutes = now;
-            return;
-        }
-    }
-
-    _state.lastAppliedMode = _currentSettings.scheduleMode;
-
-    bool shouldBeLight = ShouldBeLight(now, _state.effectiveLightMinutes, _state.effectiveDarkMinutes);
-
-    bool appsNeedsToChange = _currentSettings.changeApps && (_state.isAppsLightActive != shouldBeLight);
-    bool systemNeedsToChange = _currentSettings.changeSystem && (_state.isSystemLightActive != shouldBeLight);
-
-    /* Logger::debug(
-        L"[LightSwitchStateManager] now = {:02d}:{:02d}, light boundary = {:02d}:{:02d} ({}), dark boundary = {:02d}:{:02d} ({})",
-        now / 60,
-        now % 60,
-        _state.effectiveLightMinutes / 60,
-        _state.effectiveLightMinutes % 60,
-        _state.effectiveLightMinutes,
-        _state.effectiveDarkMinutes / 60,
-        _state.effectiveDarkMinutes % 60,
-        _state.effectiveDarkMinutes); */
-
-    /* Logger::debug("should be light = {}, apps needs change = {}, system needs change = {}",
-                  shouldBeLight ? "true" : "false",
-                  appsNeedsToChange ? "true" : "false",
-                  systemNeedsToChange ? "true" : "false"); */
-
-    // Only apply theme if there's a change or no override active
-    if (!_state.isManualOverride && (appsNeedsToChange || systemNeedsToChange))
-    {
-        Logger::info(L"[LightSwitchStateManager] Applying {} theme", shouldBeLight ? L"light" : L"dark");
-        ApplyTheme(shouldBeLight);
-
-        _state.isSystemLightActive = GetCurrentSystemTheme();
-        _state.isAppsLightActive = GetCurrentAppsTheme();
-    }
-
-    _state.lastTickMinutes = now;
-}
-
-
-
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchStateManager.h
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchStateManager.h
@@ -1,47 +0,0 @@
-#pragma once
-#include "LightSwitchSettings.h"
-#include <optional>
-
-// Represents runtime-only information (not saved in settings.json)
-struct LightSwitchState
-{
-    ScheduleMode lastAppliedMode = ScheduleMode::Off;
-    bool isManualOverride = false;
-    bool isSystemLightActive = false;
-    bool isAppsLightActive = false;
-    int lastEvaluatedDay = -1;
-    int lastTickMinutes = -1;
-
-    // Derived, runtime-resolved times
-    int effectiveLightMinutes = 0; // the boundary we actually act on
-    int effectiveDarkMinutes = 0; // includes offsets if needed
-};
-
-// The controller that reacts to settings changes, time ticks, and manual overrides.
-class LightSwitchStateManager
-{
-public:
-    LightSwitchStateManager();
-
-    // Called when settings.json changes or stabilizes.
-    void OnSettingsChanged();
-
-    // Called every minute (from service worker tick).
-    void OnTick(int currentMinutes);
-
-    // Called when manual override is toggled (via shortcut or system change).
-    void OnManualOverride();
-
-    // Initial sync at startup to align internal state with system theme
-    void SyncInitialThemeState();
-
-    // Accessor for current state (optional, for debugging or telemetry)
-    const LightSwitchState& GetState() const { return _state; }
-
-private:
-    LightSwitchState _state;
-    std::mutex _stateMutex;
-
-    void EvaluateAndApplyIfNeeded();
-    bool CoordinatesAreValid(const std::wstring& lat, const std::wstring& lon);
-};
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchUtils.h
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchUtils.h
@@ -1,24 +0,0 @@
-#pragma once
-#include <windows.h>
-
-constexpr bool ShouldBeLight(int nowMinutes, int lightTime, int darkTime)
-{
-    // Normalize values into [0, 1439]
-    int normalizedLightTime = (lightTime % 1440 + 1440) % 1440;
-    int normalizedDarkTime = (darkTime % 1440 + 1440) % 1440;
-    int normalizedNowMinutes = (nowMinutes % 1440 + 1440) % 1440;
-
-    // Case 1: Normal range, e.g. light mode comes before dark mode in the same day
-    if (normalizedLightTime < normalizedDarkTime)
-        return normalizedNowMinutes >= normalizedLightTime && normalizedNowMinutes < normalizedDarkTime;
-
-    // Case 2: Wrap-around range, e.g. light mode starts in the evening and dark mode starts in the morning
-    return normalizedNowMinutes >= normalizedLightTime || normalizedNowMinutes < normalizedDarkTime;
-}
-
-inline int GetNowMinutes()
-{
-    SYSTEMTIME st;
-    GetLocalTime(&st);
-    return st.wHour * 60 + st.wMinute;
-}
--- a/src/modules/LightSwitch/Tests/LightSwitch.UITests/TestHelper.cs
+++ b/src/modules/LightSwitch/Tests/LightSwitch.UITests/TestHelper.cs
@@ -152,16 +152,16 @@ namespace LightSwitch.UITests

            var neededTabs = 6;

-            if (modeCombobox.Text != "Fixed hours")
+            if (modeCombobox.Text != "Manual")
            {
                modeCombobox.Click();
                var manualListItem = testBase.Session.Find<Element>(By.AccessibilityId("ManualCBItem_LightSwitch"), 5000);
-                Assert.IsNotNull(manualListItem, "Fixed Hours combobox item not found.");
+                Assert.IsNotNull(manualListItem, "Manual combobox item not found.");
                manualListItem.Click();
                neededTabs = 1;
            }

-            Assert.AreEqual("Fixed hours", modeCombobox.Text, "Mode combobox should be set to Fixed hours.");
+            Assert.AreEqual("Manual", modeCombobox.Text, "Mode combobox should be set to Manual.");

            var timeline = testBase.Session.Find<Element>(By.AccessibilityId("Timeline_LightSwitch"), 5000);
            Assert.IsNotNull(timeline, "Timeline not found.");
@@ -198,7 +198,7 @@ namespace LightSwitch.UITests
        }

        /// <summary>
-        /// Perform a update manual location test operation
+        /// Perform a update geolocation test operation
        /// </summary>
        public static void PerformUserSelectedLocationTest(UITestBase testBase)
        {
@@ -216,22 +216,19 @@ namespace LightSwitch.UITests

            Assert.AreEqual("Sunset to sunrise", modeCombobox.Text, "Mode combobox should be set to Sunset to sunrise.");

-            // Click the select location button
            var setLocationButton = testBase.Session.Find<Element>(By.AccessibilityId("SetLocationButton_LightSwitch"), 5000);
            Assert.IsNotNull(setLocationButton, "Set location button not found.");
-            setLocationButton.Click(msPostAction: 1000);
+            setLocationButton.Click();

-            var latitudeBox = testBase.Session.Find<Element>(By.AccessibilityId("LatitudeBox_LightSwitch"), 5000);
-            Assert.IsNotNull(latitudeBox, "Latitude text box not found.");
-            latitudeBox.Click();
+            var autoSuggestTextbox = testBase.Session.Find<Element>(By.AccessibilityId("CitySearchBox_LightSwitch"), 5000);
+            Assert.IsNotNull(autoSuggestTextbox, "City search box not found.");
+            autoSuggestTextbox.Click();
+            autoSuggestTextbox.SendKeys("Seattle");
+            autoSuggestTextbox.SendKeys(OpenQA.Selenium.Keys.Down);
+            autoSuggestTextbox.SendKeys(OpenQA.Selenium.Keys.Enter);

-            testBase.Session.SendKeys(Key.Up);
-
-            var longitudeBox = testBase.Session.Find<Element>(By.AccessibilityId("LongitudeBox_LightSwitch"), 5000);
-            Assert.IsNotNull(longitudeBox, "Longitude text box not found.");
-            longitudeBox.Click();
-
-            testBase.Session.SendKeys(Key.Down);
+            var latLong = testBase.Session.Find<Element>(By.AccessibilityId("LocationResultText_LightSwitch"), 5000);
+            Assert.IsFalse(string.IsNullOrWhiteSpace(latLong.Text));

            var sunrise = testBase.Session.Find<Element>(By.AccessibilityId("SunriseText_LightSwitch"), 5000);
            Assert.IsFalse(string.IsNullOrWhiteSpace(sunrise.Text));
@@ -259,14 +256,13 @@ namespace LightSwitch.UITests

            Assert.AreEqual("Sunset to sunrise", modeCombobox.Text, "Mode combobox should be set to Sunset to sunrise.");

-            // Click the select location button
+            // Click the select city button
            var setLocationButton = testBase.Session.Find<Element>(By.AccessibilityId("SetLocationButton_LightSwitch"), 5000);
            Assert.IsNotNull(setLocationButton, "Set location button not found.");
-            setLocationButton.Click(msPostAction: 1000);
+            setLocationButton.Click(msPostAction: 8000);

-            var syncLocationButton = testBase.Session.Find<Element>(By.AccessibilityId("SyncLocationButton_LightSwitch"), 5000);
-            Assert.IsNotNull(syncLocationButton, "Sync location button not found.");
-            syncLocationButton.Click(msPostAction: 8000);
+            var latLong = testBase.Session.Find<Element>(By.AccessibilityId("LocationResultText_LightSwitch"), 5000);
+            Assert.IsFalse(string.IsNullOrWhiteSpace(latLong.Text));

            var sunrise = testBase.Session.Find<Element>(By.AccessibilityId("SunriseText_LightSwitch"), 5000);
            Assert.IsFalse(string.IsNullOrWhiteSpace(sunrise.Text));
@@ -367,7 +363,6 @@ namespace LightSwitch.UITests
            var systemBeforeValue = GetSystemTheme();
            var appsBeforeValue = GetAppsTheme();

-            Task.Delay(1000).Wait();
            testBase.Session.SendKeys(activationKeys);
            Task.Delay(5000).Wait();

@@ -394,7 +389,6 @@ namespace LightSwitch.UITests
            var noneSystemBeforeValue = GetSystemTheme();
            var noneAppsBeforeValue = GetAppsTheme();

-            Task.Delay(1000).Wait();
            testBase.Session.SendKeys(activationKeys);
            Task.Delay(5000).Wait();

--- a/src/modules/MouseUtils/CursorWrap/dllmain.cpp
+++ b/src/modules/MouseUtils/CursorWrap/dllmain.cpp
@@ -196,10 +196,10 @@ public:
        m_enabled = true;
        Trace::EnableCursorWrap(true);
        
-        // Always start the mouse hook when the module is enabled
-        // This ensures cursor wrapping is active immediately after enabling
-        StartMouseHook();
-        Logger::info("CursorWrap enabled - mouse hook started");
+        if (m_autoActivate)
+        {
+            StartMouseHook();
+        }
    }

    // Disable the powertoy
@@ -208,7 +208,6 @@ public:
        m_enabled = false;
        Trace::EnableCursorWrap(false);
        StopMouseHook();
-        Logger::info("CursorWrap disabled - mouse hook stopped");
    }

    // Returns if the powertoys is enabled
--- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
+++ b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
@@ -64,7 +64,6 @@
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
    <Link>
@@ -82,7 +81,6 @@
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
    <Link>
--- a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj
+++ b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj
@@ -48,7 +48,6 @@
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
    <Link>
@@ -66,7 +65,6 @@
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
    <Link>
--- a/src/modules/MouseUtils/MouseJump/MouseJump.vcxproj
+++ b/src/modules/MouseUtils/MouseJump/MouseJump.vcxproj
@@ -48,7 +48,6 @@
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
    <Link>
@@ -66,7 +65,6 @@
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
    <Link>
--- a/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj
+++ b/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj
@@ -49,7 +49,6 @@
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
    <Link>
@@ -67,7 +66,6 @@
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
    <Link>
--- a/src/modules/NewPlus/NewShellExtensionContextMenu.win10/NewPlus.ShellExtension.win10.vcxproj
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu.win10/NewPlus.ShellExtension.win10.vcxproj
@@ -46,7 +46,7 @@
      <PreprocessorDefinitions>_DEBUG;NEWPLUSSHELLEXTENSIONWIN10_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
      <PrecompiledHeader>Use</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories);..\NewShellExtensionContextMenu;$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories);..\NewShellExtensionContextMenu;$(MSBuildThisFileDirectory)Generated Files</AdditionalIncludeDirectories>
      <CompileAsWinRT>false</CompileAsWinRT>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
@@ -67,7 +67,7 @@
      <PreprocessorDefinitions>NDEBUG;NEWPLUSSHELLEXTENSIONWIN10_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
      <PrecompiledHeader>Use</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories);..\NewShellExtensionContextMenu;$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories);..\NewShellExtensionContextMenu;$(MSBuildThisFileDirectory)Generated Files</AdditionalIncludeDirectories>
      <CompileAsWinRT>false</CompileAsWinRT>
      <LanguageStandard>stdcpplatest</LanguageStandard>
    </ClCompile>
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj
@@ -67,8 +67,6 @@
      <EnableUAC>false</EnableUAC>
      <ModuleDefinitionFile>dll.def</ModuleDefinitionFile>
      <AdditionalDependencies>runtimeobject.lib;$(CoreLibraryDependencies)</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
    </Link>
    <PreBuildEvent>
      <Command>del $(OutDir)\NewPlusPackage.msix /q
@@ -100,8 +98,6 @@ MakeAppx.exe pack /d . /p $(OutDir)NewPlusPackage.msix /nv</Command>
      <EnableUAC>false</EnableUAC>
      <ModuleDefinitionFile>dll.def</ModuleDefinitionFile>
      <AdditionalDependencies>runtimeobject.lib;$(CoreLibraryDependencies)</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
    </Link>
    <PreBuildEvent>
      <Command>del $(OutDir)\NewPlusPackage.msix /q
--- a/src/modules/Workspaces/WorkspacesLauncher/WorkspacesLauncher.vcxproj
+++ b/src/modules/Workspaces/WorkspacesLauncher/WorkspacesLauncher.vcxproj
@@ -29,7 +29,6 @@
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -40,7 +39,6 @@
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>MaxSpeed</Optimization>
      <SDLCheck>false</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
    </ClCompile>
--- a/src/modules/Workspaces/WorkspacesSnapshotTool/WorkspacesSnapshotTool.vcxproj
+++ b/src/modules/Workspaces/WorkspacesSnapshotTool/WorkspacesSnapshotTool.vcxproj
@@ -29,7 +29,6 @@
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -40,7 +39,6 @@
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>MaxSpeed</Optimization>
      <SDLCheck>false</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
    </ClCompile>
--- a/src/modules/Workspaces/WorkspacesWindowArranger/WorkspacesWindowArranger.vcxproj
+++ b/src/modules/Workspaces/WorkspacesWindowArranger/WorkspacesWindowArranger.vcxproj
@@ -29,7 +29,6 @@
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -40,7 +39,6 @@
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>MaxSpeed</Optimization>
      <SDLCheck>false</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
    </ClCompile>
--- a/src/modules/ZoomIt/ZoomIt/ZoomIt.h
+++ b/src/modules/ZoomIt/ZoomIt/ZoomIt.h
@@ -39,10 +39,6 @@ type_pEnableThemeDialogTexture    pEnableThemeDialogTexture;
 #define WIN7_VERSION		0x106
 #define WIN10_VERSION		0x206

-// Default recording format frame rates
-#define RECORDING_FORMAT_GIF_DEFAULT_FRAMERATE 15
-#define RECORDING_FORMAT_MP4_DEFAULT_FRAMERATE 30
-
 // Time that we'll cache live zoom window to avoid flicker
 // of live zooming on Vista/ws2k8
 #define LIVEZOOM_WINDOW_TIMEOUT	2*3600*1000
--- a/src/modules/ZoomIt/ZoomIt/ZoomIt.rc
+++ b/src/modules/ZoomIt/ZoomIt/ZoomIt.rc
@@ -122,7 +122,7 @@ BEGIN
    DEFPUSHBUTTON   "OK",IDOK,166,306,50,14
    PUSHBUTTON      "Cancel",IDCANCEL,223,306,50,14
    LTEXT           "ZoomIt v9.20",IDC_VERSION,42,7,73,10
-    LTEXT           "Copyright © 2006-2025 Mark Russinovich",IDC_COPYRIGHT,42,17,231,8
+    LTEXT           "Copyright <EFBFBD> 2006-2025 Mark Russinovich",IDC_COPYRIGHT,42,17,231,8
    CONTROL         "<a HREF=""https://www.sysinternals.com"">Sysinternals - www.sysinternals.com</a>",IDC_LINK,
                    "SysLink",WS_TABSTOP,42,26,150,9
    ICON            "APPICON",IDC_STATIC,12,9,20,20
--- a/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj
+++ b/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj
@@ -81,7 +81,6 @@
      <Optimization>MaxSpeed</Optimization>
      <PreprocessorDefinitions>__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x602;NDEBUG;_WIN32_WINNT=0x602;_WIN32_WINDOWS=0x501;WIN32;_WINDOWS;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
    </ClCompile>
    <ResourceCompile>
@@ -103,7 +102,6 @@
      <Optimization>MaxSpeed</Optimization>
      <PreprocessorDefinitions>__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x602;NDEBUG;_WIN32_WINNT=0x602;_WIN32_WINDOWS=0x501;WIN32;_WINDOWS;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
    </ClCompile>
    <ResourceCompile>
@@ -126,7 +124,6 @@
      <Optimization>MaxSpeed</Optimization>
      <PreprocessorDefinitions>__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x602;NDEBUG;_WIN32_WINNT=0x602;_WIN32_WINDOWS=0x501;WIN32;_WINDOWS;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
    </ClCompile>
    <ResourceCompile>
@@ -148,7 +145,6 @@
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x0602;_DEBUG;_WIN32_WINNT=0x602.MSVC6;_WIN32_WINDOWS=0x600;WIN32;_WINDOWS;_WIN32_WINNT=0x602;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;_M_IX86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -169,7 +165,6 @@
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x0602;_DEBUG;_WIN32_WINNT=0x602.MSVC6;_WIN32_WINDOWS=0x600;WIN32;_WINDOWS;_WIN32_WINNT=0x602;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;_M_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -191,7 +186,6 @@
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x0602;_DEBUG;_WIN32_WINNT=0x602.MSVC6;_WIN32_WINDOWS=0x600;WIN32;_WINDOWS;_WIN32_WINNT=0x602;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;_M_ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--- a/src/modules/ZoomIt/ZoomIt/ZoomItSettings.h
+++ b/src/modules/ZoomIt/ZoomIt/ZoomItSettings.h
@@ -44,11 +44,11 @@ LOGFONT	g_LogFont;
 BOOLEAN g_DemoTypeUserDriven = false;
 TCHAR   g_DemoTypeFile[MAX_PATH] = {0};
 DWORD	g_DemoTypeSpeedSlider = static_cast<int>(((MIN_TYPING_SPEED - MAX_TYPING_SPEED) / 2) + MAX_TYPING_SPEED);
-DWORD   g_RecordFrameRate = 30; // We default to 30 here, but g_RecordFrameRate can be different depending on recording format and gets set accordingly
+DWORD	g_RecordFrameRate = 30;
 DWORD	g_RecordScaling = 100;
 DWORD	g_RecordScalingGIF = 50;
 DWORD	g_RecordScalingMP4 = 100;
-RecordingFormat g_RecordingFormat = RecordingFormat::MP4;
+RecordingFormat g_RecordingFormat = RecordingFormat::GIF;
 BOOLEAN g_CaptureAudio = FALSE;
 TCHAR	g_MicrophoneDeviceId[MAX_PATH] = {0};

@@ -87,7 +87,8 @@ REG_SETTING RegSettings[] = {
    { L"SnapToGrid", SETTING_TYPE_BOOLEAN, 0, &g_SnapToGrid, static_cast<DOUBLE>(g_SnapToGrid) },
    { L"ZoominSliderLevel", SETTING_TYPE_DWORD, 0, &g_SliderZoomLevel, static_cast<DOUBLE>(g_SliderZoomLevel) },
    { L"Font", SETTING_TYPE_BINARY, sizeof g_LogFont, &g_LogFont, static_cast<DOUBLE>(0) },
-    { L"RecordingFormat", SETTING_TYPE_DWORD, 0, &g_RecordingFormat, static_cast<DOUBLE>(g_RecordingFormat) },
+    { L"RecordFrameRate", SETTING_TYPE_DWORD, 0, &g_RecordFrameRate, static_cast<DOUBLE>(g_RecordFrameRate) },
+    { L"RecordingFormat", SETTING_TYPE_DWORD, 0, &g_RecordingFormat, static_cast<DOUBLE>(0) },
    { L"RecordScalingGIF", SETTING_TYPE_DWORD, 0, &g_RecordScalingGIF, static_cast<DOUBLE>(g_RecordScalingGIF) },
    { L"RecordScalingMP4", SETTING_TYPE_DWORD, 0, &g_RecordScalingMP4, static_cast<DOUBLE>(g_RecordScalingMP4) },
    { L"CaptureAudio", SETTING_TYPE_BOOLEAN, 0, &g_CaptureAudio, static_cast<DOUBLE>(g_CaptureAudio) },
--- a/src/modules/ZoomIt/ZoomIt/Zoomit.cpp
+++ b/src/modules/ZoomIt/ZoomIt/Zoomit.cpp
@@ -168,7 +168,6 @@ BOOL	g_RecordToggle = FALSE;
 BOOL	g_RecordCropping = FALSE;
 SelectRectangle g_SelectRectangle;
 std::wstring	g_RecordingSaveLocation;
-std::wstring	g_RecordingSaveLocationGIF;
 winrt::IDirect3DDevice	g_RecordDevice{ nullptr };
 std::shared_ptr<VideoRecordingSession> g_RecordingSession = nullptr;
 std::shared_ptr<GifRecordingSession> g_GifRecordingSession = nullptr;
@@ -1813,7 +1812,7 @@ INT_PTR CALLBACK OptionsTabProc( HWND hDlg, UINT message,
                // Check if GIF is selected by comparing the text
                bool isGifSelected = (wcscmp(selectedText, L"GIF") == 0);

-                // If GIF is selected, set the scaling to the g_RecordScalingGIF value; otherwise to the g_RecordScalingMP4 value
+                // if gif is selected set the scaling to the g_recordScaleGIF value otherwise to the g_recordScaleMP4 value
                if (isGifSelected) {
                    g_RecordScaling = g_RecordScalingGIF;

@@ -2174,10 +2173,7 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
        CheckDlgButton( g_OptionsTabs[RECORD_PAGE].hPage, IDC_CAPTURE_AUDIO,
            g_CaptureAudio ? BST_CHECKED: BST_UNCHECKED );

-        //
-        // The framerate drop down list is not used in the current version (might be added in the future)
-        //
-        /*for (int i = 0; i < _countof(g_FramerateOptions); i++) {
+        for (int i = 0; i < _countof(g_FramerateOptions); i++) {

            _stprintf(text, L"%d", g_FramerateOptions[i]);
            SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_FRAME_RATE), static_cast<UINT>(CB_ADDSTRING),
@@ -2186,7 +2182,7 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,

                SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_FRAME_RATE), CB_SETCURSEL, static_cast<WPARAM>(i), static_cast<LPARAM>(0));
            }
-        }*/
+        }

        // Add the recording format to the combo box and set the current selection
        size_t selection = 0;
@@ -2349,8 +2345,17 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
            text[2] = 0;
            newTimeout = _tstoi( text );

+            if( g_RecordingFormat == RecordingFormat::GIF )
+            {
+                // Hardcode lower frame rate for GIFs
+                g_RecordFrameRate = 15;
+            }
+            else
+            {
+                g_RecordFrameRate = g_FramerateOptions[SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_FRAME_RATE), static_cast<UINT>(CB_GETCURSEL), static_cast<WPARAM>(0), static_cast<LPARAM>(0))];
+            }
+
            g_RecordingFormat = static_cast<RecordingFormat>(SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_FORMAT), static_cast<UINT>(CB_GETCURSEL), static_cast<WPARAM>(0), static_cast<LPARAM>(0)));
-            g_RecordFrameRate = (g_RecordingFormat == RecordingFormat::GIF) ? RECORDING_FORMAT_GIF_DEFAULT_FRAMERATE : RECORDING_FORMAT_MP4_DEFAULT_FRAMERATE;
            g_RecordScaling = static_cast<int>(SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_SCALING), static_cast<UINT>(CB_GETCURSEL), static_cast<WPARAM>(0), static_cast<LPARAM>(0)) * 10 + 10);

            // Get the selected microphone
@@ -3531,16 +3536,7 @@ void StopRecording()
 //----------------------------------------------------------------------------
 auto GetUniqueRecordingFilename()
 {
-    std::filesystem::path path;
-
-    if (g_RecordingFormat == RecordingFormat::GIF)
-    {
-        path = g_RecordingSaveLocationGIF;
-    }
-    else
-    {
-        path = g_RecordingSaveLocation;
-    }
+    std::filesystem::path path{ g_RecordingSaveLocation };

    // Chop off index if it's there
    auto base = std::regex_replace( path.stem().wstring(), std::wregex( L" [(][0-9]+[)]$" ), L"" );
@@ -3595,7 +3591,6 @@ winrt::fire_and_forget StartRecordingAsync( HWND hWnd, LPRECT rcCrop, HWND hWndR
    auto stream = co_await file.OpenAsync( winrt::FileAccessMode::ReadWrite );

    // Create the appropriate recording session based on format
-    OutputDebugStringW((L"Starting recording session. Framerate:  " + std::to_wstring(g_RecordFrameRate) + L" scaling: " + std::to_wstring(g_RecordScaling) + L" Format: " + (g_RecordingFormat == RecordingFormat::GIF ? L"GIF" : L"MP4") + L"\n").c_str());
    if (g_RecordingFormat == RecordingFormat::GIF)
    {
        g_GifRecordingSession = GifRecordingSession::Create(
@@ -3662,44 +3657,18 @@ winrt::fire_and_forget StartRecordingAsync( HWND hWnd, LPRECT rcCrop, HWND hWndR
                saveDialog->SetFileTypes( _countof( fileTypes ), fileTypes );
            }

-            // Peek the folder Windows has chosen to display
-            static std::filesystem::path lastSaveFolder;
-            wil::unique_cotaskmem_string chosenFolderPath;
-            wil::com_ptr<IShellItem> currentSelectedFolder;
-            bool bFolderChanged = false; 
-            if (SUCCEEDED(saveDialog->GetFolder(currentSelectedFolder.put())))
-            {
-                if (SUCCEEDED(currentSelectedFolder->GetDisplayName(SIGDN_FILESYSPATH, chosenFolderPath.put())))
-                {
-                    if (lastSaveFolder != chosenFolderPath.get())
-                    {
-                        lastSaveFolder = chosenFolderPath.get() ? chosenFolderPath.get() : std::filesystem::path{};
-                        bFolderChanged = true;
-                    }
-                }
-            }
-
-            if( (g_RecordingFormat == RecordingFormat::GIF && g_RecordingSaveLocationGIF.size() == 0) || (g_RecordingFormat == RecordingFormat::MP4 && g_RecordingSaveLocation.size() == 0) || (bFolderChanged)) {
+            if( g_RecordingSaveLocation.size() == 0) {

                wil::com_ptr<IShellItem> shellItem;
                wil::unique_cotaskmem_string folderPath;
-                if (SUCCEEDED(saveDialog->GetFolder(shellItem.put())) && SUCCEEDED(shellItem->GetDisplayName(SIGDN_FILESYSPATH, folderPath.put()))) {
-                    if (g_RecordingFormat == RecordingFormat::GIF) {
-                        g_RecordingSaveLocationGIF = folderPath.get();
-                        std::filesystem::path currentPath{ g_RecordingSaveLocationGIF };
-                        g_RecordingSaveLocationGIF = currentPath / DEFAULT_GIF_RECORDING_FILE;
-                    }
-                    else {
-                        g_RecordingSaveLocation = folderPath.get();
-                        if (g_RecordingFormat == RecordingFormat::MP4) {
-                            std::filesystem::path currentPath{ g_RecordingSaveLocation };
-                            g_RecordingSaveLocation = currentPath / DEFAULT_RECORDING_FILE;
-                        }
-                    }
-                }
+                if (SUCCEEDED(saveDialog->GetFolder(shellItem.put())) && SUCCEEDED(shellItem->GetDisplayName(SIGDN_FILESYSPATH, folderPath.put())))
+                    g_RecordingSaveLocation = folderPath.get();
            }

            // Always use appropriate default filename based on current format
+            std::filesystem::path currentPath{ g_RecordingSaveLocation };
+            const wchar_t* defaultFile = (g_RecordingFormat == RecordingFormat::GIF) ? DEFAULT_GIF_RECORDING_FILE : DEFAULT_RECORDING_FILE;
+            g_RecordingSaveLocation = currentPath.parent_path() / defaultFile;
            auto suggestedName = GetUniqueRecordingFilename();
            saveDialog->SetFileName( suggestedName.c_str() );

@@ -3727,15 +3696,9 @@ winrt::fire_and_forget StartRecordingAsync( HWND hWnd, LPRECT rcCrop, HWND hWndR
        }
        else {

-            co_await file.MoveAndReplaceAsync(destFile);
-            if (g_RecordingFormat == RecordingFormat::GIF) {
-                g_RecordingSaveLocationGIF = file.Path();
-                SaveToClipboard(g_RecordingSaveLocationGIF.c_str(), hWnd);
-            }
-            else {
-                g_RecordingSaveLocation = file.Path();
-                SaveToClipboard(g_RecordingSaveLocation.c_str(), hWnd);
-            }
+            co_await file.MoveAndReplaceAsync( destFile );
+            g_RecordingSaveLocation = file.Path();
+            SaveToClipboard(g_RecordingSaveLocation.c_str(), hWnd);
        }
        g_bSaveInProgress = false;

@@ -3943,7 +3906,6 @@ LRESULT APIENTRY MainWndProc(
    OPENFILENAME	openFileName;
    static TCHAR	filePath[MAX_PATH] = {L"zoomit"};
    NOTIFYICONDATA	tNotifyIconData;
-    static DWORD64  g_TelescopingZoomLastTick = 0ull;

    const auto drawAllRightJustifiedLines = [&rc]( long lineHeight, bool doPop = false ) {
        rc.top = textPt.y - static_cast<LONG>(g_TextBufferPreviousLines.size()) * lineHeight;
@@ -3970,97 +3932,6 @@ LRESULT APIENTRY MainWndProc(
        }
    };

-    const auto doTelescopingZoomTimer = [hWnd, wParam, lParam, &x, &y]( bool invalidate = true ) {
-        if( zoomTelescopeStep != 0.0f )
-        {
-            zoomLevel *= zoomTelescopeStep;
-            g_TelescopingZoomLastTick = GetTickCount64();
-            if( (zoomTelescopeStep > 1 && zoomLevel >= zoomTelescopeTarget) ||
-                (zoomTelescopeStep < 1 && zoomLevel <= zoomTelescopeTarget) )
-            {
-                zoomLevel = zoomTelescopeTarget;
-
-                g_TelescopingZoomLastTick = 0ull;
-                KillTimer( hWnd, wParam );
-                OutputDebug( L"SETCURSOR mon_left: %x mon_top: %x x: %d y: %d\n",
-                            monInfo.rcMonitor.left,
-                            monInfo.rcMonitor.top,
-                            cursorPos.x,
-                            cursorPos.y );
-                SetCursorPos( monInfo.rcMonitor.left + cursorPos.x,
-                             monInfo.rcMonitor.top + cursorPos.y );
-            }
-        }
-        else
-        {
-            // Case where we didn't zoom at all
-            g_TelescopingZoomLastTick = 0ull;
-            KillTimer( hWnd, wParam );
-        }
-        if( wParam == 2 && zoomLevel == 1 )
-        {
-            g_Zoomed = FALSE;
-            if( g_ZoomOnLiveZoom )
-            {
-                GetCursorPos( &cursorPos );
-                cursorPos = ScalePointInRects( cursorPos, monInfo.rcMonitor, g_LiveZoomSourceRect );
-                SetCursorPos( cursorPos.x, cursorPos.y );
-                SendMessage( hWnd, WM_HOTKEY, LIVE_HOTKEY, 0 );
-            }
-            else if( lParam != SHALLOW_ZOOM )
-            {
-                // Figure out where final unzoomed cursor should be
-                if( g_Drawing )
-                {
-                    cursorPos = prevPt;
-                }
-                OutputDebug( L"FINAL MOUSE: x: %d y: %d\n", cursorPos.x, cursorPos.y );
-                GetZoomedTopLeftCoordinates( zoomLevel, &cursorPos, &x, width, &y, height );
-                cursorPos.x = monInfo.rcMonitor.left + x + static_cast<int>((cursorPos.x - x) * zoomLevel);
-                cursorPos.y = monInfo.rcMonitor.top + y + static_cast<int>((cursorPos.y - y) * zoomLevel);
-                SetCursorPos( cursorPos.x, cursorPos.y );
-            }
-            if( hTargetWindow )
-            {
-                SetWindowPos( hTargetWindow, HWND_BOTTOM, rcTargetWindow.left, rcTargetWindow.top, rcTargetWindow.right - rcTargetWindow.left, rcTargetWindow.bottom - rcTargetWindow.top, 0 );
-                hTargetWindow = NULL;
-            }
-            DeleteDrawUndoList( &drawUndoList );
-
-            // Restore live zoom if we came from that mode
-            if( g_ZoomOnLiveZoom )
-            {
-                SendMessage( g_hWndLiveZoom, WM_USER_SET_ZOOM, static_cast<WPARAM>(g_LiveZoomLevel), reinterpret_cast<LPARAM>(&g_LiveZoomSourceRect) );
-                g_ZoomOnLiveZoom = FALSE;
-                forcePenResize = TRUE;
-            }
-
-            SetForegroundWindow( g_ActiveWindow );
-            ClipCursor( NULL );
-            g_HaveDrawn = FALSE;
-            g_TypeMode = TypeModeOff;
-            g_HaveTyped = FALSE;
-            g_Drawing = FALSE;
-            EnableDisableStickyKeys( TRUE );
-            DeleteObject( hTypingFont );
-            DeleteDC( hdcScreen );
-            DeleteDC( hdcScreenCompat );
-            DeleteDC( hdcScreenCursorCompat );
-            DeleteDC( hdcScreenSaveCompat );
-            DeleteObject( hbmpCompat );
-            DeleteObject (hbmpCursorCompat );
-            DeleteObject( hbmpDrawingCompat );
-            DeleteObject( hDrawingPen );
-
-            SetFocus( g_ActiveWindow );
-            ShowWindow( hWnd, SW_HIDE );
-        }
-        if( invalidate )
-        {
-            InvalidateRect( hWnd, NULL, FALSE );
-        }
-    };
-
    switch (message) {
    case WM_CREATE:

@@ -4076,10 +3947,8 @@ LRESULT APIENTRY MainWndProc(
        // Set g_RecordScaling based on the current recording format
        if (g_RecordingFormat == RecordingFormat::GIF) {
            g_RecordScaling = g_RecordScalingGIF;
-            g_RecordFrameRate = RECORDING_FORMAT_GIF_DEFAULT_FRAMERATE;
        } else {
            g_RecordScaling = g_RecordScalingMP4;
-            g_RecordFrameRate = RECORDING_FORMAT_MP4_DEFAULT_FRAMERATE;
        }

        // to support migrating from
@@ -4907,10 +4776,7 @@ LRESULT APIENTRY MainWndProc(
                        zoomTelescopeStep = ZOOM_LEVEL_STEP_IN;
                        zoomTelescopeTarget = g_ZoomLevels[g_SliderZoomLevel];
                        if( g_AnimateZoom )
-                        {
                            zoomLevel = static_cast<float>(1.0) * zoomTelescopeStep;
-                            g_TelescopingZoomLastTick = GetTickCount64();
-                        }
                        else
                            zoomLevel = zoomTelescopeTarget;
                        SetTimer( hWnd, 1, ZOOM_LEVEL_STEP_TIME, NULL );
@@ -4928,7 +4794,6 @@ LRESULT APIENTRY MainWndProc(
                        // Start telescoping zoom.
                        zoomTelescopeStep = ZOOM_LEVEL_STEP_OUT;
                        zoomTelescopeTarget = 1.0;
-                        g_TelescopingZoomLastTick = GetTickCount64();
                        SetTimer( hWnd, 2, ZOOM_LEVEL_STEP_TIME, NULL );

                    } else {
@@ -5605,14 +5470,6 @@ LRESULT APIENTRY MainWndProc(
            g_Zoomed, g_Drawing, g_Tracing);

        OutputDebug(L"Window visible: %d Topmost: %d\n", IsWindowVisible(hWnd), GetWindowLong(hWnd, GWL_EXSTYLE)& WS_EX_TOPMOST);
-        if( g_Zoomed && g_TelescopingZoomLastTick != 0ull && !g_Drawing && !g_Tracing )
-        {
-            ULONG64 now = GetTickCount64();
-            if( now - g_TelescopingZoomLastTick >= ZOOM_LEVEL_STEP_TIME )
-            {
-                doTelescopingZoomTimer( false );
-            }
-        }

        if( g_Zoomed && (g_TypeMode == TypeModeOff) && !g_bSaveInProgress ) {

@@ -6371,17 +6228,6 @@ LRESULT APIENTRY MainWndProc(
    {
        // Reload the settings. This message is called from PowerToys after a setting is changed by the user.
        reg.ReadRegSettings(RegSettings);
-        
-        if (g_RecordingFormat == RecordingFormat::GIF)
-        {
-            g_RecordScaling = g_RecordScalingGIF;
-            g_RecordFrameRate = RECORDING_FORMAT_GIF_DEFAULT_FRAMERATE; 
-        }
-        else
-        {
-            g_RecordScaling = g_RecordScalingMP4;
-            g_RecordFrameRate = RECORDING_FORMAT_MP4_DEFAULT_FRAMERATE;
-        }

        // Apply tray icon setting
        EnableDisableTrayIcon(hWnd, g_ShowTrayIcon);
@@ -6490,10 +6336,12 @@ LRESULT APIENTRY MainWndProc(
                GetCursorPos(&local_savedCursorPos);
            }

-            // Determine the user's desired save area in zoomed viewport coordinates.
-            // This will be the entire viewport if the user does not select a crop
-            // rectangle.
-            int copyX = 0, copyY = 0, copyWidth = width, copyHeight = height;
+            HBITMAP     hInterimSaveBitmap;
+            HDC         hInterimSaveDc;
+            HBITMAP     hSaveBitmap;
+            HDC         hSaveDc;
+            int         copyX, copyY;
+            int         copyWidth, copyHeight;

            if ( LOWORD( wParam ) == IDC_SAVE_CROP )
            {
@@ -6508,51 +6356,55 @@ LRESULT APIENTRY MainWndProc(
                    }
                    break;
                }
-
                auto copyRc = selectRectangle.SelectedRect();
                selectRectangle.Stop();
                g_RecordCropping = FALSE;
-
                copyX = copyRc.left;
                copyY = copyRc.top;
                copyWidth = copyRc.right - copyRc.left;
                copyHeight = copyRc.bottom - copyRc.top;
            }
+            else
+            {
+                copyX = 0;
+                copyY = 0;
+                copyWidth = width;
+                copyHeight = height;
+            }
            OutputDebug( L"***x: %d, y: %d, width: %d, height: %d\n", copyX, copyY, copyWidth, copyHeight );

            RECT oldClipRect{};
            GetClipCursor( &oldClipRect );
            ClipCursor( NULL );

-            // Translate the viewport selection into coordinates for the 1:1 source
-            // bitmap hdcScreenCompat.
-            int viewportX, viewportY;
-            GetZoomedTopLeftCoordinates(
-                zoomLevel, &cursorPos, &viewportX, width, &viewportY, height );
+            // Capture the screen before displaying the save dialog
+            hInterimSaveDc = CreateCompatibleDC( hdcScreen );
+            hInterimSaveBitmap = CreateCompatibleBitmap( hdcScreen, copyWidth, copyHeight );
+            SelectObject( hInterimSaveDc, hInterimSaveBitmap );

-            int saveX = viewportX + static_cast<int>( copyX / zoomLevel );
-            int saveY = viewportY + static_cast<int>( copyY / zoomLevel );
-            int saveWidth = static_cast<int>( copyWidth / zoomLevel );
-            int saveHeight = static_cast<int>( copyHeight / zoomLevel );
+            hSaveDc = CreateCompatibleDC( hdcScreen );
+#if SCALE_HALFTONE
+            SetStretchBltMode( hInterimSaveDc, HALFTONE );
+            SetStretchBltMode( hSaveDc, HALFTONE );
+#else
+            // Use HALFTONE for better quality when smooth image is enabled
+            if (g_SmoothImage) {
+                SetStretchBltMode( hInterimSaveDc, HALFTONE );
+                SetStretchBltMode( hSaveDc, HALFTONE );
+            } else {
+                SetStretchBltMode( hInterimSaveDc, COLORONCOLOR );
+                SetStretchBltMode( hSaveDc, COLORONCOLOR );
+            }
+#endif
+            StretchBlt( hInterimSaveDc,
+                        0, 0,
+                        copyWidth, copyHeight,
+                        hdcScreen,
+                        monInfo.rcMonitor.left + copyX,
+                        monInfo.rcMonitor.top + copyY,
+                        copyWidth, copyHeight,
+                        SRCCOPY|CAPTUREBLT );

-            // Create a pixel-accurate copy of the desired area from the source bitmap.
-            wil::unique_hdc hdcActualSize( CreateCompatibleDC( hdcScreen ) );
-            wil::unique_hbitmap hbmActualSize(
-                CreateCompatibleBitmap( hdcScreen, saveWidth, saveHeight ) );
-            // Note: we do not need to restore the existing context later. The objects
-            // are transient and not reused.
-            SelectObject( hdcActualSize.get(), hbmActualSize.get() );
-
-            // Perform a direct 1:1 copy from the backing bitmap.
-            BitBlt( hdcActualSize.get(),
-                    0, 0,
-                    saveWidth, saveHeight,
-                    hdcScreenCompat,
-                    saveX, saveY,
-                    SRCCOPY | CAPTUREBLT );
-
-            // Open the Save As dialog and capture the desired file path and whether to
-            // save the zoomed display or the source bitmap pixels.
            g_bSaveInProgress = true;
            memset( &openFileName, 0, sizeof(openFileName ));
            openFileName.lStructSize       = OPENFILENAME_SIZE_VERSION_400;
@@ -6568,7 +6420,6 @@ LRESULT APIENTRY MainWndProc(
                                             "Actual size PNG\0*.png\0\0";
                                             //"Actual size BMP\0*.bmp\0\0";
            openFileName.lpstrFile			= filePath;
-
            if( GetSaveFileName( &openFileName ) )
            {
                TCHAR targetFilePath[MAX_PATH];
@@ -6578,47 +6429,42 @@ LRESULT APIENTRY MainWndProc(
                    _tcscat( targetFilePath, L".png" );
                }

-                if( openFileName.nFilterIndex == 2 )
+                // Save image at screen size
+                if( openFileName.nFilterIndex == 1 )
                {
-                    // Save at actual size.
-                    SavePng( targetFilePath, hbmActualSize.get() );
+                    SavePng( targetFilePath, hInterimSaveBitmap );
                }
+                // Save image scaled down to actual size
                else
                {
-                    // Save zoomed-in image at screen resolution.
-#if SCALE_HALFTONE
-                    const int bltMode = HALFTONE;
-#else
-                    // Use HALFTONE for better quality when smooth image is enabled
-                    const int bltMode = g_SmoothImage ? HALFTONE : COLORONCOLOR;
-#endif
-                    // Recreate the zoomed-in view by upscaling from our source bitmap.
-                    wil::unique_hdc hdcZoomed( CreateCompatibleDC(hdcScreen) );
-                    wil::unique_hbitmap hbmZoomed(
-                        CreateCompatibleBitmap( hdcScreen, copyWidth, copyHeight ) );
-                    SelectObject( hdcZoomed.get(), hbmZoomed.get() );
+                    int saveWidth = static_cast<int>( copyWidth / zoomLevel );
+                    int saveHeight = static_cast<int>( copyHeight / zoomLevel );

-                    SetStretchBltMode( hdcZoomed.get(), bltMode );
+                    hSaveBitmap = CreateCompatibleBitmap( hdcScreen, saveWidth, saveHeight );
+                    SelectObject( hSaveDc, hSaveBitmap );

-                    StretchBlt( hdcZoomed.get(),
-                                0, 0,
-                                copyWidth, copyHeight,
-                                hdcActualSize.get(),
+                    StretchBlt( hSaveDc,
                                0, 0,
                                saveWidth, saveHeight,
+                                hInterimSaveDc,
+                                0,
+                                0,
+                                copyWidth, copyHeight,
                                SRCCOPY | CAPTUREBLT );

-                    SavePng( targetFilePath, hbmZoomed.get() );
+                    SavePng( targetFilePath, hSaveBitmap );
                }
            }
            g_bSaveInProgress = false;

+            DeleteDC( hInterimSaveDc );
+            DeleteDC( hSaveDc );
+
            if( lParam != SHALLOW_ZOOM )
            {
-                SetCursorPos( local_savedCursorPos.x, local_savedCursorPos.y );
+                SetCursorPos(local_savedCursorPos.x, local_savedCursorPos.y);
            }
            ClipCursor( &oldClipRect );
-
            break;
        }

@@ -6889,7 +6735,88 @@ LRESULT APIENTRY MainWndProc(

        case 2:
        case 1:
-            doTelescopingZoomTimer();
+            //
+            // Telescoping zoom timer
+            //
+            if( zoomTelescopeStep ) {
+
+                zoomLevel *= zoomTelescopeStep;
+                if( (zoomTelescopeStep > 1 && zoomLevel >= zoomTelescopeTarget ) ||
+                    (zoomTelescopeStep < 1 && zoomLevel <= zoomTelescopeTarget )) {
+
+                    zoomLevel = zoomTelescopeTarget;
+                    KillTimer( hWnd, wParam );
+                    OutputDebug( L"SETCURSOR mon_left: %x mon_top: %x x: %d y: %d\n",
+                            monInfo.rcMonitor.left, monInfo.rcMonitor.top, cursorPos.x, cursorPos.y );
+                    SetCursorPos( monInfo.rcMonitor.left + cursorPos.x,
+                                        monInfo.rcMonitor.top + cursorPos.y );
+                }
+
+            } else {
+
+                // Case where we didn't zoom at all
+                KillTimer( hWnd, wParam );
+            }
+            if( wParam == 2 && zoomLevel == 1 ) {
+
+                g_Zoomed = FALSE;
+                if( g_ZoomOnLiveZoom )
+                {
+                    GetCursorPos( &cursorPos );
+                    cursorPos = ScalePointInRects( cursorPos, monInfo.rcMonitor, g_LiveZoomSourceRect );
+                    SetCursorPos( cursorPos.x, cursorPos.y );
+                    SendMessage(hWnd, WM_HOTKEY, LIVE_HOTKEY, 0);
+                }
+                else if( lParam != SHALLOW_ZOOM )
+                {
+                    // Figure out where final unzoomed cursor should be
+                    if (g_Drawing) {
+                        cursorPos = prevPt;
+                    }
+                    OutputDebug(L"FINAL MOUSE: x: %d y: %d\n", cursorPos.x, cursorPos.y );
+                    GetZoomedTopLeftCoordinates(zoomLevel, &cursorPos, &x, width, &y, height);
+                    cursorPos.x = monInfo.rcMonitor.left + x + static_cast<int>((cursorPos.x - x) * zoomLevel);
+                    cursorPos.y = monInfo.rcMonitor.top + y + static_cast<int>((cursorPos.y - y) * zoomLevel);
+                    SetCursorPos(cursorPos.x, cursorPos.y);
+                }
+                if( hTargetWindow ) {
+
+                    SetWindowPos( hTargetWindow, HWND_BOTTOM, rcTargetWindow.left, rcTargetWindow.top,
+                            rcTargetWindow.right - rcTargetWindow.left,
+                            rcTargetWindow.bottom - rcTargetWindow.top, 0 );
+                    hTargetWindow = NULL;
+                }
+                DeleteDrawUndoList( &drawUndoList );
+
+                // Restore live zoom if we came from that mode
+                if( g_ZoomOnLiveZoom ) {
+
+                    SendMessage( g_hWndLiveZoom, WM_USER_SET_ZOOM, static_cast<WPARAM>(g_LiveZoomLevel), reinterpret_cast<LPARAM>(&g_LiveZoomSourceRect) );
+                    g_ZoomOnLiveZoom = FALSE;
+                    forcePenResize = TRUE;
+                }
+
+                SetForegroundWindow( g_ActiveWindow );
+                ClipCursor( NULL );
+                g_HaveDrawn = FALSE;
+                g_TypeMode = TypeModeOff;
+                g_HaveTyped = FALSE;
+                g_Drawing = FALSE;
+                EnableDisableStickyKeys( TRUE );
+                DeleteObject( hTypingFont );
+                DeleteDC( hdcScreen );
+                DeleteDC( hdcScreenCompat );
+                DeleteDC( hdcScreenCursorCompat );
+                DeleteDC( hdcScreenSaveCompat );
+                DeleteObject( hbmpCompat );
+                DeleteObject( hbmpCursorCompat );
+                DeleteObject( hbmpDrawingCompat );
+                DeleteObject( hDrawingPen );
+
+                SetFocus( g_ActiveWindow );
+                ShowWindow( hWnd, SW_HIDE );
+            }
+            InvalidateRect( hWnd, NULL, FALSE );
            break;

        case 3:
--- a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj
+++ b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj
@@ -29,7 +29,6 @@
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -40,7 +39,6 @@
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>MaxSpeed</Optimization>
      <SDLCheck>false</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
    </ClCompile>
--- a/src/modules/awake/Awake/Core/Manager.cs
+++ b/src/modules/awake/Awake/Core/Manager.cs
@@ -350,7 +350,7 @@ namespace Awake.Core
                            TrayHelper.TimedIcon,
                            TrayIconAction.Update);
                    },
-                    () => HandleTimerCompletion("timed"),
+                    _ => HandleTimerCompletion("timed"),
                    _tokenSource.Token);
        }

--- a/src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj
+++ b/src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj
@@ -141,43 +141,4 @@
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
  </Target>
-
-  <!-- BEGIN common.build.post.props -->
-  <!--
-    The Hybrid CRT model statically links the runtime and STL and dynamically
-    links the UCRT instead of the VC++ CRT. The UCRT ships with Windows.
-    WinAppSDK asserts that this is "supported according to the CRT maintainer."
-
-    This must come before Microsoft.Cpp.targets because it manipulates ClCompile.RuntimeLibrary.
-  -->
-  <ItemDefinitionGroup Condition="'$(EnableHybridCRT)'=='true' and '$(Configuration)'=='Debug'">
-    <ClCompile>
-      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(EnableHybridCRT)'=='true' and ('$(Configuration)'=='Release' or '$(Configuration)'=='AuditMode')">
-    <ClCompile>
-      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <!-- END common.build.post.props -->
-
 </Project>
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs
@@ -64,8 +64,6 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext

    public string Title { get => string.IsNullOrEmpty(field) ? Name : field; protected set; } = string.Empty;

-    public string Id { get; protected set; } = string.Empty;
-
    // This property maps to `IPage.IsLoading`, but we want to expose our own
    // `IsLoading` property as a combo of this value and `IsInitialized`
    public bool ModelIsLoading { get; protected set; } = true;
@@ -144,7 +142,6 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
            return; // throw?
        }

-        Id = page.Id;
        Name = page.Name;
        ModelIsLoading = page.IsLoading;
        Title = page.Title;
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Events/OpenPage.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Events/OpenPage.cs
@@ -15,12 +15,9 @@ public class OpenPage : EventBase, IEvent
 {
    public int PageDepth { get; set; }

-    public string Id { get; set; }
-
-    public OpenPage(int pageDepth, string id)
+    public OpenPage(int pageDepth)
    {
        PageDepth = pageDepth;
-        Id = id;

        EventName = "CmdPal_OpenPage";
    }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
@@ -21,6 +21,7 @@ using Microsoft.PowerToys.Telemetry;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Automation.Peers;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media.Animation;
@@ -159,7 +160,7 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
                new AsyncNavigationRequest(message.Page, message.CancellationToken),
                message.WithAnimation ? DefaultPageAnimation : _noAnimation);

-            PowerToysTelemetry.Log.WriteEvent(new OpenPage(RootFrame.BackStackDepth, message.Page.Id));
+            PowerToysTelemetry.Log.WriteEvent(new OpenPage(RootFrame.BackStackDepth));

            if (!ViewModel.IsNested)
            {
@@ -654,15 +655,15 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
                e.Handled = true;
                break;
            default:
-                {
-                    // The CommandBar is responsible for handling all the item keybindings,
-                    // since the bound context item may need to then show another
-                    // context menu
-                    TryCommandKeybindingMessage msg = new(ctrlPressed, altPressed, shiftPressed, winPressed, e.Key);
-                    WeakReferenceMessenger.Default.Send(msg);
-                    e.Handled = msg.Handled;
-                    break;
-                }
+            {
+                // The CommandBar is responsible for handling all the item keybindings,
+                // since the bound context item may need to then show another
+                // context menu
+                TryCommandKeybindingMessage msg = new(ctrlPressed, altPressed, shiftPressed, winPressed, e.Key);
+                WeakReferenceMessenger.Default.Send(msg);
+                e.Handled = msg.Handled;
+                break;
+            }
        }
    }

--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
@@ -429,7 +429,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
    <value>More</value>
  </data>
  <data name="Run_Radio_Position_LastPosition.Content" xml:space="preserve">
-    <value>Last position</value>
+    <value>Last Position</value>
    <comment>Reopen the window where it was last closed</comment>
  </data>
  <data name="TrayMenu_Settings" xml:space="preserve">
--- a/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
+++ b/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
@@ -74,35 +74,11 @@
    <ClCompile>
      <LanguageStandard>stdcpp20</LanguageStandard>
    </ClCompile>
-    <ClCompile>
-      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib /profile /opt:ref /opt:icf</AdditionalOptions>
-    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
    <ClCompile>
      <LanguageStandard>stdcpp20</LanguageStandard>
    </ClCompile>
-    <ClCompile>
-      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib /profile /opt:ref /opt:icf</AdditionalOptions>
-    </Link>
  </ItemDefinitionGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj
@@ -68,34 +68,6 @@
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib /profile /opt:ref /opt:icf</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib /profile /opt:ref /opt:icf</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
--- a/src/modules/fancyzones/FancyZones/FancyZones.vcxproj
+++ b/src/modules/fancyzones/FancyZones/FancyZones.vcxproj
@@ -26,7 +26,6 @@
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -37,7 +36,6 @@
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>MaxSpeed</Optimization>
      <SDLCheck>false</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
    </ClCompile>
--- a/src/modules/imageresizer/ui/ImageResizerUI.csproj
+++ b/src/modules/imageresizer/ui/ImageResizerUI.csproj
@@ -24,13 +24,13 @@
    <ApplicationIcon>Resources\ImageResizer.ico</ApplicationIcon>
  </PropertyGroup>

-  <!-- <PropertyGroup>
+  <PropertyGroup>
    <ApplicationManifest>ImageResizerUI.dev.manifest</ApplicationManifest>
  </PropertyGroup>

  <PropertyGroup Condition="'$(CIBuild)'=='true'">
    <ApplicationManifest>ImageResizerUI.prod.manifest</ApplicationManifest>
-  </PropertyGroup> -->
+  </PropertyGroup>

  <ItemGroup>
    <EmbeddedResource Update="Properties\Resources.resx">
--- a/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj
+++ b/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj
@@ -30,7 +30,6 @@
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -41,7 +40,6 @@
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Optimization>MaxSpeed</Optimization>
      <SDLCheck>false</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
    </ClCompile>
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Images/oneNote.dark.png
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Images/oneNote.dark.png
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Images/oneNote.light.png
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Images/oneNote.light.png
--- a/src/modules/powerrename/PowerRename.FuzzingTest/PowerRename.FuzzingTest.vcxproj
+++ b/src/modules/powerrename/PowerRename.FuzzingTest/PowerRename.FuzzingTest.vcxproj
@@ -44,7 +44,6 @@
      <ConformanceMode>true</ConformanceMode>
      <PrecompiledHeader>NotUsing</PrecompiledHeader>
      <AdditionalOptions>/fsanitize=address /fsanitize-coverage=inline-8bit-counters /fsanitize-coverage=edge /fsanitize-coverage=trace-cmp /fsanitize-coverage=trace-div %(AdditionalOptions)</AdditionalOptions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <LanguageStandard>stdcpplatest</LanguageStandard>
      <AdditionalIncludeDirectories>..\;..\lib\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
--- a/src/runner/main.cpp
+++ b/src/runner/main.cpp
@@ -161,7 +161,7 @@ int runner(bool isProcessElevated, bool openSettings, std::string settingsWindow
            L"PowerToys.MouseJump.dll",
            L"PowerToys.AlwaysOnTopModuleInterface.dll",
            L"PowerToys.MousePointerCrosshairs.dll",
-            // L"PowerToys.CursorWrap.dll",
+            L"PowerToys.CursorWrap.dll",
            L"PowerToys.PowerAccentModuleInterface.dll",
            L"PowerToys.PowerOCRModuleInterface.dll",
            L"PowerToys.AdvancedPasteModuleInterface.dll",
--- a/src/settings-ui/Settings.UI.Library/AIProviderConfigurationSnapshot.cs
+++ b/src/settings-ui/Settings.UI.Library/AIProviderConfigurationSnapshot.cs
@@ -0,0 +1,35 @@
+// 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.Text.Json.Serialization;
+
+namespace Microsoft.PowerToys.Settings.UI.Library
+{
+    /// <summary>
+    /// Stores provider-specific configuration overrides so each AI service can keep distinct settings.
+    /// </summary>
+    public class AIProviderConfigurationSnapshot
+    {
+        [JsonPropertyName("model-name")]
+        public string ModelName { get; set; } = string.Empty;
+
+        [JsonPropertyName("endpoint-url")]
+        public string EndpointUrl { get; set; } = string.Empty;
+
+        [JsonPropertyName("api-version")]
+        public string ApiVersion { get; set; } = string.Empty;
+
+        [JsonPropertyName("deployment-name")]
+        public string DeploymentName { get; set; } = string.Empty;
+
+        [JsonPropertyName("model-path")]
+        public string ModelPath { get; set; } = string.Empty;
+
+        [JsonPropertyName("system-prompt")]
+        public string SystemPrompt { get; set; } = string.Empty;
+
+        [JsonPropertyName("moderation-enabled")]
+        public bool ModerationEnabled { get; set; } = true;
+    }
+}
--- a/src/settings-ui/Settings.UI.Library/AIServiceTypeRegistry.cs
+++ b/src/settings-ui/Settings.UI.Library/AIServiceTypeRegistry.cs
@@ -19,7 +19,7 @@ public static class AIServiceTypeRegistry
        {
            ServiceType = AIServiceType.AzureAIInference,
            DisplayName = "Azure AI Inference",
-            IconPath = "ms-appx:///Assets/Settings/Icons/Models/Azure.svg",
+            IconPath = "ms-appx:///Assets/Settings/Icons/Models/FoundryLocal.svg", // No icon for Azure AI Inference, use Foundry Local temporarily
            IsOnlineService = true,
            LegalDescription = "AdvancedPaste_AzureAIInference_LegalDescription",
            TermsLabel = "AdvancedPaste_AzureAIInference_TermsLabel",
--- a/src/settings-ui/Settings.UI.Library/AdvancedPasteMigrationHelper.cs
+++ b/src/settings-ui/Settings.UI.Library/AdvancedPasteMigrationHelper.cs
@@ -1,105 +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.ObjectModel;
-using System.Linq;
-
-namespace Microsoft.PowerToys.Settings.UI.Library
-{
-    /// <summary>
-    /// Helper methods for migrating legacy Advanced Paste settings to the updated schema.
-    /// </summary>
-    public static class AdvancedPasteMigrationHelper
-    {
-        /// <summary>
-        /// Ensures an OpenAI provider exists in the configuration, creating one if necessary.
-        /// </summary>
-        /// <param name="configuration">The configuration instance.</param>
-        /// <returns>The ensured provider and a flag indicating whether changes were made.</returns>
-        public static (PasteAIProviderDefinition Provider, bool Updated) EnsureOpenAIProvider(PasteAIConfiguration configuration)
-        {
-            if (configuration is null)
-            {
-                return (null, false);
-            }
-
-            configuration.Providers ??= new ObservableCollection<PasteAIProviderDefinition>();
-
-            const string serviceTypeKey = "OpenAI";
-            var existingProvider = configuration.Providers.FirstOrDefault(provider => string.Equals(provider.ServiceType, serviceTypeKey, StringComparison.OrdinalIgnoreCase));
-            bool updated = false;
-
-            if (existingProvider is null)
-            {
-                existingProvider = CreateProvider(serviceTypeKey);
-                configuration.Providers.Add(existingProvider);
-                updated = true;
-            }
-
-            updated |= EnsureActiveProviderIsValid(configuration, existingProvider);
-
-            return (existingProvider, updated);
-        }
-
-        /// <summary>
-        /// Creates a provider with default values for the requested service type.
-        /// </summary>
-        private static PasteAIProviderDefinition CreateProvider(string serviceTypeKey)
-        {
-            var serviceType = serviceTypeKey.ToAIServiceType();
-            var metadata = AIServiceTypeRegistry.GetMetadata(serviceType);
-            var provider = new PasteAIProviderDefinition
-            {
-                ServiceType = serviceTypeKey,
-                ModelName = PasteAIProviderDefaults.GetDefaultModelName(serviceType),
-                EndpointUrl = string.Empty,
-                ApiVersion = string.Empty,
-                DeploymentName = string.Empty,
-                ModelPath = string.Empty,
-                SystemPrompt = string.Empty,
-                ModerationEnabled = serviceType == AIServiceType.OpenAI,
-                IsLocalModel = metadata.IsLocalModel,
-            };
-
-            return provider;
-        }
-
-        private static bool EnsureActiveProviderIsValid(PasteAIConfiguration configuration, PasteAIProviderDefinition preferredProvider = null)
-        {
-            if (configuration?.Providers is null || configuration.Providers.Count == 0)
-            {
-                if (!string.IsNullOrWhiteSpace(configuration?.ActiveProviderId))
-                {
-                    configuration.ActiveProviderId = string.Empty;
-                    return true;
-                }
-
-                return false;
-            }
-
-            bool updated = false;
-
-            var activeProvider = configuration.Providers.FirstOrDefault(provider => string.Equals(provider.Id, configuration.ActiveProviderId, StringComparison.OrdinalIgnoreCase));
-            if (activeProvider is null)
-            {
-                activeProvider = preferredProvider ?? configuration.Providers.First();
-                configuration.ActiveProviderId = activeProvider.Id;
-                updated = true;
-            }
-
-            foreach (var provider in configuration.Providers)
-            {
-                bool shouldBeActive = string.Equals(provider.Id, configuration.ActiveProviderId, StringComparison.OrdinalIgnoreCase);
-                if (provider.IsActive != shouldBeActive)
-                {
-                    provider.IsActive = shouldBeActive;
-                    updated = true;
-                }
-            }
-
-            return updated;
-        }
-    }
-}
--- a/src/settings-ui/Settings.UI.Library/AdvancedPasteProperties.cs
+++ b/src/settings-ui/Settings.UI.Library/AdvancedPasteProperties.cs
@@ -27,48 +27,35 @@ namespace Microsoft.PowerToys.Settings.UI.Library
            IsAIEnabled = false;
            ShowCustomPreview = true;
            CloseAfterLosingFocus = false;
-            EnableClipboardPreview = true;
            PasteAIConfiguration = new();
        }

        [JsonConverter(typeof(BoolPropertyJsonConverter))]
        public bool IsAIEnabled { get; set; }

-        private bool? _legacyAdvancedAIEnabled;
-
-        [JsonPropertyName("IsAdvancedAIEnabled")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public BoolProperty LegacyAdvancedAIEnabledProperty
+        [JsonExtensionData]
+        public Dictionary<string, JsonElement> ExtensionData
        {
-            get => null;
+            get => _extensionData;
            set
            {
-                if (value is not null)
+                _extensionData = value;
+
+                if (_extensionData != null && _extensionData.TryGetValue("IsOpenAIEnabled", out var legacyElement) && legacyElement.ValueKind == JsonValueKind.Object && legacyElement.TryGetProperty("value", out var valueElement))
                {
-                    LegacyAdvancedAIEnabled = value.Value;
+                    IsAIEnabled = valueElement.ValueKind switch
+                    {
+                        JsonValueKind.True => true,
+                        JsonValueKind.False => false,
+                        _ => IsAIEnabled,
+                    };
+
+                    _extensionData.Remove("IsOpenAIEnabled");
                }
            }
        }

-        [JsonIgnore]
-        public bool? LegacyAdvancedAIEnabled
-        {
-            get => _legacyAdvancedAIEnabled;
-            private set => _legacyAdvancedAIEnabled = value;
-        }
-
-        public bool TryConsumeLegacyAdvancedAIEnabled(out bool value)
-        {
-            if (_legacyAdvancedAIEnabled is bool flag)
-            {
-                value = flag;
-                _legacyAdvancedAIEnabled = null;
-                return true;
-            }
-
-            value = default;
-            return false;
-        }
+        private Dictionary<string, JsonElement> _extensionData;

        [JsonConverter(typeof(BoolPropertyJsonConverter))]
        public bool ShowCustomPreview { get; set; }
@@ -76,9 +63,6 @@ namespace Microsoft.PowerToys.Settings.UI.Library
        [JsonConverter(typeof(BoolPropertyJsonConverter))]
        public bool CloseAfterLosingFocus { get; set; }

-        [JsonConverter(typeof(BoolPropertyJsonConverter))]
-        public bool EnableClipboardPreview { get; set; }
-
        [JsonPropertyName("advanced-paste-ui-hotkey")]
        public HotkeySettings AdvancedPasteUIShortcut { get; set; }

--- a/src/settings-ui/Settings.UI.Library/PasteAIConfiguration.cs
+++ b/src/settings-ui/Settings.UI.Library/PasteAIConfiguration.cs
@@ -20,6 +20,8 @@ namespace Microsoft.PowerToys.Settings.UI.Library
    {
        private string _activeProviderId = string.Empty;
        private ObservableCollection<PasteAIProviderDefinition> _providers = new();
+        private bool _useSharedCredentials = true;
+        private Dictionary<string, AIProviderConfigurationSnapshot> _legacyProviderConfigurations;

        public event PropertyChangedEventHandler PropertyChanged;

@@ -37,6 +39,21 @@ namespace Microsoft.PowerToys.Settings.UI.Library
            set => SetProperty(ref _providers, value ?? new ObservableCollection<PasteAIProviderDefinition>());
        }

+        [JsonPropertyName("use-shared-credentials")]
+        public bool UseSharedCredentials
+        {
+            get => _useSharedCredentials;
+            set => SetProperty(ref _useSharedCredentials, value);
+        }
+
+        [JsonPropertyName("provider-configurations")]
+        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+        public Dictionary<string, AIProviderConfigurationSnapshot> LegacyProviderConfigurations
+        {
+            get => _legacyProviderConfigurations;
+            set => _legacyProviderConfigurations = value;
+        }
+
        [JsonIgnore]
        public PasteAIProviderDefinition ActiveProvider
        {
--- a/src/settings-ui/Settings.UI.Library/PasteAIProviderDefaults.cs
+++ b/src/settings-ui/Settings.UI.Library/PasteAIProviderDefaults.cs
@@ -1,29 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.PowerToys.Settings.UI.Library
-{
-    /// <summary>
-    /// Provides default values for Paste AI provider definitions.
-    /// </summary>
-    public static class PasteAIProviderDefaults
-    {
-        /// <summary>
-        /// Gets the default model name for a given AI service type.
-        /// </summary>
-        public static string GetDefaultModelName(AIServiceType serviceType)
-        {
-            return serviceType switch
-            {
-                AIServiceType.OpenAI => "gpt-4o",
-                AIServiceType.AzureOpenAI => "gpt-4o",
-                AIServiceType.Mistral => "mistral-large-latest",
-                AIServiceType.Google => "gemini-1.5-pro",
-                AIServiceType.AzureAIInference => "gpt-4o-mini",
-                AIServiceType.Ollama => "llama3",
-                _ => string.Empty,
-            };
-        }
-    }
-}
--- a/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/FoundryLocal.svg
+++ b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/FoundryLocal.svg
@@ -1,34 +1,59 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.2663 0H0.231885C0.103572 0 0 0.10358 0 0.231885V2.55072C0 2.67904 0.103572 2.78261 0.231885 2.78261H12.5217C12.9059 2.78261 13.2174 3.09411 13.2174 3.47826V3.18995C13.2174 1.53971 11.9861 0 10.2663 0Z" fill="url(#paint0_linear_178_3940)"/>
-<path d="M12.2334 0.81543C12.8633 1.44693 13.2174 2.29872 13.2174 3.19069V15.7689C13.2174 15.8972 13.3209 16.0007 13.4492 16.0007H15.7681C15.8964 16.0007 16 15.8972 16 15.7689V5.73524C16 4.99707 15.707 4.28983 15.1853 3.76732L12.2334 0.81543Z" fill="url(#paint1_linear_178_3940)"/>
-<path d="M6.78804 3.47852H0.231885C0.103572 3.47852 0 3.58209 0 3.71039V6.02921C0 6.1575 0.103572 6.26112 0.231885 6.26112H9.04346C9.42759 6.26112 9.7391 6.57263 9.7391 6.95676V6.6685C9.7391 5.01822 8.50778 3.47852 6.78804 3.47852Z" fill="url(#paint2_linear_178_3940)"/>
-<path d="M8.75537 4.29297C9.38531 4.92446 9.73928 5.77628 9.73928 6.6682V15.7681C9.73928 15.8964 9.8429 16 9.97119 16H12.29C12.4183 16 12.5219 15.8964 12.5219 15.7681V9.21281C12.5219 8.47462 12.229 7.76735 11.7072 7.24482L8.75537 4.29297Z" fill="url(#paint3_linear_178_3940)"/>
-<path d="M3.30975 6.95703H0.231885C0.103572 6.95703 0 7.06056 0 7.18886V9.50771C0 9.63609 0.103572 9.73962 0.231885 9.73962H5.56521C5.94936 9.73962 6.26087 10.0511 6.26087 10.4353V10.147C6.26087 8.49675 5.02956 6.95703 3.30975 6.95703Z" fill="url(#paint4_linear_178_3940)"/>
-<path d="M5.27686 7.77148C5.90677 8.40302 6.26083 9.25477 6.26083 10.1468V15.7684C6.26083 15.8967 6.36436 16.0003 6.49274 16.0003H8.8115C8.93988 16.0003 9.04341 15.8967 9.04341 15.7684V12.6913C9.04341 11.9531 8.75051 11.2459 8.22874 10.7234L5.27686 7.77148Z" fill="url(#paint5_linear_178_3940)"/>
+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2092_1741)">
+<mask id="mask0_2092_1741" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="17" height="16">
+<path d="M16.5 0H0.5V16H16.5V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_2092_1741)">
+<mask id="mask1_2092_1741" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="-1" y="-2" width="19" height="20">
+<path d="M17.8337 -1.33337H-0.833008V17.3333H17.8337V-1.33337Z" fill="white"/>
+</mask>
+<g mask="url(#mask1_2092_1741)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.1137 0.315668C11.57 0.315668 11.9744 0.657891 12.1196 1.15567C12.2648 1.65345 13.1152 4.73345 13.1152 4.73345V10.852H10.0352L10.0974 0.305298H11.1137V0.315668Z" fill="url(#paint0_linear_2092_1741)"/>
+<path d="M15.6352 5.09586C15.6352 4.87808 15.4589 4.71216 15.2515 4.71216H13.4366C12.1611 4.71216 11.124 5.7492 11.124 7.02472V10.8618H13.3226C14.5982 10.8618 15.6352 9.82472 15.6352 8.54919V5.09586Z" fill="url(#paint1_linear_2092_1741)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.1133 0.315674C10.7607 0.315674 10.4807 0.595674 10.4807 0.948265L10.4185 12.5942C10.4185 14.2949 9.0392 15.6742 7.33847 15.6742H1.74885C1.47921 15.6742 1.30292 15.4149 1.38589 15.1661L5.86589 2.37938C6.30144 1.14531 7.46293 0.315674 8.7696 0.315674H11.1237H11.1133Z" fill="url(#paint2_linear_2092_1741)"/>
+</g>
+</g>
+</g>
 <defs>
-<linearGradient id="paint0_linear_178_3940" x1="13.2174" y1="3.15349" x2="0" y2="3.15349" gradientUnits="userSpaceOnUse">
-<stop stop-color="#2C08AC"/>
-<stop offset="0.8" stop-color="#4F42FD"/>
+<linearGradient id="paint0_linear_2092_1741" x1="12.3996" y1="11.0801" x2="9.80702" y2="0.699373" gradientUnits="userSpaceOnUse">
+<stop stop-color="#712575"/>
+<stop offset="0.09" stop-color="#9A2884"/>
+<stop offset="0.18" stop-color="#BF2C92"/>
+<stop offset="0.27" stop-color="#DA2E9C"/>
+<stop offset="0.34" stop-color="#EB30A2"/>
+<stop offset="0.4" stop-color="#F131A5"/>
+<stop offset="0.5" stop-color="#EC30A3"/>
+<stop offset="0.61" stop-color="#DF2F9E"/>
+<stop offset="0.72" stop-color="#C92D96"/>
+<stop offset="0.83" stop-color="#AA2A8A"/>
+<stop offset="0.95" stop-color="#83267C"/>
+<stop offset="1" stop-color="#712575"/>
 </linearGradient>
-<linearGradient id="paint1_linear_178_3940" x1="14.2303" y1="0.81543" x2="23.44" y2="11.9747" gradientUnits="userSpaceOnUse">
-<stop offset="0.3" stop-color="#7274FF"/>
-<stop offset="1" stop-color="#4F42FD"/>
+<linearGradient id="paint1_linear_2092_1741" x1="13.3848" y1="0.532897" x2="13.3848" y2="15.1759" gradientUnits="userSpaceOnUse">
+<stop stop-color="#DA7ED0"/>
+<stop offset="0.08" stop-color="#B17BD5"/>
+<stop offset="0.19" stop-color="#8778DB"/>
+<stop offset="0.3" stop-color="#6276E1"/>
+<stop offset="0.41" stop-color="#4574E5"/>
+<stop offset="0.54" stop-color="#2E72E8"/>
+<stop offset="0.67" stop-color="#1D71EB"/>
+<stop offset="0.81" stop-color="#1471EC"/>
+<stop offset="1" stop-color="#1171ED"/>
 </linearGradient>
-<linearGradient id="paint2_linear_178_3940" x1="9.7391" y1="6.63202" x2="0" y2="6.63202" gradientUnits="userSpaceOnUse">
-<stop stop-color="#2C08AC"/>
-<stop offset="0.8" stop-color="#4F42FD"/>
-</linearGradient>
-<linearGradient id="paint3_linear_178_3940" x1="10.7523" y1="4.29297" x2="17.3026" y2="14.5881" gradientUnits="userSpaceOnUse">
-<stop offset="0.3" stop-color="#7274FF"/>
-<stop offset="1" stop-color="#4F42FD"/>
-</linearGradient>
-<linearGradient id="paint4_linear_178_3940" x1="6.26087" y1="9.91172" x2="0" y2="9.91172" gradientUnits="userSpaceOnUse">
-<stop stop-color="#2C08AC"/>
-<stop offset="0.8" stop-color="#4F42FD"/>
-</linearGradient>
-<linearGradient id="paint5_linear_178_3940" x1="7.2738" y1="7.77148" x2="11.0624" y2="16.243" gradientUnits="userSpaceOnUse">
-<stop offset="0.3" stop-color="#7274FF"/>
-<stop offset="1" stop-color="#4F42FD"/>
+<linearGradient id="paint2_linear_2092_1741" x1="12.5029" y1="0.865306" x2="2.79625" y2="16.4313" gradientUnits="userSpaceOnUse">
+<stop stop-color="#DA7ED0"/>
+<stop offset="0.05" stop-color="#B77BD4"/>
+<stop offset="0.11" stop-color="#9079DA"/>
+<stop offset="0.18" stop-color="#6E77DF"/>
+<stop offset="0.25" stop-color="#5175E3"/>
+<stop offset="0.33" stop-color="#3973E7"/>
+<stop offset="0.42" stop-color="#2772E9"/>
+<stop offset="0.54" stop-color="#1A71EB"/>
+<stop offset="0.68" stop-color="#1371EC"/>
+<stop offset="1" stop-color="#1171ED"/>
 </linearGradient>
+<clipPath id="clip0_2092_1741">
+<rect width="16" height="16" fill="white" transform="translate(0.5)"/>
+</clipPath>
 </defs>
 </svg>
--- a/src/settings-ui/Settings.UI/Assets/Settings/Modules/CmdPal_Background.png
+++ b/src/settings-ui/Settings.UI/Assets/Settings/Modules/CmdPal_Background.png
--- a/src/settings-ui/Settings.UI/Assets/Settings/Modules/CmdPal_Hero.png
+++ b/src/settings-ui/Settings.UI/Assets/Settings/Modules/CmdPal_Hero.png
--- a/src/settings-ui/Settings.UI/Converters/StringToDouble.cs
+++ b/src/settings-ui/Settings.UI/Converters/StringToDouble.cs
@@ -1,33 +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.Globalization;
-using Microsoft.UI.Xaml.Data;
-
-namespace Microsoft.PowerToys.Settings.UI.Converters
-{
-    public partial class StringToDoubleConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is string s && double.TryParse(s, NumberStyles.Float, CultureInfo.InvariantCulture, out double result))
-            {
-                return result;
-            }
-
-            return 0.0;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            if (value is double d)
-            {
-                return d.ToString(CultureInfo.InvariantCulture);
-            }
-
-            return "0";
-        }
-    }
-}
--- a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
+++ b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
@@ -28,8 +28,6 @@
 		<None Remove="Assets\Settings\Icons\Models\WindowsML.svg" />
 		<None Remove="Assets\Settings\Modules\APDialog.dark.png" />
 		<None Remove="Assets\Settings\Modules\APDialog.light.png" />
-		<None Remove="Assets\Settings\Modules\CmdPal_Background.png" />
-		<None Remove="Assets\Settings\Modules\CmdPal_Hero.png" />
 		<None Remove="Assets\Settings\Modules\LightSwitch.png" />
 		<None Remove="SettingsXAML\Controls\Dashboard\CheckUpdateControl.xaml" />
 		<None Remove="SettingsXAML\Controls\Dashboard\ShortcutConflictControl.xaml" />
@@ -73,7 +71,6 @@
 	</ItemGroup>

 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView" />
 		<PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" />
 		<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" />
 		<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" />
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml
@@ -30,24 +30,6 @@
    </UserControl.Resources>

    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        <InfoBar
-            x:Uid="AdvancedPaste_FL_PreviewMessage"
-            Grid.Row="1"
-            Padding="4"
-            IsClosable="False"
-            IsOpen="True"
-            Message="Foundry Local is still in Public Preview">
-            <InfoBar.ActionButton>
-                <HyperlinkButton
-                    x:Uid="AdvancedPaste_FL_LearnMoreFoundryLocal"
-                    Content="Learn more"
-                    NavigateUri="https://learn.microsoft.com/azure/ai-foundry/foundry-local/what-is-foundry-local" />
-            </InfoBar.ActionButton>
-        </InfoBar>
        <StackPanel
            x:Name="LoadingPanel"
            HorizontalAlignment="Center"
@@ -60,9 +42,8 @@
                HorizontalAlignment="Center" />
            <TextBlock
                x:Name="LoadingStatusTextBlock"
-                x:Uid="AdvancedPaste_FL_LoadingStatus"
-                HorizontalAlignment="Center"
                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                Text="Loading Foundry Local status..."
                TextAlignment="Center"
                TextWrapping="Wrap" />
        </StackPanel>
@@ -75,6 +56,7 @@
                    <RowDefinition Height="Auto" />
                    <RowDefinition Height="Auto" />
                </Grid.RowDefinitions>
+
                <StackPanel
                    x:Name="NoModelsPanel"
                    Grid.Row="0"
@@ -82,28 +64,24 @@
                    HorizontalAlignment="Center"
                    Orientation="Vertical"
                    Spacing="4">
-                    <FontIcon
-                        AutomationProperties.AccessibilityView="Raw"
-                        FontSize="24"
-                        Glyph="&#xF158;" />
+                    <FontIcon FontSize="24" Glyph="&#xE74E;" />
                    <TextBlock
-                        x:Uid="AdvancedPaste_FL_NoModelsDownloaded"
                        HorizontalAlignment="Center"
                        Style="{StaticResource BodyStrongTextBlockStyle}"
+                        Text="No models downloaded"
                        TextAlignment="Center" />
                    <TextBlock
-                        x:Uid="AdvancedPaste_FL_RunFoundryLocalText"
                        HorizontalAlignment="Center"
                        FontSize="12"
                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        Text="Run Foundry Local to download or add a local model below."
                        TextAlignment="Center"
                        TextWrapping="Wrap" />
                    <Button
                        x:Name="LaunchFoundryModelListButton"
-                        x:Uid="AdvancedPaste_FL_OpenFoundryModelList"
-                        Margin="0,8,0,0"
                        HorizontalAlignment="Center"
                        Click="LaunchFoundryModelListButton_Click"
+                        Content="Open Foundry model list"
                        Style="{StaticResource AccentButtonStyle}" />
                </StackPanel>

@@ -123,10 +101,10 @@
                            SelectionChanged="CachedModelsComboBox_SelectionChanged">
                            <ComboBox.Header>
                                <TextBlock>
-                                    <Run x:Uid="AdvancedPaste_FL_LocalModel" /><LineBreak /><Run
-                                        x:Uid="AdvancedPaste_FL_UseCliToDownloadModels"
+                                    <Run Text="Foundry Local model" /><LineBreak /><Run
                                        FontSize="12"
-                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Text="Use the Foundry Local CLI to download models that run locally on-device. They'll appear here." />
                                </TextBlock>
                            </ComboBox.Header>
                        </ComboBox>
@@ -136,11 +114,9 @@
                            MinHeight="32"
                            VerticalAlignment="Bottom"
                            Click="RefreshModelsButton_Click"
-                            Style="{StaticResource SubtleButtonStyle}">
+                            Style="{StaticResource SubtleButtonStyle}"
+                            ToolTipService.ToolTip="Refresh model list">
                            <FontIcon FontSize="16" Glyph="&#xE72C;" />
-                            <ToolTipService.ToolTip>
-                                <TextBlock x:Uid="AdvancedPaste_FL_RefreshModelList" />
-                            </ToolTipService.ToolTip>
                        </Button>
                    </Grid>
                    <StackPanel
@@ -170,28 +146,24 @@
                Spacing="8">
                <Image Width="36" Source="ms-appx:///Assets/Settings/Icons/Models/FoundryLocal.svg" />
                <TextBlock
-                    x:Uid="AdvancedPaste_FL_FLNotAvailableYet"
-                    HorizontalAlignment="Center"
                    FontWeight="SemiBold"
+                    Text="Foundry Local is not available on this device yet."
                    TextAlignment="Center"
                    TextWrapping="Wrap" />
                <TextBlock
-                    x:Uid="AdvancedPaste_FL_StartService"
-                    HorizontalAlignment="Center"
                    FontSize="12"
                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                    IsTextSelectionEnabled="True"
                    TextAlignment="Center"
-                    TextWrapping="Wrap" />
-                <HyperlinkButton
-                    x:Uid="AdvancedPaste_FL_CLIGuide"
-                    HorizontalAlignment="Center"
-                    NavigateUri="https://learn.microsoft.com/azure/ai-foundry/foundry-local/get-started" />
+                    TextWrapping="Wrap">
+                    <Run Text="Start the Foundry Local service before returning to PowerToys." />
+                </TextBlock>
+                <HyperlinkButton Content="Follow the Foundry Local CLI guide" NavigateUri="https://learn.microsoft.com/en-us/azure/ai-foundry/foundry-local/get-started" />
                <TextBlock
                    x:Uid="FoundryLocal_RestartRequiredNote"
-                    HorizontalAlignment="Center"
                    FontSize="12"
                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Text="Note: After installing the Foundry Local CLI, restart PowerToys to use it."
                    TextAlignment="Center"
                    TextWrapping="Wrap" />
            </StackPanel>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml.cs
@@ -30,7 +30,7 @@ public sealed partial class FoundryLocalModelPicker : UserControl

    public delegate void DownloadRequestedEventHandler(object sender, object payload);

-    public delegate void LoadRequestedEventHandler(object sender);
+    public delegate void LoadRequestedEventHandler(object sender, FoundryLoadRequestedEventArgs args);

    public event ModelSelectionChangedEventHandler SelectionChanged;

@@ -94,7 +94,7 @@ public sealed partial class FoundryLocalModelPicker : UserControl

    public bool HasDownloadableModels => DownloadableModels?.Cast<object>().Any() ?? false;

-    public void RequestLoad()
+    public void RequestLoad(bool refresh)
    {
        if (IsLoading)
        {
@@ -107,7 +107,7 @@ public sealed partial class FoundryLocalModelPicker : UserControl

        IsAvailable = false;
        StatusText = "Loading Foundry Local status...";
-        LoadRequested?.Invoke(this);
+        LoadRequested?.Invoke(this, new FoundryLoadRequestedEventArgs(refresh));
    }

    private static void OnCachedModelsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -310,7 +310,7 @@ public sealed partial class FoundryLocalModelPicker : UserControl

    private void RefreshModelsButton_Click(object sender, RoutedEventArgs e)
    {
-        RequestLoad();
+        RequestLoad(refresh: true);
    }

    private void UpdateVisualStates()
@@ -444,4 +444,14 @@ public sealed partial class FoundryLocalModelPicker : UserControl
    {
        return string.IsNullOrWhiteSpace(license) ? Visibility.Collapsed : Visibility.Visible;
    }
+
+    public sealed class FoundryLoadRequestedEventArgs : EventArgs
+    {
+        public FoundryLoadRequestedEventArgs(bool refresh)
+        {
+            Refresh = refresh;
+        }
+
+        public bool Refresh { get; }
+    }
 }
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml
@@ -103,7 +103,10 @@
                                </StackPanel>
                            </tkcontrols:SettingsExpander.Description>
                            <tkcontrols:SettingsExpander.ItemsHeader>
-                                <tkcontrols:SettingsCard x:Uid="AdvancedPaste_ModelProviders" Style="{StaticResource DefaultSettingsExpanderItemStyle}">
+                                <tkcontrols:SettingsCard
+                                    Description="Add online or local models"
+                                    Header="Model providers"
+                                    Style="{StaticResource DefaultSettingsExpanderItemStyle}">
                                    <Button Content="Add model" Style="{StaticResource AccentButtonStyle}">
                                        <Button.Flyout>
                                            <MenuFlyout x:Name="AddProviderMenuFlyout" Opening="AddProviderMenuFlyout_Opening" />
@@ -127,16 +130,16 @@
                                                <Button.Flyout>
                                                    <MenuFlyout>
                                                        <MenuFlyoutItem
-                                                            x:Uid="AdvancedPaste_Edit"
                                                            Click="EditPasteAIProviderButton_Click"
                                                            Icon="{ui:FontIcon Glyph=&#xE70F;}"
-                                                            Tag="{x:Bind}" />
+                                                            Tag="{x:Bind}"
+                                                            Text="Edit" />
                                                        <MenuFlyoutSeparator />
                                                        <MenuFlyoutItem
-                                                            x:Uid="AdvancedPaste_Remove"
                                                            Click="RemovePasteAIProviderButton_Click"
                                                            Icon="{ui:FontIcon Glyph=&#xE74D;}"
-                                                            Tag="{x:Bind}" />
+                                                            Tag="{x:Bind}"
+                                                            Text="Remove" />
                                                    </MenuFlyout>
                                                </Button.Flyout>
                                            </Button>
@@ -168,9 +171,6 @@
                                </InfoBar>
                            </tkcontrols:SettingsExpander.ItemsHeader>
                            <tkcontrols:SettingsExpander.Items>
-                                <tkcontrols:SettingsCard Name="AdvancedPasteEnableClipboardPreview" ContentAlignment="Left">
-                                    <controls:CheckBoxWithDescriptionControl x:Uid="AdvancedPaste_EnableClipboardPreview" IsChecked="{x:Bind ViewModel.EnableClipboardPreview, Mode=TwoWay}" />
-                                </tkcontrols:SettingsCard>
                                <tkcontrols:SettingsCard
                                    Name="AdvancedPasteClipboardHistoryEnabledSettingsCard"
                                    ContentAlignment="Left"
@@ -429,11 +429,12 @@
        <!--  Paste AI provider dialog  -->
        <ContentDialog
            x:Name="PasteAIProviderConfigurationDialog"
-            x:Uid="AdvancedPaste_EndpointDialog"
            Title="Paste with AI provider configuration"
            Closed="PasteAIProviderConfigurationDialog_Closed"
            PrimaryButtonClick="PasteAIProviderConfigurationDialog_PrimaryButtonClick"
-            PrimaryButtonStyle="{ThemeResource AccentButtonStyle}">
+            PrimaryButtonStyle="{ThemeResource AccentButtonStyle}"
+            PrimaryButtonText="Save"
+            SecondaryButtonText="Cancel">
            <ContentDialog.Resources>
                <x:Double x:Key="ContentDialogMaxWidth">900</x:Double>
                <x:Double x:Key="ContentDialogMaxHeight">700</x:Double>
@@ -495,44 +496,46 @@
                        Spacing="16">
                        <TextBox
                            x:Name="PasteAIModelNameTextBox"
-                            x:Uid="AdvancedPaste_ModelName"
                            MinWidth="200"
                            HorizontalAlignment="Stretch"
-                            PlaceholderText="gpt-4o"
+                            Header="Model name"
+                            PlaceholderText="gpt-4"
                            Text="{x:Bind ViewModel.PasteAIProviderDraft.ModelName, Mode=TwoWay}" />
                        <TextBox
                            x:Name="PasteAIEndpointUrlTextBox"
-                            x:Uid="AdvancedPaste_EndpointURL"
                            MinWidth="200"
                            HorizontalAlignment="Stretch"
+                            Header="Endpoint URL"
                            PlaceholderText="https://your-resource.openai.azure.com/"
                            Text="{x:Bind ViewModel.PasteAIProviderDraft.EndpointUrl, Mode=TwoWay}" />
+
                        <PasswordBox
                            x:Name="PasteAIApiKeyPasswordBox"
-                            x:Uid="AdvancedPaste_APIKey"
-                            MinWidth="200" />
+                            MinWidth="200"
+                            Header="API key"
+                            PlaceholderText="Enter API Key" />
                        <TextBox
                            x:Name="PasteAIApiVersionTextBox"
-                            x:Uid="AdvancedPaste_APIVersion"
                            MinWidth="200"
                            HorizontalAlignment="Stretch"
+                            Header="API version"
                            PlaceholderText="2024-10-01"
                            Text="{x:Bind ViewModel.PasteAIProviderDraft.ApiVersion, Mode=TwoWay}"
                            Visibility="Collapsed" />
                        <TextBox
                            x:Name="PasteAIDeploymentNameTextBox"
-                            x:Uid="AdvancedPaste_DeploymentName"
                            MinWidth="200"
-                            PlaceholderText="gpt-4o"
+                            Header="Deployment name"
+                            PlaceholderText="gpt-4"
                            Text="{x:Bind ViewModel.PasteAIProviderDraft.DeploymentName, Mode=TwoWay}" />
                        <TextBox
                            x:Name="PasteAISystemPromptTextBox"
-                            x:Uid="AdvancedPaste_SystemPrompt"
                            MinWidth="200"
                            MinHeight="76"
                            HorizontalAlignment="Stretch"
                            AcceptsReturn="True"
                            Header="System prompt"
+                            PlaceholderText="You are tasked with reformatting user's clipboard data. Use the user's instructions, and the content of their clipboard below to edit their clipboard content as they have requested it. Do not output anything else besides the reformatted clipboard content."
                            Text="{x:Bind ViewModel.PasteAIProviderDraft.SystemPrompt, Mode=TwoWay}"
                            TextWrapping="Wrap" />
                        <Grid
@@ -572,10 +575,13 @@
                            IsOn="{x:Bind ViewModel.PasteAIProviderDraft.EnableAdvancedAI, Mode=TwoWay}"
                            Toggled="PasteAIEnableAdvancedAICheckBox_Toggled"
                            Visibility="Collapsed">
+                            <ToolTipService.ToolTip>
+                                <TextBlock Text="" TextWrapping="Wrap" />
+                            </ToolTipService.ToolTip>
                            <ToggleSwitch.Header>
                                <TextBlock>
-                                    <Run x:Uid="AdvancedPaste_EnableAdvancedAI" /> <LineBreak />
-                                    <Run x:Uid="AdvancedPaste_EnableAdvancedAIDescription" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                    <Run Text="Enable Advanced AI" /> <LineBreak />
+                                    <Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Use built-in functions to handle complex tasks. Token consumption may increase." />
                                </TextBlock>
                            </ToggleSwitch.Header>
                        </ToggleSwitch>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml.cs
@@ -27,6 +27,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
    public sealed partial class AdvancedPastePage : NavigablePage, IRefreshablePage, IDisposable
    {
        private readonly ObservableCollection<ModelDetails> _foundryCachedModels = new();
+        private readonly ObservableCollection<FoundryDownloadableModel> _foundryDownloadableModels = new();
        private CancellationTokenSource _foundryModelLoadCts;
        private bool _suppressFoundrySelectionChanged;
        private bool _isFoundryLocalAvailable;
@@ -35,8 +36,6 @@ namespace Microsoft.PowerToys.Settings.UI.Views

        private const string AdvancedAISystemPrompt = "You are an agent who is tasked with helping users paste their clipboard data. You have functions available to help you with this task. Call function when necessary to help user finish the transformation task. You never need to ask permission, always try to do as the user asks. The user will only input one message and will not be available for further questions, so try your best. The user will put in a request to format their clipboard data and you will fulfill it. Do not output anything else besides the reformatted clipboard content.";
        private const string SimpleAISystemPrompt = "You are tasked with reformatting user's clipboard data. Use the user's instructions, and the content of their clipboard below to edit their clipboard content as they have requested it. Do not output anything else besides the reformatted clipboard content.";
-        private static readonly string AdvancedAISystemPromptNormalized = AdvancedAISystemPrompt.Trim();
-        private static readonly string SimpleAISystemPromptNormalized = SimpleAISystemPrompt.Trim();

        private AdvancedPasteViewModel ViewModel { get; set; }

@@ -56,6 +55,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            if (FoundryLocalPicker is not null)
            {
                FoundryLocalPicker.CachedModels = _foundryCachedModels;
+                FoundryLocalPicker.DownloadableModels = _foundryDownloadableModels;
                FoundryLocalPicker.SelectionChanged += FoundryLocalPicker_SelectionChanged;
                FoundryLocalPicker.LoadRequested += FoundryLocalPicker_LoadRequested;
            }
@@ -82,7 +82,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
        {
            ViewModel.RefreshEnabledState();
            UpdatePasteAIUIVisibility();
-            _ = UpdateFoundryLocalUIAsync();
+            _ = UpdateFoundryLocalUIAsync(refreshFoundry: true);
        }

        private void EnableAdvancedPasteAI() => ViewModel.EnableAI();
@@ -384,7 +384,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            }
        }

-        private Task UpdateFoundryLocalUIAsync()
+        private Task UpdateFoundryLocalUIAsync(bool refreshFoundry = false)
        {
            string selectedType = ViewModel?.PasteAIProviderDraft?.ServiceType ?? string.Empty;
            bool isFoundryLocal = string.Equals(selectedType, "FoundryLocal", StringComparison.OrdinalIgnoreCase);
@@ -419,12 +419,12 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                PasteAIProviderConfigurationDialog.IsPrimaryButtonEnabled = false;
            }

-            FoundryLocalPicker?.RequestLoad();
+            FoundryLocalPicker?.RequestLoad(refreshFoundry);

            return Task.CompletedTask;
        }

-        private async Task LoadFoundryLocalModelsAsync()
+        private async Task LoadFoundryLocalModelsAsync(bool refresh = false)
        {
            if (FoundryLocalPanel is null)
            {
@@ -456,7 +456,9 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                    return;
                }

-                IEnumerable<ModelDetails> cachedModelsEnumerable = await provider.GetModelsAsync(cancelationToken: cancellationToken).ConfigureAwait(false);
+                IEnumerable<ModelDetails> cachedModelsEnumerable = refresh
+                    ? await provider.GetModelsAsync(ignoreCached: true, cancelationToken: cancellationToken)
+                    : await provider.GetModelsAsync(cancelationToken: cancellationToken);

                if (cancellationToken.IsCancellationRequested)
                {
@@ -465,12 +467,9 @@ namespace Microsoft.PowerToys.Settings.UI.Views

                var cachedModels = cachedModelsEnumerable?.ToList() ?? new List<ModelDetails>();

-                DispatcherQueue.TryEnqueue(() =>
-                {
-                    UpdateFoundryCollections(cachedModels);
-                    ShowFoundryAvailableState();
-                    RestoreFoundrySelection(cachedModels);
-                });
+                UpdateFoundryCollections(cachedModels, []);
+                ShowFoundryAvailableState();
+                RestoreFoundrySelection(cachedModels);
            }
            catch (OperationCanceledException)
            {
@@ -479,18 +478,12 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            catch (Exception ex)
            {
                var errorMessage = $"Unable to load Foundry Local models. {ex.Message}";
+                ShowFoundryUnavailableState(errorMessage);
                System.Diagnostics.Debug.WriteLine($"[AdvancedPastePage] Failed to load Foundry Local models: {ex}");
-                DispatcherQueue.TryEnqueue(() =>
-                {
-                    ShowFoundryUnavailableState(errorMessage);
-                });
            }
            finally
            {
-                DispatcherQueue.TryEnqueue(() =>
-                {
-                    UpdateFoundrySaveButtonState();
-                });
+                UpdateFoundrySaveButtonState();
            }
        }

@@ -543,7 +536,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            UpdateFoundrySaveButtonState();
        }

-        private void UpdateFoundryCollections(IReadOnlyCollection<ModelDetails> cachedModels)
+        private void UpdateFoundryCollections(IReadOnlyCollection<ModelDetails> cachedModels, IReadOnlyCollection<ModelDetails> catalogModels)
        {
            _foundryCachedModels.Clear();

@@ -552,7 +545,20 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                _foundryCachedModels.Add(model);
            }

-            var cachedReferences = new HashSet<string>(_foundryCachedModels.Select(m => m.Name), StringComparer.OrdinalIgnoreCase);
+            var cachedReferences = new HashSet<string>(_foundryCachedModels.Select(m => NormalizeFoundryModelReference(m.Url ?? m.Name)), StringComparer.OrdinalIgnoreCase);
+
+            _foundryDownloadableModels.Clear();
+
+            foreach (var model in catalogModels.OrderBy(m => m.Name, StringComparer.OrdinalIgnoreCase))
+            {
+                var reference = NormalizeFoundryModelReference(model.Url ?? model.Name);
+                if (cachedReferences.Contains(reference))
+                {
+                    continue;
+                }
+
+                _foundryDownloadableModels.Add(new FoundryDownloadableModel(model));
+            }
        }

        private void RestoreFoundrySelection(IReadOnlyCollection<ModelDetails> cachedModels)
@@ -568,8 +574,9 @@ namespace Microsoft.PowerToys.Settings.UI.Views

            if (!string.IsNullOrWhiteSpace(currentModelReference))
            {
+                var normalizedReference = NormalizeFoundryModelReference(currentModelReference);
                matchingModel = cachedModels.FirstOrDefault(model =>
-                    string.Equals(model.Name, currentModelReference, StringComparison.OrdinalIgnoreCase));
+                    string.Equals(NormalizeFoundryModelReference(model.Url ?? model.Name), normalizedReference, StringComparison.OrdinalIgnoreCase));
            }

            if (FoundryLocalPicker is null)
@@ -599,7 +606,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            {
                if (ViewModel?.PasteAIProviderDraft is not null)
                {
-                    ViewModel.PasteAIProviderDraft.ModelName = matchingModel.Name;
+                    ViewModel.PasteAIProviderDraft.ModelName = NormalizeFoundryModelReference(matchingModel.Url ?? matchingModel.Name);
                }

                if (FoundryLocalPicker is not null)
@@ -611,6 +618,19 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            UpdateFoundrySaveButtonState();
        }

+        private static string NormalizeFoundryModelReference(string modelReference)
+        {
+            if (string.IsNullOrWhiteSpace(modelReference))
+            {
+                return string.Empty;
+            }
+
+            var prefix = FoundryLocalModelProvider.Instance.UrlPrefix;
+            return modelReference.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)
+                ? modelReference
+                : $"{prefix}{modelReference}";
+        }
+
        private void UpdateFoundrySaveButtonState()
        {
            if (PasteAIProviderConfigurationDialog is null)
@@ -634,7 +654,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                return;
            }

-            if (!_isFoundryLocalAvailable)
+            if (!_isFoundryLocalAvailable || _foundryDownloadableModels.Any(model => model.IsDownloading))
            {
                PasteAIProviderConfigurationDialog.IsPrimaryButtonEnabled = false;
                return;
@@ -655,7 +675,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            {
                if (ViewModel?.PasteAIProviderDraft is not null)
                {
-                    ViewModel.PasteAIProviderDraft.ModelName = selectedModel.Name;
+                    ViewModel.PasteAIProviderDraft.ModelName = NormalizeFoundryModelReference(selectedModel.Url ?? selectedModel.Name);
                }

                if (FoundryLocalPicker is not null)
@@ -679,9 +699,9 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            UpdateFoundrySaveButtonState();
        }

-        private async void FoundryLocalPicker_LoadRequested(object sender)
+        private async void FoundryLocalPicker_LoadRequested(object sender, FoundryLocalModelPicker.FoundryLoadRequestedEventArgs args)
        {
-            await LoadFoundryLocalModelsAsync();
+            await LoadFoundryLocalModelsAsync(args?.Refresh ?? false);
        }

        private sealed class FoundryDownloadableModel : INotifyPropertyChanged
@@ -784,7 +804,6 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                return;
            }

-            NormalizeSystemPrompt(draft);
            string serviceType = draft.ServiceType ?? "OpenAI";
            string apiKey = PasteAIApiKeyPasswordBox.Password;
            string trimmedApiKey = apiKey?.Trim() ?? string.Empty;
@@ -815,8 +834,22 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                return;
            }

-            NormalizeSystemPrompt(draft);
-            UpdateSystemPromptPlaceholder();
+            bool isEmptyOrDefault = string.IsNullOrWhiteSpace(draft.SystemPrompt) ||
+                                     draft.SystemPrompt.Trim() == AdvancedAISystemPrompt.Trim() ||
+                                     draft.SystemPrompt.Trim() == SimpleAISystemPrompt.Trim();
+
+            if (isEmptyOrDefault)
+            {
+                if (!draft.EnableAdvancedAI)
+                {
+                    // Now we'll switch
+                    draft.SystemPrompt = AdvancedAISystemPrompt;
+                }
+                else
+                {
+                    draft.SystemPrompt = SimpleAISystemPrompt;
+                }
+            }
        }

        private static bool RequiresApiKeyForService(string serviceType)
@@ -917,47 +950,15 @@ namespace Microsoft.PowerToys.Settings.UI.Views

        private Visibility GetServicePrivacyVisibility(string serviceType) => HasServicePrivacyLink(serviceType) ? Visibility.Visible : Visibility.Collapsed;

-        private static bool IsPlaceholderSystemPrompt(string prompt)
-        {
-            if (string.IsNullOrWhiteSpace(prompt))
-            {
-                return true;
-            }
-
-            string trimmedPrompt = prompt.Trim();
-            return string.Equals(trimmedPrompt, AdvancedAISystemPromptNormalized, StringComparison.Ordinal)
-                || string.Equals(trimmedPrompt, SimpleAISystemPromptNormalized, StringComparison.Ordinal);
-        }
-
-        private static void NormalizeSystemPrompt(PasteAIProviderDefinition draft)
-        {
-            if (draft is null)
-            {
-                return;
-            }
-
-            if (IsPlaceholderSystemPrompt(draft.SystemPrompt))
-            {
-                draft.SystemPrompt = string.Empty;
-            }
-        }
-
        private void UpdateSystemPromptPlaceholder()
        {
            var draft = ViewModel?.PasteAIProviderDraft;
-            if (draft is null)
+            if (draft is null || PasteAISystemPromptTextBox is null)
            {
                return;
            }

-            NormalizeSystemPrompt(draft);
-            if (PasteAISystemPromptTextBox is null)
-            {
-                return;
-            }
-
-            bool useAdvancedPlaceholder = PasteAIEnableAdvancedAICheckBox?.IsOn ?? draft.EnableAdvancedAI;
-            PasteAISystemPromptTextBox.PlaceholderText = useAdvancedPlaceholder
+            PasteAISystemPromptTextBox.PlaceholderText = draft.EnableAdvancedAI
                ? AdvancedAISystemPrompt
                : SimpleAISystemPrompt;
        }
@@ -1096,7 +1097,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                PasteAIProviderConfigurationDialog.Title = $"{displayName} provider configuration";
            }

-            await UpdateFoundryLocalUIAsync();
+            await UpdateFoundryLocalUIAsync(refreshFoundry: true);
            UpdatePasteAIUIVisibility();
            RefreshDialogBindings();

@@ -1125,7 +1126,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                : $"{titlePrefix} provider configuration";

            UpdatePasteAIUIVisibility();
-            await UpdateFoundryLocalUIAsync();
+            await UpdateFoundryLocalUIAsync(refreshFoundry: false);
            RefreshDialogBindings();
            PasteAIApiKeyPasswordBox.Password = ViewModel.GetPasteAIApiKey(provider.Id, provider.ServiceType);
            await PasteAIProviderConfigurationDialog.ShowAsync();
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml
@@ -10,202 +10,40 @@
    xmlns:ui="using:CommunityToolkit.WinUI"
    AutomationProperties.LandmarkType="Main"
    mc:Ignorable="d">
-    <Grid>
-        <ScrollViewer AutomationProperties.AutomationId="PageScrollViewer">
-            <Grid
-                MaxWidth="1000"
-                Padding="16,0,16,0"
-                VerticalAlignment="Top"
-                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                BorderThickness="1"
-                CornerRadius="16"
-                RowSpacing="8">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <tkcontrols:OpacityMaskView Margin="-16,0,-16,0" HorizontalAlignment="Stretch">
-                    <tkcontrols:OpacityMaskView.OpacityMask>
-                        <Rectangle>
-                            <Rectangle.Fill>
-                                <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                    <GradientStop Offset="0.50" Color="Black" />
-                                    <GradientStop Offset="0.75" Color="#80000000" />
-                                    <GradientStop Offset="0.95" Color="Transparent" />
-                                </LinearGradientBrush>
-                            </Rectangle.Fill>
-                        </Rectangle>
-                    </tkcontrols:OpacityMaskView.OpacityMask>
-                    <Grid Height="560">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
-                        <Image
-                            Grid.RowSpan="3"
-                            HorizontalAlignment="Stretch"
-                            Source="/Assets/Settings/Modules/CmdPal_Background.png"
-                            Stretch="UniformToFill" />
-                        <TextBlock
-                            Margin="0,24,0,12"
-                            HorizontalAlignment="Center"
-                            FontSize="36"
-                            FontWeight="Bold"
-                            Text="Command Palette">
-                            <TextBlock.Foreground>
-                                <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                                    <GradientStop Offset="0.0" Color="#FFB9EBFF" />
-                                    <GradientStop Offset="0.49" Color="#FF86CBFF" />
-                                    <GradientStop Offset="1.0" Color="#FFA1E7FF" />
-                                </LinearGradientBrush>
-                            </TextBlock.Foreground>
-                        </TextBlock>
-                        <TextBlock
-                            Grid.Row="1"
-                            HorizontalAlignment="Center"
-                            Foreground="White"
-                            TextAlignment="Center"
-                            TextWrapping="Wrap">
-                            <Run x:Uid="CmdPal_Description" />
-                            <Hyperlink NavigateUri="">
-                                <Run x:Uid="LearnMore_CmdPal.Text" Foreground="White" />
-                            </Hyperlink>
-                        </TextBlock>
-                        <Image
-                            Grid.Row="2"
-                            Margin="0,16,0,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Top"
-                            Source="/Assets/Settings/Modules/CmdPal_Hero.png"
-                            Stretch="Uniform" />
-                    </Grid>
-                </tkcontrols:OpacityMaskView>

-                <Grid
-                    Grid.Row="1"
-                    Margin="0,-12,0,24"
-                    ColumnSpacing="32"
-                    RowSpacing="8">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <FontIcon
-                        HorizontalAlignment="Center"
-                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        Glyph="&#xEB3B;" />
-                    <TextBlock
-                        Grid.Row="1"
-                        HorizontalAlignment="Center"
-                        TextAlignment="Center"
-                        TextWrapping="Wrap">
-                        <Run x:Uid="CmdPal_ExtensibleHeader" FontWeight="SemiBold" /> <LineBreak />
-                        <Run
-                            x:Uid="CmdPal_ExtensibleDescription"
-                            FontSize="12"
-                            Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                    </TextBlock>
-
-                    <FontIcon
-                        Grid.Column="1"
-                        HorizontalAlignment="Center"
-                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        Glyph="&#xE945;" />
-                    <TextBlock
-                        Grid.Row="1"
-                        Grid.Column="1"
-                        HorizontalAlignment="Center"
-                        TextAlignment="Center"
-                        TextWrapping="Wrap">
-                        <Run x:Uid="CmdPal_FastHeader" FontWeight="SemiBold" /> <LineBreak />
-                        <Run
-                            x:Uid="CmdPal_FastDescription"
-                            FontSize="12"
-                            Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                    </TextBlock>
-
-                    <FontIcon
-                        Grid.Column="2"
-                        HorizontalAlignment="Center"
-                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        Glyph="&#xE790;" />
-                    <TextBlock
-                        Grid.Row="1"
-                        Grid.Column="2"
-                        HorizontalAlignment="Center"
-                        TextAlignment="Center"
-                        TextWrapping="Wrap">
-                        <Run x:Uid="CmdPal_ModernHeader" FontWeight="SemiBold" /> <LineBreak />
-                        <Run
-                            x:Uid="CmdPal_ModernDescription"
-                            FontSize="12"
-                            Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                    </TextBlock>
-                </Grid>
-                <StackPanel
-                    Grid.Row="2"
-                    Margin="0,8,0,0"
-                    Orientation="Vertical"
-                    Spacing="{StaticResource SettingsCardSpacing}">
-                    <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
-                        <tkcontrols:SettingsCard
-                            Name="CmdPalEnableCmdPal"
-                            x:Uid="CmdPal_Enable_CmdPal"
-                            HorizontalAlignment="Stretch"
-                            HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CmdPal.png}">
-                            <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                        </tkcontrols:SettingsCard>
-                    </controls:GPOInfoControl>
+    <controls:SettingsPageControl x:Uid="CmdPal" ModuleImageSource="ms-appx:///Assets/Settings/Modules/CmdPal.png">
+        <controls:SettingsPageControl.ModuleContent>
+            <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
                    <tkcontrols:SettingsCard
-                        x:Uid="CmdPal_Launch"
-                        Grid.Row="3"
-                        ActionIcon="{ui:FontIcon Glyph=&#xE8A7;}"
-                        Click="LaunchCard_Click"
-                        Header="Launch Command Palette"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xE945;}"
-                        IsClickEnabled="True"
-                        IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
-                        <ItemsControl
-                            AutomationProperties.AccessibilityView="Raw"
-                            IsTabStop="False"
-                            ItemsSource="{x:Bind Path=ViewModel.Hotkey.GetKeysList(), Mode=OneWay}">
-                            <ItemsControl.ItemsPanel>
-                                <ItemsPanelTemplate>
-                                    <StackPanel Orientation="Horizontal" Spacing="4" />
-                                </ItemsPanelTemplate>
-                            </ItemsControl.ItemsPanel>
-                            <ItemsControl.ItemTemplate>
-                                <DataTemplate>
-                                    <controls:KeyVisual
-                                        Padding="8,8,8,8"
-                                        VerticalAlignment="Center"
-                                        AutomationProperties.AccessibilityView="Raw"
-                                        Content="{Binding}"
-                                        Style="{StaticResource AccentKeyVisualStyle}" />
-                                </DataTemplate>
-                            </ItemsControl.ItemTemplate>
-                        </ItemsControl>
+                        Name="CmdPalEnableCmdPal"
+                        x:Uid="CmdPal_Enable_CmdPal"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CmdPal.png}">
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
+                <controls:SettingsGroup x:Uid="CmdPal_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                    <tkcontrols:SettingsCard
-                        x:Uid="CmdPal_Settings"
-                        Grid.Row="4"
-                        ActionIcon="{ui:FontIcon Glyph=&#xE8A7;}"
-                        Click="SettingsCard_Click"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xE713;}"
-                        IsClickEnabled="True"
-                        IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}" />
-                </StackPanel>
-            </Grid>
-        </ScrollViewer>
-    </Grid>
+                        Name="CmdPalActivationShortcut"
+                        x:Uid="CmdPal_ActivationShortcut"
+                        HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
+                        <controls:ShortcutControl
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            HotkeySettings="{x:Bind Path=ViewModel.Hotkey, Mode=OneWay}"
+                            IsEnabled="False" />
+                        <tkcontrols:SettingsCard.Description>
+                            <HyperlinkButton
+                                x:Name="CmdPalSettingsDeeplink"
+                                x:Uid="CmdPal_DeeplinkContent"
+                                Click="CmdPalSettingsDeeplink_Click" />
+                        </tkcontrols:SettingsCard.Description>
+                    </tkcontrols:SettingsCard>
+                </controls:SettingsGroup>
+            </StackPanel>
+        </controls:SettingsPageControl.ModuleContent>
+
+        <controls:SettingsPageControl.PrimaryLinks>
+            <controls:PageLink x:Uid="LearnMore_CmdPal" Link="https://aka.ms/PowerToysOverview_CmdPal" />
+        </controls:SettingsPageControl.PrimaryLinks>
+    </controls:SettingsPageControl>
 </local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs
@@ -63,20 +63,12 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            }
        }

-        private void SettingsCard_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+        private void CmdPalSettingsDeeplink_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
        {
            // Launch CmdPal settings window as normal user using explorer
            string launchPath = "explorer.exe";
            string launchArgs = "x-cmdpal://settings";
            LaunchApp(launchPath, launchArgs);
        }
-
-        private void LaunchCard_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
-        {
-            // Launch CmdPal window as normal user using explorer
-            string launchPath = "explorer.exe";
-            string launchArgs = "x-cmdpal:";
-            LaunchApp(launchPath, launchArgs);
-        }
    }
 }
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/LightSwitchPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/LightSwitchPage.xaml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<local:NavigablePage
+<Page
    x:Class="Microsoft.PowerToys.Settings.UI.Views.LightSwitchPage"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:ViewModel="using:Microsoft.PowerToys.Settings.UI.ViewModels"
+    xmlns:animations="using:CommunityToolkit.WinUI.Animations"
    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
    xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Helpers"
+    xmlns:helpers="using:Settings.UI.Library.Helpers"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
+    xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
    xmlns:ui="using:CommunityToolkit.WinUI"
-    xmlns:viewModels="using:Microsoft.PowerToys.Settings.UI.ViewModels"
-    d:DataContext="{d:DesignInstance Type=viewModels:LightSwitchViewModel}"
+    d:DataContext="{d:DesignInstance Type=ViewModel:LightSwitchViewModel}"
    AutomationProperties.LandmarkType="Main"
    mc:Ignorable="d">
-    <local:NavigablePage.Resources>
+    <Page.Resources>
        <converters:TimeSpanToFriendlyTimeConverter x:Key="TimeSpanToFriendlyTimeConverter" />
-        <converters:StringToDoubleConverter x:Key="StringToDoubleConverter" />
-    </local:NavigablePage.Resources>
+    </Page.Resources>
    <Grid>
        <controls:SettingsPageControl
            x:Uid="LightSwitch"
@@ -87,14 +88,16 @@
                                    x:Uid="LightSwitch_LocationSettingsCard"
                                    Visibility="Collapsed">
                                    <StackPanel Orientation="Horizontal" Spacing="8">
-                                        <controls:IsEnabledTextBlock
+                                        <TextBlock
                                            VerticalAlignment="Center"
                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                            Text="{x:Bind ViewModel.SyncButtonInformation, Mode=OneWay}" />
                                        <Button
-                                            x:Uid="LightSwitch_SetLocationButton"
+                                            Padding="8"
                                            AutomationProperties.AutomationId="SetLocationButton_LightSwitch"
-                                            Click="SyncLocationButton_Click" />
+                                            Click="SyncLocationButton_Click"
+                                            Content="{ui:FontIcon Glyph=&#xECAF;,
+                                                                  FontSize=16}" />
                                    </StackPanel>
                                </tkcontrols:SettingsCard>

@@ -199,20 +202,17 @@
                        <ContentDialog
                            x:Name="LocationDialog"
                            x:Uid="LightSwitch_LocationDialog"
-                            IsPrimaryButtonEnabled="False"
+                            IsPrimaryButtonEnabled="True"
                            IsSecondaryButtonEnabled="True"
+                            Opened="LocationDialog_Opened"
                            PrimaryButtonClick="LocationDialog_PrimaryButtonClick"
                            PrimaryButtonStyle="{StaticResource AccentButtonStyle}">
-                            <Grid RowSpacing="16">
+                            <Grid RowSpacing="48">
                                <Grid.RowDefinitions>
                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="*" MinHeight="64" />
+                                    <RowDefinition Height="*" />
                                </Grid.RowDefinitions>
-                                <TextBlock
-                                    x:Uid="LightSwitch_LocationDialog_Description"
-                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                    TextWrapping="Wrap" />
+                                <TextBlock x:Uid="LightSwitch_LocationDialog_Description" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
                                <!--<AutoSuggestBox
                                x:Name="CityAutoSuggestBox"
                                Grid.Row="1"
@@ -240,84 +240,80 @@
                                    </DataTemplate>
                                </AutoSuggestBox.ItemTemplate>
                            </AutoSuggestBox>-->
-
-                                <Grid
-                                    Grid.Row="1"
-                                    Margin="0,12,0,0"
-                                    ColumnSpacing="4">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="124" />
-                                        <ColumnDefinition Width="124" />
-                                        <ColumnDefinition Width="*" />
-                                    </Grid.ColumnDefinitions>
-                                    <NumberBox
-                                        x:Name="LatitudeBox"
-                                        x:Uid="LightSwitch_LatitudeBox"
-                                        AutomationProperties.AutomationId="LatitudeBox_LightSwitch"
-                                        Maximum="90"
-                                        Minimum="-90"
-                                        ValueChanged="LatLonBox_ValueChanged"
-                                        Value="{x:Bind ViewModel.LocationPanelLatitude, Mode=TwoWay}" />
-                                    <NumberBox
-                                        x:Name="LongitudeBox"
-                                        x:Uid="LightSwitch_LongitudeBox"
-                                        Grid.Column="1"
-                                        AutomationProperties.AutomationId="LongitudeBox_LightSwitch"
-                                        Maximum="180"
-                                        Minimum="-180"
-                                        ValueChanged="LatLonBox_ValueChanged"
-                                        Value="{x:Bind ViewModel.LocationPanelLongitude, Mode=TwoWay}" />
+                                <StackPanel
+                                    Grid.Row="2"
+                                    Margin="0,24,0,0"
+                                    HorizontalAlignment="Center"
+                                    Orientation="Vertical"
+                                    Spacing="32">
                                    <Button
                                        x:Name="SyncButton"
-                                        x:Uid="LightSwitch_FindLocationAutomation"
-                                        Grid.Column="2"
-                                        Margin="4,0,0,0"
                                        HorizontalAlignment="Stretch"
-                                        VerticalAlignment="Bottom"
                                        AutomationProperties.AutomationId="SyncLocationButton_LightSwitch"
-                                        Click="GetGeoLocation_Click">
+                                        Style="{StaticResource AccentButtonStyle}"
+                                        Visibility="Collapsed">
                                        <StackPanel Orientation="Horizontal" Spacing="8">
-                                            <FontIcon FontSize="16" Glyph="&#xECAF;" />
-                                            <TextBlock x:Uid="LightSwitch_FindLocation" />
+                                            <FontIcon FontSize="14" Glyph="&#xECAF;" />
+                                            <TextBlock x:Uid="LightSwitch_GetCurrentLocation" />
                                        </StackPanel>
                                    </Button>
-                                </Grid>
+                                </StackPanel>
+
                                <ProgressRing
                                    x:Name="SyncLoader"
-                                    Grid.Row="2"
+                                    Grid.Row="1"
                                    Width="40"
                                    Height="40"
                                    VerticalAlignment="Center"
                                    IsActive="False"
                                    Visibility="Collapsed" />
+
                                <Grid
                                    x:Name="LocationResultPanel"
-                                    Grid.Row="2"
+                                    Grid.Row="1"
                                    VerticalAlignment="Bottom"
                                    ColumnSpacing="16"
                                    RowSpacing="12"
                                    Visibility="Collapsed">
                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="*" />
                                        <ColumnDefinition Width="*" />
                                    </Grid.ColumnDefinitions>
                                    <Grid.RowDefinitions>
                                        <RowDefinition Height="Auto" />
                                        <RowDefinition Height="Auto" />
                                    </Grid.RowDefinitions>
-                                    <FontIcon FontSize="20" Glyph="&#xED39;">
+                                    <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.LocationPanelLightTime, Converter={StaticResource TimeSpanToFriendlyTimeConverter}, Mode=OneWay}"
-                                        TextAlignment="Left" />
+                                        Text="{x:Bind ViewModel.LightTimeTimeSpan, Converter={StaticResource TimeSpanToFriendlyTimeConverter}, Mode=OneWay}"
+                                        TextAlignment="Center" />
                                    <FontIcon
-                                        Grid.Row="1"
+                                        Grid.Column="2"
                                        FontSize="20"
                                        Glyph="&#xED3A;">
                                        <ToolTipService.ToolTip>
@@ -325,12 +321,12 @@
                                        </ToolTipService.ToolTip>
                                    </FontIcon>
                                    <TextBlock
-                                        Grid.Row="1"
-                                        Grid.Column="1"
+                                        Grid.Row="2"
+                                        Grid.Column="2"
                                        AutomationProperties.AutomationId="SunsetText_LightSwitch"
                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="{x:Bind ViewModel.LocationPanelDarkTime, Converter={StaticResource TimeSpanToFriendlyTimeConverter}, Mode=OneWay}"
-                                        TextAlignment="Left" />
+                                        Text="{x:Bind ViewModel.DarkTimeTimeSpan, Converter={StaticResource TimeSpanToFriendlyTimeConverter}, Mode=OneWay}"
+                                        TextAlignment="Center" />
                                </Grid>
                            </Grid>
                        </ContentDialog>
@@ -362,4 +358,4 @@
            </VisualStateGroup>
        </VisualStateManager.VisualStateGroups>
    </Grid>
-</local:NavigablePage>
+</Page>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/LightSwitchPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/LightSwitchPage.xaml.cs
@@ -12,94 +12,88 @@ using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 using Microsoft.PowerToys.Settings.UI.ViewModels;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using PowerToys.GPOWrapper;
 using Settings.UI.Library;
+using Settings.UI.Library.Helpers;
 using Windows.Devices.Geolocation;
+using Windows.Services.Maps;

 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class LightSwitchPage : NavigablePage, IRefreshablePage
+    public sealed partial class LightSwitchPage : Page
    {
-        private readonly string appName = "LightSwitch";
-        private readonly SettingsUtils settingsUtils;
-        private readonly Func<string, int> sendConfigMsg = ShellPage.SendDefaultIPCMessage;
+        private readonly string _appName = "LightSwitch";
+        private readonly SettingsUtils _settingsUtils;
+        private readonly Func<string, int> _sendConfigMsg = ShellPage.SendDefaultIPCMessage;

-        private readonly SettingsRepository<GeneralSettings> generalSettingsRepository;
-        private readonly SettingsRepository<LightSwitchSettings> moduleSettingsRepository;
+        private readonly ISettingsRepository<GeneralSettings> _generalSettingsRepository;
+        private readonly ISettingsRepository<LightSwitchSettings> _moduleSettingsRepository;

-        private readonly IFileSystem fileSystem;
-        private readonly IFileSystemWatcher fileSystemWatcher;
-        private readonly DispatcherQueue dispatcherQueue;
-        private bool suppressViewModelUpdates;
+        private readonly IFileSystem _fileSystem;
+        private readonly IFileSystemWatcher _fileSystemWatcher;
+        private readonly DispatcherQueue _dispatcherQueue;

        private LightSwitchViewModel ViewModel { get; set; }

        public LightSwitchPage()
        {
-            this.settingsUtils = new SettingsUtils();
-            this.sendConfigMsg = ShellPage.SendDefaultIPCMessage;
+            _settingsUtils = new SettingsUtils();
+            _sendConfigMsg = ShellPage.SendDefaultIPCMessage;

-            this.generalSettingsRepository = SettingsRepository<GeneralSettings>.GetInstance(this.settingsUtils);
-            this.moduleSettingsRepository = SettingsRepository<LightSwitchSettings>.GetInstance(this.settingsUtils);
+            _generalSettingsRepository = SettingsRepository<GeneralSettings>.GetInstance(_settingsUtils);
+            _moduleSettingsRepository = SettingsRepository<LightSwitchSettings>.GetInstance(_settingsUtils);

            // Get settings from JSON (or defaults if JSON missing)
-            var darkSettings = this.moduleSettingsRepository.SettingsConfig;
+            var darkSettings = _moduleSettingsRepository.SettingsConfig;

            // Pass them into the ViewModel
-            this.ViewModel = new LightSwitchViewModel(darkSettings, this.sendConfigMsg);
-            this.ViewModel.PropertyChanged += ViewModel_PropertyChanged;
+            ViewModel = new LightSwitchViewModel(darkSettings, ShellPage.SendDefaultIPCMessage);
+            ViewModel.PropertyChanged += ViewModel_PropertyChanged;

-            this.LoadSettings(this.generalSettingsRepository, this.moduleSettingsRepository);
+            LoadSettings(_generalSettingsRepository, _moduleSettingsRepository);

-            DataContext = this.ViewModel;
+            DataContext = ViewModel;

-            var settingsPath = this.settingsUtils.GetSettingsFilePath(this.appName);
+            var settingsPath = _settingsUtils.GetSettingsFilePath(_appName);

-            this.dispatcherQueue = DispatcherQueue.GetForCurrentThread();
-            this.fileSystem = new FileSystem();
+            _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+            _fileSystem = new FileSystem();

-            this.fileSystemWatcher = this.fileSystem.FileSystemWatcher.New();
-            this.fileSystemWatcher.Path = this.fileSystem.Path.GetDirectoryName(settingsPath);
-            this.fileSystemWatcher.Filter = this.fileSystem.Path.GetFileName(settingsPath);
-            this.fileSystemWatcher.NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.CreationTime;
-            this.fileSystemWatcher.Changed += Settings_Changed;
-            this.fileSystemWatcher.EnableRaisingEvents = true;
+            _fileSystemWatcher = _fileSystem.FileSystemWatcher.New();
+            _fileSystemWatcher.Path = _fileSystem.Path.GetDirectoryName(settingsPath);
+            _fileSystemWatcher.Filter = _fileSystem.Path.GetFileName(settingsPath);
+            _fileSystemWatcher.NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.CreationTime;
+            _fileSystemWatcher.Changed += Settings_Changed;
+            _fileSystemWatcher.EnableRaisingEvents = true;

            this.InitializeComponent();
-            Loaded += LightSwitchPage_Loaded;
-            Loaded += (s, e) => this.ViewModel.OnPageLoaded();
-        }
-
-        public void RefreshEnabledState()
-        {
-            this.ViewModel.RefreshEnabledState();
+            this.Loaded += LightSwitchPage_Loaded;
+            this.Loaded += (s, e) => ViewModel.OnPageLoaded();
        }

        private void LightSwitchPage_Loaded(object sender, RoutedEventArgs e)
        {
-            if (this.ViewModel.SearchLocations.Count == 0)
+            if (ViewModel.SearchLocations.Count == 0)
            {
                foreach (var city in SearchLocationLoader.GetAll())
                {
-                    this.ViewModel.SearchLocations.Add(city);
+                    ViewModel.SearchLocations.Add(city);
                }
            }

-            this.ViewModel.InitializeScheduleMode();
+            ViewModel.InitializeScheduleMode();
        }

-        private async void GetGeoLocation_Click(object sender, RoutedEventArgs e)
+        private async Task GetGeoLocation()
        {
-            this.LatitudeBox.IsEnabled = false;
-            this.LongitudeBox.IsEnabled = false;
-            this.SyncButton.IsEnabled = false;
-            this.SyncLoader.IsActive = true;
-            this.SyncLoader.Visibility = Visibility.Visible;
-            this.LocationResultPanel.Visibility = Visibility.Collapsed;
+            SyncButton.IsEnabled = false;
+            SyncLoader.IsActive = true;
+            SyncLoader.Visibility = Visibility.Visible;

            try
            {
@@ -118,110 +112,75 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                double latitude = Math.Round(pos.Coordinate.Point.Position.Latitude);
                double longitude = Math.Round(pos.Coordinate.Point.Position.Longitude);

-                ViewModel.LocationPanelLatitude = latitude;
-                ViewModel.LocationPanelLongitude = longitude;
+                SunTimes result = SunCalc.CalculateSunriseSunset(
+                    latitude,
+                    longitude,
+                    DateTime.Now.Year,
+                    DateTime.Now.Month,
+                    DateTime.Now.Day);

-                var result = SunCalc.CalculateSunriseSunset(latitude, longitude, DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
-
-                this.ViewModel.LocationPanelLightTimeMinutes = (result.SunriseHour * 60) + result.SunriseMinute;
-                this.ViewModel.LocationPanelDarkTimeMinutes = (result.SunsetHour * 60) + result.SunsetMinute;
+                ViewModel.LightTime = (result.SunriseHour * 60) + result.SunriseMinute;
+                ViewModel.DarkTime = (result.SunsetHour * 60) + result.SunsetMinute;
+                ViewModel.Latitude = latitude.ToString(CultureInfo.InvariantCulture);
+                ViewModel.Longitude = longitude.ToString(CultureInfo.InvariantCulture);

                // Since we use this mode, we can remove the selected city data.
-                this.ViewModel.SelectedCity = null;
+                ViewModel.SelectedCity = null;
+
+                // CityAutoSuggestBox.Text = string.Empty;
+                ViewModel.SyncButtonInformation = $"{ViewModel.Latitude}<7D>, {ViewModel.Longitude}<7D>";

                // ViewModel.CityTimesText = $"Sunrise: {result.SunriseHour}:{result.SunriseMinute:D2}\n" + $"Sunset: {result.SunsetHour}:{result.SunsetMinute:D2}";
-                this.SyncButton.IsEnabled = true;
-                this.SyncLoader.IsActive = false;
-                this.SyncLoader.Visibility = Visibility.Collapsed;
-                this.LocationDialog.IsPrimaryButtonEnabled = true;
-                this.LatitudeBox.IsEnabled = true;
-                this.LongitudeBox.IsEnabled = true;
-                this.LocationResultPanel.Visibility = Visibility.Visible;
+                SyncButton.IsEnabled = true;
+                SyncLoader.IsActive = false;
+                SyncLoader.Visibility = Visibility.Collapsed;
+                LocationDialog.IsPrimaryButtonEnabled = true;
+                LocationResultPanel.Visibility = Visibility.Visible;
            }
            catch (Exception ex)
            {
-                this.SyncButton.IsEnabled = true;
-                this.SyncLoader.IsActive = false;
-                this.SyncLoader.Visibility = Visibility.Collapsed;
-                this.LocationResultPanel.Visibility = Visibility.Collapsed;
-                this.LatitudeBox.IsEnabled = true;
-                this.LongitudeBox.IsEnabled = true;
-                Logger.LogInfo($"Location error: " + ex.Message);
-            }
-        }
-
-        private void LatLonBox_ValueChanged(NumberBox sender, NumberBoxValueChangedEventArgs args)
-        {
-            double latitude = this.LatitudeBox.Value;
-            double longitude = this.LongitudeBox.Value;
-
-            if (double.IsNaN(latitude) || double.IsNaN(longitude) || (latitude == 0 && longitude == 0))
-            {
-                return;
-            }
-
-            var result = SunCalc.CalculateSunriseSunset(latitude, longitude, DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
-
-            this.ViewModel.LocationPanelLightTimeMinutes = (result.SunriseHour * 60) + result.SunriseMinute;
-            this.ViewModel.LocationPanelDarkTimeMinutes = (result.SunsetHour * 60) + result.SunsetMinute;
-
-            this.LocationResultPanel.Visibility = Visibility.Visible;
-            if (this.LocationDialog != null)
-            {
-                this.LocationDialog.IsPrimaryButtonEnabled = true;
+                SyncButton.IsEnabled = true;
+                SyncLoader.IsActive = false;
+                System.Diagnostics.Debug.WriteLine("Location error: " + ex.Message);
            }
        }

        private void LocationDialog_PrimaryButtonClick(object sender, ContentDialogButtonClickEventArgs args)
        {
-            if (double.IsNaN(this.LatitudeBox.Value) || double.IsNaN(this.LongitudeBox.Value))
+            if (ViewModel.ScheduleMode == "SunriseToSunsetUser")
            {
-                return;
+                ViewModel.SyncButtonInformation = ViewModel.SelectedCity.City;
+            }
+            else if (ViewModel.ScheduleMode == "SunriseToSunsetGeo")
+            {
+                ViewModel.SyncButtonInformation = $"{ViewModel.Latitude}<7D>, {ViewModel.Longitude}<7D>";
            }

-            double latitude = this.LatitudeBox.Value;
-            double longitude = this.LongitudeBox.Value;
-
-            // need to save the values
-            this.ViewModel.Latitude = latitude.ToString(CultureInfo.InvariantCulture);
-            this.ViewModel.Longitude = longitude.ToString(CultureInfo.InvariantCulture);
-            this.ViewModel.SyncButtonInformation = $"{this.ViewModel.Latitude}<7D>, {this.ViewModel.Longitude}<7D>";
-
-            var result = SunCalc.CalculateSunriseSunset(latitude, longitude, DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
-
-            this.ViewModel.LightTime = (result.SunriseHour * 60) + result.SunriseMinute;
-            this.ViewModel.DarkTime = (result.SunsetHour * 60) + result.SunsetMinute;
-
-            this.SunriseModeChartState();
+            SunriseModeChartState();
        }

        private void ViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
        {
-            if (this.suppressViewModelUpdates)
-            {
-                return;
-            }
-
            if (e.PropertyName == "IsEnabled")
            {
-                if (this.ViewModel.IsEnabled != this.generalSettingsRepository.SettingsConfig.Enabled.LightSwitch)
+                if (ViewModel.IsEnabled != _generalSettingsRepository.SettingsConfig.Enabled.LightSwitch)
                {
-                    this.generalSettingsRepository.SettingsConfig.Enabled.LightSwitch = this.ViewModel.IsEnabled;
+                    _generalSettingsRepository.SettingsConfig.Enabled.LightSwitch = ViewModel.IsEnabled;

-                    var generalSettingsMessage = new OutGoingGeneralSettings(this.generalSettingsRepository.SettingsConfig).ToString();
+                    var generalSettingsMessage = new OutGoingGeneralSettings(_generalSettingsRepository.SettingsConfig).ToString();
                    Logger.LogInfo($"Saved general settings from Light Switch page.");

-                    this.sendConfigMsg?.Invoke(generalSettingsMessage);
+                    _sendConfigMsg?.Invoke(generalSettingsMessage);
                }
            }
            else
            {
-                if (this.ViewModel.ModuleSettings != null)
+                if (ViewModel.ModuleSettings != null)
                {
-                    SndLightSwitchSettings currentSettings = new(this.moduleSettingsRepository.SettingsConfig);
+                    SndLightSwitchSettings currentSettings = new(_moduleSettingsRepository.SettingsConfig);
                    SndModuleSettings<SndLightSwitchSettings> csIpcMessage = new(currentSettings);

-                    SndLightSwitchSettings outSettings = new(this.ViewModel.ModuleSettings);
+                    SndLightSwitchSettings outSettings = new(ViewModel.ModuleSettings);
                    SndModuleSettings<SndLightSwitchSettings> outIpcMessage = new(outSettings);

                    string csMessage = csIpcMessage.ToJsonString();
@@ -231,13 +190,13 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                    {
                        Logger.LogInfo($"Saved Light Switch settings from Light Switch page.");

-                        this.sendConfigMsg?.Invoke(outMessage);
+                        _sendConfigMsg?.Invoke(outMessage);
                    }
                }
            }
        }

-        private void LoadSettings(SettingsRepository<GeneralSettings> generalSettingsRepository, SettingsRepository<LightSwitchSettings> moduleSettingsRepository)
+        private void LoadSettings(ISettingsRepository<GeneralSettings> generalSettingsRepository, ISettingsRepository<LightSwitchSettings> moduleSettingsRepository)
        {
            if (generalSettingsRepository != null)
            {
@@ -262,8 +221,8 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            {
                if (generalSettings != null)
                {
-                    this.ViewModel.IsEnabled = generalSettings.Enabled.LightSwitch;
-                    this.ViewModel.ModuleSettings = (LightSwitchSettings)lightSwitchSettings.Clone();
+                    ViewModel.IsEnabled = generalSettings.Enabled.LightSwitch;
+                    ViewModel.ModuleSettings = (LightSwitchSettings)lightSwitchSettings.Clone();

                    UpdateEnabledState(generalSettings.Enabled.LightSwitch);
                }
@@ -280,14 +239,10 @@ namespace Microsoft.PowerToys.Settings.UI.Views

        private void Settings_Changed(object sender, FileSystemEventArgs e)
        {
-            this.dispatcherQueue.TryEnqueue(() =>
+            _dispatcherQueue.TryEnqueue(() =>
            {
-                this.suppressViewModelUpdates = true;
-
-                this.moduleSettingsRepository.ReloadSettings();
-                this.LoadSettings(this.generalSettingsRepository, this.moduleSettingsRepository);
-
-                this.suppressViewModelUpdates = false;
+                _moduleSettingsRepository.ReloadSettings();
+                LoadSettings(_generalSettingsRepository, _moduleSettingsRepository);
            });
        }

@@ -298,20 +253,20 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            if (enabledGpoRuleConfiguration == GpoRuleConfigured.Disabled || enabledGpoRuleConfiguration == GpoRuleConfigured.Enabled)
            {
                // Get the enabled state from GPO.
-                this.ViewModel.IsEnabledGpoConfigured = true;
-                this.ViewModel.EnabledGPOConfiguration = enabledGpoRuleConfiguration == GpoRuleConfigured.Enabled;
+                ViewModel.IsEnabledGpoConfigured = true;
+                ViewModel.EnabledGPOConfiguration = enabledGpoRuleConfiguration == GpoRuleConfigured.Enabled;
            }
            else
            {
-                this.ViewModel.IsEnabled = recommendedState;
+                ViewModel.IsEnabled = recommendedState;
            }
        }

        private async void SyncLocationButton_Click(object sender, RoutedEventArgs e)
        {
-            this.LocationDialog.IsPrimaryButtonEnabled = false;
-            this.LocationResultPanel.Visibility = Visibility.Collapsed;
-            await this.LocationDialog.ShowAsync();
+            LocationDialog.IsPrimaryButtonEnabled = false;
+            LocationResultPanel.Visibility = Visibility.Collapsed;
+            await LocationDialog.ShowAsync();
        }

        private void CityAutoSuggestBox_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
@@ -321,7 +276,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                string query = sender.Text.ToLower(CultureInfo.CurrentCulture);

                // Filter your cities (assuming ViewModel.Cities is a List<City>)
-                var filtered = this.ViewModel.SearchLocations
+                var filtered = ViewModel.SearchLocations
                    .Where(c =>
                        (c.City?.Contains(query, StringComparison.CurrentCultureIgnoreCase) ?? false) ||
                        (c.Country?.Contains(query, StringComparison.CurrentCultureIgnoreCase) ?? false))
@@ -331,7 +286,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            }
        }

-        /* private void CityAutoSuggestBox_SuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)
+        private void CityAutoSuggestBox_SuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)
        {
            if (args.SelectedItem is SearchLocation location)
            {
@@ -341,38 +296,43 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                LocationDialog.IsPrimaryButtonEnabled = true;
                LocationResultPanel.Visibility = Visibility.Visible;
            }
-        } */
+        }

        private void ModeSelector_SelectionChanged(object sender, SelectionChangedEventArgs e)
        {
-            switch (this.ViewModel.ScheduleMode)
+            switch (ViewModel.ScheduleMode)
            {
                case "FixedHours":
                    VisualStateManager.GoToState(this, "ManualState", true);
-                    this.TimelineCard.Visibility = Visibility.Visible;
+                    TimelineCard.Visibility = Visibility.Visible;
                    break;
                case "SunsetToSunrise":
                    VisualStateManager.GoToState(this, "SunsetToSunriseState", true);
-                    this.SunriseModeChartState();
+                    SunriseModeChartState();
                    break;
                default:
                    VisualStateManager.GoToState(this, "OffState", true);
-                    this.TimelineCard.Visibility = Visibility.Collapsed;
+                    TimelineCard.Visibility = Visibility.Collapsed;
                    break;
            }
        }

+        private async void LocationDialog_Opened(ContentDialog sender, ContentDialogOpenedEventArgs args)
+        {
+            await GetGeoLocation();
+        }
+
        private void SunriseModeChartState()
        {
-            if (this.ViewModel.Latitude != "0.0" && this.ViewModel.Longitude != "0.0")
+            if (ViewModel.Latitude != "0.0" && ViewModel.Longitude != "0.0")
            {
-                this.TimelineCard.Visibility = Visibility.Visible;
-                this.LocationWarningBar.Visibility = Visibility.Collapsed;
+                TimelineCard.Visibility = Visibility.Visible;
+                LocationWarningBar.Visibility = Visibility.Collapsed;
            }
            else
            {
-                this.TimelineCard.Visibility = Visibility.Collapsed;
-                this.LocationWarningBar.Visibility = Visibility.Visible;
+                TimelineCard.Visibility = Visibility.Collapsed;
+                LocationWarningBar.Visibility = Visibility.Visible;
            }
        }
    }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Leilei Zhang	528f9665cd	update tool	2025-11-11 12:57:36 +08:00
Leilei Zhang	552e305556	Merge branch 'main' of https://github.com/microsoft/PowerToys into leilzh/adclean	2025-11-11 10:14:02 +08:00
Leilei Zhang	19d0f7827c	format	2025-11-10 22:27:17 +08:00
Leilei Zhang	b1474c4353	clean unused provider	2025-11-10 22:24:40 +08:00