fix location

<!-- Enter a brief description/summary of your PR here. What does it
fix/what does it change/how was it tested (even manually, if necessary)?
-->
## Summary of the Pull Request
This pull request introduces a configuration update to the
`src/runner/runner.vcxproj` project file. The change enables undocked,
registration-free WinRT initialization for the Windows App SDK, which
can improve compatibility and reduce dependency issues in certain
deployment scenarios.

Windows App SDK configuration:

* Enabled `WindowsAppSdkUndockedRegFreeWinRTInitialize` to allow
registration-free WinRT initialization in the project file
`runner.vcxproj`.

<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist

- [ ] Closes: #xxx
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx

<!-- Provide a more detailed description of the PR, other things fixed,
or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments

<!-- Describe how you validated the behavior. Add automated tests
wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
Validate in x64 environment, and it can be run without problem, no
errors any more

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

@@ -105,6 +105,7 @@
 ^src/common/notifications/BackgroundActivatorDLL/cpp\.hint$
 ^src/common/sysinternals/Eula/
 ^src/modules/cmdpal/doc/initial-sdk-spec/list-elements-mock-002\.pdn$
+^src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownImagesPage\.cs$
 ^src/modules/colorPicker/ColorPickerUI/Shaders/GridShader\.cso$
 ^src/modules/launcher/Plugins/Microsoft\.PowerToys\.Run\.Plugin\.TimeDate/Properties/
 ^src/modules/MouseUtils/MouseJumpUI/MainForm\.resx$

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

@@ -66,6 +66,7 @@ APIIs
 Apm
 APPBARDATA
 APPEXECLINK
+appext
 APPLICATIONFRAMEHOST
 appmanifest
 APPMODEL
@@ -101,7 +102,6 @@ ATX
 ATRIOX
 aumid
 authenticode
-Authenticode
 AUTOBUDDY
 AUTOCHECKBOX
 AUTOHIDE
@@ -188,6 +188,7 @@ CAPTUREBLT
 CAPTURECHANGED
 CARETBLINKING
 CAtl
+CBN
 cch
 CCHDEVICENAME
 CCHFORMNAME
@@ -258,6 +259,7 @@ cominterop
 commandnotfound
 commandpalette
 compmgmt
+COMPOSITIONDISABLED
 COMPOSITIONFULL
 CONFIGW
 CONFLICTINGMODIFIERKEY
@@ -315,7 +317,6 @@ CURSORINFO
 cursorpos
 CURSORSHOWING
 CURSORWRAP
-CursorWrap
 customaction
 CUSTOMACTIONTEST
 CUSTOMFORMATPLACEHOLDER
@@ -415,6 +416,9 @@ DNLEN
 DONOTROUND
 DONTVALIDATEPATH
 dotnet
+downsampled
+downsampling
+Downsampled
 downscale
 DPICHANGED
 DPIs
@@ -431,7 +435,6 @@ DSTINVERT
 DString
 DSVG
 dto
-DTo
 DUMMYUNIONNAME
 dutil
 DVASPECT
@@ -465,7 +468,6 @@ EDITKEYBOARD
 EDITSHORTCUTS
 EDITTEXT
 EFile
-ekus
 eku
 emojis
 ENABLEDELAYEDEXPANSION
@@ -601,6 +603,7 @@ getfilesiginforedist
 geolocator
 GETHOTKEY
 GETICON
+GETLBTEXT
 GETMINMAXINFO
 GETNONCLIENTMETRICS
 GETPROPERTYSTOREFLAGS
@@ -608,6 +611,7 @@ GETSCREENSAVERRUNNING
 GETSECKEY
 GETSTICKYKEYS
 GETTEXTLENGTH
+GIFs
 gitmodules
 GHND
 GMEM
@@ -618,6 +622,7 @@ GPOCA
 gpp
 gpu
 gradians
+grctlext
 Gridcustomlayout
 GSM
 gtm
@@ -1151,7 +1156,6 @@ NONCLIENTMETRICSW
 NONELEVATED
 nonspace
 nonstd
-nullrefs
 NOOWNERZORDER
 NOPARENTNOTIFY
 NOPREFIX
@@ -1191,8 +1195,8 @@ ntfs
 NTSTATUS
 NTSYSAPI
 NULLCURSOR
-nullref
 nullonfailure
+nullref
 numberbox
 nwc
 ocr

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

@@ -253,7 +253,7 @@ _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING
 
 # hit-count: 1 file-count: 1
 # Amazon
-\bamazon\.com/[-\w]+/(?:dp/[0-9A-Z]+|)[^"'\s]+
+\bamazon\.com/[-\w]+/(?:dp/[0-9A-Z]+|)
 
 # hit-count: 3 file-count: 3
 # imgur

.gitignore

@@ -349,10 +349,7 @@ src/common/Telemetry/*.etl
 /src/modules/powerrename/ui/RCb24464
 
 # Generated installer file for Monaco source files.
-/installer/PowerToysSetup/MonacoSRC.wxs
-/installer/PowerToysSetup/DscResources.wxs
 /installer/PowerToysSetupVNext/MonacoSRC.wxs
-/installer/PowerToysSetupVNext/DscResources.wxs
 
 # MSBuildCache
 /MSBuildCacheLogs/

.pipelines/generateDscManifests.ps1

@@ -65,21 +65,28 @@ if (-not (Test-Path $outputDir)) {
     New-Item -Path $outputDir -ItemType Directory -Force | Out-Null
 }
 
-Write-Host "DSC manifests will be generated to: '$outputDir'"
+# DSC v3 manifests go to DSCModules subfolder
+$dscOutputDir = Join-Path $outputDir 'DSCModules'
+if (-not (Test-Path $dscOutputDir)) {
+    Write-Host "Creating DSCModules subfolder at '$dscOutputDir'."
+    New-Item -Path $dscOutputDir -ItemType Directory -Force | Out-Null
+}
 
-Write-Host "Cleaning previously generated DSC manifest files from '$outputDir'."
-Get-ChildItem -Path $outputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction SilentlyContinue | Remove-Item -Force
+Write-Host "DSC manifests will be generated to: '$dscOutputDir'"
 
-$arguments = @('manifest', '--resource', 'settings', '--outputDir', $outputDir)
+Write-Host "Cleaning previously generated DSC manifest files from '$dscOutputDir'."
+Get-ChildItem -Path $dscOutputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction SilentlyContinue | Remove-Item -Force
+
+$arguments = @('manifest', '--resource', 'settings', '--outputDir', $dscOutputDir)
 Write-Host "Invoking DSC manifest generator: '$exePath' $($arguments -join ' ')"
 & $exePath @arguments
 if ($LASTEXITCODE -ne 0) {
     throw "PowerToys.DSC.exe exited with code $LASTEXITCODE"
 }
 
-$generatedFiles = Get-ChildItem -Path $outputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction Stop
+$generatedFiles = Get-ChildItem -Path $dscOutputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction Stop
 if ($generatedFiles.Count -eq 0) {
-    throw "No DSC manifest files were generated in '$outputDir'."
+    throw "No DSC manifest files were generated in '$dscOutputDir'."
 }
 
 Write-Host "Generated $($generatedFiles.Count) DSC manifest file(s):"

.pipelines/v2/release.yml

@@ -52,8 +52,6 @@ extends:
       name: SHINE-INT-S
       ${{ if eq(parameters.useVSPreview, true) }}:
         demands: ImageOverride -equals SHINE-VS17-Preview
-      ${{ else }}:
-        image: SHINE-VS17-Latest
       os: windows
     sdl:
       tsa:
@@ -75,7 +73,6 @@ extends:
                 name: SHINE-INT-L
                 demands:
                   # Our INT agents have a large disk mounted at P:\
-                  - WorkFolder -equals P:\_work
                   - ${{ if eq(parameters.useVSPreview, true) }}:
                     - ImageOverride -equals SHINE-VS17-Preview
                 os: windows
@@ -126,7 +123,6 @@ extends:
             parameters:
               pool:
                 name: SHINE-INT-L
-                image: SHINE-VS17-Latest
                 os: windows
               official: true
               codeSign: true

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

@@ -111,6 +111,7 @@ jobs:
             ${{ else }}:
               OutputBuildPlatform: ${{ platform }}
   variables:
+    NUGET_PACKAGES: 'C:\NuGetPackages' # Some of our build steps cache these here... and it was apparently part of the global environment
     MakeAppxPath: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x86\MakeAppx.exe'
     # Azure DevOps abhors a vacuum
     # If these are blank, expansion will fail later on... which will result in direct substitution of the variable *names*
@@ -139,6 +140,10 @@ jobs:
     - output: pipelineArtifact
       artifactName: $(JobOutputArtifactName)
       targetPath: $(Build.ArtifactStagingDirectory)
+    - output: pipelineArtifact
+      artifactName: $(JobOutputArtifactName)-failure-$(System.JobAttempt)
+      targetPath: $(LogOutputDirectory)
+      condition: or(failed(), canceled())
   steps:
   - checkout: self
     clean: true
@@ -395,7 +400,7 @@ jobs:
   ### HACK: On ARM64 builds, building an app with Windows App SDK copies the x64 WebView2 dll instead of the ARM64 one. This task makes sure the right dll is used.
   - task: CopyFiles@2
     displayName: HACK Copy core WebView2 ARM64 dll to output directory
-    condition: eq(variables['BuildPlatform'],'arm64')
+    condition: and(succeeded(), eq(variables['BuildPlatform'], 'arm64'))
     inputs:
       contents: packages/Microsoft.Web.WebView2.1.0.2903.40/runtimes/win-ARM64/native_uap/Microsoft.Web.WebView2.Core.dll
       targetFolder: $(Build.SourcesDirectory)/ARM64/Release/WinUI3Apps/
@@ -434,11 +439,11 @@ jobs:
       inputs:
         testResultsFormat: VSTest
         testResultsFiles: '**/*.trx'
-      condition: ne(variables['BuildPlatform'],'arm64')
+      condition: and(succeeded(), ne(variables['BuildPlatform'], 'arm64'))
 
     # Native dlls
     - task: VSTest@2
-      condition: ne(variables['BuildPlatform'],'arm64') # No arm64 agents to run the tests.
+      condition: and(succeeded(), ne(variables['BuildPlatform'], 'arm64')) # No arm64 agents to run the tests.
       displayName: 'Native Tests'
       inputs:
         platform: '$(BuildPlatform)'

README.md

@@ -10,11 +10,11 @@
 
 <h3 align="center">
   <a href="#-installation">Installation</a>
-  <span> . </span>
+  <span> · </span>
   <a href="https://aka.ms/powertoys-docs">Documentation</a>
-  <span> . </span>
+  <span> · </span>
   <a href="https://aka.ms/powertoys-releaseblog">Blog</a>
-  <span> . </span>
+  <span> · </span>
   <a href="#-whats-new">Release notes</a>
 </h3>
 <br/><br/>

installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj

@@ -54,6 +54,7 @@
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\CmdPal.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\CmdPal.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\ColorPicker.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\ColorPicker.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Core.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Core.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\DscResources.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\DscResources.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\EnvironmentVariables.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\EnvironmentVariables.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\FileExplorerPreview.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\FileExplorerPreview.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\FileLocksmith.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\FileLocksmith.wxs.bk""""

installer/PowerToysSetupVNext/Core.wxs

@@ -15,8 +15,8 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="powertoys_env_path_user" Value="" KeyPath="yes" />
         </RegistryKey>
-        <!-- Append install folder to current user's PATH -->
-        <Environment Id="AddPowerToysToUserPath" Name="PATH" Action="set" Part="last" System="no" Value="[INSTALLFOLDER]" />
+        <!-- Append DSCModules folder to current user's PATH for DSC v3 usage -->
+        <Environment Id="AddPowerToysToUserPath" Name="PATH" Action="set" Part="last" System="no" Value="[DSCModulesReferenceFolder]" />
       </Component>
       <?else?>
       <Component Id="powertoys_env_path_machine" Bitness="always64">
@@ -24,8 +24,8 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="powertoys_env_path_machine" Value="" KeyPath="yes" />
         </RegistryKey>
-        <!-- Append install folder to machine PATH -->
-        <Environment Id="AddPowerToysToMachinePath" Name="PATH" Action="set" Part="last" System="yes" Value="[INSTALLFOLDER]" />
+        <!-- Append DSCModules folder to machine PATH for DSC v3 usage -->
+        <Environment Id="AddPowerToysToMachinePath" Name="PATH" Action="set" Part="last" System="yes" Value="[DSCModulesReferenceFolder]" />
       </Component>
       <?endif?>
       <Component Id="powertoys_toast_clsid" Bitness="always64">
@@ -63,16 +63,6 @@
       </Component>
     </DirectoryRef>
 
-    <DirectoryRef Id="DSCModulesReferenceFolder">
-      <Component Id="PowerToysDSCReference" Guid="40869ACB-0BEB-4911-AE41-5E73BC1586A9" Bitness="always64">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="DSCModulesReference" Value="" KeyPath="yes" />
-        </RegistryKey>
-        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psd1" Id="PTConfReference.psd1" />
-        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psm1" Id="PTConfReference.psm1" />
-      </Component>
-    </DirectoryRef>
-
     <?if $(var.PerUser) = "true" ?>
     <!-- DSC module files for PerUser handled in InstallDSCModule custom action. -->
     <?else?>
@@ -120,7 +110,6 @@
           <RegistryValue Type="string" Name="RemoveCoreFolder" Value="" KeyPath="yes" />
         </RegistryKey>
         <RemoveFolder Id="RemoveBaseApplicationsAssetsFolder" Directory="BaseApplicationsAssetsFolder" On="uninstall" />
-        <RemoveFolder Id="RemoveDSCModulesReferenceFolder" Directory="DSCModulesReferenceFolder" On="uninstall" />
         <RemoveFolder Id="RemoveWinUI3AppsInstallFolder" Directory="WinUI3AppsInstallFolder" On="uninstall" />
         <RemoveFolder Id="RemoveWinUI3AppsAssetsFolder" Directory="WinUI3AppsAssetsFolder" On="uninstall" />
         <RemoveFolder Id="RemoveINSTALLFOLDER" Directory="INSTALLFOLDER" On="uninstall" />
@@ -128,16 +117,15 @@
       <ComponentRef Id="powertoys_exe" />
       <ComponentRef Id="PowerToysStartMenuShortcut" />
       <ComponentRef Id="powertoys_per_machine_comp" />
-  <?if $(var.PerUser) = "true" ?>
-  <ComponentRef Id="powertoys_env_path_user" />
-  <?else?>
-  <ComponentRef Id="powertoys_env_path_machine" />
-  <?endif?>
       <ComponentRef Id="powertoys_toast_clsid" />
       <ComponentRef Id="License_rtf" />
       <ComponentRef Id="Notice_md" />
       <ComponentRef Id="DesktopShortcut" />
-      <ComponentRef Id="PowerToysDSCReference" />
+      <?if $(var.PerUser) = "true" ?>
+      <ComponentRef Id="powertoys_env_path_user" />
+      <?else?>
+      <ComponentRef Id="powertoys_env_path_machine" />
+      <?endif?>
       <?if $(var.PerUser) = "false" ?>
       <ComponentRef Id="PowerToysDSC" />
       <?endif?>

installer/PowerToysSetupVNext/DscResources.wxs

@@ -0,0 +1,33 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define DscJsonFiles=?>
+  <?define DscJsonFilesPath=$(var.BinDir)\DSCModules?>
+
+  <Fragment>
+    <DirectoryRef Id="DSCModulesReferenceFolder" FileSource="$(var.DscJsonFilesPath)">
+      <!-- DSC v2 PowerShell module files -->
+      <Component Id="PowerToysDSCReference" Guid="40869ACB-0BEB-4911-AE41-5E73BC1586A9" Bitness="always64">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="DSCModulesReference" Value="" KeyPath="yes" />
+        </RegistryKey>
+        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psd1" Id="PTConfReference.psd1" />
+        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psm1" Id="PTConfReference.psm1" />
+      </Component>
+      
+      <!-- DSC v3 JSON manifest files - Generated by generateAllFileComponents.ps1 -->
+      <!--DscJsonFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="DscResourcesComponentGroup">
+      <ComponentRef Id="PowerToysDSCReference" />
+      <Component Id="RemoveDSCModulesFolder" Guid="A3C77D92-4E97-4C1A-9F2E-8B3C5D6E7F80" Directory="DSCModulesReferenceFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveDSCModulesFolder" Value="" KeyPath="yes" />
+        </RegistryKey>
+        <RemoveFolder Id="RemoveDSCModulesReferenceFolder" Directory="DSCModulesReferenceFolder" On="uninstall" />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>

installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj

@@ -14,7 +14,6 @@ SET PTRoot=$(SolutionDir)\..
 call "..\..\..\publish.cmd" x64
 )
 call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs" -Platform "$(Platform)" -nugetHeatPath "$(NUGET_PACKAGES)\wixtoolset.heat\5.0.2"
-call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateDscResourcesWxs.ps1 -dscWxsFile "$(MSBuildThisFileDirectory)\DscResources.wxs" -Platform "$(Platform)" -Configuration "$(Configuration)"
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)' != 'x64'">
@@ -25,7 +24,6 @@ SET PTRoot=$(SolutionDir)\..
 call "..\..\..\publish.cmd" arm64
 )
 call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs" -Platform "$(Platform)" -nugetHeatPath "$(NUGET_PACKAGES)\wixtoolset.heat\5.0.2"
-call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateDscResourcesWxs.ps1 -dscWxsFile "$(MSBuildThisFileDirectory)\DscResources.wxs" -Platform "$(Platform)" -Configuration "$(Configuration)"
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
@@ -37,6 +35,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
       call move /Y ..\..\..\CmdPal.wxs.bk ..\..\..\CmdPal.wxs
       call move /Y ..\..\..\ColorPicker.wxs.bk ..\..\..\ColorPicker.wxs
       call move /Y ..\..\..\Core.wxs.bk ..\..\..\Core.wxs
+      call move /Y ..\..\..\DscResources.wxs.bk ..\..\..\DscResources.wxs
       call move /Y ..\..\..\EnvironmentVariables.wxs.bk ..\..\..\EnvironmentVariables.wxs
       call move /Y ..\..\..\FileExplorerPreview.wxs.bk ..\..\..\FileExplorerPreview.wxs
       call move /Y ..\..\..\FileLocksmith.wxs.bk ..\..\..\FileLocksmith.wxs

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" />
-      <Custom Action="SetBundleInstallLocation" After="InstallFiles" 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="ApplyModulesRegistryChangeSets" After="InstallFiles" Condition="NOT Installed" />
       <Custom Action="InstallCmdPalPackage" After="InstallFiles" Condition="NOT Installed" />
       <Custom Action="InstallPackageIdentityMSIX" After="InstallFiles" Condition="NOT Installed" />

installer/PowerToysSetupVNext/generateAllFileComponents.ps1

@@ -317,3 +317,7 @@ Generate-FileComponents -fileListName "SettingsV2IconsModelsFiles" -wxsFilePath
 #Workspaces
 Generate-FileList -fileDepsJson "" -fileListName WorkspacesImagesComponentFiles -wxsFilePath $PSScriptRoot\Workspaces.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Workspaces\"
 Generate-FileComponents -fileListName "WorkspacesImagesComponentFiles" -wxsFilePath $PSScriptRoot\Workspaces.wxs
+
+#DSC Resources - JSON manifest files in DSCModules subfolder
+Generate-FileList -fileDepsJson "" -fileListName DscJsonFiles -wxsFilePath $PSScriptRoot\DscResources.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\DSCModules\"
+Generate-FileComponents -fileListName "DscJsonFiles" -wxsFilePath $PSScriptRoot\DscResources.wxs

installer/PowerToysSetupVNext/generateDscResourcesWxs.ps1

@@ -1,102 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory = $True)]
-    [string]$dscWxsFile,
-    [Parameter(Mandatory = $True)]
-    [string]$Platform,
-    [Parameter(Mandatory = $True)]
-    [string]$Configuration
-)
-
-$ErrorActionPreference = 'Stop'
-
-$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
-
-# Find build output directory
-$buildOutputDir = Join-Path $scriptDir "..\..\$Platform\$Configuration"
-
-if (-not (Test-Path $buildOutputDir)) {
-    Write-Error "Build output directory not found: '$buildOutputDir'"
-    exit 1
-}
-
-# Find all DSC manifest JSON files
-$dscFiles = Get-ChildItem -Path $buildOutputDir -Filter "microsoft.powertoys.*.settings.dsc.resource.json" -File
-
-if (-not $dscFiles) {
-    Write-Warning "No DSC manifest files found in '$buildOutputDir'"
-    # Create empty component group
-    $wxsContent = @"
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-  <?include `$(sys.CURRENTDIR)\Common.wxi?>
-
-  <Fragment>
-    <ComponentGroup Id="DscResourcesComponentGroup">
-    </ComponentGroup>
-  </Fragment>
-</Wix>
-"@
-    Set-Content -Path $dscWxsFile -Value $wxsContent
-    exit 0
-}
-
-Write-Host "Found $($dscFiles.Count) DSC manifest file(s)"
-
-# Generate WiX fragment
-$wxsContent = @"
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-  <?include `$(sys.CURRENTDIR)\Common.wxi?>
-
-  <Fragment>
-    <DirectoryRef Id="DSCModulesReferenceFolder">
-"@
-
-$componentRefs = @()
-
-foreach ($file in $dscFiles) {
-    $componentId = "DscResource_" + ($file.BaseName -replace '[^A-Za-z0-9_]', '_')
-    $fileId = $componentId + "_File"
-    $guid = [System.Guid]::NewGuid().ToString().ToUpper()
-    
-    $componentRefs += $componentId
-    
-    $wxsContent += @"
-
-      <Component Id="$componentId" Guid="{$guid}" Directory="DSCModulesReferenceFolder">
-        <RegistryKey Root="`$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="$componentId" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="$fileId" Source="`$(var.BinDir)$($file.Name)" Vital="no"/>
-      </Component>
-"@
-}
-
-$wxsContent += @"
-
-    </DirectoryRef>
-  </Fragment>
-
-  <Fragment>
-    <ComponentGroup Id="DscResourcesComponentGroup">
-"@
-
-foreach ($componentId in $componentRefs) {
-    $wxsContent += @"
-
-      <ComponentRef Id="$componentId"/>
-"@
-}
-
-$wxsContent += @"
-
-    </ComponentGroup>
-  </Fragment>
-</Wix>
-"@
-
-# Write the WiX file
-Set-Content -Path $dscWxsFile -Value $wxsContent
-
-Write-Host "Generated DSC resources WiX fragment: '$dscWxsFile'"

src/common/UITestAutomation/SettingsConfigHelper.cs

@@ -0,0 +1,175 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Text.Json;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
+
+namespace Microsoft.PowerToys.UITest
+{
+    /// <summary>
+    /// Helper class for configuring PowerToys settings for UI tests.
+    /// </summary>
+    public class SettingsConfigHelper
+    {
+        private static readonly JsonSerializerOptions IndentedJsonOptions = new() { WriteIndented = true };
+        private static readonly SettingsUtils SettingsUtils = new SettingsUtils();
+
+        /// <summary>
+        /// Configures global PowerToys settings to enable only specified modules and disable all others.
+        /// </summary>
+        /// <param name="modulesToEnable">Array of module names to enable (e.g., "Peek", "FancyZones"). All other modules will be disabled.</param>
+        /// <exception cref="ArgumentNullException">Thrown when modulesToEnable is null.</exception>
+        /// <exception cref="InvalidOperationException">Thrown when settings file operations fail.</exception>
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "This is test code and will not be trimmed")]
+        [UnconditionalSuppressMessage("AOT", "IL3050", Justification = "This is test code and will not be AOT compiled")]
+        public static void ConfigureGlobalModuleSettings(params string[] modulesToEnable)
+        {
+            ArgumentNullException.ThrowIfNull(modulesToEnable);
+
+            try
+            {
+                GeneralSettings settings;
+                try
+                {
+                    settings = SettingsUtils.GetSettingsOrDefault<GeneralSettings>();
+                }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine($"Failed to load settings, creating defaults: {ex.Message}");
+                    settings = new GeneralSettings();
+                }
+
+                string settingsJson = settings.ToJsonString();
+                using (JsonDocument doc = JsonDocument.Parse(settingsJson))
+                {
+                    var options = new JsonSerializerOptions { WriteIndented = true };
+                    var root = doc.RootElement.Clone();
+
+                    if (root.TryGetProperty("enabled", out var enabledElement))
+                    {
+                        var enabledModules = new Dictionary<string, bool>();
+
+                        foreach (var property in enabledElement.EnumerateObject())
+                        {
+                            string moduleName = property.Name;
+
+                            bool shouldEnable = Array.Exists(modulesToEnable, m => string.Equals(m, moduleName, StringComparison.Ordinal));
+                            enabledModules[moduleName] = shouldEnable;
+                        }
+
+                        var settingsDict = JsonSerializer.Deserialize<Dictionary<string, object>>(settingsJson);
+                        if (settingsDict != null)
+                        {
+                            settingsDict["enabled"] = enabledModules;
+                            settingsJson = JsonSerializer.Serialize(settingsDict, IndentedJsonOptions);
+                        }
+                    }
+                }
+
+                SettingsUtils.SaveSettings(settingsJson);
+
+                string enabledList = modulesToEnable.Length > 0 ? string.Join(", ", modulesToEnable) : "none";
+                Debug.WriteLine($"Successfully updated global settings");
+                Debug.WriteLine($"Enabled modules: {enabledList}");
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"ERROR in ConfigureGlobalModuleSettings: {ex.Message}");
+                throw new InvalidOperationException($"Failed to configure global module settings: {ex.Message}", ex);
+            }
+        }
+
+        /// <summary>
+        /// Updates a module's settings file. If the file doesn't exist, creates it with default content.
+        /// If the file exists, reads it and applies the provided update function to modify the settings.
+        /// </summary>
+        /// <param name="moduleName">The name of the module (e.g., "Peek", "FancyZones").</param>
+        /// <param name="defaultSettingsContent">The default JSON content to use if the settings file doesn't exist.</param>
+        /// <param name="updateSettingsAction">
+        /// A callback function that modifies the settings dictionary. The function receives the deserialized settings
+        /// and should modify it in-place. The function should accept a Dictionary&lt;string, object&gt; and not return a value.
+        /// Example: (settings) => { ((Dictionary&lt;string, object&gt;)settings["properties"])["SomeSetting"] = newValue; }
+        /// </param>
+        /// <exception cref="ArgumentNullException">Thrown when moduleName or updateSettingsAction is null.</exception>
+        /// <exception cref="InvalidOperationException">Thrown when settings file operations fail.</exception>
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "This is test code and will not be trimmed")]
+        [UnconditionalSuppressMessage("AOT", "IL3050", Justification = "This is test code and will not be AOT compiled")]
+        public static void UpdateModuleSettings(
+            string moduleName,
+            string defaultSettingsContent,
+            Action<Dictionary<string, object>> updateSettingsAction)
+        {
+            ArgumentNullException.ThrowIfNull(moduleName);
+            ArgumentNullException.ThrowIfNull(updateSettingsAction);
+
+            try
+            {
+                // Build the path to the module settings file
+                string powerToysSettingsDirectory = Path.Combine(
+                    Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+                    "Microsoft",
+                    "PowerToys");
+
+                string moduleDirectory = Path.Combine(powerToysSettingsDirectory, moduleName);
+                string settingsPath = Path.Combine(moduleDirectory, "settings.json");
+
+                // Ensure directory exists
+                Directory.CreateDirectory(moduleDirectory);
+
+                // Read existing settings or use default
+                string existingJson = string.Empty;
+                if (File.Exists(settingsPath))
+                {
+                    existingJson = File.ReadAllText(settingsPath);
+                }
+
+                Dictionary<string, object>? settings;
+
+                // If file doesn't exist or is empty, create from defaults
+                if (string.IsNullOrWhiteSpace(existingJson))
+                {
+                    if (string.IsNullOrWhiteSpace(defaultSettingsContent))
+                    {
+                        throw new ArgumentException("Default settings content must be provided when file doesn't exist.", nameof(defaultSettingsContent));
+                    }
+
+                    settings = JsonSerializer.Deserialize<Dictionary<string, object>>(defaultSettingsContent)
+                               ?? throw new InvalidOperationException($"Failed to deserialize default settings for {moduleName}");
+
+                    Debug.WriteLine($"Created default settings for {moduleName} at {settingsPath}");
+                }
+                else
+                {
+                    // Parse existing settings
+                    settings = JsonSerializer.Deserialize<Dictionary<string, object>>(existingJson)
+                               ?? throw new InvalidOperationException($"Failed to deserialize existing settings for {moduleName}");
+
+                    Debug.WriteLine($"Loaded existing settings for {moduleName} from {settingsPath}");
+                }
+
+                // Apply the update action to modify settings
+                updateSettingsAction(settings);
+
+                // Serialize and save the updated settings using SettingsUtils
+                string updatedJson = JsonSerializer.Serialize(settings, IndentedJsonOptions);
+                SettingsUtils.SaveSettings(updatedJson, moduleName);
+
+                Debug.WriteLine($"Successfully updated settings for {moduleName}");
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"ERROR in UpdateModuleSettings for {moduleName}: {ex.Message}");
+                throw new InvalidOperationException($"Failed to update settings for {moduleName}: {ex.Message}", ex);
+            }
+        }
+    }
+}

src/common/UITestAutomation/UITestAutomation.csproj

@@ -8,7 +8,7 @@
     <Nullable>enable</Nullable>
     <PublishAot>true</PublishAot>
     <InvariantGlobalization>true</InvariantGlobalization>
-    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
@@ -21,4 +21,8 @@
     <PackageReference Include="CoenM.ImageSharp.ImageHash" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />
+  </ItemGroup>
+
 </Project>

src/dsc/v3/PowerToys.DSC/Models/DscManifest.cs

@@ -13,7 +13,7 @@ namespace PowerToys.DSC.Models;
 public sealed class DscManifest
 {
     private const string Schema = "https://aka.ms/dsc/schemas/v3/bundled/resource/manifest.vscode.json";
-    private const string Executable = @"PowerToys.DSC.exe";
+    private const string Executable = @"..\PowerToys.DSC.exe";
 
     private readonly string _type;
     private readonly string _version;

src/dsc/v3/PowerToys.DSC/PowerToys.DSC.csproj

@@ -40,9 +40,11 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  <!-- In debug mode, generate the DSC resource JSON files -->
-  <Target Name="GenerateDscResourceJsonFiles" AfterTargets="Build" Condition="'$(Configuration)' == 'Debug'">
-	<Message Text="Generating DSC resource JSON files inside ..." Importance="high" />
-	<Exec Command="dotnet &quot;$(TargetPath)&quot; manifest --resource settings --outputDir &quot;$(TargetDir)\&quot;" />
+  <!-- Generate the DSC resource JSON files to DSCModules subfolder -->
+  <!-- Skip generation in CI/CD builds (CIBuild=true) to avoid unnecessary work during pipeline -->
+  <Target Name="GenerateDscResourceJsonFiles" AfterTargets="Build" Condition="'$(CIBuild)' != 'true'">
+    <Message Text="Generating DSC resource JSON files to DSCModules subfolder..." Importance="high" />
+    <MakeDir Directories="$(TargetDir)DSCModules" />
+    <Exec Command="dotnet &quot;$(TargetPath)&quot; manifest --resource settings --outputDir &quot;$(TargetDir)DSCModules&quot;" />
   </Target>
 </Project>

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml

@@ -542,7 +542,10 @@
                             Source="{x:Bind ViewModel.ActiveAIProvider?.ServiceType, Mode=OneWay, Converter={StaticResource ServiceTypeToIconConverter}}" />
                     </DropDownButton.Content>
                     <DropDownButton.Flyout>
-                        <Flyout Placement="Bottom" ShouldConstrainToRootBounds="False">
+                        <Flyout
+                            Opened="AIProviderFlyout_Opened"
+                            Placement="Bottom"
+                            ShouldConstrainToRootBounds="False">
                             <Grid
                                 Width="386"
                                 Margin="-4"

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml.cs

@@ -22,6 +22,8 @@ namespace AdvancedPaste.Controls
     {
         public OptionsViewModel ViewModel { get; private set; }
 
+        private bool _syncingProviderSelection;
+
         public static readonly DependencyProperty PlaceholderTextProperty = DependencyProperty.Register(
             nameof(PlaceholderText),
             typeof(string),
@@ -74,6 +76,11 @@ namespace AdvancedPaste.Controls
                 var state = ViewModel.IsBusy ? "LoadingState" : ViewModel.PasteActionError.HasText ? "ErrorState" : "DefaultState";
                 VisualStateManager.GoToState(this, state, true);
             }
+
+            if (e.PropertyName is nameof(ViewModel.ActiveAIProvider) or nameof(ViewModel.AIProviders))
+            {
+                SyncProviderSelection();
+            }
         }
 
         private void ViewModel_PreviewRequested(object sender, EventArgs e)
@@ -87,6 +94,7 @@ namespace AdvancedPaste.Controls
         private void Grid_Loaded(object sender, RoutedEventArgs e)
         {
             InputTxtBox.Focus(FocusState.Programmatic);
+            SyncProviderSelection();
         }
 
         [RelayCommand]
@@ -126,18 +134,56 @@ namespace AdvancedPaste.Controls
             Loader.IsLoading = loading;
         }
 
+        private void SyncProviderSelection()
+        {
+            if (AIProviderListView is null)
+            {
+                return;
+            }
+
+            try
+            {
+                _syncingProviderSelection = true;
+                AIProviderListView.SelectedItem = ViewModel.ActiveAIProvider;
+            }
+            finally
+            {
+                _syncingProviderSelection = false;
+            }
+        }
+
+        private void AIProviderFlyout_Opened(object sender, object e)
+        {
+            SyncProviderSelection();
+        }
+
         private async void AIProviderListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (AIProviderListView.SelectedItem is PasteAIProviderDefinition provider)
+            if (_syncingProviderSelection)
             {
-                if (ViewModel.SetActiveProviderCommand.CanExecute(provider))
-                {
-                    await ViewModel.SetActiveProviderCommand.ExecuteAsync(provider);
-                }
-
-                var flyout = FlyoutBase.GetAttachedFlyout(AIProviderButton);
-                flyout?.Hide();
+                return;
             }
+
+            var flyout = FlyoutBase.GetAttachedFlyout(AIProviderButton);
+
+            if (AIProviderListView.SelectedItem is not PasteAIProviderDefinition provider)
+            {
+                return;
+            }
+
+            if (string.Equals(ViewModel.ActiveAIProvider?.Id, provider.Id, StringComparison.OrdinalIgnoreCase))
+            {
+                flyout?.Hide();
+                return;
+            }
+
+            if (ViewModel.SetActiveProviderCommand.CanExecute(provider))
+            {
+                await ViewModel.SetActiveProviderCommand.ExecuteAsync(provider);
+                SyncProviderSelection();
+            }
+
+            flyout?.Hide();
         }
     }
 }

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml

@@ -280,13 +280,15 @@
                                             x:Uid="TermsLink"
                                             Padding="0"
                                             FontSize="12"
-                                            NavigateUri="https://openai.com/policies/terms-of-use" />
+                                            NavigateUri="{x:Bind ViewModel.TermsLinkUri, Mode=OneWay}"
+                                            Visibility="{x:Bind ViewModel.HasTermsLink, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
                                         <HyperlinkButton
                                             x:Name="PrivacyHyperLink"
                                             x:Uid="PrivacyLink"
                                             Padding="0"
                                             FontSize="12"
-                                            NavigateUri="https://openai.com/policies/privacy-policy" />
+                                            NavigateUri="{x:Bind ViewModel.PrivacyLinkUri, Mode=OneWay}"
+                                            Visibility="{x:Bind ViewModel.HasPrivacyLink, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
                                     </StackPanel>
                                 </StackPanel>
                             </Flyout>

src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs

@@ -71,6 +71,11 @@ namespace AdvancedPaste.ViewModels
         [NotifyPropertyChangedFor(nameof(IsCustomAIAvailable))]
         [NotifyPropertyChangedFor(nameof(AllowedAIProviders))]
         [NotifyPropertyChangedFor(nameof(ActiveAIProvider))]
+        [NotifyPropertyChangedFor(nameof(ActiveAIProviderTooltip))]
+        [NotifyPropertyChangedFor(nameof(TermsLinkUri))]
+        [NotifyPropertyChangedFor(nameof(PrivacyLinkUri))]
+        [NotifyPropertyChangedFor(nameof(HasTermsLink))]
+        [NotifyPropertyChangedFor(nameof(HasPrivacyLink))]
         private bool _isAllowedByGPO;
 
         [ObservableProperty]
@@ -187,6 +192,35 @@ namespace AdvancedPaste.ViewModels
             }
         }
 
+        private AIServiceTypeMetadata GetActiveProviderMetadata()
+        {
+            var provider = ActiveAIProvider ?? AllowedAIProviders.FirstOrDefault();
+            var serviceType = provider?.ServiceTypeKind ?? AIServiceType.OpenAI;
+            return AIServiceTypeRegistry.GetMetadata(serviceType);
+        }
+
+        public Uri TermsLinkUri
+        {
+            get
+            {
+                var metadata = GetActiveProviderMetadata();
+                return metadata.HasTermsLink ? metadata.TermsUri : null;
+            }
+        }
+
+        public Uri PrivacyLinkUri
+        {
+            get
+            {
+                var metadata = GetActiveProviderMetadata();
+                return metadata.HasPrivacyLink ? metadata.PrivacyUri : null;
+            }
+        }
+
+        public bool HasTermsLink => GetActiveProviderMetadata().HasTermsLink;
+
+        public bool HasPrivacyLink => GetActiveProviderMetadata().HasPrivacyLink;
+
         public bool ClipboardHasData => AvailableClipboardFormats != ClipboardFormat.None;
 
         public bool ClipboardHasDataForCustomAI => PasteFormat.SupportsClipboardFormats(CustomAIFormat, AvailableClipboardFormats);
@@ -276,8 +310,8 @@ namespace AdvancedPaste.ViewModels
             OnPropertyChanged(nameof(IsAdvancedAIEnabled));
             OnPropertyChanged(nameof(AIProviders));
             OnPropertyChanged(nameof(AllowedAIProviders));
-            OnPropertyChanged(nameof(ActiveAIProvider));
-            OnPropertyChanged(nameof(ActiveAIProviderTooltip));
+
+            NotifyActiveProviderChanged();
 
             EnqueueRefreshPasteFormats();
         }
@@ -316,8 +350,17 @@ namespace AdvancedPaste.ViewModels
                 }
             }
 
+            NotifyActiveProviderChanged();
+        }
+
+        private void NotifyActiveProviderChanged()
+        {
             OnPropertyChanged(nameof(ActiveAIProvider));
             OnPropertyChanged(nameof(ActiveAIProviderTooltip));
+            OnPropertyChanged(nameof(TermsLinkUri));
+            OnPropertyChanged(nameof(PrivacyLinkUri));
+            OnPropertyChanged(nameof(HasTermsLink));
+            OnPropertyChanged(nameof(HasPrivacyLink));
         }
 
         private void RefreshPasteFormats()
@@ -837,6 +880,7 @@ namespace AdvancedPaste.ViewModels
 
             UpdateAIProviderActiveFlags();
             OnPropertyChanged(nameof(AIProviders));
+            NotifyActiveProviderChanged();
             EnqueueRefreshPasteFormats();
         }
 

src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp

@@ -11,7 +11,6 @@
 #include <logger/logger_settings.h>
 #include <logger/logger.h>
 #include <utils/logger_helper.h>
-#include <LightSwitchServiceObserver.h>
 
 SERVICE_STATUS g_ServiceStatus = {};
 SERVICE_STATUS_HANDLE g_StatusHandle = nullptr;
@@ -20,6 +19,7 @@ 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);
@@ -164,48 +164,8 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
 
     LightSwitchSettings::instance().InitFileWatcher();
 
-    LightSwitchServiceObserver observer({ SettingId::LightTime,
-                                          SettingId::DarkTime,
-                                          SettingId::ScheduleMode,
-                                          SettingId::Sunrise_Offset,
-                                          SettingId::Sunset_Offset });
-
     HANDLE hManualOverride = OpenEventW(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
 
-    auto applyTheme = [](int nowMinutes, int lightMinutes, int darkMinutes, const auto& settings) {
-        bool isLightActive = (lightMinutes < darkMinutes) ? (nowMinutes >= lightMinutes && nowMinutes < darkMinutes) : (nowMinutes >= lightMinutes || nowMinutes < darkMinutes);
-
-        bool isSystemCurrentlyLight = GetCurrentSystemTheme();
-        bool isAppsCurrentlyLight = GetCurrentAppsTheme();
-
-        if (isLightActive)
-        {
-            if (settings.changeSystem && !isSystemCurrentlyLight)
-            {
-                SetSystemTheme(true);
-                Logger::info(L"[LightSwitchService] Changing system theme to light mode.");
-            }
-            if (settings.changeApps && !isAppsCurrentlyLight)
-            {
-                SetAppsTheme(true);
-                Logger::info(L"[LightSwitchService] Changing apps theme to light mode.");
-            }
-        }
-        else
-        {
-            if (settings.changeSystem && isSystemCurrentlyLight)
-            {
-                SetSystemTheme(false);
-                Logger::info(L"[LightSwitchService] Changing system theme to dark mode.");
-            }
-            if (settings.changeApps && isAppsCurrentlyLight)
-            {
-                SetAppsTheme(false);
-                Logger::info(L"[LightSwitchService] Changing apps theme to dark mode.");
-            }
-        }
-    };
-
     LightSwitchSettings::instance().LoadSettings();
     auto& settings = LightSwitchSettings::instance().settings();
 
@@ -213,22 +173,22 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
     GetLocalTime(&st);
     int nowMinutes = st.wHour * 60 + st.wMinute;
 
+    // Handle initial theme application if necessary
     if (settings.scheduleMode != ScheduleMode::Off)
     {
-        applyTheme(nowMinutes,
-                   settings.lightTime + settings.sunrise_offset,
-                   settings.darkTime + settings.sunset_offset,
-                   settings);
-        Logger::trace(L"[LightSwitchService] Initialized g_lastUpdatedDay = {}", g_lastUpdatedDay);
+        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 OFF - ticker suspended, waiting for manual action or mode change.");
+        Logger::info(L"[LightSwitchService] Schedule mode is set to Off.");
     }
 
     g_lastUpdatedDay = st.wDay;
+    Logger::info(L"[LightSwitchService] Initializing g_lastUpdatedDay to {}.", g_lastUpdatedDay);
     ULONGLONG lastSettingsReload = 0;
 
+    // ticker loop
     for (;;)
     {
         HANDLE waits[2] = { g_ServiceStopEvent, hParent };
@@ -237,13 +197,10 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
 
         const auto& settings = LightSwitchSettings::instance().settings();
 
-        bool scheduleJustEnabled = (prevMode == ScheduleMode::Off && settings.scheduleMode != ScheduleMode::Off);
-        prevMode = settings.scheduleMode;
-
-        // ─── Handle "Schedule Off" Mode ─────────────────────────────────────────────
+        // 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 OFF - suspending scheduler but keeping service alive.");
+            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");
@@ -283,7 +240,6 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
                 {
                     Logger::trace(L"[LightSwitchService] Settings change event triggered, reloading settings...");
                     ResetEvent(LightSwitchSettings::instance().GetSettingsChangedEvent());
-                    LightSwitchSettings::instance().LoadSettings();
                     const auto& newSettings = LightSwitchSettings::instance().settings();
                     lastSettingsReload = GetTickCount64();
 
@@ -298,73 +254,150 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
             continue;
         }
 
-        // ─── Normal Schedule Loop ───────────────────────────────────────────────────
+        bool scheduleJustEnabled = (prevMode == ScheduleMode::Off && settings.scheduleMode != ScheduleMode::Off);
+        prevMode = settings.scheduleMode;
+
         ULONGLONG nowTick = GetTickCount64();
-        bool recentSettingsReload = (nowTick - lastSettingsReload < 5000);
+        bool recentSettingsReload = (nowTick - lastSettingsReload < 2000);
 
-        if (g_lastUpdatedDay != -1)
+        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)
         {
-            bool manualOverrideActive = (hManualOverride && WaitForSingleObject(hManualOverride, 0) == WAIT_OBJECT_0);
+            Logger::debug(L"[LightSwitchService] Manual override active = {}", manualOverrideActive);
+            lastOverrideStatus = manualOverrideActive;
+        }
 
-            if (settings.scheduleMode != ScheduleMode::Off && !recentSettingsReload && !scheduleJustEnabled)
+        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)
             {
-                Logger::debug(L"[LightSwitchService] Checking if manual override is active...");
-                bool manualOverrideActive = (hManualOverride && WaitForSingleObject(hManualOverride, 0) == WAIT_OBJECT_0);
-                Logger::debug(L"[LightSwitchService] Manual override active = {}", manualOverrideActive);
-
-                if (!manualOverrideActive)
-                {
-                    bool currentSystemTheme = GetCurrentSystemTheme();
-                    bool currentAppsTheme = GetCurrentAppsTheme();
-
-                    SYSTEMTIME st;
-                    GetLocalTime(&st);
-                    int nowMinutes = st.wHour * 60 + st.wMinute;
-
-                    bool shouldBeLight = (settings.lightTime < settings.darkTime) ? (nowMinutes >= settings.lightTime && nowMinutes < settings.darkTime) : (nowMinutes >= settings.lightTime || nowMinutes < settings.darkTime);
-
-                    Logger::debug(L"[LightSwitchService] shouldBeLight = {}", shouldBeLight);
-
-                    if ((settings.changeSystem && (currentSystemTheme != shouldBeLight)) ||
-                        (settings.changeApps && (currentAppsTheme != shouldBeLight)))
-                    {
-                        Logger::debug(L"[LightSwitchService] External theme change detected - enabling manual override");
-
-                        if (!hManualOverride)
-                        {
-                            hManualOverride = OpenEventW(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
-                            if (!hManualOverride)
-                                hManualOverride = CreateEventW(nullptr, TRUE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
-                        }
-
-                        if (hManualOverride)
-                        {
-                            SetEvent(hManualOverride);
-                            Logger::info(L"[LightSwitchService] Detected manual theme change outside of LightSwitch. Triggering manual override.");
-                            skipRest = true;
-                        }
-                    }
-                }
+                lightBoundary = (settings.lightTime + settings.sunrise_offset) % 1440;
+                darkBoundary = (settings.darkTime + settings.sunset_offset) % 1440;
             }
             else
             {
-                Logger::debug(L"[LightSwitchService] Skipping external-change detection (schedule off, recent reload, or just enabled).");
+                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 Schedule Logic ───────────────────────────────────────────────────
+        // 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)
             {
-                Logger::info(L"[LightSwitchService] Mode or coordinates changed, recalculating sun times.");
-                update_sun_times(settings);
                 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;
@@ -383,70 +416,23 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
                 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=%d",
+                       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,
-                       static_cast<int>(currentSettings.scheduleMode));
+                       ToString(currentSettings.scheduleMode).c_str());
             Logger::info(msg);
 
-            bool manualOverrideActive = false;
-            if (hManualOverride)
-                manualOverrideActive = (WaitForSingleObject(hManualOverride, 0) == WAIT_OBJECT_0);
-
-            if (manualOverrideActive)
-            {
-                int lightBoundary = (currentSettings.lightTime + currentSettings.sunrise_offset) % 1440;
-                int darkBoundary = (currentSettings.darkTime + currentSettings.sunset_offset) % 1440;
-
-                bool crossedLight = false;
-                bool crossedDark = false;
-
-                if (prevMinutes != -1)
-                {
-                    if (nowMinutes < prevMinutes)
-                    {
-                        crossedLight = (prevMinutes <= lightBoundary || nowMinutes >= lightBoundary);
-                        crossedDark = (prevMinutes <= darkBoundary || nowMinutes >= darkBoundary);
-                    }
-                    else
-                    {
-                        crossedLight = (prevMinutes < lightBoundary && nowMinutes >= lightBoundary);
-                        crossedDark = (prevMinutes < darkBoundary && nowMinutes >= darkBoundary);
-                    }
-                }
-
-                Logger::debug(L"[LightSwitchService] prevMinutes={} nowMinutes={} light={} dark={}",
-                              prevMinutes,
-                              nowMinutes,
-                              lightBoundary,
-                              darkBoundary);
-
-                if (crossedLight || crossedDark)
-                {
-                    ResetEvent(hManualOverride);
-                    Logger::info(L"[LightSwitchService] Manual override cleared after crossing schedule boundary.");
-                }
-                else
-                {
-                    Logger::info(L"[LightSwitchService] Skipping schedule due to manual override");
-                    skipRest = true;
-                }
-            }
-
-            if (!skipRest)
-                applyTheme(nowMinutes,
-                           currentSettings.lightTime + currentSettings.sunrise_offset,
-                           currentSettings.darkTime + currentSettings.sunset_offset,
-                           currentSettings);
+            LightSwitchSettings::instance().ApplyThemeIfNecessary();
         }
 
         // ─── Wait For Next Minute Tick Or Stop Event ────────────────────────────────
@@ -480,54 +466,6 @@ cleanup:
     return 0;
 }
 
-void ApplyThemeNow()
-{
-    LightSwitchSettings::instance().LoadSettings();
-    const auto& settings = LightSwitchSettings::instance().settings();
-
-    SYSTEMTIME st;
-    GetLocalTime(&st);
-    int nowMinutes = st.wHour * 60 + st.wMinute;
-
-    bool shouldBeLight = false;
-    if (settings.lightTime < settings.darkTime)
-        shouldBeLight = (nowMinutes >= settings.lightTime && nowMinutes < settings.darkTime);
-    else
-        shouldBeLight = (nowMinutes >= settings.lightTime || nowMinutes < settings.darkTime);
-
-    bool isSystemCurrentlyLight = GetCurrentSystemTheme();
-    bool isAppsCurrentlyLight = GetCurrentAppsTheme();
-
-    Logger::info(L"[LightSwitchService] Applying (if needed) theme immediately due to schedule change.");
-
-    if (shouldBeLight)
-    {
-        if (settings.changeSystem && !isSystemCurrentlyLight)
-        {
-            SetSystemTheme(true);
-            Logger::info(L"[LightSwitchService] Changing system theme to light mode.");
-        }
-        if (settings.changeApps && !isAppsCurrentlyLight)
-        {
-            SetAppsTheme(true);
-            Logger::info(L"[LightSwitchService] Changing apps theme to light mode.");
-        }
-    }
-    else
-    {
-        if (settings.changeSystem && isSystemCurrentlyLight)
-        {
-            SetSystemTheme(false);
-            Logger::info(L"[LightSwitchService] Changing system theme to dark mode.");
-        }
-        if (settings.changeApps && isAppsCurrentlyLight)
-        {
-            SetAppsTheme(false);
-            Logger::info(L"[LightSwitchService] Changing apps theme to dark mode.");
-        }
-    }
-}
-
 int APIENTRY wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
 {
     if (powertoys_gpo::getConfiguredLightSwitchEnabledValue() == powertoys_gpo::gpo_rule_configured_disabled)

src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj

@@ -74,7 +74,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="LightSwitchService.cpp" />
-    <ClCompile Include="LightSwitchServiceObserver.cpp" />
     <ClCompile Include="LightSwitchSettings.cpp" />
     <ClCompile Include="SettingsConstants.cpp" />
     <ClCompile Include="ThemeHelper.cpp" />
@@ -85,7 +84,6 @@
     <ResourceCompile Include="LightSwitchService.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="LightSwitchServiceObserver.h" />
     <ClInclude Include="LightSwitchSettings.h" />
     <ClInclude Include="SettingsConstants.h" />
     <ClInclude Include="SettingsObserver.h" />

src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj.filters

@@ -33,9 +33,6 @@
     <ClCompile Include="WinHookEventIDs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="LightSwitchServiceObserver.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ThemeScheduler.h">
@@ -56,9 +53,6 @@
     <ClInclude Include="WinHookEventIDs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="LightSwitchServiceObserver.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />

src/modules/LightSwitch/LightSwitchService/LightSwitchServiceObserver.cpp

@@ -1,29 +0,0 @@
-#include "LightSwitchServiceObserver.h"
-#include <logger.h>
-#include "LightSwitchSettings.h"
-
-// These are defined elsewhere in your service module (ServiceWorkerThread.cpp)
-extern int g_lastUpdatedDay;
-void ApplyThemeNow();
-
-void LightSwitchServiceObserver::SettingsUpdate(SettingId id)
-{
-    Logger::info(L"[LightSwitchService] Setting changed: {}", static_cast<int>(id));
-    g_lastUpdatedDay = -1;
-    ApplyThemeNow();
-}
-
-bool LightSwitchServiceObserver::WantsToBeNotified(SettingId id) const noexcept
-{
-    switch (id)
-    {
-    case SettingId::LightTime:
-    case SettingId::DarkTime:
-    case SettingId::ScheduleMode:
-    case SettingId::Sunrise_Offset:
-    case SettingId::Sunset_Offset:
-        return true;
-    default:
-        return false;
-    }
-}

src/modules/LightSwitch/LightSwitchService/LightSwitchServiceObserver.h

@@ -1,16 +0,0 @@
-#pragma once
-
-#include "SettingsObserver.h"
-
-// The LightSwitchServiceObserver reacts when LightSwitchSettings changes.
-class LightSwitchServiceObserver : public SettingsObserver
-{
-public:
-    explicit LightSwitchServiceObserver(std::unordered_set<SettingId> observedSettings) :
-        SettingsObserver(std::move(observedSettings))
-    {
-    }
-
-    void SettingsUpdate(SettingId id) override;
-    bool WantsToBeNotified(SettingId id) const noexcept override;
-};

src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp

@@ -2,7 +2,7 @@
 #include <common/utils/json.h>
 #include <common/SettingsAPI/settings_helpers.h>
 #include "SettingsObserver.h"
-
+#include "ThemeHelper.h"
 #include <filesystem>
 #include <fstream>
 #include <WinHookEventIDs.h>
@@ -38,13 +38,80 @@ void LightSwitchSettings::InitFileWatcher()
         m_settingsFileWatcher = std::make_unique<FileWatcher>(
             GetSettingsFileName(),
             [this]() {
-                Logger::info(L"[LightSwitchSettings] Settings file changed, signaling event.");
-                LoadSettings();
-                SetEvent(m_settingsChangedEvent);
+                using namespace std::chrono;
+
+                {
+                    std::lock_guard<std::mutex> lock(m_debounceMutex);
+                    m_lastChangeTime = steady_clock::now();
+                    if (m_debouncePending)
+                        return;
+                    m_debouncePending = true;
+                }
+
+                m_debounceThread = std::jthread([this](std::stop_token stop) {
+                    using namespace std::chrono;
+                    while (!stop.stop_requested())
+                    {
+                        std::this_thread::sleep_for(seconds(3));
+
+                        auto elapsed = steady_clock::now() - m_lastChangeTime;
+                        if (elapsed >= seconds(1))
+                            break;
+                    }
+
+                    {
+                        std::lock_guard<std::mutex> lock(m_debounceMutex);
+                        m_debouncePending = false;
+                    }
+
+                    Logger::info(L"[LightSwitchSettings] Settings file stabilized, reloading.");
+
+                    try
+                    {
+                        LoadSettings();
+                        ApplyThemeIfNecessary();
+                        SetEvent(m_settingsChangedEvent);
+                    }
+                    catch (const std::exception& e)
+                    {
+                        std::wstring wmsg;
+                        wmsg.assign(e.what(), e.what() + strlen(e.what()));
+                        Logger::error(L"[LightSwitchSettings] Exception during debounced reload: {}", wmsg);
+                    }
+                });
             });
     }
 }
 
+LightSwitchSettings::~LightSwitchSettings()
+{
+    Logger::info(L"[LightSwitchSettings] Cleaning up settings resources...");
+
+    // Stop and join the debounce thread (std::jthread auto-joins, but we can signal stop too)
+    if (m_debounceThread.joinable())
+    {
+        m_debounceThread.request_stop();
+    }
+
+    // Release the file watcher so it closes file handles and background threads
+    if (m_settingsFileWatcher)
+    {
+        m_settingsFileWatcher.reset();
+        Logger::info(L"[LightSwitchSettings] File watcher stopped.");
+    }
+
+    // Close the Windows event handle
+    if (m_settingsChangedEvent)
+    {
+        CloseHandle(m_settingsChangedEvent);
+        m_settingsChangedEvent = nullptr;
+        Logger::info(L"[LightSwitchSettings] Settings changed event closed.");
+    }
+
+    Logger::info(L"[LightSwitchSettings] Cleanup complete.");
+}
+
+
 void LightSwitchSettings::AddObserver(SettingsObserver& observer)
 {
     m_observers.insert(&observer);
@@ -73,6 +140,7 @@ HANDLE LightSwitchSettings::GetSettingsChangedEvent() const
 
 void LightSwitchSettings::LoadSettings()
 {
+    std::lock_guard<std::mutex> guard(m_settingsMutex);
     try
     {
         PowerToysSettings::PowerToyValues values =
@@ -181,4 +249,49 @@ 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.");
+        }
+    }
 }

src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.h

@@ -5,7 +5,10 @@
 #include <vector>
 #include <memory>
 #include <windows.h>
-
+#include <mutex>
+#include <atomic>
+#include <thread>
+#include <chrono>
 #include <common/SettingsAPI/FileWatcher.h>
 #include <common/SettingsAPI/settings_objects.h>
 #include <SettingsConstants.h>
@@ -78,12 +81,13 @@ public:
     void RemoveObserver(SettingsObserver& observer);
 
     void LoadSettings();
+    void ApplyThemeIfNecessary();
 
     HANDLE GetSettingsChangedEvent() const;
 
 private:
     LightSwitchSettings();
-    ~LightSwitchSettings() = default;
+    ~LightSwitchSettings();
 
     LightSwitchConfig m_settings;
     std::unique_ptr<FileWatcher> m_settingsFileWatcher;
@@ -92,4 +96,11 @@ private:
     void NotifyObservers(SettingId id) const;
 
     HANDLE m_settingsChangedEvent = nullptr;
+    mutable std::mutex m_settingsMutex;
+
+    // Debounce state
+    std::atomic_bool m_debouncePending{ false };
+    std::mutex m_debounceMutex;
+    std::chrono::steady_clock::time_point m_lastChangeTime{};
+    std::jthread m_debounceThread;
 };

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</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</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories);..\NewShellExtensionContextMenu;$(MSBuildThisFileDirectory)Generated Files</AdditionalIncludeDirectories>
       <CompileAsWinRT>false</CompileAsWinRT>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>

src/modules/ZoomIt/ZoomIt/GifRecordingSession.cpp

@@ -0,0 +1,548 @@
+//==============================================================================
+//
+// Zoomit
+// Sysinternals - www.sysinternals.com
+//
+// GIF recording support using Windows Imaging Component (WIC)
+//
+//==============================================================================
+#include "pch.h"
+#include "GifRecordingSession.h"
+#include "CaptureFrameWait.h"
+#include <shcore.h>
+
+extern DWORD g_RecordScaling;
+
+namespace winrt
+{
+    using namespace Windows::Foundation;
+    using namespace Windows::Graphics;
+    using namespace Windows::Graphics::Capture;
+    using namespace Windows::Graphics::DirectX;
+    using namespace Windows::Graphics::DirectX::Direct3D11;
+    using namespace Windows::Storage;
+    using namespace Windows::UI::Composition;
+}
+
+namespace util
+{
+    using namespace robmikh::common::uwp;
+}
+
+const float CLEAR_COLOR[] = { 0.0f, 0.0f, 0.0f, 1.0f };
+
+int32_t EnsureEvenGif(int32_t value)
+{
+    if (value % 2 == 0)
+    {
+        return value;
+    }
+    else
+    {
+        return value + 1;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// GifRecordingSession::GifRecordingSession
+//
+//----------------------------------------------------------------------------
+GifRecordingSession::GifRecordingSession(
+    winrt::IDirect3DDevice const& device,
+    winrt::GraphicsCaptureItem const& item,
+    RECT const cropRect,
+    uint32_t frameRate,
+    winrt::Streams::IRandomAccessStream const& stream)
+{
+    m_device = device;
+    m_d3dDevice = GetDXGIInterfaceFromObject<ID3D11Device>(m_device);
+    m_d3dDevice->GetImmediateContext(m_d3dContext.put());
+    m_item = item;
+    m_frameRate = frameRate;
+    m_stream = stream;
+
+    auto itemSize = item.Size();
+    auto inputWidth = EnsureEvenGif(itemSize.Width);
+    auto inputHeight = EnsureEvenGif(itemSize.Height);
+    m_frameWait = std::make_shared<CaptureFrameWait>(m_device, m_item, winrt::SizeInt32{ inputWidth, inputHeight });
+    auto weakPointer{ std::weak_ptr{ m_frameWait } };
+    m_itemClosed = item.Closed(winrt::auto_revoke, [weakPointer](auto&, auto&)
+        {
+            auto sharedPointer{ weakPointer.lock() };
+            if (sharedPointer)
+            {
+                sharedPointer->StopCapture();
+            }
+        });
+
+    // Get crop dimension
+    if ((cropRect.right - cropRect.left) != 0)
+    {
+        m_rcCrop = cropRect;
+        m_frameWait->ShowCaptureBorder(false);
+    }
+    else
+    {
+        m_rcCrop.left = 0;
+        m_rcCrop.top = 0;
+        m_rcCrop.right = inputWidth;
+        m_rcCrop.bottom = inputHeight;
+    }
+
+    // Apply scaling
+    constexpr int c_minimumSize = 34;
+    auto scaledWidth = MulDiv(m_rcCrop.right - m_rcCrop.left, g_RecordScaling, 100);
+    auto scaledHeight = MulDiv(m_rcCrop.bottom - m_rcCrop.top, g_RecordScaling, 100);
+    m_width = scaledWidth;
+    m_height = scaledHeight;
+    if (m_width < c_minimumSize)
+    {
+        m_width = c_minimumSize;
+        m_height = MulDiv(m_height, m_width, scaledWidth);
+    }
+    if (m_height < c_minimumSize)
+    {
+        m_height = c_minimumSize;
+        m_width = MulDiv(m_width, m_height, scaledHeight);
+    }
+    if (m_width > inputWidth)
+    {
+        m_width = inputWidth;
+        m_height = c_minimumSize, MulDiv(m_height, scaledWidth, m_width);
+    }
+    if (m_height > inputHeight)
+    {
+        m_height = inputHeight;
+        m_width = c_minimumSize, MulDiv(m_width, scaledHeight, m_height);
+    }
+    m_width = EnsureEvenGif(m_width);
+    m_height = EnsureEvenGif(m_height);
+
+    m_frameDelay = (frameRate > 0) ? (100 / frameRate) : 15;
+
+    // Initialize WIC
+    winrt::check_hresult(CoCreateInstance(
+        CLSID_WICImagingFactory,
+        nullptr,
+        CLSCTX_INPROC_SERVER,
+        IID_PPV_ARGS(m_wicFactory.put())));
+
+    // Create WIC stream from IRandomAccessStream
+    winrt::check_hresult(m_wicFactory->CreateStream(m_wicStream.put()));
+
+    // Get the IStream from the IRandomAccessStream
+    winrt::com_ptr<IStream> streamInterop;
+    winrt::check_hresult(CreateStreamOverRandomAccessStream(
+        winrt::get_unknown(stream),
+        IID_PPV_ARGS(streamInterop.put())));
+    winrt::check_hresult(m_wicStream->InitializeFromIStream(streamInterop.get()));
+
+    // Create GIF encoder
+    winrt::check_hresult(m_wicFactory->CreateEncoder(
+        GUID_ContainerFormatGif,
+        nullptr,
+        m_gifEncoder.put()));
+
+    winrt::check_hresult(m_gifEncoder->Initialize(m_wicStream.get(), WICBitmapEncoderNoCache));
+
+    // Set global GIF metadata for looping (NETSCAPE2.0 application extension)
+    try
+    {
+        winrt::com_ptr<IWICMetadataQueryWriter> encoderMetadataWriter;
+        if (SUCCEEDED(m_gifEncoder->GetMetadataQueryWriter(encoderMetadataWriter.put())) && encoderMetadataWriter)
+        {
+            OutputDebugStringW(L"Setting NETSCAPE2.0 looping extension on encoder...\n");
+
+            // Set application extension
+            PROPVARIANT propValue;
+            PropVariantInit(&propValue);
+            propValue.vt = VT_UI1 | VT_VECTOR;
+            propValue.caub.cElems = 11;
+            propValue.caub.pElems = static_cast<UCHAR*>(CoTaskMemAlloc(11));
+            if (propValue.caub.pElems != nullptr)
+            {
+                memcpy(propValue.caub.pElems, "NETSCAPE2.0", 11);
+                HRESULT hr = encoderMetadataWriter->SetMetadataByName(L"/appext/application", &propValue);
+                if (SUCCEEDED(hr))
+                {
+                    OutputDebugStringW(L"Encoder application extension set successfully\n");
+                }
+                else
+                {
+                    OutputDebugStringW(L"Failed to set encoder application extension\n");
+                }
+                PropVariantClear(&propValue);
+
+                // Set loop count (0 = infinite)
+                PropVariantInit(&propValue);
+                propValue.vt = VT_UI1 | VT_VECTOR;
+                propValue.caub.cElems = 5;
+                propValue.caub.pElems = static_cast<UCHAR*>(CoTaskMemAlloc(5));
+                if (propValue.caub.pElems != nullptr)
+                {
+                    propValue.caub.pElems[0] = 3;
+                    propValue.caub.pElems[1] = 1;
+                    propValue.caub.pElems[2] = 0;
+                    propValue.caub.pElems[3] = 0;
+                    propValue.caub.pElems[4] = 0;
+                    hr = encoderMetadataWriter->SetMetadataByName(L"/appext/data", &propValue);
+                    if (SUCCEEDED(hr))
+                    {
+                        OutputDebugStringW(L"Encoder loop count set successfully\n");
+                    }
+                    else
+                    {
+                        OutputDebugStringW(L"Failed to set encoder loop count\n");
+                    }
+                    PropVariantClear(&propValue);
+                }
+            }
+        }
+        else
+        {
+            OutputDebugStringW(L"Failed to get encoder metadata writer\n");
+        }
+    }
+    catch (...)
+    {
+        OutputDebugStringW(L"Warning: Failed to set GIF encoder looping metadata\n");
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// GifRecordingSession::~GifRecordingSession
+//
+//----------------------------------------------------------------------------
+GifRecordingSession::~GifRecordingSession()
+{
+    Close();
+}
+
+//----------------------------------------------------------------------------
+//
+// GifRecordingSession::Create
+//
+//----------------------------------------------------------------------------
+std::shared_ptr<GifRecordingSession> GifRecordingSession::Create(
+    winrt::IDirect3DDevice const& device,
+    winrt::GraphicsCaptureItem const& item,
+    RECT const& crop,
+    uint32_t frameRate,
+    winrt::Streams::IRandomAccessStream const& stream)
+{
+    return std::shared_ptr<GifRecordingSession>(new GifRecordingSession(device, item, crop, frameRate, stream));
+}
+
+//----------------------------------------------------------------------------
+//
+// GifRecordingSession::EncodeFrame
+//
+//----------------------------------------------------------------------------
+HRESULT GifRecordingSession::EncodeFrame(ID3D11Texture2D* frameTexture)
+{
+    try
+    {
+        // Create a staging texture for CPU access
+        D3D11_TEXTURE2D_DESC frameDesc;
+        frameTexture->GetDesc(&frameDesc);
+
+        // GIF encoding with palette generation is VERY slow at high resolutions (4K takes 1 second per frame!)
+
+        UINT targetWidth = frameDesc.Width;
+        UINT targetHeight = frameDesc.Height;
+
+        if (frameDesc.Width > static_cast<uint32_t>(m_width) || frameDesc.Height > static_cast<uint32_t>(m_height))
+        {
+            float scaleX = static_cast<float>(m_width) / frameDesc.Width;
+            float scaleY = static_cast<float>(m_height) / frameDesc.Height;
+            float scale = min(scaleX, scaleY);
+
+            targetWidth = static_cast<UINT>(frameDesc.Width * scale);
+            targetHeight = static_cast<UINT>(frameDesc.Height * scale);
+
+            // Ensure even dimensions for GIF
+            targetWidth = (targetWidth / 2) * 2;
+            targetHeight = (targetHeight / 2) * 2;
+        }
+
+        D3D11_TEXTURE2D_DESC stagingDesc = frameDesc;
+        stagingDesc.Usage = D3D11_USAGE_STAGING;
+        stagingDesc.BindFlags = 0;
+        stagingDesc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
+        stagingDesc.MiscFlags = 0;
+
+        winrt::com_ptr<ID3D11Texture2D> stagingTexture;
+        winrt::check_hresult(m_d3dDevice->CreateTexture2D(&stagingDesc, nullptr, stagingTexture.put()));
+
+        // Copy the frame to staging texture
+        m_d3dContext->CopyResource(stagingTexture.get(), frameTexture);
+
+        // Map the staging texture
+        D3D11_MAPPED_SUBRESOURCE mappedResource;
+        winrt::check_hresult(m_d3dContext->Map(stagingTexture.get(), 0, D3D11_MAP_READ, 0, &mappedResource));
+
+        // Create a new frame in the GIF
+        winrt::com_ptr<IWICBitmapFrameEncode> frameEncode;
+        winrt::com_ptr<IPropertyBag2> propertyBag;
+        winrt::check_hresult(m_gifEncoder->CreateNewFrame(frameEncode.put(), propertyBag.put()));
+
+        // Initialize the frame encoder with property bag
+        winrt::check_hresult(frameEncode->Initialize(propertyBag.get()));
+
+        // CRITICAL: For GIF, we MUST set size and pixel format BEFORE WriteSource
+        // Use target dimensions (may be downsampled)
+        winrt::check_hresult(frameEncode->SetSize(targetWidth, targetHeight));
+
+        // Set the pixel format to 8-bit indexed (required for GIF)
+        WICPixelFormatGUID pixelFormat = GUID_WICPixelFormat8bppIndexed;
+        winrt::check_hresult(frameEncode->SetPixelFormat(&pixelFormat));
+
+        // Create a WIC bitmap from the BGRA texture data
+        winrt::com_ptr<IWICBitmap> sourceBitmap;
+        winrt::check_hresult(m_wicFactory->CreateBitmapFromMemory(
+            frameDesc.Width,
+            frameDesc.Height,
+            GUID_WICPixelFormat32bppBGRA,
+            mappedResource.RowPitch,
+            frameDesc.Height * mappedResource.RowPitch,
+            static_cast<BYTE*>(mappedResource.pData),
+            sourceBitmap.put()));
+
+        // If we need downsampling, use WIC scaler
+        winrt::com_ptr<IWICBitmapSource> finalSource = sourceBitmap;
+        if (targetWidth != frameDesc.Width || targetHeight != frameDesc.Height)
+        {
+            winrt::com_ptr<IWICBitmapScaler> scaler;
+            winrt::check_hresult(m_wicFactory->CreateBitmapScaler(scaler.put()));
+            winrt::check_hresult(scaler->Initialize(
+                sourceBitmap.get(),
+                targetWidth,
+                targetHeight,
+                WICBitmapInterpolationModeHighQualityCubic));
+            finalSource = scaler;
+
+            OutputDebugStringW((L"Downsampled from " + std::to_wstring(frameDesc.Width) + L"x" + std::to_wstring(frameDesc.Height) +
+                               L" to " + std::to_wstring(targetWidth) + L"x" + std::to_wstring(targetHeight) + L"\n").c_str());
+        }
+
+        // Use WriteSource - WIC will handle the BGRA to 8bpp indexed conversion
+        winrt::check_hresult(frameEncode->WriteSource(finalSource.get(), nullptr));
+
+        try
+        {
+            winrt::com_ptr<IWICMetadataQueryWriter> frameMetadataWriter;
+            if (SUCCEEDED(frameEncode->GetMetadataQueryWriter(frameMetadataWriter.put())) && frameMetadataWriter)
+            {
+                // Set the frame delay in the metadata (in hundredths of a second)
+                PROPVARIANT propValue;
+                PropVariantInit(&propValue);
+                propValue.vt = VT_UI2;
+                propValue.uiVal = static_cast<USHORT>(m_frameDelay);
+                frameMetadataWriter->SetMetadataByName(L"/grctlext/Delay", &propValue);
+                PropVariantClear(&propValue);
+
+                // Set disposal method (2 = restore to background, needed for animation)
+                PropVariantInit(&propValue);
+                propValue.vt = VT_UI1;
+                propValue.bVal = 2; // Disposal method: restore to background color
+                frameMetadataWriter->SetMetadataByName(L"/grctlext/Disposal", &propValue);
+                PropVariantClear(&propValue);
+            }
+        }
+        catch (...)
+        {
+            // Metadata setting failed, continue anyway
+            OutputDebugStringW(L"Warning: Failed to set GIF frame metadata\n");
+        }
+
+        // Commit the frame
+        OutputDebugStringW(L"About to commit frame to encoder...\n");
+        winrt::check_hresult(frameEncode->Commit());
+        OutputDebugStringW(L"Frame committed successfully\n");
+
+        // Unmap the staging texture
+        m_d3dContext->Unmap(stagingTexture.get(), 0);
+
+        // Increment and log frame count
+        m_frameCount++;
+        OutputDebugStringW((L"GIF Frame #" + std::to_wstring(m_frameCount) + L" fully encoded and committed\n").c_str());
+
+        return S_OK;
+    }
+    catch (const winrt::hresult_error& error)
+    {
+        OutputDebugStringW(error.message().c_str());
+        return error.code();
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// GifRecordingSession::StartAsync
+//
+//----------------------------------------------------------------------------
+winrt::IAsyncAction GifRecordingSession::StartAsync()
+{
+    auto expected = false;
+    if (m_isRecording.compare_exchange_strong(expected, true))
+    {
+        auto self = shared_from_this();
+
+        try
+        {
+            // Start capturing frames
+            auto frameStartTime = std::chrono::high_resolution_clock::now();
+            int captureAttempts = 0;
+            int successfulCaptures = 0;
+            int duplicatedFrames = 0;
+
+            // Keep track of the last frame to duplicate when needed
+            winrt::com_ptr<ID3D11Texture2D> lastCroppedTexture;
+
+            while (m_isRecording && !m_closed)
+            {
+                captureAttempts++;
+                auto frame = m_frameWait->TryGetNextFrame();
+
+                winrt::com_ptr<ID3D11Texture2D> croppedTexture;
+
+                if (frame)
+                {
+                    successfulCaptures++;
+                    auto contentSize = frame->ContentSize;
+                    auto frameTexture = GetDXGIInterfaceFromObject<ID3D11Texture2D>(frame->FrameTexture);
+                    D3D11_TEXTURE2D_DESC desc = {};
+                    frameTexture->GetDesc(&desc);
+
+                    // Use the smaller of the crop size or content size
+                    auto width = min(m_rcCrop.right - m_rcCrop.left, contentSize.Width);
+                    auto height = min(m_rcCrop.bottom - m_rcCrop.top, contentSize.Height);
+
+                    D3D11_TEXTURE2D_DESC croppedDesc = {};
+                    croppedDesc.Width = width;
+                    croppedDesc.Height = height;
+                    croppedDesc.MipLevels = 1;
+                    croppedDesc.ArraySize = 1;
+                    croppedDesc.Format = DXGI_FORMAT_B8G8R8A8_UNORM;
+                    croppedDesc.SampleDesc.Count = 1;
+                    croppedDesc.Usage = D3D11_USAGE_DEFAULT;
+                    croppedDesc.BindFlags = D3D11_BIND_RENDER_TARGET;
+
+                    winrt::check_hresult(m_d3dDevice->CreateTexture2D(&croppedDesc, nullptr, croppedTexture.put()));
+
+                    // Set the content region to copy and clamp the coordinates
+                    D3D11_BOX region = {};
+                    region.left = std::clamp(m_rcCrop.left, static_cast<LONG>(0), static_cast<LONG>(desc.Width));
+                    region.right = std::clamp(m_rcCrop.left + width, static_cast<LONG>(0), static_cast<LONG>(desc.Width));
+                    region.top = std::clamp(m_rcCrop.top, static_cast<LONG>(0), static_cast<LONG>(desc.Height));
+                    region.bottom = std::clamp(m_rcCrop.top + height, static_cast<LONG>(0), static_cast<LONG>(desc.Height));
+                    region.back = 1;
+
+                    // Copy the cropped region
+                    m_d3dContext->CopySubresourceRegion(
+                        croppedTexture.get(),
+                        0,
+                        0, 0, 0,
+                        frameTexture.get(),
+                        0,
+                        &region);
+
+                    // Save this as the last frame for duplication
+                    lastCroppedTexture = croppedTexture;
+                }
+                else if (lastCroppedTexture)
+                {
+                    // No new frame, duplicate the last one
+                    duplicatedFrames++;
+                    croppedTexture = lastCroppedTexture;
+                }
+
+                // Encode the frame (either new or duplicated)
+                if (croppedTexture)
+                {
+                    HRESULT hr = EncodeFrame(croppedTexture.get());
+                    if (FAILED(hr))
+                    {
+                        CloseInternal();
+                        break;
+                    }
+                }
+
+                // Wait for the next frame interval
+                co_await winrt::resume_after(std::chrono::milliseconds(1000 / m_frameRate));
+            }
+
+            // Commit the GIF encoder
+            if (m_gifEncoder)
+            {
+                auto frameEndTime = std::chrono::high_resolution_clock::now();
+                auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(frameEndTime - frameStartTime).count();
+
+                OutputDebugStringW(L"Recording stopped. Committing GIF encoder...\n");
+                OutputDebugStringW((L"Total frames captured: " + std::to_wstring(m_frameCount) + L"\n").c_str());
+                OutputDebugStringW((L"Capture attempts: " + std::to_wstring(captureAttempts) + L"\n").c_str());
+                OutputDebugStringW((L"Successful captures: " + std::to_wstring(successfulCaptures) + L"\n").c_str());
+                OutputDebugStringW((L"Duplicated frames: " + std::to_wstring(duplicatedFrames) + L"\n").c_str());
+                OutputDebugStringW((L"Recording duration: " + std::to_wstring(duration) + L"ms\n").c_str());
+                OutputDebugStringW((L"Actual FPS: " + std::to_wstring(m_frameCount * 1000.0 / duration) + L"\n").c_str());
+
+                winrt::check_hresult(m_gifEncoder->Commit());
+                OutputDebugStringW(L"GIF encoder committed successfully\n");
+            }
+        }
+        catch (const winrt::hresult_error& error)
+        {
+            OutputDebugStringW(L"Error in GIF recording: ");
+            OutputDebugStringW(error.message().c_str());
+            OutputDebugStringW(L"\n");
+
+            // Try to commit the encoder even on error
+            if (m_gifEncoder)
+            {
+                try
+                {
+                    m_gifEncoder->Commit();
+                }
+                catch (...) {}
+            }
+
+            CloseInternal();
+        }
+    }
+    co_return;
+}
+
+//----------------------------------------------------------------------------
+//
+// GifRecordingSession::Close
+//
+//----------------------------------------------------------------------------
+void GifRecordingSession::Close()
+{
+    auto expected = false;
+    if (m_closed.compare_exchange_strong(expected, true))
+    {
+        expected = true;
+        if (!m_isRecording.compare_exchange_strong(expected, false))
+        {
+            CloseInternal();
+        }
+        else
+        {
+            m_frameWait->StopCapture();
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// GifRecordingSession::CloseInternal
+//
+//----------------------------------------------------------------------------
+void GifRecordingSession::CloseInternal()
+{
+    m_frameWait->StopCapture();
+    m_itemClosed.revoke();
+}

src/modules/ZoomIt/ZoomIt/GifRecordingSession.h

@@ -0,0 +1,69 @@
+//==============================================================================
+//
+// Zoomit
+// Sysinternals - www.sysinternals.com
+//
+// GIF recording support using Windows Imaging Component (WIC)
+//
+//==============================================================================
+#pragma once
+
+#include "CaptureFrameWait.h"
+#include <d3d11_4.h>
+#include <vector>
+
+class GifRecordingSession : public std::enable_shared_from_this<GifRecordingSession>
+{
+public:
+    [[nodiscard]] static std::shared_ptr<GifRecordingSession> Create(
+        winrt::Direct3D11::IDirect3DDevice const& device,
+        winrt::GraphicsCaptureItem const& item,
+        RECT const& cropRect,
+        uint32_t frameRate,
+        winrt::Streams::IRandomAccessStream const& stream);
+    ~GifRecordingSession();
+
+    winrt::IAsyncAction StartAsync();
+    void EnableCursorCapture(bool enable = true) { m_frameWait->EnableCursorCapture(enable); }
+    void Close();
+
+private:
+    GifRecordingSession(
+        winrt::Direct3D11::IDirect3DDevice const& device,
+        winrt::Capture::GraphicsCaptureItem const& item,
+        RECT const cropRect,
+        uint32_t frameRate,
+        winrt::Streams::IRandomAccessStream const& stream);
+    void CloseInternal();
+    HRESULT EncodeFrame(ID3D11Texture2D* texture);
+
+private:
+    winrt::Direct3D11::IDirect3DDevice m_device{ nullptr };
+    winrt::com_ptr<ID3D11Device> m_d3dDevice;
+    winrt::com_ptr<ID3D11DeviceContext> m_d3dContext;
+    RECT m_rcCrop;
+    uint32_t m_frameRate;
+
+    winrt::GraphicsCaptureItem m_item{ nullptr };
+    winrt::GraphicsCaptureItem::Closed_revoker m_itemClosed;
+    std::shared_ptr<CaptureFrameWait> m_frameWait;
+
+    winrt::Streams::IRandomAccessStream m_stream{ nullptr };
+
+    // WIC components for GIF encoding
+    winrt::com_ptr<IWICImagingFactory> m_wicFactory;
+    winrt::com_ptr<IWICStream> m_wicStream;
+    winrt::com_ptr<IWICBitmapEncoder> m_gifEncoder;
+    winrt::com_ptr<IWICMetadataQueryWriter> m_encoderMetadataWriter;
+
+    std::atomic<bool> m_isRecording = false;
+    std::atomic<bool> m_closed = false;
+
+    uint32_t m_frameWidth=0;
+    uint32_t m_frameHeight=0;
+    uint32_t m_frameDelay=0;
+    uint32_t m_frameCount = 0;
+
+    int32_t m_width=0;
+    int32_t m_height=0;
+};

src/modules/ZoomIt/ZoomIt/ZoomIt.rc

@@ -32,18 +32,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE 
+1 TEXTINCLUDE
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE 
+2 TEXTINCLUDE
 BEGIN
     "#include ""winres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE 
+3 TEXTINCLUDE
 BEGIN
     "#include ""binres.rc""\0"
 END
@@ -121,8 +121,8 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,166,306,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,223,306,50,14
-    LTEXT           "ZoomIt v9.10",IDC_VERSION,42,7,73,10
-    LTEXT           "Copyright © 2006-2025 Mark Russinovich",IDC_COPYRIGHT,42,17,231,8
+    LTEXT           "ZoomIt v9.20",IDC_VERSION,42,7,73,10
+    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
@@ -272,13 +272,15 @@ BEGIN
     LTEXT           "Note: Recording is only available on Windows 10 (version 1903) and higher.",IDC_STATIC,7,77,246,19
     LTEXT           "Scaling:",IDC_STATIC,30,115,26,8
     COMBOBOX        IDC_RECORD_SCALING,61,114,26,30,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_OEMCONVERT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Format:",IDC_STATIC,30,132,26,8
+    COMBOBOX        IDC_RECORD_FORMAT,61,131,60,30,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_OEMCONVERT | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Frame Rate:",IDC_STATIC,119,115,44,8,NOT WS_VISIBLE
     COMBOBOX        IDC_RECORD_FRAME_RATE,166,114,42,30,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_OEMCONVERT | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
     LTEXT           "To crop the portion of the screen that will be recorded, enter the hotkey with the Shift key in the opposite mode. ",IDC_STATIC,7,32,246,19
     LTEXT           "To record a specific window, enter the hotkey with the Alt key in the opposite mode.",IDC_STATIC,7,55,246,19
-    CONTROL         "&Capture audio input:",IDC_CAPTURE_AUDIO,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,137,83,10
-    COMBOBOX        IDC_MICROPHONE,81,152,172,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Microphone:",IDC_STATIC,32,154,47,8
+    CONTROL         "&Capture audio input:",IDC_CAPTURE_AUDIO,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,149,83,10
+    COMBOBOX        IDC_MICROPHONE,81,164,172,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Microphone:",IDC_STATIC,32,166,47,8
 END
 
 SNIP DIALOGEX 0, 0, 260, 68

src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj

@@ -234,6 +234,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="GifRecordingSession.cpp" />
     <ClCompile Include="pch.cpp" />
     <ClCompile Include="SelectRectangle.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
@@ -288,6 +289,7 @@
     <ClInclude Include="AudioSampleGenerator.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\common\sysinternals\Eula\Eula.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\ZoomItModuleInterface\Trace.h" />
+    <ClInclude Include="GifRecordingSession.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="Registry.h" />
     <ClInclude Include="resource.h" />

src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj.filters

@@ -54,6 +54,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\common\sysinternals\WindowsVersions.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="GifRecordingSession.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Registry.h">
@@ -95,6 +98,9 @@
     <ClInclude Include="ZoomItSettings.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="GifRecordingSession.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="appicon.ico">

src/modules/ZoomIt/ZoomIt/ZoomItSettings.h

@@ -3,6 +3,13 @@
 #include "Registry.h"
 #include "DemoType.h"
 
+// Recording format enum
+enum class RecordingFormat
+{
+    GIF = 0,
+    MP4 = 1
+};
+
 DWORD	g_ToggleKey = (HOTKEYF_CONTROL << 8)| '1';
 DWORD	g_LiveZoomToggleKey = ((HOTKEYF_CONTROL) << 8)| '4';
 DWORD	g_DrawToggleKey = ((HOTKEYF_CONTROL) << 8)| '2';
@@ -38,8 +45,10 @@ 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;
-// Divide by 100 to get actual scaling
-DWORD	g_RecordScaling = 100; 
+DWORD	g_RecordScaling = 100;
+DWORD	g_RecordScalingGIF = 50;
+DWORD	g_RecordScalingMP4 = 100;
+RecordingFormat g_RecordingFormat = RecordingFormat::GIF;
 BOOLEAN g_CaptureAudio = FALSE;
 TCHAR	g_MicrophoneDeviceId[MAX_PATH] = {0};
 
@@ -79,7 +88,9 @@ REG_SETTING RegSettings[] = {
     { 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"RecordFrameRate", SETTING_TYPE_DWORD, 0, &g_RecordFrameRate, static_cast<DOUBLE>(g_RecordFrameRate) },
-    { L"RecordScaling", SETTING_TYPE_DWORD, 0, &g_RecordScaling, static_cast<DOUBLE>(g_RecordScaling) },
+    { 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) },
     { L"MicrophoneDeviceId", SETTING_TYPE_STRING, sizeof(g_MicrophoneDeviceId), g_MicrophoneDeviceId, static_cast<DOUBLE>(0) },
     { NULL, SETTING_TYPE_DWORD, 0, NULL, static_cast<DOUBLE>(0) }

src/modules/ZoomIt/ZoomIt/resource.h

@@ -93,6 +93,7 @@
 #define IDC_DEMOTYPE_SLIDER2            1074
 #define IDC_DEMOTYPE_STATIC2            1074
 #define IDC_COPYRIGHT                   1075
+#define IDC_RECORD_FORMAT               1076
 #define IDC_PEN_WIDTH                   1105
 #define IDC_TIMER                       1106
 #define IDC_SMOOTH_IMAGE				1107

src/modules/ZoomIt/ZoomItSettingsInterop/ZoomItSettings.cpp

@@ -14,6 +14,9 @@ namespace winrt::PowerToys::ZoomItSettingsInterop::implementation
     const unsigned int SPECIAL_SEMANTICS_SHORTCUT = 1;
     const unsigned int SPECIAL_SEMANTICS_COLOR = 2;
     const unsigned int SPECIAL_SEMANTICS_LOG_FONT = 3;
+    const unsigned int SPECIAL_SEMANTICS_RECORDING_FORMAT = 4;
+    const unsigned int SPECIAL_SEMANTICS_RECORD_SCALING_GIF = 5;
+    const unsigned int SPECIAL_SEMANTICS_RECORD_SCALING_MP4 = 6;
 
     std::vector<unsigned char> base64_decode(const std::wstring& base64_string)
     {
@@ -72,6 +75,9 @@ namespace winrt::PowerToys::ZoomItSettingsInterop::implementation
         { L"PenColor", SPECIAL_SEMANTICS_COLOR },
         { L"BreakPenColor", SPECIAL_SEMANTICS_COLOR },
         { L"Font", SPECIAL_SEMANTICS_LOG_FONT },
+        { L"RecordingFormat", SPECIAL_SEMANTICS_RECORDING_FORMAT },
+        { L"RecordScalingGIF", SPECIAL_SEMANTICS_RECORD_SCALING_GIF },
+        { L"RecordScalingMP4", SPECIAL_SEMANTICS_RECORD_SCALING_MP4 },
     };
 
     hstring ZoomItSettings::LoadSettingsJson()
@@ -103,6 +109,11 @@ namespace winrt::PowerToys::ZoomItSettingsInterop::implementation
                             value & 0xFF);
                         _settings.add_property(curSetting->ValueName, hotkey.get_json());
                     }
+                    else if (special_semantics->second == SPECIAL_SEMANTICS_RECORDING_FORMAT)
+                    {
+                        std::wstring formatString = (value == 0) ? L"GIF" : L"MP4";
+                        _settings.add_property(L"RecordFormat", formatString);
+                    }
                     else if (special_semantics->second == SPECIAL_SEMANTICS_COLOR)
                     {
                         /* PowerToys settings likes colors as #FFFFFF strings.
@@ -156,6 +167,9 @@ namespace winrt::PowerToys::ZoomItSettingsInterop::implementation
             curSetting++;
         }
 
+        DWORD recordScaling = (g_RecordingFormat == static_cast<RecordingFormat>(0)) ? g_RecordScalingGIF : g_RecordScalingMP4;
+        _settings.add_property<DWORD>(L"RecordScaling", recordScaling);
+
         return _settings.get_raw_json().Stringify();
     }
 
@@ -167,6 +181,8 @@ namespace winrt::PowerToys::ZoomItSettingsInterop::implementation
         PowerToysSettings::PowerToyValues valuesFromSettings =
             PowerToysSettings::PowerToyValues::from_json_string(json, L"ZoomIt");
 
+        bool formatChanged = false;
+
         PREG_SETTING curSetting = RegSettings;
         while (curSetting->ValueName)
         {
@@ -212,6 +228,42 @@ namespace winrt::PowerToys::ZoomItSettingsInterop::implementation
                             *static_cast<PDWORD>(curSetting->Setting) = value;
                         }
                     }
+                    else if (special_semantics->second == SPECIAL_SEMANTICS_RECORDING_FORMAT)
+                    {
+                        // Convert string ("GIF" or "MP4") to DWORD enum value (0=GIF, 1=MP4)
+                        auto possibleValue = valuesFromSettings.get_string_value(L"RecordFormat");
+                        if (possibleValue.has_value())
+                        {
+                            RecordingFormat oldFormat = g_RecordingFormat;
+                            DWORD formatValue = (possibleValue.value() == L"GIF") ? 0 : 1;
+                            RecordingFormat newFormat = static_cast<RecordingFormat>(formatValue);
+
+                            *static_cast<PDWORD>(curSetting->Setting) = formatValue;
+
+                            if (oldFormat != newFormat)
+                            {
+                                formatChanged = true;
+
+                                if (oldFormat == static_cast<RecordingFormat>(0))
+                                {
+                                    g_RecordScalingGIF = g_RecordScaling;
+                                }
+                                else
+                                {
+                                    g_RecordScalingMP4 = g_RecordScaling;
+                                }
+
+                                if (newFormat == static_cast<RecordingFormat>(0))
+                                {
+                                    g_RecordScaling = g_RecordScalingGIF;
+                                }
+                                else
+                                {
+                                    g_RecordScaling = g_RecordScalingMP4;
+                                }
+                            }
+                        }
+                    }
                     else if (special_semantics->second == SPECIAL_SEMANTICS_COLOR)
                     {
                         /* PowerToys settings likes colors as #FFFFFF strings.
@@ -275,6 +327,22 @@ namespace winrt::PowerToys::ZoomItSettingsInterop::implementation
             }
             curSetting++;
         }
+
+        auto recordScalingValue = valuesFromSettings.get_uint_value(L"RecordScaling");
+        if (recordScalingValue.has_value() && !formatChanged)
+        {
+            g_RecordScaling = recordScalingValue.value();
+
+            if (g_RecordingFormat == static_cast<RecordingFormat>(0))
+            {
+                g_RecordScalingGIF = recordScalingValue.value();
+            }
+            else
+            {
+                g_RecordScalingMP4 = recordScalingValue.value();
+            }
+        }
+
         reg.WriteRegSettings(RegSettings);
     }
 }

src/modules/awake/Awake/Core/Native/Bridge.cs

@@ -88,9 +88,6 @@ namespace Awake.Core.Native
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static extern bool GetCursorPos(out Point lpPoint);
 
-        [DllImport("user32.dll", SetLastError = true)]
-        internal static extern bool ScreenToClient(IntPtr hWnd, ref Point lpPoint);
-
         [DllImport("user32.dll", SetLastError = true)]
         internal static extern bool GetMessage(out Msg lpMsg, IntPtr hWnd, uint wMsgFilterMin, uint wMsgFilterMax);
 

src/modules/awake/Awake/Core/TrayHelper.cs

@@ -61,9 +61,8 @@ namespace Awake.Core
 
             Bridge.SetForegroundWindow(hWnd);
 
-            // Get cursor position and convert it to client coordinates
+            // Get cursor position in screen coordinates
             Bridge.GetCursorPos(out Models.Point cursorPos);
-            Bridge.ScreenToClient(hWnd, ref cursorPos);
 
             // Set menu information
             MenuInfo menuInfo = new()

src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/nuget.config

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<packageSources>
+		<clear />
+		<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+	</packageSources>
+	<packageSourceMapping>
+		<packageSource key="nuget.org">
+			<package pattern="*" />
+		</packageSource>
+	</packageSourceMapping>
+</configuration>

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

@@ -11,7 +11,7 @@ namespace Microsoft.CmdPal.UI.ViewModels.BuiltinCommands;
 /// <summary>
 /// Built-in Provider for a top-level command which can quit the application. Invokes the <see cref="QuitCommand"/>, which sends a <see cref="QuitMessage"/>.
 /// </summary>
-public partial class BuiltInsCommandProvider : CommandProvider
+public sealed partial class BuiltInsCommandProvider : CommandProvider
 {
     private readonly OpenSettingsCommand openSettings = new();
     private readonly QuitCommand quitCommand = new();
@@ -21,7 +21,7 @@ public partial class BuiltInsCommandProvider : CommandProvider
 
     public override ICommandItem[] TopLevelCommands() =>
         [
-            new CommandItem(openSettings) { Subtitle = Properties.Resources.builtin_open_settings_subtitle },
+            new CommandItem(openSettings) { },
             new CommandItem(_newExtension) { Title = _newExtension.Title, Subtitle = Properties.Resources.builtin_new_extension_subtitle },
         ];
 
@@ -34,7 +34,7 @@ public partial class BuiltInsCommandProvider : CommandProvider
 
     public BuiltInsCommandProvider()
     {
-        Id = "Core";
+        Id = "com.microsoft.cmdpal.builtin.core";
         DisplayName = Properties.Resources.builtin_display_name;
         Icon = IconHelpers.FromRelativePath("Assets\\StoreLogo.scale-200.png");
     }

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

@@ -30,7 +30,12 @@ public partial class MainListPage : DynamicListPage,
 {
     private readonly string[] _specialFallbacks = [
         "com.microsoft.cmdpal.builtin.run",
-        "com.microsoft.cmdpal.builtin.calculator"
+        "com.microsoft.cmdpal.builtin.calculator",
+        "com.microsoft.cmdpal.builtin.system",
+        "com.microsoft.cmdpal.builtin.core",
+        "com.microsoft.cmdpal.builtin.websearch",
+        "com.microsoft.cmdpal.builtin.windowssettings",
+        "com.microsoft.cmdpal.builtin.datetime",
     ];
 
     private readonly IServiceProvider _serviceProvider;

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.resx

@@ -117,11 +117,8 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="builtin_open_settings_subtitle" xml:space="preserve">
-    <value>Open Command Palette settings</value>
-  </data>
   <data name="builtin_new_extension_subtitle" xml:space="preserve">
-    <value>Creates a project for a new Command Palette extension</value>
+    <value>Generate a new Command Palette extension project</value>
   </data>
   <data name="builtin_quit_subtitle" xml:space="preserve">
     <value>Exit Command Palette</value>
@@ -157,10 +154,10 @@
     <value>Open</value>
   </data>
   <data name="builtin_create_extension_title" xml:space="preserve">
-    <value>Create a new extension</value>
+    <value>Create extension</value>
   </data>
   <data name="builtin_open_settings_name" xml:space="preserve">
-    <value>Open Settings</value>
+    <value>Open Command Palette settings</value>
   </data>
   <data name="builtin_create_extension_success" xml:space="preserve">
     <value>Successfully created your new extension!</value>

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

@@ -51,10 +51,10 @@ internal sealed partial class GlobalErrorHandler
         // without its exception being observed. It is NOT raised immediately
         // when the Task faults; timing depends on GC finalization.
         e.SetObserved();
-        HandleException(e.Exception, Context.UnobservedTaskException, isRecoverable: true);
+        HandleException(e.Exception, Context.UnobservedTaskException);
     }
 
-    private void HandleException(Exception ex, Context context, bool isRecoverable = false)
+    private static void HandleException(Exception ex, Context context)
     {
         Logger.LogError($"Unhandled exception detected ({context})", ex);
 
@@ -70,10 +70,25 @@ internal sealed partial class GlobalErrorHandler
 
             StoreReport(report, storeOnDesktop: false);
 
+            string message;
+            string caption;
+            try
+            {
+                message = ResourceLoaderInstance.GetString("GlobalErrorHandler_CrashMessageBox_Message");
+                caption = ResourceLoaderInstance.GetString("GlobalErrorHandler_CrashMessageBox_Caption");
+            }
+            catch
+            {
+                // The resource loader may not be available if the exception occurred during startup.
+                // Fall back to hardcoded strings in that case.
+                message = "Command Palette has encountered a fatal error and must close.";
+                caption = "Command Palette - Fatal error";
+            }
+
             PInvoke.MessageBox(
                 HWND.Null,
-                "Command Palette has encountered a fatal error and must close.\n\nAn error report has been saved to your desktop.",
-                "Unhandled Error",
+                message,
+                caption,
                 MESSAGEBOX_STYLE.MB_ICONERROR);
         }
     }

src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs

@@ -68,7 +68,6 @@ public sealed partial class MainWindow : WindowEx,
     public MainWindow()
     {
         InitializeComponent();
-        HideWindow();
 
         _hwnd = new HWND(WinRT.Interop.WindowNative.GetWindowHandle(this).ToInt32());
 

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

@@ -431,8 +431,8 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="Run_Radio_Position_LastPosition.Content" xml:space="preserve">
     <value>Last Position</value>
     <comment>Reopen the window where it was last closed</comment>
-  </data> 
-  <data name="TrayMenu_Settings" xml:space="preserve">  
+  </data>
+  <data name="TrayMenu_Settings" xml:space="preserve">
     <value>Settings</value>
   </data>
   <data name="TrayMenu_Close" xml:space="preserve">
@@ -493,28 +493,34 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="Settings_ExtensionsPage_Reloading_Text.Text" xml:space="preserve">
     <value>Reloading extensions..</value>
   </data>
-	<data name="Settings_ExtensionsPage_Banner_Header.Text" xml:space="preserve">
+  <data name="Settings_ExtensionsPage_Banner_Header.Text" xml:space="preserve">
     <value>Discover more extensions</value>
   </data>
-	<data name="Settings_ExtensionsPage_Banner_Description.Text" xml:space="preserve">
+  <data name="Settings_ExtensionsPage_Banner_Description.Text" xml:space="preserve">
     <value>Find more extensions on the Microsoft Store or WinGet.</value>
   </data>
-	<data name="Settings_ExtensionsPage_Banner_Hyperlink.Content" xml:space="preserve">
+  <data name="Settings_ExtensionsPage_Banner_Hyperlink.Content" xml:space="preserve">
     <value>Learn how to create your own extensions</value>
   </data>
-	<data name="Settings_ExtensionsPage_FindExtensions_MicrosoftStore.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+  <data name="Settings_ExtensionsPage_FindExtensions_MicrosoftStore.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Find extensions on the Microsoft Store</value>
   </data>
-	<data name="Settings_ExtensionsPage_FindExtensions_MicrosoftStore.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+  <data name="Settings_ExtensionsPage_FindExtensions_MicrosoftStore.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Microsoft Store</value>
   </data>
-	<data name="Settings_ExtensionsPage_FindExtensions_WinGet.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+  <data name="Settings_ExtensionsPage_FindExtensions_WinGet.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Find extensions on WinGet</value>
   </data>
-	<data name="Settings_ExtensionsPage_FindExtensions_WinGet.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+  <data name="Settings_ExtensionsPage_FindExtensions_WinGet.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Microsoft Store</value>
   </data>
-	<data name="Settings_ExtensionsPage_SearchBox_Placeholder.PlaceholderText" xml:space="preserve">
+  <data name="Settings_ExtensionsPage_SearchBox_Placeholder.PlaceholderText" xml:space="preserve">
     <value>Search extensions</value>
   </data>
+  <data name="GlobalErrorHandler_CrashMessageBox_Message" xml:space="preserve">
+    <value>Command Palette has encountered a fatal error and must close.</value>
+  </data>
+  <data name="GlobalErrorHandler_CrashMessageBox_Caption" xml:space="preserve">
+    <value>Command Palette - Fatal error</value>
+  </data>
 </root>

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

@@ -25,7 +25,7 @@ public class QueryTests : CommandPaletteUnitTestBase
     [DataRow("hibernate", "Hibernate")]
     [DataRow("open recycle", "Open Recycle Bin")]
     [DataRow("empty recycle", "Empty Recycle Bin")]
-    [DataRow("uefi", "UEFI Firmware Settings")]
+    [DataRow("uefi", "UEFI firmware settings")]
     public void TopLevelPageQueryTest(string input, string matchedTitle)
     {
         var settings = new Settings();
@@ -143,6 +143,6 @@ public class QueryTests : CommandPaletteUnitTestBase
         Assert.IsNotNull(result);
         var firstItem = result.FirstOrDefault();
         var firstItemIsUefiCommand = firstItem?.Title.Contains("UEFI", StringComparison.OrdinalIgnoreCase) ?? false;
-        Assert.AreEqual(hasCommand, firstItemIsUefiCommand, $"Expected to match (or not match) 'UEFI Firmware Settings' but got '{firstItem?.Title}'");
+        Assert.AreEqual(hasCommand, firstItemIsUefiCommand, $"Expected to match (or not match) 'UEFI firmware settings' but got '{firstItem?.Title}'");
     }
 }

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/TimeDateCommandsProviderTests.cs

@@ -41,7 +41,7 @@ namespace Microsoft.CmdPal.Ext.TimeDate.UnitTests
             // Assert
             Assert.IsNotNull(provider);
             Assert.IsNotNull(provider.DisplayName);
-            Assert.AreEqual("DateTime", provider.Id);
+            Assert.AreEqual("com.microsoft.cmdpal.builtin.datetime", provider.Id);
             Assert.IsNotNull(provider.Icon);
             Assert.IsNotNull(provider.Settings);
         }
@@ -103,7 +103,7 @@ namespace Microsoft.CmdPal.Ext.TimeDate.UnitTests
 
             // Assert
             Assert.IsFalse(string.IsNullOrEmpty(subtitle));
-            Assert.IsTrue(subtitle.Contains("Provides time and date values in different formats"));
+            Assert.IsTrue(subtitle.Contains("Show time and date values in different formats"));
         }
     }
 }

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WebSearch.UnitTests/WebSearchCommandProviderTests.cs

@@ -16,7 +16,7 @@ public class WebSearchCommandProviderTests
         var provider = new WebSearchCommandsProvider();
 
         // Assert
-        Assert.AreEqual("WebSearch", provider.Id);
+        Assert.AreEqual("com.microsoft.cmdpal.builtin.websearch", provider.Id);
     }
 
     [TestMethod]

src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/BasicTests.cs

@@ -49,8 +49,8 @@ public class BasicTests : CommandPaletteTestBase
     {
         SetSearchBox("time and date");
 
-        var searchFileItem = this.Find<NavigationViewItem>("Time and Date");
-        Assert.AreEqual(searchFileItem.Name, "Time and Date");
+        var searchFileItem = this.Find<NavigationViewItem>("Time and date");
+        Assert.AreEqual(searchFileItem.Name, "Time and date");
         searchFileItem.DoubleClick();
 
         SetTimeAndDaterExtensionSearchBox("year");
@@ -63,8 +63,8 @@ public class BasicTests : CommandPaletteTestBase
     {
         SetSearchBox("Windows Terminal");
 
-        var searchFileItem = this.Find<NavigationViewItem>("Open Windows Terminal Profiles");
-        Assert.AreEqual(searchFileItem.Name, "Open Windows Terminal Profiles");
+        var searchFileItem = this.Find<NavigationViewItem>("Open Windows Terminal profiles");
+        Assert.AreEqual(searchFileItem.Name, "Open Windows Terminal profiles");
         searchFileItem.DoubleClick();
 
         // SetSearchBox("PowerShell");
@@ -74,10 +74,10 @@ public class BasicTests : CommandPaletteTestBase
     [TestMethod]
     public void BasicWindowsSettingsTest()
     {
-        SetSearchBox("Windows Settings");
+        SetSearchBox("Windows settings");
 
-        var searchFileItem = this.Find<NavigationViewItem>("Windows Settings");
-        Assert.AreEqual(searchFileItem.Name, "Windows Settings");
+        var searchFileItem = this.Find<NavigationViewItem>("Windows settings");
+        Assert.AreEqual(searchFileItem.Name, "Windows settings");
         searchFileItem.DoubleClick();
 
         SetSearchBox("power");

src/modules/cmdpal/custom.props

@@ -5,7 +5,7 @@
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
     <XesBaseYearForStoreVersion>2025</XesBaseYearForStoreVersion>
     <VersionMajor>0</VersionMajor>
-    <VersionMinor>6</VersionMinor>
+    <VersionMinor>7</VersionMinor>
     <VersionInfoProductName>Microsoft Command Palette</VersionInfoProductName>
   </PropertyGroup>
 </Project>

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

@@ -35,7 +35,6 @@ public partial class AllAppsCommandProvider : CommandProvider
 
         _listItem = new(_page)
         {
-            Subtitle = Resources.search_installed_apps,
             MoreCommands = [new CommandContextItem(AllAppsSettings.Instance.Settings.SettingsPage)],
         };
 

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

@@ -15,8 +15,6 @@ namespace Microsoft.CmdPal.Ext.Apps.Programs;
 
 public sealed partial class AppListItem : ListItem
 {
-    private static readonly Tag _appTag = new("App");
-
     private readonly AppCommand _appCommand;
     private readonly AppItem _app;
     private readonly Lazy<Details> _details;
@@ -48,7 +46,6 @@ public sealed partial class AppListItem : ListItem
         _app = app;
         Title = app.Name;
         Subtitle = app.Subtitle;
-        Tags = [_appTag];
         Icon = Icons.GenericAppIcon;
 
         MoreCommands = AddPinCommands(_app.Commands!, isPinned);

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

@@ -19,7 +19,7 @@ namespace Microsoft.CmdPal.Ext.Apps.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -61,7 +61,7 @@ namespace Microsoft.CmdPal.Ext.Apps.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to All Apps.
+        ///   Looks up a localized string similar to Search apps.
         /// </summary>
         internal static string all_apps {
             get {
@@ -313,16 +313,7 @@ namespace Microsoft.CmdPal.Ext.Apps.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Search installed apps.
-        /// </summary>
-        internal static string search_installed_apps {
-            get {
-                return ResourceManager.GetString("search_installed_apps", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Search installed apps....
+        ///   Looks up a localized string similar to Search apps....
         /// </summary>
         internal static string search_installed_apps_placeholder {
             get {

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

@@ -124,14 +124,11 @@
   <data name="installed_apps" xml:space="preserve">
     <value>Installed apps</value>
   </data>
-  <data name="search_installed_apps" xml:space="preserve">
-    <value>Search installed apps</value>
-  </data>
   <data name="all_apps" xml:space="preserve">
-    <value>All Apps</value>
+    <value>Search apps</value>
   </data>
   <data name="search_installed_apps_placeholder" xml:space="preserve">
-    <value>Search installed apps...</value>
+    <value>Search apps...</value>
   </data>
   <data name="open_path_in_console" xml:space="preserve">
     <value>Open path in console</value>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/FallbackOpenFileItem.cs

@@ -120,7 +120,6 @@ internal sealed partial class FallbackOpenFileItem : FallbackCommandItem, System
                 var indexerPage = new IndexerPage(query, _searchEngine, _queryCookie, results);
                 Title = string.Format(CultureInfo.CurrentCulture, fallbackItemSearchPageTitleCompositeFormat, query);
                 Icon = Icons.FileExplorerIcon;
-                Subtitle = Resources.Indexer_Subtitle;
                 Command = indexerPage;
 
                 return;

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/IndexerCommandsProvider.cs

@@ -33,7 +33,6 @@ public partial class IndexerCommandsProvider : CommandProvider
             new CommandItem(new IndexerPage())
             {
                 Title = Resources.Indexer_Title,
-                Subtitle = Resources.Indexer_Subtitle,
             }
         ];
     }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/IndexerPage.cs

@@ -68,7 +68,6 @@ internal sealed partial class IndexerPage : DynamicListPage, IDisposable
         _noSearchEmptyContent = new CommandItem(new NoOpCommand())
         {
             Icon = Icon,
-            Title = Resources.Indexer_Subtitle,
             Subtitle = Resources.Indexer_NoSearchQueryMessageTip,
         };
 

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

@@ -295,15 +295,6 @@ namespace Microsoft.CmdPal.Ext.Indexer.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Search files on this device.
-        /// </summary>
-        internal static string Indexer_Subtitle {
-            get {
-                return ResourceManager.GetString("Indexer_Subtitle", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Search files.
         /// </summary>

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

@@ -171,9 +171,6 @@
   <data name="Indexer_Settings_FallbackCommand_FilePathExist" xml:space="preserve">
     <value>Only when file path exist</value>
   </data>
-  <data name="Indexer_Subtitle" xml:space="preserve">
-    <value>Search files on this device</value>
-  </data>
   <data name="Indexer_Title" xml:space="preserve">
     <value>Search files</value>
   </data>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Registry/RegistryCommandsProvider.cs

@@ -25,8 +25,7 @@ public partial class RegistryCommandsProvider : CommandProvider
         return [
             new CommandItem(new RegistryListPage(_settingsManager))
             {
-                Title = "Registry",
-                Subtitle = "Navigate the Windows registry",
+                Title = "Browse the Windows registry",
             }
         ];
     }

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

@@ -97,7 +97,7 @@ namespace Microsoft.CmdPal.Ext.Shell.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Executes commands (e.g. &apos;ping&apos;, &apos;cmd&apos;).
+        ///   Looks up a localized string similar to Execute system commands like &apos;ping&apos; and &apos;cmd&apos;.
         /// </summary>
         public static string cmd_plugin_description {
             get {

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

@@ -121,7 +121,7 @@
     <value>Run commands</value>
   </data>
   <data name="cmd_plugin_description" xml:space="preserve">
-    <value>Executes commands (e.g. 'ping', 'cmd')</value>
+    <value>Execute system commands like 'ping' and 'cmd'</value>
   </data>
   <data name="cmd_has_been_executed_times" xml:space="preserve">
     <value>this command has been executed {0} times</value>

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

@@ -160,7 +160,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Adapter Details.
+        ///   Looks up a localized string similar to Adapter details.
         /// </summary>
         public static string Microsoft_plugin_ext_adapter_details {
             get {
@@ -169,7 +169,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connection Details.
+        ///   Looks up a localized string similar to Connection details.
         /// </summary>
         public static string Microsoft_plugin_ext_connection_details {
             get {
@@ -187,7 +187,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Open System Command.
+        ///   Looks up a localized string similar to Open system command.
         /// </summary>
         public static string Microsoft_plugin_ext_fallback_display_title {
             get {
@@ -205,7 +205,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to System Commands.
+        ///   Looks up a localized string similar to System commands.
         /// </summary>
         public static string Microsoft_plugin_ext_system_page_name {
             get {
@@ -214,7 +214,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Windows System Commands.
+        ///   Looks up a localized string similar to Windows system commands.
         /// </summary>
         public static string Microsoft_plugin_ext_system_page_title {
             get {
@@ -628,7 +628,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to You are about to restart this computer, are you sure?.
+        ///   Looks up a localized string similar to You are about to restart this computer. Are you sure?.
         /// </summary>
         public static string Microsoft_plugin_sys_restart_computer_confirmation {
             get {
@@ -790,7 +790,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DNS Suffix.
+        ///   Looks up a localized string similar to DNS suffix.
         /// </summary>
         public static string Microsoft_plugin_sys_Suffix {
             get {
@@ -817,7 +817,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to UEFI Firmware Settings.
+        ///   Looks up a localized string similar to UEFI firmware settings.
         /// </summary>
         public static string Microsoft_plugin_sys_uefi {
             get {
@@ -826,7 +826,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to You are about to reboot this computer into UEFI Firmware Settings menu, are you sure?.
+        ///   Looks up a localized string similar to You are about to reboot this computer into UEFI firmware settings menu, are you sure?.
         /// </summary>
         public static string Microsoft_plugin_sys_uefi_confirmation {
             get {
@@ -835,7 +835,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Reboot computer into UEFI Firmware Settings (Requires administrative permissions.).
+        ///   Looks up a localized string similar to Reboot computer into UEFI firmware Settings (requires administrative permissions.).
         /// </summary>
         public static string Microsoft_plugin_sys_uefi_description {
             get {

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

@@ -149,10 +149,10 @@
     <value>Shutdown</value>
   </data>
   <data name="Microsoft_plugin_ext_connection_details" xml:space="preserve">
-    <value>Connection Details</value>
+    <value>Connection details</value>
   </data>
   <data name="Microsoft_plugin_ext_adapter_details" xml:space="preserve">
-    <value>Adapter Details</value>
+    <value>Adapter details</value>
   </data>
   <data name="Microsoft_plugin_ext_copy" xml:space="preserve">
     <value>Copy to clipboard</value>
@@ -161,10 +161,10 @@
     <value>Hide disconnected network info</value>
   </data>
   <data name="Microsoft_plugin_ext_system_page_title" xml:space="preserve">
-    <value>Windows System Commands</value>
+    <value>Windows system commands</value>
   </data>
   <data name="Microsoft_plugin_ext_system_page_name" xml:space="preserve">
-    <value>System Commands</value>
+    <value>System commands</value>
   </data>
   <data name="Microsoft_plugin_sys_AdapterName" xml:space="preserve">
     <value>Adapter name</value>
@@ -327,7 +327,7 @@
     <comment>This should align to the action in Windows of a restarting your computer.</comment>
   </data>
   <data name="Microsoft_plugin_sys_restart_computer_confirmation" xml:space="preserve">
-    <value>You are about to restart this computer, are you sure?</value>
+    <value>You are about to restart this computer. Are you sure?</value>
     <comment>This should align to the action in Windows of a restarting your computer.</comment>
   </data>
   <data name="Microsoft_plugin_sys_restart_computer_description" xml:space="preserve">
@@ -381,7 +381,7 @@
     <value>State</value>
   </data>
   <data name="Microsoft_plugin_sys_Suffix" xml:space="preserve">
-    <value>DNS Suffix</value>
+    <value>DNS suffix</value>
   </data>
   <data name="Microsoft_plugin_sys_TunnelConnection" xml:space="preserve">
     <value>Tunnel</value>
@@ -391,15 +391,15 @@
     <comment>Means type like category. Here it means network interface type (ethernet, wifi, ...).</comment>
   </data>
   <data name="Microsoft_plugin_sys_uefi" xml:space="preserve">
-    <value>UEFI Firmware Settings</value>
+    <value>UEFI firmware settings</value>
     <comment>This should align to the action in Windows Recovery Environment that restart into uefi settings.</comment>
   </data>
   <data name="Microsoft_plugin_sys_uefi_confirmation" xml:space="preserve">
-    <value>You are about to reboot this computer into UEFI Firmware Settings menu, are you sure?</value>
+    <value>You are about to reboot this computer into UEFI firmware settings menu, are you sure?</value>
     <comment>This should align to the action in Windows Recovery Environment that restart into uefi settings.</comment>
   </data>
   <data name="Microsoft_plugin_sys_uefi_description" xml:space="preserve">
-    <value>Reboot computer into UEFI Firmware Settings (Requires administrative permissions.)</value>
+    <value>Reboot computer into UEFI firmware Settings (requires administrative permissions.)</value>
     <comment>This should align to the action in Windows Recovery Environment that restart into uefi settings.</comment>
   </data>
   <data name="Microsoft_plugin_sys_Unknown" xml:space="preserve">
@@ -415,7 +415,7 @@
     <value>Sleep</value>
   </data>
   <data name="Microsoft_plugin_ext_fallback_display_title" xml:space="preserve">
-    <value>Open System Command</value>
+    <value>Execute system commands</value>
   </data>
   <data name="Microsoft_plugin_sys_RestartShell" xml:space="preserve">
     <value>Restart Windows Explorer</value>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/SystemCommandExtensionProvider.cs

@@ -9,7 +9,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.System;
 
-public partial class SystemCommandExtensionProvider : CommandProvider
+public sealed partial class SystemCommandExtensionProvider : CommandProvider
 {
     private readonly ICommandItem[] _commands;
     private static readonly SettingsManager _settingsManager = new();
@@ -19,7 +19,7 @@ public partial class SystemCommandExtensionProvider : CommandProvider
     public SystemCommandExtensionProvider()
     {
         DisplayName = Resources.Microsoft_plugin_ext_system_page_name;
-        Id = "System";
+        Id = "com.microsoft.cmdpal.builtin.system";
         _commands = [
             new CommandItem(Page)
             {

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Helpers/TimeDateCalculator.cs

@@ -17,11 +17,6 @@ public sealed partial class TimeDateCalculator
     /// </summary>
     private const string InputDelimiter = "::";
 
-    /// <summary>
-    /// A list of conjunctions that we ignore on search
-    /// </summary>
-    private static readonly string[] _conjunctionList = Resources.Microsoft_plugin_timedate_Search_ConjunctionList.Split("; ");
-
     /// <summary>
     /// Searches for results
     /// </summary>

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

@@ -349,7 +349,7 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Time and Date.
+        ///   Looks up a localized string similar to Time and date.
         /// </summary>
         public static string Microsoft_plugin_timedate_main_page_title {
             get {
@@ -448,7 +448,7 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Provides time and date values in different formats.
+        ///   Looks up a localized string similar to Show time and date values in different formats.
         /// </summary>
         public static string Microsoft_plugin_timedate_plugin_description {
             get {
@@ -484,7 +484,7 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Time and Date.
+        ///   Looks up a localized string similar to Time and date.
         /// </summary>
         public static string Microsoft_plugin_timedate_plugin_name {
             get {
@@ -501,15 +501,6 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to "for; and; nor; but; or; so".
-        /// </summary>
-        public static string Microsoft_plugin_timedate_Search_ConjunctionList {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_Search_ConjunctionList", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Date and time; Time and Date; Custom format.
         /// </summary>

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

@@ -202,7 +202,7 @@
     <comment>'UTC' means here 'Universal Time Convention'</comment>
   </data>
   <data name="Microsoft_plugin_timedate_plugin_description" xml:space="preserve">
-    <value>Provides time and date values in different formats</value>
+    <value>Show time and date values in different formats</value>
     <comment>Do not translate the placeholders like '{0}' because it will be replaced in code.</comment>
   </data>
   <data name="Microsoft_plugin_timedate_plugin_description_example_calendarWeek" xml:space="preserve">
@@ -215,7 +215,7 @@
     <value>Time</value>
   </data>
   <data name="Microsoft_plugin_timedate_plugin_name" xml:space="preserve">
-    <value>Time and Date</value>
+    <value>Time and date</value>
   </data>
   <data name="Microsoft_plugin_timedate_Rfc1123" xml:space="preserve">
     <value>RFC1123</value>
@@ -252,10 +252,6 @@
     <value>Current Time; Now</value>
     <comment>Don't change order</comment>
   </data>
-  <data name="Microsoft_plugin_timedate_Search_ConjunctionList" xml:space="preserve">
-    <value>for; and; nor; but; or; so</value>
-    <comment>List of conjunctions. We don't add 'yet' because this can be a synonym of 'now' which might be problematic on localized searches.</comment>
-  </data>
   <data name="Microsoft_plugin_timedate_Second" xml:space="preserve">
     <value>Second</value>
   </data>
@@ -358,7 +354,7 @@
     <value>Error: Invalid input</value>
   </data>
   <data name="Microsoft_plugin_timedate_main_page_title" xml:space="preserve">
-    <value>Time and Date</value>
+    <value>Time and date</value>
   </data>
   <data name="Microsoft_plugin_timedate_InvalidInput_SupportedInput" xml:space="preserve">
     <value>A {0}format name{0}, a {0}valid date or time value{0}, or a {0}prefixed number{0}. To search for a format in a specific date/time please use the syntax {0}format::date/time/number{0}.{1}Supported prefixes:{2}'{0}u{0}' for Unix Timestamp{2}'{0}ums{0}' for Unix Timestamp in milliseconds{2}'{0}ft{0}' for Windows file time{2}'{0}oa{0}' for OLE Automation Date{2}'{0}exc{0}' for Excel's 1900 date value{2}'{0}exf{0}' for Excel's 1904 date value</value>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/TimeDateCommandsProvider.cs

@@ -12,7 +12,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.TimeDate;
 
-public partial class TimeDateCommandsProvider : CommandProvider
+public sealed partial class TimeDateCommandsProvider : CommandProvider
 {
     private readonly CommandItem _command;
     private static readonly SettingsManager _settingsManager = new SettingsManager();
@@ -23,7 +23,7 @@ public partial class TimeDateCommandsProvider : CommandProvider
     public TimeDateCommandsProvider()
     {
         DisplayName = Resources.Microsoft_plugin_timedate_plugin_name;
-        Id = "DateTime";
+        Id = "com.microsoft.cmdpal.builtin.datetime";
         _command = new CommandItem(_timeDateExtensionPage)
         {
             Icon = _timeDateExtensionPage.Icon,

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/WebSearchCommandsProvider.cs

@@ -11,7 +11,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.WebSearch;
 
-public partial class WebSearchCommandsProvider : CommandProvider
+public sealed partial class WebSearchCommandsProvider : CommandProvider
 {
     private readonly SettingsManager _settingsManager = new();
     private readonly FallbackExecuteSearchItem _fallbackItem;
@@ -22,7 +22,7 @@ public partial class WebSearchCommandsProvider : CommandProvider
 
     public WebSearchCommandsProvider()
     {
-        Id = "WebSearch";
+        Id = "com.microsoft.cmdpal.builtin.websearch";
         DisplayName = Resources.extension_name;
         Icon = Icons.WebSearch;
         Settings = _settingsManager.Settings;

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

@@ -124,16 +124,7 @@ namespace Microsoft.CmdPal.Ext.WinGet.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Search for extensions on WinGet.
-        /// </summary>
-        public static string winget_install_extensions_subtitle {
-            get {
-                return ResourceManager.GetString("winget_install_extensions_subtitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Install Command Palette extensions.
+        ///   Looks up a localized string similar to Add Command Palette extensions from WinGet.
         /// </summary>
         public static string winget_install_extensions_title {
             get {
@@ -205,7 +196,7 @@ namespace Microsoft.CmdPal.Ext.WinGet.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Search WinGet.
+        ///   Looks up a localized string similar to Find apps on WinGet.
         /// </summary>
         public static string winget_page_name {
             get {
@@ -268,7 +259,7 @@ namespace Microsoft.CmdPal.Ext.WinGet.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Search for extensions in the Store.
+        ///   Looks up a localized string similar to Add Command Palette extensions from the Microsoft Store.
         /// </summary>
         public static string winget_search_store_title {
             get {

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

@@ -127,19 +127,15 @@
   <comment></comment>
 </data>
 <data name="winget_install_extensions_title" xml:space="preserve">
-  <value>Install Command Palette extensions</value>
-  <comment></comment>
-</data>
-<data name="winget_install_extensions_subtitle" xml:space="preserve">
-  <value>Search for extensions on WinGet</value>
+  <value>Add Command Palette extensions from WinGet</value>
   <comment></comment>
 </data>
 <data name="winget_search_store_title" xml:space="preserve">
-  <value>Search for extensions in the Store</value>
+  <value>Add Command Palette extensions from the Microsoft Store</value>
   <comment></comment>
 </data>
 <data name="winget_page_name" xml:space="preserve">
-  <value>Search WinGet</value>
+  <value>Find apps on WinGet</value>
   <comment></comment>
 </data>
 <data name="winget_create_catalog_error" xml:space="preserve">

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/WinGetExtensionCommandsProvider.cs

@@ -27,7 +27,6 @@ public partial class WinGetExtensionCommandsProvider : CommandProvider
             new WinGetExtensionPage(WinGetExtensionPage.ExtensionsTag) { Title = Properties.Resources.winget_install_extensions_title })
          {
             Title = Properties.Resources.winget_install_extensions_title,
-            Subtitle = Properties.Resources.winget_install_extensions_subtitle,
          },
 
         new ListItem(

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

@@ -70,7 +70,7 @@ namespace Microsoft.CmdPal.Ext.WindowWalker.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to On all Desktops.
+        ///   Looks up a localized string similar to On all desktops.
         /// </summary>
         public static string VirtualDesktopHelper_AllDesktops {
             get {
@@ -196,7 +196,7 @@ namespace Microsoft.CmdPal.Ext.WindowWalker.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Not Responding.
+        ///   Looks up a localized string similar to Not responding.
         /// </summary>
         public static string windowwalker_NotResponding {
             get {

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

@@ -209,7 +209,7 @@
     <value>When disabled, windows will be sorted by title</value>
   </data>
   <data name="windowwalker_NotResponding" xml:space="preserve">
-    <value>Not Responding</value>
+    <value>Not responding</value>
   </data>
   <data name="window_walker_top_level_command_title" xml:space="preserve">
     <value>Switch between open windows</value>
@@ -218,7 +218,7 @@
     <value>Switch to</value>
   </data>
   <data name="VirtualDesktopHelper_AllDesktops" xml:space="preserve">
-    <value>On all Desktops</value>
+    <value>On all desktops</value>
   </data>
   <data name="VirtualDesktopHelper_Desktop" xml:space="preserve">
     <value>Desktop {0}</value>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/WindowsServicesCommandsProvider.cs

@@ -23,8 +23,7 @@ public partial class WindowsServicesCommandsProvider : CommandProvider
         return [
             new CommandItem(new ServicesListPage())
             {
-                Title = "Windows Services",
-                Subtitle = "Manage Windows Services",
+                Title = "Manage Windows services",
             }
         ];
     }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsSettings/WindowsSettingsCommandsProvider.cs

@@ -10,7 +10,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.WindowsSettings;
 
-public partial class WindowsSettingsCommandsProvider : CommandProvider
+public sealed partial class WindowsSettingsCommandsProvider : CommandProvider
 {
     private readonly CommandItem _searchSettingsListItem;
 
@@ -22,7 +22,7 @@ public partial class WindowsSettingsCommandsProvider : CommandProvider
 
     public WindowsSettingsCommandsProvider()
     {
-        Id = "Windows.Settings";
+        Id = "com.microsoft.cmdpal.builtin.windowssettings";
         DisplayName = Resources.WindowsSettingsProvider_DisplayName;
         Icon = Icons.WindowsSettingsIcon;
 

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

@@ -97,7 +97,7 @@ namespace Microsoft.CmdPal.Ext.WindowsTerminal.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Open Windows Terminal Profiles.
+        ///   Looks up a localized string similar to Open Windows Terminal profiles.
         /// </summary>
         internal static string list_item_title {
             get {

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

@@ -156,7 +156,7 @@
     <value>Settings</value>
   </data>
   <data name="list_item_title" xml:space="preserve">
-    <value>Open Windows Terminal Profiles</value>
+    <value>Open Windows Terminal profiles</value>
   </data>
   <data name="preferred_channel" xml:space="preserve">
     <value>Preferred channel</value>

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

@@ -63,7 +63,7 @@ internal sealed partial class SampleListPageWithDetails : ListPage
                 Details = new Details()
                 {
                     Title = "Hero Image Example",
-                    HeroImage = new IconInfo("https://m.media-amazon.com/images/M/MV5BNDBkMzVmNGQtYTM2OC00OWRjLTk5OWMtNzNkMDI4NjFjNTZmXkEyXkFqcGdeQXZ3ZXNsZXk@._V1_QL75_UX500_CR0,0,500,281_.jpg"),
+                    HeroImage = new IconInfo("https://m.media-amazon.com/images/M/MV5BNDBkMzVmNGQtYTM2OC00OWRjLTk5OWMtNzNkMDI4NjFjNTZmXkEyXkFqcGdeQXZ3ZXNsZXk@._V1_QL75_UX500_CR0,0,500,281_.jpg"), /* #no-spell-check-line */
                     Body = "It is literally an image of a hero",
                 },
             },

src/modules/imageresizer/tests/Models/ResizeBatchTests.cs

@@ -10,7 +10,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
-
+using ImageResizer.Properties;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Moq.Protected;
@@ -101,7 +101,9 @@ namespace ImageResizer.Models
         private static ResizeBatch CreateBatch(Action<string> executeAction)
         {
             var mock = new Mock<ResizeBatch> { CallBase = true };
-            mock.Protected().Setup("Execute", ItExpr.IsAny<string>()).Callback(executeAction);
+            mock.Protected()
+                .Setup("Execute", ItExpr.IsAny<string>(), ItExpr.IsAny<Settings>())
+                .Callback((string file, Settings settings) => executeAction(file));
 
             return mock.Object;
         }

src/modules/imageresizer/ui/Models/ResizeBatch.cs

@@ -87,9 +87,14 @@ namespace ImageResizer.Models
         public IEnumerable<ResizeError> Process(Action<int, double> reportProgress, CancellationToken cancellationToken)
         {
             double total = Files.Count;
-            var completed = 0;
+            int completed = 0;
             var errors = new ConcurrentBag<ResizeError>();
 
+            // NOTE: Settings.Default is captured once before parallel processing.
+            // Any changes to settings on disk during this batch will NOT be reflected until the next batch.
+            // This improves performance and predictability by avoiding repeated mutex acquisition and behaviour change results in a batch.
+            var settings = Settings.Default;
+
             // TODO: If we ever switch to Windows.Graphics.Imaging, we can get a lot more throughput by using the async
             //       APIs and a custom SynchronizationContext
             Parallel.ForEach(
@@ -97,13 +102,12 @@ namespace ImageResizer.Models
                 new ParallelOptions
                 {
                     CancellationToken = cancellationToken,
-                    MaxDegreeOfParallelism = Environment.ProcessorCount,
                 },
                 (file, state, i) =>
                 {
                     try
                     {
-                        Execute(file);
+                        Execute(file, settings);
                     }
                     catch (Exception ex)
                     {
@@ -111,14 +115,13 @@ namespace ImageResizer.Models
                     }
 
                     Interlocked.Increment(ref completed);
-
                     reportProgress(completed, total);
                 });
 
             return errors;
         }
 
-        protected virtual void Execute(string file)
-            => new ResizeOperation(file, DestinationDirectory, Settings.Default).Execute();
+        protected virtual void Execute(string file, Settings settings)
+            => new ResizeOperation(file, DestinationDirectory, settings).Execute();
     }
 }

src/modules/imageresizer/ui/Properties/Settings.cs

@@ -461,33 +461,42 @@ namespace ImageResizer.Properties
             {
             }
 
-            // Needs to be called on the App UI thread as the properties are bound to the UI.
-            App.Current.Dispatcher.Invoke(() =>
+            if (App.Current?.Dispatcher != null)
             {
-                ShrinkOnly = jsonSettings.ShrinkOnly;
-                Replace = jsonSettings.Replace;
-                IgnoreOrientation = jsonSettings.IgnoreOrientation;
-                RemoveMetadata = jsonSettings.RemoveMetadata;
-                JpegQualityLevel = jsonSettings.JpegQualityLevel;
-                PngInterlaceOption = jsonSettings.PngInterlaceOption;
-                TiffCompressOption = jsonSettings.TiffCompressOption;
-                FileName = jsonSettings.FileName;
-                KeepDateModified = jsonSettings.KeepDateModified;
-                FallbackEncoder = jsonSettings.FallbackEncoder;
-                CustomSize = jsonSettings.CustomSize;
-                SelectedSizeIndex = jsonSettings.SelectedSizeIndex;
-
-                if (jsonSettings.Sizes.Count > 0)
-                {
-                    Sizes.Clear();
-                    Sizes.AddRange(jsonSettings.Sizes);
-
-                    // Ensure Ids are unique and handle missing Ids
-                    IdRecoveryHelper.RecoverInvalidIds(Sizes);
-                }
-            });
+                // Needs to be called on the App UI thread as the properties are bound to the UI.
+                App.Current.Dispatcher.Invoke(() => ReloadCore(jsonSettings));
+            }
+            else
+            {
+                ReloadCore(jsonSettings);
+            }
 
             _jsonMutex.ReleaseMutex();
         }
+
+        private void ReloadCore(Settings jsonSettings)
+        {
+            ShrinkOnly = jsonSettings.ShrinkOnly;
+            Replace = jsonSettings.Replace;
+            IgnoreOrientation = jsonSettings.IgnoreOrientation;
+            RemoveMetadata = jsonSettings.RemoveMetadata;
+            JpegQualityLevel = jsonSettings.JpegQualityLevel;
+            PngInterlaceOption = jsonSettings.PngInterlaceOption;
+            TiffCompressOption = jsonSettings.TiffCompressOption;
+            FileName = jsonSettings.FileName;
+            KeepDateModified = jsonSettings.KeepDateModified;
+            FallbackEncoder = jsonSettings.FallbackEncoder;
+            CustomSize = jsonSettings.CustomSize;
+            SelectedSizeIndex = jsonSettings.SelectedSizeIndex;
+
+            if (jsonSettings.Sizes.Count > 0)
+            {
+                Sizes.Clear();
+                Sizes.AddRange(jsonSettings.Sizes);
+
+                // Ensure Ids are unique and handle missing Ids
+                IdRecoveryHelper.RecoverInvalidIds(Sizes);
+            }
+        }
     }
 }

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/QueryTests.cs

@@ -74,7 +74,7 @@ namespace Microsoft.PowerToys.Run.Plugin.System.UnitTests
             var result = main.Object.Query(expectedQuery).FirstOrDefault().SubTitle;
 
             // Assert
-            Assert.AreEqual("Reboot computer into UEFI Firmware Settings (Requires administrative permissions.)", result);
+            Assert.AreEqual("Reboot computer into UEFI firmware settings (Requires administrative permissions.)", result);
         }
 
         [TestMethod]

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace Microsoft.PowerToys.Run.Plugin.System.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -682,7 +682,7 @@ namespace Microsoft.PowerToys.Run.Plugin.System.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to You are about to reboot this computer into UEFI Firmware Settings menu, are you sure?.
+        ///   Looks up a localized string similar to You are about to reboot this computer into UEFI firmware settings menu, are you sure?.
         /// </summary>
         internal static string Microsoft_plugin_sys_uefi_confirmation {
             get {
@@ -691,7 +691,7 @@ namespace Microsoft.PowerToys.Run.Plugin.System.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Reboot computer into UEFI Firmware Settings (Requires administrative permissions.).
+        ///   Looks up a localized string similar to Reboot computer into UEFI firmware settings (Requires administrative permissions.).
         /// </summary>
         internal static string Microsoft_plugin_sys_uefi_description {
             get {

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Properties/Resources.resx

@@ -362,15 +362,15 @@
     <comment>Means type like category. Here it means network interface type (ethernet, wifi, ...).</comment>
   </data>
   <data name="Microsoft_plugin_sys_uefi" xml:space="preserve">
-    <value>UEFI Firmware Settings</value>
+    <value>UEFI firmware settings</value>
     <comment>This should align to the action in Windows Recovery Environment that restart into uefi settings.</comment>
   </data>
   <data name="Microsoft_plugin_sys_uefi_confirmation" xml:space="preserve">
-    <value>You are about to reboot this computer into UEFI Firmware Settings menu, are you sure?</value>
+    <value>You are about to reboot this computer into UEFI firmware settings menu, are you sure?</value>
     <comment>This should align to the action in Windows Recovery Environment that restart into uefi settings.</comment>
   </data>
   <data name="Microsoft_plugin_sys_uefi_description" xml:space="preserve">
-    <value>Reboot computer into UEFI Firmware Settings (Requires administrative permissions.)</value>
+    <value>Reboot computer into UEFI firmware settings (Requires administrative permissions.)</value>
     <comment>This should align to the action in Windows Recovery Environment that restart into uefi settings.</comment>
   </data>
   <data name="Microsoft_plugin_sys_Unknown" xml:space="preserve">

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Properties/Resources.resx

@@ -208,7 +208,7 @@
     <comment>'UTC' means here 'Universal Time Convention'</comment>
   </data>
   <data name="Microsoft_plugin_timedate_plugin_description" xml:space="preserve">
-    <value>Provides time and date values for the system time or a custom time stamp (e.g.'{0}', '{1}', '{2}', '{3}')</value>
+    <value>Shows time and date values for the system time or a custom time stamp (e.g.'{0}', '{1}', '{2}', '{3}')</value>
     <comment>Do not translate the placeholders like '{0}' because it will be replaced in code.</comment>
   </data>
   <data name="Microsoft_plugin_timedate_plugin_description_example_calendarWeek" xml:space="preserve">

src/modules/launcher/PowerLauncher/Helper/ErrorReporting.cs

@@ -61,7 +61,7 @@ namespace PowerLauncher.Helper
             // Many bug reports because users see the "Report problem UI" after "the" crash with System.Runtime.InteropServices.COMException 0xD0000701 or 0x80263001.
             // However, displaying this "Report problem UI" during WPF crashes, especially when DWM composition is changing, is not ideal; some users reported it hangs for up to a minute before the "Report problem UI" appears.
             // This change modifies the behavior to log the exception instead of showing the "Report problem UI".
-            if (IsDwmCompositionException(e as System.Runtime.InteropServices.COMException))
+            if (ExceptionHelper.IsRecoverableDwmCompositionException(e as System.Runtime.InteropServices.COMException))
             {
                 var logger = LogManager.GetLogger(LoggerName);
                 logger.Error($"From {(isNotUIThread ? "non" : string.Empty)} UI thread's exception: {ExceptionFormatter.FormatException(e)}");
@@ -91,22 +91,5 @@ namespace PowerLauncher.Helper
                 }
             }
         }
-
-        private static bool IsDwmCompositionException(System.Runtime.InteropServices.COMException comException)
-        {
-            if (comException == null)
-            {
-                return false;
-            }
-
-            var stackTrace = comException.StackTrace;
-            if (string.IsNullOrEmpty(stackTrace))
-            {
-                return false;
-            }
-
-            // Check for common DWM composition changed patterns in the stack trace
-            return stackTrace.Contains("DwmCompositionChanged");
-        }
     }
 }

src/modules/launcher/PowerLauncher/Helper/ExceptionHelper.cs

@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace PowerLauncher.Helper
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "Win32 naming conventions")]
+    internal static class ExceptionHelper
+    {
+        private const string PresentationFrameworkExceptionSource = "PresentationFramework";
+
+        private const int DWM_E_COMPOSITIONDISABLED = unchecked((int)0x80263001);
+
+        // HRESULT for NT STATUS STATUS_MESSAGE_LOST (0xC0000701 | 0x10000000 == 0xD0000701)
+        private const int STATUS_MESSAGE_LOST_HR = unchecked((int)0xD0000701);
+
+        /// <summary>
+        /// Returns true if the exception is a recoverable DWM composition exception.
+        /// </summary>
+        internal static bool IsRecoverableDwmCompositionException(Exception exception)
+        {
+            if (exception is not COMException comException)
+            {
+                return false;
+            }
+
+            if (comException.HResult is DWM_E_COMPOSITIONDISABLED)
+            {
+                return true;
+            }
+
+            if (comException.HResult is STATUS_MESSAGE_LOST_HR && comException.Source == PresentationFrameworkExceptionSource)
+            {
+                return true;
+            }
+
+            // Check for common DWM composition changed patterns in the stack trace
+            var stackTrace = comException.StackTrace;
+            return !string.IsNullOrEmpty(stackTrace) &&
+                   stackTrace.Contains("DwmCompositionChanged");
+        }
+    }
+}

src/modules/launcher/PowerLauncher/Helper/ThemeManager.cs

@@ -3,13 +3,16 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media;
 using ManagedCommon;
 using Microsoft.Win32;
 using Wox.Infrastructure.Image;
 using Wox.Infrastructure.UserSettings;
+using Wox.Plugin.Logger;
 
 namespace PowerLauncher.Helper
 {
@@ -20,6 +23,9 @@ namespace PowerLauncher.Helper
         private readonly ThemeHelper _themeHelper = new();
 
         private bool _disposed;
+        private CancellationTokenSource _themeUpdateTokenSource;
+        private const int MaxRetries = 5;
+        private const int InitialDelayMs = 2000;
 
         public Theme CurrentTheme { get; private set; }
 
@@ -108,10 +114,80 @@ namespace PowerLauncher.Helper
         {
             Theme newTheme = _themeHelper.DetermineTheme(_settings.Theme);
 
-            _mainWindow.Dispatcher.Invoke(() =>
+            // Cancel any existing theme update operation
+            _themeUpdateTokenSource?.Cancel();
+            _themeUpdateTokenSource?.Dispose();
+            _themeUpdateTokenSource = new CancellationTokenSource();
+
+            // Start theme update with retry logic in the background
+            _ = UpdateThemeWithRetryAsync(newTheme, _themeUpdateTokenSource.Token);
+        }
+
+        /// <summary>
+        /// Applies the theme with retry logic for desktop composition errors.
+        /// </summary>
+        /// <param name="theme">The theme to apply.</param>
+        /// <param name="cancellationToken">Token to cancel the operation.</param>
+        private async Task UpdateThemeWithRetryAsync(Theme theme, CancellationToken cancellationToken)
+        {
+            var delayMs = 0;
+            const int maxAttempts = MaxRetries + 1;
+
+            for (var attempt = 1; attempt <= maxAttempts; attempt++)
             {
-                SetSystemTheme(newTheme);
-            });
+                try
+                {
+                    if (delayMs > 0)
+                    {
+                        await Task.Delay(delayMs, cancellationToken);
+                    }
+
+                    if (cancellationToken.IsCancellationRequested)
+                    {
+                        Log.Debug("Theme update operation was cancelled.", typeof(ThemeManager));
+                        return;
+                    }
+
+                    await _mainWindow.Dispatcher.InvokeAsync(() =>
+                    {
+                        SetSystemTheme(theme);
+                    });
+
+                    if (attempt > 1)
+                    {
+                        Log.Info($"Successfully applied theme after {attempt - 1} retry attempt(s).", typeof(ThemeManager));
+                    }
+
+                    return;
+                }
+                catch (COMException ex) when (ExceptionHelper.IsRecoverableDwmCompositionException(ex))
+                {
+                    switch (attempt)
+                    {
+                        case 1:
+                            Log.Warn($"Desktop composition is disabled (HRESULT: 0x{ex.HResult:X}). Scheduling retries for theme update.", typeof(ThemeManager));
+                            delayMs = InitialDelayMs;
+                            break;
+                        case < maxAttempts:
+                            Log.Warn($"Retry {attempt - 1}/{MaxRetries} failed: Desktop composition still disabled. Retrying in {delayMs * 2}ms...", typeof(ThemeManager));
+                            delayMs *= 2;
+                            break;
+                        default:
+                            Log.Exception($"Failed to set theme after {MaxRetries} retry attempts. Desktop composition remains disabled.", ex, typeof(ThemeManager));
+                            break;
+                    }
+                }
+                catch (OperationCanceledException)
+                {
+                    Log.Debug("Theme update operation was cancelled.", typeof(ThemeManager));
+                    return;
+                }
+                catch (Exception ex)
+                {
+                    Log.Exception($"Unexpected error during theme update (attempt {attempt}/{maxAttempts}): {ex.Message}", ex, typeof(ThemeManager));
+                    throw;
+                }
+            }
         }
 
         public void Dispose()
@@ -130,6 +206,8 @@ namespace PowerLauncher.Helper
             if (disposing)
             {
                 SystemEvents.UserPreferenceChanged -= OnUserPreferenceChanged;
+                _themeUpdateTokenSource?.Cancel();
+                _themeUpdateTokenSource?.Dispose();
             }
 
             _disposed = true;

src/modules/peek/Peek.FilePreviewer/Previewers/MediaPreviewer/AudioPreviewer.cs

@@ -24,13 +24,15 @@ using Windows.Storage;
 
 namespace Peek.FilePreviewer.Previewers.MediaPreviewer
 {
-    public partial class AudioPreviewer : ObservableObject, IAudioPreviewer
+    public partial class AudioPreviewer : ObservableObject, IDisposable, IAudioPreviewer
     {
+        private MediaSource? _mediaSource;
+
         [ObservableProperty]
         private PreviewState _state;
 
         [ObservableProperty]
-        private AudioPreviewData _preview;
+        private AudioPreviewData? _preview;
 
         private IFileSystemItem Item { get; }
 
@@ -40,7 +42,6 @@ namespace Peek.FilePreviewer.Previewers.MediaPreviewer
         {
             Item = file;
             Dispatcher = DispatcherQueue.GetForCurrentThread();
-            Preview = new AudioPreviewData();
         }
 
         public async Task CopyAsync()
@@ -63,19 +64,23 @@ namespace Peek.FilePreviewer.Previewers.MediaPreviewer
         {
             State = PreviewState.Loading;
 
+            Preview = new AudioPreviewData();
+
             var thumbnailTask = LoadThumbnailAsync(cancellationToken);
             var sourceTask = LoadSourceAsync(cancellationToken);
             var metadataTask = LoadMetadataAsync(cancellationToken);
 
             await Task.WhenAll(thumbnailTask, sourceTask, metadataTask);
 
-            if (!thumbnailTask.Result || !sourceTask.Result || !metadataTask.Result)
+            if (sourceTask.Result && metadataTask.Result)
             {
-                State = PreviewState.Error;
+                State = PreviewState.Loaded;
             }
             else
             {
-                State = PreviewState.Loaded;
+                // Release all resources on error.
+                Unload();
+                State = PreviewState.Error;
             }
         }
 
@@ -88,12 +93,15 @@ namespace Peek.FilePreviewer.Previewers.MediaPreviewer
                 {
                     cancellationToken.ThrowIfCancellationRequested();
 
-                    var thumbnail = await ThumbnailHelper.GetThumbnailAsync(Item.Path, cancellationToken)
-                        ?? await ThumbnailHelper.GetIconAsync(Item.Path, cancellationToken);
+                    if (Preview != null)
+                    {
+                        var thumbnail = await ThumbnailHelper.GetThumbnailAsync(Item.Path, cancellationToken)
+                            ?? await ThumbnailHelper.GetIconAsync(Item.Path, cancellationToken);
 
-                    cancellationToken.ThrowIfCancellationRequested();
+                        cancellationToken.ThrowIfCancellationRequested();
 
-                    Preview.Thumbnail = thumbnail ?? new SvgImageSource(new Uri("ms-appx:///Assets/Peek/DefaultFileIcon.svg"));
+                        Preview.Thumbnail = thumbnail ?? new SvgImageSource(new Uri("ms-appx:///Assets/Peek/DefaultFileIcon.svg"));
+                    }
                 });
             });
         }
@@ -110,7 +118,11 @@ namespace Peek.FilePreviewer.Previewers.MediaPreviewer
                 {
                     cancellationToken.ThrowIfCancellationRequested();
 
-                    Preview.MediaSource = MediaSource.CreateFromStorageFile(storageFile);
+                    if (Preview != null)
+                    {
+                        _mediaSource = MediaSource.CreateFromStorageFile(storageFile);
+                        Preview.MediaSource = _mediaSource;
+                    }
                 });
             });
         }
@@ -123,6 +135,11 @@ namespace Peek.FilePreviewer.Previewers.MediaPreviewer
 
                 await Dispatcher.RunOnUiThread(() =>
                 {
+                    if (Preview == null)
+                    {
+                        return;
+                    }
+
                     cancellationToken.ThrowIfCancellationRequested();
                     Preview.Title = PropertyStoreHelper.TryGetStringProperty(Item.Path, PropertyKey.MusicTitle)
                         ?? Item.Name[..^Item.Extension.Length];
@@ -160,6 +177,22 @@ namespace Peek.FilePreviewer.Previewers.MediaPreviewer
             return _supportedFileTypes.Contains(item.Extension);
         }
 
+        public void Dispose()
+        {
+            Unload();
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Explicitly unloads the preview and releases file resources.
+        /// </summary>
+        public void Unload()
+        {
+            _mediaSource?.Dispose();
+            _mediaSource = null;
+            Preview = null;
+        }
+
         private static readonly HashSet<string> _supportedFileTypes = new()
         {
             ".aac",