CursorWrap improvements (#44936)

## Summary of the Pull Request
- Updated engine for better multi-monitor support.
- Closing the laptop lid will now update the monitor topology
- New settings/dropdown to support wrapping on horizontal, vertical, or
both

<img width="1103" height="643" alt="image"
src="https://github.com/user-attachments/assets/ff4f0835-a8ca-4603-9441-123b71747d5c"
/>

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

- [x] Closes: #44820
- [x] Closes: #44864
- [x] Closes: #44952

- [ ] **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

## Detailed Description of the Pull Request / Additional comments
Feedback for CursorWrap shows that users want the ability to constrain
wrapping for horizontal only, vertical only, or both (default behavior).
This PR adds a new dropdown to CursorWrap settings to enable a user to
select the appropriate wrapping model.

## Validation Steps Performed
Local build and running on Surface Laptop 7 Pro - will also validate on
a multi-monitor setup.

---------

Co-authored-by: vanzue <vanzue@outlook.com>

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

@@ -22,7 +22,6 @@ ADate
 ADDSTRING
 ADDUNDORECORD
 ADifferent
-adjacents
 ADMINS
 adml
 admx
@@ -99,7 +98,6 @@ ASYNCWINDOWPLACEMENT
 ASYNCWINDOWPOS
 atl
 ATRIOX
-ATX
 aumid
 authenticode
 AUTOBUDDY
@@ -209,14 +207,17 @@ changecursor
 CHILDACTIVATE
 CHILDWINDOW
 CHOOSEFONT
+CIBUILD
 cidl
 CIELCh
 cim
 CImage
 cla
 CLASSDC
+classguid
 classmethod
 CLASSNOTAVAILABLE
+claude
 CLEARTYPE
 clickable
 clickonce
@@ -255,7 +256,6 @@ colorhistory
 colorhistorylimit
 COLORKEY
 colorref
-Convs
 comctl
 comdlg
 comexp
@@ -276,6 +276,7 @@ CONTEXTHELP
 CONTEXTMENUHANDLER
 contractversion
 CONTROLPARENT
+Convs
 copiedcolorrepresentation
 coppied
 copyable
@@ -291,7 +292,6 @@ cpcontrols
 cph
 cplusplus
 CPower
-cppcoreguidelines
 cpptools
 cppvsdbg
 cppwinrt
@@ -320,7 +320,7 @@ CURRENTDIR
 CURSORINFO
 cursorpos
 CURSORSHOWING
-CURSORWRAP
+cursorwrap
 customaction
 CUSTOMACTIONTEST
 CUSTOMFORMATPLACEHOLDER
@@ -343,12 +343,14 @@ datareader
 datatracker
 dataversion
 Dayof
+dbcc
 DBID
 DBLCLKS
 DBLEPSILON
 DBPROP
 DBPROPIDSET
 DBPROPSET
+DBT
 DCBA
 DCOM
 DComposition
@@ -366,8 +368,7 @@ DEFAULTICON
 defaultlib
 DEFAULTONLY
 DEFAULTSIZE
-DEFAULTTONEAREST
-Defaulttonearest
+defaulttonearest
 DEFAULTTONULL
 DEFAULTTOPRIMARY
 DEFERERASE
@@ -389,14 +390,19 @@ DESKTOPVERTRES
 devblogs
 devdocs
 devenv
+DEVICEINTERFACE
+devicetype
+DEVINTERFACE
 devmgmt
 DEVMODE
 DEVMODEW
+DEVNODES
 devpal
+DEVTYP
 dfx
 DIALOGEX
-digicert
 diffs
+digicert
 DINORMAL
 DISABLEASACTIONKEY
 DISABLENOSCROLL
@@ -539,7 +545,6 @@ fdx
 FErase
 fesf
 FFFF
-FInc
 Figma
 FILEEXPLORER
 fileexploreraddons
@@ -560,6 +565,7 @@ FILESYSPATH
 Filetime
 FILEVERSION
 FILTERMODE
+FInc
 findfast
 findmymouse
 FIXEDFILEINFO
@@ -661,13 +667,14 @@ HCRYPTPROV
 hcursor
 hcwhite
 hdc
+HDEVNOTIFY
 hdr
 hdrop
 hdwwiz
 Helpline
 helptext
-HGFE
 hgdiobj
+HGFE
 hglobal
 hhk
 HHmmssfff
@@ -743,9 +750,9 @@ HWNDPARENT
 HWNDPREV
 hyjiacan
 IAI
+icf
 ICONERROR
 ICONLOCATION
-icf
 IDCANCEL
 IDD
 idk
@@ -836,8 +843,8 @@ jeli
 jfif
 jgeosdfsdsgmkedfgdfgdfgbkmhcgcflmi
 jjw
-JOBOBJECT
 jobject
+JOBOBJECT
 jpe
 jpnime
 Jsons
@@ -881,6 +888,7 @@ Ldr
 LEFTALIGN
 LEFTSCROLLBAR
 LEFTTEXT
+leftclick
 LError
 LEVELID
 LExit
@@ -923,9 +931,9 @@ LOWORD
 lparam
 LPBITMAPINFOHEADER
 LPCFHOOKPROC
+lpch
 LPCITEMIDLIST
 LPCLSID
-lpch
 lpcmi
 LPCMINVOKECOMMANDINFO
 LPCREATESTRUCT
@@ -941,6 +949,7 @@ LPMONITORINFO
 LPOSVERSIONINFOEXW
 LPQUERY
 lprc
+LPrivate
 LPSAFEARRAY
 lpstr
 lpsz
@@ -950,7 +959,6 @@ lptpm
 LPTR
 LPTSTR
 lpv
-LPrivate
 LPW
 lpwcx
 lpwndpl
@@ -994,18 +1002,19 @@ mber
 MBM
 MBR
 Mbuttondown
+mcp
 MDICHILD
 MDL
 mdtext
 mdtxt
 mdwn
 meme
-mcp
 memicmp
 MENUITEMINFO
 MENUITEMINFOW
 MERGECOPY
 MERGEPAINT
+Metacharacter
 metadatamatters
 Metadatas
 metafile
@@ -1036,6 +1045,7 @@ mmsys
 mobileredirect
 mockapi
 MODALFRAME
+modelcontextprotocol
 MODESPRUNED
 MONITORENUMPROC
 MONITORINFO
@@ -1079,9 +1089,9 @@ MSLLHOOKSTRUCT
 Mso
 msrc
 msstore
+mstsc
 msvcp
 MT
-mstsc
 MTND
 MULTIPLEUSE
 multizone
@@ -1091,11 +1101,11 @@ muxxc
 muxxh
 MVPs
 mvvm
-myorg
-myrepo
 MVVMTK
 MWBEx
 MYICON
+myorg
+myrepo
 NAMECHANGE
 namespaceanddescendants
 nao
@@ -1236,10 +1246,8 @@ opencode
 OPENFILENAME
 openrdp
 opensource
-openxmlformats
-ollama
-onnx
 openurl
+openxmlformats
 OPTIMIZEFORINVOKE
 ORPHANEDDIALOGTITLE
 ORSCANS
@@ -1455,7 +1463,6 @@ rbhid
 Rbuttondown
 rclsid
 RCZOOMIT
-remotedesktop
 rdp
 RDW
 READMODE
@@ -1484,6 +1491,7 @@ remappings
 REMAPSUCCESSFUL
 REMAPUNSUCCESSFUL
 Remotable
+remotedesktop
 remoteip
 Removelnk
 renamable
@@ -1517,8 +1525,8 @@ RIGHTSCROLLBAR
 riid
 RKey
 RNumber
-rop
 rollups
+rop
 ROUNDSMALL
 ROWSETEXT
 rpcrt
@@ -1756,8 +1764,7 @@ SVGIO
 svgz
 SVSI
 SWFO
-SWP
-Swp
+swp
 SWPNOSIZE
 SWPNOZORDER
 SWRESTORE
@@ -1776,8 +1783,7 @@ SYSKEY
 syskeydown
 SYSKEYUP
 SYSLIB
-SYSMENU
-Sysmenu
+sysmenu
 systemai
 SYSTEMAPPS
 SYSTEMMODAL
@@ -1881,9 +1887,9 @@ uitests
 UITo
 ULONGLONG
 Ultrawide
-ums
 UMax
 UMin
+ums
 uncompilable
 UNCPRIORITY
 UNDNAME

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

@@ -6,13 +6,45 @@ description: 'Generate an 80-character git commit title for the local diff'
 
 # Generate Commit Title
 
-**Goal:** Provide a ready-to-paste git commit title (<= 80 characters) that captures the most important local changes since `HEAD`.
+## Purpose
+Provide a single-line, ready-to-paste git commit title (<= 80 characters) that reflects the most important local changes since `HEAD`.
 
-**Workflow:**
-1. Run a single command to view the local diff since the last commit:
-   ```@terminal
-   git diff HEAD
-   ```
-2. From that diff, identify the dominant area (reference key paths like `src/modules/*`, `doc/devdocs/**`, etc.), the type of change (bug fix, docs update, config tweak), and any notable impact.
-3. Draft a concise, imperative commit title summarizing the dominant change. Keep it plain ASCII, <= 80 characters, and avoid trailing punctuation. Mention the primary component when obvious (for example `FancyZones:` or `Docs:`).
-4. Respond with only the final commit title on a single line so it can be pasted directly into `git commit`.
+## Input to collect
+- Run exactly one command to view the local diff:
+  ```@terminal
+  git diff HEAD
+  ```
+
+## How to decide the title
+1. From the diff, find the dominant area (e.g., `src/modules/*`, `doc/devdocs/**`) and the change type (bug fix, docs update, config tweak).
+2. Draft an imperative, plain-ASCII title that:
+   - Mentions the primary component when obvious (e.g., `FancyZones:` or `Docs:`)
+   - Stays within 80 characters and has no trailing punctuation
+
+## Final output
+- Reply with only the commit title on a single line—no extra text.
+
+## PR title convention (when asked)
+Use Conventional Commits style:
+
+`<type>(<scope>): <summary>`
+
+**Allowed types**
+- feat, fix, docs, refactor, perf, test, build, ci, chore
+
+**Scope rules**
+- Use a short, PowerToys-focused scope (one word preferred). Common scopes:
+  - Core: `runner`, `settings-ui`, `common`, `docs`, `build`, `ci`, `installer`, `gpo`, `dsc`
+  - Modules: `fancyzones`, `powerrename`, `awake`, `colorpicker`, `imageresizer`, `keyboardmanager`, `mouseutils`, `peek`, `hosts`, `file-locksmith`, `screen-ruler`, `text-extractor`, `cropandlock`, `paste`, `powerlauncher`
+- If unclear, pick the closest module or subsystem; omit only if unavoidable
+
+**Summary rules**
+- Imperative, present tense (“add”, “update”, “remove”, “fix”)
+- Keep it <= 72 characters when possible; be specific, avoid “misc changes”
+
+**Examples**
+- `feat(fancyzones): add canvas template duplication`
+- `fix(mouseutils): guard crosshair toggle when dpi info missing`
+- `docs(runner): document tray icon states`
+- `build(installer): align wix v5 suffix flag`
+- `ci(ci): cache pipeline artifacts for x64`

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

@@ -22,3 +22,4 @@ description: 'Generate a PowerToys-ready pull request description from the local
 5. Confirm validation: list tests executed with results or state why tests were skipped in line with repo guidance.
 6. Load `.github/pull_request_template.md`, mirror its section order, and populate it with the gathered facts. Include only relevant checklist entries, marking them `[x]/[ ]` and noting any intentional omissions as "N/A".
 7. Present the filled template inside a fenced ```markdown code block with no extra commentary so it is ready to paste into a PR, clearly flagging any placeholders that still need user input.
+8. Prepend the PR title above the filled template, applying the Conventional Commit type/scope rules from `.github/prompts/create-commit-title.prompt.md`; pick the dominant component from the diff and keep the title concise and imperative.

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

@@ -10,8 +10,8 @@ description: 'Resolve Code scanning / check-spelling comments on the active PR'
 
 **Guardrails:**
 - Update only discussion threads authored by `github-actions` or `github-actions[bot]` that mention `Code scanning results / check-spelling`.
-- Resolve findings solely by editing `.github/actions/spell-check/expect.txt`; reuse existing entries.
-- Leave all other files and topics untouched.
+- Prefer improving the wording in the originally flagged file when it clarifies intent without changing meaning; if the wording is already clear/standard for the context, handle it via `.github/actions/spell-check/expect.txt` and reuse existing entries.
+- Limit edits to the flagged text and `.github/actions/spell-check/expect.txt`; leave all other files and topics untouched.
 
 **Prerequisites:**
 - Install GitHub CLI if it is not present: `winget install GitHub.cli`.
@@ -20,5 +20,6 @@ description: 'Resolve Code scanning / check-spelling comments on the active PR'
 **Workflow:**
 1. Determine the active pull request with a single `gh pr view --json number` call (default to the current branch).
 2. Fetch all PR discussion data once via `gh pr view --json comments,reviews` and filter to check-spelling comments authored by `github-actions` or `github-actions[bot]` that are not minimized; when several remain, process only the most recent comment body.
-3. For each flagged token, review `.github/actions/spell-check/expect.txt` for an equivalent term (for example an existing lowercase variant); when found, reuse that normalized term rather than adding a new entry, even if the flagged token differs only by casing. Only add a new entry after confirming no equivalent already exists.
-4. Add any remaining missing token to `.github/actions/spell-check/expect.txt`, keeping surrounding formatting intact.
+3. For each flagged token, first consider tightening or rephrasing the original text to avoid the false positive while keeping the meaning intact; if the existing wording is already normal and professional for the context, proceed to allowlisting instead of changing it.
+4. When allowlisting, review `.github/actions/spell-check/expect.txt` for an equivalent term (for example an existing lowercase variant); when found, reuse that normalized term rather than adding a new entry, even if the flagged token differs only by casing. Only add a new entry after confirming no equivalent already exists.
+5. Add any remaining missing token to `.github/actions/spell-check/expect.txt`, keeping surrounding formatting intact.

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

@@ -504,6 +504,14 @@ jobs:
         Remove-Item -Force -Recurse "$(JobOutputDirectory)/_appx" -ErrorAction:Ignore
       displayName: Re-pack the new CmdPal package after signing
 
+    - pwsh: |
+        $testsPath = "$(Build.SourcesDirectory)/$(BuildPlatform)/$(BuildConfiguration)/tests"
+        if (Test-Path $testsPath) {
+            Remove-Item -Path $testsPath -Recurse -Force
+            Write-Host "Removed tests folder to reduce signing workload: $testsPath"
+        }
+      displayName: Remove tests folder before signing
+
     - template: steps-esrp-signing.yml
       parameters:
         displayName: Sign Core PowerToys

.pipelines/v2/templates/steps-esrp-signing.yml

@@ -10,7 +10,7 @@ parameters:
     default: {}
 
 steps:
-  - task: EsrpCodeSigning@5
+  - task: EsrpCodeSigning@6
     displayName: 🔏 ${{ parameters.displayName }}
     inputs:
       ConnectedServiceName: ${{ parameters.signingIdentity.serviceName }}

.vscode/settings.json

@@ -0,0 +1,17 @@
+{
+    "github.copilot.chat.reviewSelection.instructions": [
+        {
+            "file": ".github/prompts/review-pr.prompt.md"
+        }
+    ],
+    "github.copilot.chat.commitMessageGeneration.instructions": [
+        {
+            "file": ".github/prompts/create-commit-title.prompt.md"
+        }
+    ],
+    "github.copilot.chat.pullRequestDescriptionGeneration.instructions": [
+        {
+            "file": ".github/prompts/create-pr-summary.prompt.md"
+        }
+    ]
+}

Directory.Packages.props

@@ -13,6 +13,8 @@
     <PackageVersion Include="Microsoft.Bot.AdaptiveExpressions.Core" Version="4.23.0" />
     <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
     <PackageVersion Include="CoenM.ImageSharp.ImageHash" Version="1.3.6" />
+    <!-- Pin the SixLabors.ImageSharp version (a transitive dependency of CoenM.ImageSharp.ImageHash) to restore functionality and apply patches. -->
+    <PackageVersion Include="SixLabors.ImageSharp" Version="2.1.12" />
     <PackageVersion Include="CommunityToolkit.Common" Version="8.4.0" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.2.250402" />
@@ -24,7 +26,7 @@
     <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
     <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
-    <PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.251002-build.2316" />
+    <PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.260116-build.2514" />
     <PackageVersion Include="ControlzEx" Version="6.0.0" />
     <PackageVersion Include="HelixToolkit" Version="2.24.0" />
     <PackageVersion Include="HelixToolkit.Core.Wpf" Version="2.24.0" />

README.md

@@ -48,7 +48,7 @@ But to get started quickly, choose one of the installation methods below:
 <details open>
 <summary><strong>Download .exe from GitHub</strong></summary>
 <br/>
-Go to the [PowerToys GitHub releases][github-release-link], click Assets to reveal the downloads, and choose the installer that matches your architecture and install scope. For most devices, that's the x64 per-user installer.
+Go to the <a href="https://aka.ms/installPowerToys">PowerToys GitHub releases</a>, click Assets to reveal the downloads, and choose the installer that matches your architecture and install scope. For most devices, that's the x64 per-user installer.
 
 <!-- items that need to be updated release to release -->
 [github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.97%22
@@ -83,7 +83,7 @@ You can easily install PowerToys from the Microsoft Store:
 <details>
 <summary><strong>WinGet</strong></summary>
 <br/>
-Download PowerToys from [WinGet][winget-link]. Updating PowerToys via winget will respect the current PowerToys installation scope. To install PowerToys, run the following command from the command line / PowerShell:
+Download PowerToys from <a href="https://github.com/microsoft/winget-cli#installing-the-client">WinGet</a>. Updating PowerToys via winget will respect the current PowerToys installation scope. To install PowerToys, run the following command from the command line / PowerShell:
 
 *User scope installer [default]*
 ```powershell
@@ -99,7 +99,7 @@ winget install --scope machine Microsoft.PowerToys -s winget
 <details>
 <summary><strong>Other methods</strong></summary>
 <br/>
-There are [community driven install methods](./doc/unofficialInstallMethods.md) such as Chocolatey and Scoop. If these are your preferred install solutions, you can find the install instructions there.
+There are <a href="https://learn.microsoft.com/windows/powertoys/install#community-driven-install-tools">community driven install methods</a> such as Chocolatey and Scoop. If these are your preferred install solutions, you can find the install instructions there.
 </details>
 
 ## ✨ What's new

installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp

@@ -1549,7 +1549,7 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
     }
     processes.resize(bytes / sizeof(processes[0]));
 
-    std::array<std::wstring_view, 42> processesToTerminate = {
+    std::array<std::wstring_view, 44> processesToTerminate = {
         L"PowerToys.PowerLauncher.exe",
         L"PowerToys.Settings.exe",
         L"PowerToys.AdvancedPaste.exe",
@@ -1584,12 +1584,14 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
         L"PowerToys.MouseWithoutBordersService.exe",
         L"PowerToys.CropAndLock.exe",
         L"PowerToys.EnvironmentVariables.exe",
+        L"PowerToys.QuickAccess.exe",
         L"PowerToys.WorkspacesSnapshotTool.exe",
         L"PowerToys.WorkspacesLauncher.exe",
         L"PowerToys.WorkspacesLauncherUI.exe",
         L"PowerToys.WorkspacesEditor.exe",
         L"PowerToys.WorkspacesWindowArranger.exe",
         L"Microsoft.CmdPal.UI.exe",
+        L"Microsoft.CmdPal.Ext.PowerToys.exe",
         L"PowerToys.ZoomIt.exe",
         L"PowerToys.exe",
     };

installer/PowerToysSetupVNext/CmdPal.wxs

@@ -18,6 +18,7 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="Module_CmdPal" Value="" KeyPath="yes" />
         </RegistryKey>
+        <RemoveFile Id="RemoveOldCmdPalMsix" Name="Microsoft.CmdPal.UI_*.msix" On="install" />
         <?if $(sys.BUILDARCH) = x64 ?>
         <File Id="Microsoft.CmdPal.UI___var.CmdPalVersion_._x64.msix" Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_x64.msix" />
         <?else?>

installer/PowerToysSetupVNext/Core.wxs

@@ -61,6 +61,16 @@
         </RegistryKey>
         <File Source="$(var.RepoDir)\Notice.md" Id="Notice.md" />
       </Component>
+      <Directory Id="SvgsFolder" Name="svgs">
+        <Component Id="svgs_icons" Guid="A9B7C5D3-E1F2-4A6B-8C9D-0E1F2A3B4C5D" Bitness="always64">
+          <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+            <RegistryValue Type="string" Name="svgs_icons" Value="" KeyPath="yes" />
+          </RegistryKey>
+          <File Id="icon.ico" Source="$(var.BinDir)svgs\icon.ico" />
+          <File Id="PowerToysWhite.ico" Source="$(var.BinDir)svgs\PowerToysWhite.ico" />
+          <File Id="PowerToysDark.ico" Source="$(var.BinDir)svgs\PowerToysDark.ico" />
+        </Component>
+      </Directory>
     </DirectoryRef>
 
     <?if $(var.PerUser) = "true" ?>
@@ -112,6 +122,7 @@
         <RemoveFolder Id="RemoveBaseApplicationsAssetsFolder" Directory="BaseApplicationsAssetsFolder" On="uninstall" />
         <RemoveFolder Id="RemoveWinUI3AppsInstallFolder" Directory="WinUI3AppsInstallFolder" On="uninstall" />
         <RemoveFolder Id="RemoveWinUI3AppsAssetsFolder" Directory="WinUI3AppsAssetsFolder" On="uninstall" />
+        <RemoveFolder Id="RemoveSvgsFolder" Directory="SvgsFolder" On="uninstall" />
         <RemoveFolder Id="RemoveINSTALLFOLDER" Directory="INSTALLFOLDER" On="uninstall" />
       </Component>
       <ComponentRef Id="powertoys_exe" />
@@ -120,6 +131,7 @@
       <ComponentRef Id="powertoys_toast_clsid" />
       <ComponentRef Id="License_rtf" />
       <ComponentRef Id="Notice_md" />
+      <ComponentRef Id="svgs_icons" />
       <ComponentRef Id="DesktopShortcut" />
       <?if $(var.PerUser) = "true" ?>
       <ComponentRef Id="powertoys_env_path_user" />

src/common/GPOWrapperProjection/GPOWrapper.cs

@@ -66,5 +66,10 @@ namespace PowerToys.GPOWrapperProjection
         {
             return (GpoRuleConfigured)PowerToys.GPOWrapper.GPOWrapper.GetConfiguredWorkspacesEnabledValue();
         }
+
+        public static GpoRuleConfigured GetConfiguredLightSwitchEnabledValue()
+        {
+            return (GpoRuleConfigured)PowerToys.GPOWrapper.GPOWrapper.GetConfiguredLightSwitchEnabledValue();
+        }
     }
 }

src/common/ManagedCommon/OSVersionHelper.cs

@@ -10,7 +10,7 @@ namespace ManagedCommon
     {
         public static bool IsWindows10()
         {
-            return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Minor < 22000;
+            return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build < 22000;
         }
 
         public static bool IsWindows11()

src/common/Themes/theme_listener.cpp

@@ -16,13 +16,50 @@ DWORD WINAPI _checkTheme(LPVOID lpParam)
 
 void ThemeListener::AddChangedHandler(THEME_HANDLE handle)
 {
+    std::lock_guard<std::mutex> lock(handlesMutex);
     handles.push_back(handle);
 }
 
 void ThemeListener::DelChangedHandler(THEME_HANDLE handle)
 {
+    std::lock_guard<std::mutex> lock(handlesMutex);
     auto it = std::find(handles.begin(), handles.end(), handle);
-    handles.erase(it);
+    if (it != handles.end())
+    {
+        handles.erase(it);
+    }
+}
+
+void ThemeListener::AddAppThemeChangedHandler(THEME_HANDLE handle)
+{
+    std::lock_guard<std::mutex> lock(handlesMutex);
+    appThemeHandles.push_back(handle);
+}
+
+void ThemeListener::DelAppThemeChangedHandler(THEME_HANDLE handle)
+{
+    std::lock_guard<std::mutex> lock(handlesMutex);
+    auto it = std::find(appThemeHandles.begin(), appThemeHandles.end(), handle);
+    if (it != appThemeHandles.end())
+    {
+        appThemeHandles.erase(it);
+    }
+}
+
+void ThemeListener::AddSystemThemeChangedHandler(THEME_HANDLE handle)
+{
+    std::lock_guard<std::mutex> lock(handlesMutex);
+    systemThemeHandles.push_back(handle);
+}
+
+void ThemeListener::DelSystemThemeChangedHandler(THEME_HANDLE handle)
+{
+    std::lock_guard<std::mutex> lock(handlesMutex);
+    auto it = std::find(systemThemeHandles.begin(), systemThemeHandles.end(), handle);
+    if (it != systemThemeHandles.end())
+    {
+        systemThemeHandles.erase(it);
+    }
 }
 
 void ThemeListener::CheckTheme()
@@ -48,13 +85,51 @@ void ThemeListener::CheckTheme()
 
             WaitForSingleObject(hEvent, INFINITE);
 
-            auto _theme = ThemeHelpers::GetAppTheme();
-            if (AppTheme != _theme)
+            auto _appTheme = ThemeHelpers::GetAppTheme();
+            auto _systemTheme = ThemeHelpers::GetSystemTheme();
+            
+            bool appThemeChanged = (AppTheme != _appTheme);
+            bool systemThemeChanged = (SystemTheme != _systemTheme);
+            
+            if (appThemeChanged || systemThemeChanged)
             {
-                AppTheme = _theme;
-                for (int i = 0; i < handles.size(); i++)
+                AppTheme = _appTheme;
+                SystemTheme = _systemTheme;
+                
+                // Copy handlers under lock, then invoke outside lock to avoid deadlock
+                std::vector<THEME_HANDLE> handlesCopy;
+                std::vector<THEME_HANDLE> appThemeHandlesCopy;
+                std::vector<THEME_HANDLE> systemThemeHandlesCopy;
+                
                 {
-                    handles[i]();
+                    std::lock_guard<std::mutex> lock(handlesMutex);
+                    handlesCopy = handles;
+                    if (appThemeChanged)
+                    {
+                        appThemeHandlesCopy = appThemeHandles;
+                    }
+                    if (systemThemeChanged)
+                    {
+                        systemThemeHandlesCopy = systemThemeHandles;
+                    }
+                }
+                
+                // Call generic handlers (backward compatible)
+                for (const auto& handler : handlesCopy)
+                {
+                    handler();
+                }
+                
+                // Call app theme specific handlers
+                for (const auto& handler : appThemeHandlesCopy)
+                {
+                    handler();
+                }
+                
+                // Call system theme specific handlers
+                for (const auto& handler : systemThemeHandlesCopy)
+                {
+                    handler();
                 }
             }
         }

src/common/Themes/theme_listener.h

@@ -3,6 +3,7 @@
 #include <windows.h>
 #include <iostream>
 #include <vector>
+#include <mutex>
 
 typedef void (*THEME_HANDLE)();
 DWORD WINAPI _checkTheme(LPVOID lpParam);
@@ -14,6 +15,7 @@ public:
     ThemeListener()
     {
         AppTheme = ThemeHelpers::GetAppTheme();
+        SystemTheme = ThemeHelpers::GetSystemTheme();
         dwThreadHandle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)_checkTheme, this, 0, &dwThreadId);
     }
     ~ThemeListener()
@@ -23,12 +25,20 @@ public:
     }
 
     Theme AppTheme;
+    Theme SystemTheme;
     void ThemeListener::AddChangedHandler(THEME_HANDLE handle);
     void ThemeListener::DelChangedHandler(THEME_HANDLE handle);
+    void ThemeListener::AddAppThemeChangedHandler(THEME_HANDLE handle);
+    void ThemeListener::DelAppThemeChangedHandler(THEME_HANDLE handle);
+    void ThemeListener::AddSystemThemeChangedHandler(THEME_HANDLE handle);
+    void ThemeListener::DelSystemThemeChangedHandler(THEME_HANDLE handle);
     void CheckTheme();
 
 private:
     HANDLE dwThreadHandle;
     DWORD dwThreadId;
     std::vector<THEME_HANDLE> handles;
+    std::vector<THEME_HANDLE> appThemeHandles;
+    std::vector<THEME_HANDLE> systemThemeHandles;
+    mutable std::mutex handlesMutex;
 };

src/common/utils/package.h

@@ -2,6 +2,7 @@
 
 #include <Windows.h>
 
+#include <algorithm>
 #include <appxpackaging.h>
 #include <exception>
 #include <filesystem>
@@ -337,6 +338,30 @@ namespace package
                     }
                 }
             }
+
+            // Sort by package version in descending order (newest first)
+            std::sort(matchedFiles.begin(), matchedFiles.end(), [](const std::wstring& a, const std::wstring& b) {
+                std::wstring nameA, nameB;
+                PACKAGE_VERSION versionA{}, versionB{};
+
+                bool gotA = GetPackageNameAndVersionFromAppx(a, nameA, versionA);
+                bool gotB = GetPackageNameAndVersionFromAppx(b, nameB, versionB);
+
+                // Files that failed to parse go to the end
+                if (!gotA)
+                    return false;
+                if (!gotB)
+                    return true;
+
+                // Compare versions: Major, Minor, Build, Revision (descending)
+                if (versionA.Major != versionB.Major)
+                    return versionA.Major > versionB.Major;
+                if (versionA.Minor != versionB.Minor)
+                    return versionA.Minor > versionB.Minor;
+                if (versionA.Build != versionB.Build)
+                    return versionA.Build > versionB.Build;
+                return versionA.Revision > versionB.Revision;
+            });
         }
         catch (const std::exception& ex)
         {

src/gpo/assets/PowerToys.admx

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.
      Licensed under the MIT License. -->
-<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.18" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
+<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.19" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
   <policyNamespaces>
     <target prefix="powertoys" namespace="Microsoft.Policies.PowerToys" />
   </policyNamespaces>
-  <resources minRequiredRevision="1.18"/><!-- Last changed with PowerToys v0.96.0 -->
+  <resources minRequiredRevision="1.19"/><!-- Last changed with PowerToys v0.97.0 -->
   <supportedOn>
     <definitions>
       <definition name="SUPPORTED_POWERTOYS_0_64_0" displayName="$(string.SUPPORTED_POWERTOYS_0_64_0)"/>
@@ -27,6 +27,7 @@
       <definition name="SUPPORTED_POWERTOYS_0_89_0" displayName="$(string.SUPPORTED_POWERTOYS_0_89_0)"/>
       <definition name="SUPPORTED_POWERTOYS_0_90_0" displayName="$(string.SUPPORTED_POWERTOYS_0_90_0)"/>
       <definition name="SUPPORTED_POWERTOYS_0_96_0" displayName="$(string.SUPPORTED_POWERTOYS_0_96_0)"/>
+      <definition name="SUPPORTED_POWERTOYS_0_97_0" displayName="$(string.SUPPORTED_POWERTOYS_0_97_0)"/>
       <definition name="SUPPORTED_POWERTOYS_0_64_0_TO_0_87_1" displayName="$(string.SUPPORTED_POWERTOYS_0_64_0_TO_0_87_1)"/>
     </definitions>
   </supportedOn>
@@ -338,6 +339,16 @@
         <decimal value="0" />
       </disabledValue>
     </policy>
+    <policy name="ConfigureEnabledUtilityCursorWrap" class="Both" displayName="$(string.ConfigureEnabledUtilityCursorWrap)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityCursorWrap">
+      <parentCategory ref="PowerToys" />
+      <supportedOn ref="SUPPORTED_POWERTOYS_0_97_0" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
     <policy name="ConfigureEnabledUtilityFindMyMouse" class="Both" displayName="$(string.ConfigureEnabledUtilityFindMyMouse)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityFindMyMouse">
       <parentCategory ref="PowerToys" />
       <supportedOn ref="SUPPORTED_POWERTOYS_0_64_0" />

src/gpo/assets/en-US/PowerToys.adml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.
      Licensed under the MIT License. -->
-<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.18" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
+<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.19" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
   <displayName>PowerToys</displayName>
   <description>PowerToys</description>
   <resources>
@@ -34,6 +34,7 @@
       <string id="SUPPORTED_POWERTOYS_0_89_0">PowerToys version 0.89.0 or later</string>
       <string id="SUPPORTED_POWERTOYS_0_90_0">PowerToys version 0.90.0 or later</string>
       <string id="SUPPORTED_POWERTOYS_0_96_0">PowerToys version 0.96.0 or later</string>
+      <string id="SUPPORTED_POWERTOYS_0_97_0">PowerToys version 0.97.0 or later</string>
       <string id="SUPPORTED_POWERTOYS_0_64_0_TO_0_87_1">From PowerToys version 0.64.0 until PowerToys version 0.87.1</string>
 
       <string id="ConfigureAllUtilityGlobalEnabledStateDescription">This policy configures the enabled state for all PowerToys utilities.
@@ -266,6 +267,7 @@ If you don't configure this policy, the user will be able to control the setting
       <string id="ConfigureEnabledUtilityKeyboardManager">Keyboard Manager: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityFindMyMouse">Find My Mouse: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityMouseHighlighter">Mouse Highlighter: Configure enabled state</string>
+      <string id="ConfigureEnabledUtilityCursorWrap">CursorWrap: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityMouseJump">Mouse Jump: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityMousePointerCrosshairs">Mouse Pointer Crosshairs: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityMouseWithoutBorders">Mouse Without Borders: Configure enabled state</string>

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesMainPage.xaml

@@ -466,39 +466,27 @@
                         TextChanged="EditVariableDialogValueTxtBox_TextChanged"
                         TextWrapping="Wrap" />
                     <MenuFlyoutSeparator Visibility="{Binding ShowAsList, Converter={StaticResource BoolToVisibilityConverter}}" />
-                    <ListView
+                    <ItemsControl
                         x:Name="EditVariableValuesList"
                         Margin="0,-8,0,12"
                         HorizontalAlignment="Stretch"
-                        AllowDrop="True"
-                        CanDragItems="True"
-                        CanReorderItems="True"
-                        DragItemsCompleted="EditVariableValuesList_DragItemsCompleted"
                         ItemsSource="{Binding ValuesList, Mode=TwoWay}"
                         Visibility="{Binding ShowAsList, Converter={StaticResource BoolToVisibilityConverter}}">
-                        <ListView.ItemTemplate>
+                        <ItemsControl.ItemTemplate>
                             <DataTemplate>
                                 <Grid>
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="32" />
                                         <ColumnDefinition Width="*" />
                                         <ColumnDefinition Width="40" />
                                     </Grid.ColumnDefinitions>
-                                    <FontIcon
-                                        Grid.Column="0"
-                                        Margin="0,0,8,0"
-                                        FontSize="16"
-                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                        Glyph="&#xE759;" />
                                     <TextBox
-                                        Grid.Column="1"
                                         Background="Transparent"
                                         BorderBrush="Transparent"
                                         LostFocus="EditVariableValuesListTextBox_LostFocus"
                                         Text="{Binding Text}" />
                                     <Button
                                         x:Uid="More_Options_Button"
-                                        Grid.Column="2"
+                                        Grid.Column="1"
                                         VerticalAlignment="Center"
                                         Content="&#xE712;"
                                         FontFamily="{ThemeResource SymbolThemeFontFamily}"
@@ -535,8 +523,8 @@
                                     </Button>
                                 </Grid>
                             </DataTemplate>
-                        </ListView.ItemTemplate>
-                    </ListView>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
                 </StackPanel>
             </ScrollViewer>
         </ContentDialog>

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesMainPage.xaml.cs

@@ -16,8 +16,6 @@ namespace EnvironmentVariablesUILib
 {
     public sealed partial class EnvironmentVariablesMainPage : Page
     {
-        private const string ValueListSeparator = ";";
-
         private sealed class RelayCommandParameter
         {
             public RelayCommandParameter(Variable variable, VariablesSet set)
@@ -442,7 +440,7 @@ namespace EnvironmentVariablesUILib
                 variable.ValuesList.Move(index, index - 1);
             }
 
-            var newValues = string.Join(ValueListSeparator, variable.ValuesList?.Select(x => x.Text).ToArray());
+            var newValues = string.Join(";", variable.ValuesList?.Select(x => x.Text).ToArray());
             EditVariableDialogValueTxtBox.Text = newValues;
         }
 
@@ -463,7 +461,7 @@ namespace EnvironmentVariablesUILib
                 variable.ValuesList.Move(index, index + 1);
             }
 
-            var newValues = string.Join(ValueListSeparator, variable.ValuesList?.Select(x => x.Text).ToArray());
+            var newValues = string.Join(";", variable.ValuesList?.Select(x => x.Text).ToArray());
             EditVariableDialogValueTxtBox.Text = newValues;
         }
 
@@ -478,7 +476,7 @@ namespace EnvironmentVariablesUILib
             var variable = EditVariableDialog.DataContext as Variable;
             variable.ValuesList.Remove(listItem);
 
-            var newValues = string.Join(ValueListSeparator, variable.ValuesList?.Select(x => x.Text).ToArray());
+            var newValues = string.Join(";", variable.ValuesList?.Select(x => x.Text).ToArray());
             EditVariableDialogValueTxtBox.Text = newValues;
         }
 
@@ -494,7 +492,7 @@ namespace EnvironmentVariablesUILib
             var index = variable.ValuesList.IndexOf(listItem);
             variable.ValuesList.Insert(index, new Variable.ValuesListItem { Text = string.Empty });
 
-            var newValues = string.Join(ValueListSeparator, variable.ValuesList?.Select(x => x.Text).ToArray());
+            var newValues = string.Join(";", variable.ValuesList?.Select(x => x.Text).ToArray());
             EditVariableDialogValueTxtBox.TextChanged -= EditVariableDialogValueTxtBox_TextChanged;
             EditVariableDialogValueTxtBox.Text = newValues;
             EditVariableDialogValueTxtBox.TextChanged += EditVariableDialogValueTxtBox_TextChanged;
@@ -512,7 +510,7 @@ namespace EnvironmentVariablesUILib
             var index = variable.ValuesList.IndexOf(listItem);
             variable.ValuesList.Insert(index + 1, new Variable.ValuesListItem { Text = string.Empty });
 
-            var newValues = string.Join(ValueListSeparator, variable.ValuesList?.Select(x => x.Text).ToArray());
+            var newValues = string.Join(";", variable.ValuesList?.Select(x => x.Text).ToArray());
             EditVariableDialogValueTxtBox.TextChanged -= EditVariableDialogValueTxtBox_TextChanged;
             EditVariableDialogValueTxtBox.Text = newValues;
             EditVariableDialogValueTxtBox.TextChanged += EditVariableDialogValueTxtBox_TextChanged;
@@ -534,7 +532,7 @@ namespace EnvironmentVariablesUILib
             listItem.Text = (sender as TextBox)?.Text;
             var variable = EditVariableDialog.DataContext as Variable;
 
-            var newValues = string.Join(ValueListSeparator, variable.ValuesList?.Select(x => x.Text).ToArray());
+            var newValues = string.Join(";", variable.ValuesList?.Select(x => x.Text).ToArray());
             EditVariableDialogValueTxtBox.TextChanged -= EditVariableDialogValueTxtBox_TextChanged;
             EditVariableDialogValueTxtBox.Text = newValues;
             EditVariableDialogValueTxtBox.TextChanged += EditVariableDialogValueTxtBox_TextChanged;
@@ -550,16 +548,5 @@ namespace EnvironmentVariablesUILib
             CancelAddVariable();
             ConfirmAddVariableBtn.IsEnabled = false;
         }
-
-        private void EditVariableValuesList_DragItemsCompleted(ListViewBase sender, DragItemsCompletedEventArgs args)
-        {
-            if (EditVariableDialog.DataContext is Variable variable && variable.ValuesList != null)
-            {
-                var newValues = string.Join(ValueListSeparator, variable.ValuesList.Select(x => x.Text));
-                EditVariableDialogValueTxtBox.TextChanged -= EditVariableDialogValueTxtBox_TextChanged;
-                EditVariableDialogValueTxtBox.Text = newValues;
-                EditVariableDialogValueTxtBox.TextChanged += EditVariableDialogValueTxtBox_TextChanged;
-            }
-        }
     }
 }

src/modules/MouseUtils/CursorWrap/CursorWrap.vcxproj

@@ -84,14 +84,17 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="CursorWrapCore.h" />
     <ClInclude Include="CursorWrapTests.h" />
+    <ClInclude Include="MonitorTopology.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="trace.h" />
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="CursorWrapCore.cpp" />
     <ClCompile Include="dllmain.cpp" />
-
+    <ClCompile Include="MonitorTopology.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
     </ClCompile>

src/modules/MouseUtils/CursorWrap/CursorWrapCore.cpp

@@ -0,0 +1,268 @@
+// 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.
+
+#include "pch.h"
+#include "CursorWrapCore.h"
+#include "../../../common/logger/logger.h"
+#include <sstream>
+#include <iomanip>
+#include <ctime>
+
+CursorWrapCore::CursorWrapCore()
+{
+}
+
+#ifdef _DEBUG
+std::wstring CursorWrapCore::GenerateTopologyJSON() const
+{
+    std::wostringstream json;
+
+    // Get current time
+    auto now = std::time(nullptr);
+    std::tm tm{};
+    localtime_s(&tm, &now);
+
+    wchar_t computerName[MAX_COMPUTERNAME_LENGTH + 1] = {0};
+    DWORD size = MAX_COMPUTERNAME_LENGTH + 1;
+    GetComputerNameW(computerName, &size);
+
+    wchar_t userName[256] = {0};
+    size = 256;
+    GetUserNameW(userName, &size);
+
+    json << L"{\n";
+    json << L"  \"captured_at\": \"" << std::put_time(&tm, L"%Y-%m-%dT%H:%M:%S%z") << L"\",\n";
+    json << L"  \"computer_name\": \"" << computerName << L"\",\n";
+    json << L"  \"user_name\": \"" << userName << L"\",\n";
+    json << L"  \"monitor_count\": " << m_monitors.size() << L",\n";
+    json << L"  \"monitors\": [\n";
+
+    for (size_t i = 0; i < m_monitors.size(); ++i)
+    {
+        const auto& monitor = m_monitors[i];
+
+        // Get DPI for this monitor
+        UINT dpiX = 96, dpiY = 96;
+        POINT center = {
+            (monitor.rect.left + monitor.rect.right) / 2,
+            (monitor.rect.top + monitor.rect.bottom) / 2
+        };
+        HMONITOR hMon = MonitorFromPoint(center, MONITOR_DEFAULTTONEAREST);
+        if (hMon)
+        {
+            // Try GetDpiForMonitor (requires linking Shcore.lib)
+            using GetDpiForMonitorFunc = HRESULT (WINAPI *)(HMONITOR, int, UINT*, UINT*);
+            HMODULE shcore = LoadLibraryW(L"Shcore.dll");
+            if (shcore)
+            {
+                auto getDpi = reinterpret_cast<GetDpiForMonitorFunc>(GetProcAddress(shcore, "GetDpiForMonitor"));
+                if (getDpi)
+                {
+                    getDpi(hMon, 0, &dpiX, &dpiY); // MDT_EFFECTIVE_DPI = 0
+                }
+                FreeLibrary(shcore);
+            }
+        }
+
+        int scalingPercent = static_cast<int>((dpiX / 96.0) * 100);
+
+        json << L"    {\n";
+        json << L"      \"left\": " << monitor.rect.left << L",\n";
+        json << L"      \"top\": " << monitor.rect.top << L",\n";
+        json << L"      \"right\": " << monitor.rect.right << L",\n";
+        json << L"      \"bottom\": " << monitor.rect.bottom << L",\n";
+        json << L"      \"width\": " << (monitor.rect.right - monitor.rect.left) << L",\n";
+        json << L"      \"height\": " << (monitor.rect.bottom - monitor.rect.top) << L",\n";
+        json << L"      \"dpi\": " << dpiX << L",\n";
+        json << L"      \"scaling_percent\": " << scalingPercent << L",\n";
+        json << L"      \"primary\": " << (monitor.isPrimary ? L"true" : L"false") << L",\n";
+        json << L"      \"monitor_id\": " << monitor.monitorId << L"\n";
+        json << L"    }";
+        if (i < m_monitors.size() - 1)
+        {
+            json << L",";
+        }
+        json << L"\n";
+    }
+
+    json << L"  ]\n";
+    json << L"}";
+
+    return json.str();
+}
+#endif
+
+void CursorWrapCore::UpdateMonitorInfo()
+{
+    size_t previousMonitorCount = m_monitors.size();
+    Logger::info(L"======= UPDATE MONITOR INFO START =======");
+    Logger::info(L"Previous monitor count: {}", previousMonitorCount);
+
+    m_monitors.clear();
+
+    EnumDisplayMonitors(nullptr, nullptr, [](HMONITOR hMonitor, HDC, LPRECT, LPARAM lParam) -> BOOL {
+        auto* self = reinterpret_cast<CursorWrapCore*>(lParam);
+
+        MONITORINFO mi{};
+        mi.cbSize = sizeof(MONITORINFO);
+        if (GetMonitorInfo(hMonitor, &mi))
+        {
+            MonitorInfo info{};
+            info.hMonitor = hMonitor; // Store handle for direct comparison later
+            info.rect = mi.rcMonitor;
+            info.isPrimary = (mi.dwFlags & MONITORINFOF_PRIMARY) != 0;
+            info.monitorId = static_cast<int>(self->m_monitors.size());
+            self->m_monitors.push_back(info);
+            
+            Logger::info(L"Enumerated monitor {}: hMonitor={}, rect=({},{},{},{}), primary={}",
+                info.monitorId, reinterpret_cast<uintptr_t>(hMonitor),
+                mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom,
+                info.isPrimary ? L"yes" : L"no");
+        }
+
+        return TRUE;
+    }, reinterpret_cast<LPARAM>(this));
+
+    if (previousMonitorCount != m_monitors.size())
+    {
+        Logger::info(L"*** MONITOR CONFIGURATION CHANGED: {} -> {} monitors ***", 
+            previousMonitorCount, m_monitors.size());
+    }
+
+    m_topology.Initialize(m_monitors);
+
+    // Log monitor configuration summary
+    Logger::info(L"Monitor configuration updated: {} monitor(s)", m_monitors.size());
+    for (size_t i = 0; i < m_monitors.size(); ++i)
+    {
+        const auto& m = m_monitors[i];
+        int width = m.rect.right - m.rect.left;
+        int height = m.rect.bottom - m.rect.top;
+        Logger::info(L"  Monitor {}: {}x{} at ({}, {}){}",
+            i, width, height, m.rect.left, m.rect.top,
+            m.isPrimary ? L" [PRIMARY]" : L"");
+    }
+    Logger::info(L"  Detected {} outer edges for cursor wrapping", m_topology.GetOuterEdges().size());
+
+    // Detect and log monitor gaps
+    auto gaps = m_topology.DetectMonitorGaps();
+    if (!gaps.empty())
+    {
+        Logger::warn(L"Monitor configuration has coordinate gaps that may prevent wrapping:");
+        for (const auto& gap : gaps)
+        {
+            Logger::warn(L"  Gap between Monitor {} and Monitor {}: {}px horizontal gap, {}px vertical overlap",
+                gap.monitor1Index, gap.monitor2Index, gap.horizontalGap, gap.verticalOverlap);
+        }
+        Logger::warn(L"  If monitors appear snapped in Display Settings but show gaps here:");
+        Logger::warn(L"  1. Try dragging monitors apart and snapping them back together");
+        Logger::warn(L"  2. Update your GPU drivers");
+    }
+
+    Logger::info(L"======= UPDATE MONITOR INFO END =======");
+}
+
+POINT CursorWrapCore::HandleMouseMove(const POINT& currentPos, bool disableWrapDuringDrag, int wrapMode)
+{
+    // Check if wrapping should be disabled during drag
+    if (disableWrapDuringDrag && (GetAsyncKeyState(VK_LBUTTON) & 0x8000))
+    {
+#ifdef _DEBUG
+        OutputDebugStringW(L"[CursorWrap] [DRAG] Left mouse button down - skipping wrap\n");
+#endif
+        return currentPos;
+    }
+
+    // Convert int wrapMode to WrapMode enum
+    WrapMode mode = static_cast<WrapMode>(wrapMode);
+
+#ifdef _DEBUG
+    {
+        std::wostringstream oss;
+        oss << L"[CursorWrap] [MOVE] Cursor at (" << currentPos.x << L", " << currentPos.y << L")";
+
+        // Get current monitor and identify which one
+        HMONITOR currentMonitor = MonitorFromPoint(currentPos, MONITOR_DEFAULTTONEAREST);
+        RECT monitorRect;
+        if (m_topology.GetMonitorRect(currentMonitor, monitorRect))
+        {
+            // Find monitor ID
+            int monitorId = -1;
+            for (const auto& monitor : m_monitors)
+            {
+                if (monitor.rect.left == monitorRect.left &&
+                    monitor.rect.top == monitorRect.top &&
+                    monitor.rect.right == monitorRect.right &&
+                    monitor.rect.bottom == monitorRect.bottom)
+                {
+                    monitorId = monitor.monitorId;
+                    break;
+                }
+            }
+            oss << L" on Monitor " << monitorId << L" [" << monitorRect.left << L".." << monitorRect.right
+                << L", " << monitorRect.top << L".." << monitorRect.bottom << L"]";
+        }
+        else
+        {
+            oss << L" (beyond monitor bounds)";
+        }
+        oss << L"\n";
+        OutputDebugStringW(oss.str().c_str());
+    }
+#endif
+
+    // Get current monitor
+    HMONITOR currentMonitor = MonitorFromPoint(currentPos, MONITOR_DEFAULTTONEAREST);
+
+    // Check if cursor is on an outer edge (filtered by wrap mode)
+    EdgeType edgeType;
+    if (!m_topology.IsOnOuterEdge(currentMonitor, currentPos, edgeType, mode))
+    {
+#ifdef _DEBUG
+        static bool lastWasNotOuter = false;
+        if (!lastWasNotOuter)
+        {
+            OutputDebugStringW(L"[CursorWrap] [MOVE] Not on outer edge - no wrapping\n");
+            lastWasNotOuter = true;
+        }
+#endif
+        return currentPos; // Not on an outer edge
+    }
+
+#ifdef _DEBUG
+    {
+        const wchar_t* edgeStr = L"Unknown";
+        switch (edgeType)
+        {
+        case EdgeType::Left: edgeStr = L"Left"; break;
+        case EdgeType::Right: edgeStr = L"Right"; break;
+        case EdgeType::Top: edgeStr = L"Top"; break;
+        case EdgeType::Bottom: edgeStr = L"Bottom"; break;
+        }
+        std::wostringstream oss;
+        oss << L"[CursorWrap] [EDGE] Detected outer " << edgeStr << L" edge at (" << currentPos.x << L", " << currentPos.y << L")\n";
+        OutputDebugStringW(oss.str().c_str());
+    }
+#endif
+
+    // Calculate wrap destination
+    POINT newPos = m_topology.GetWrapDestination(currentMonitor, currentPos, edgeType);
+
+#ifdef _DEBUG
+    if (newPos.x != currentPos.x || newPos.y != currentPos.y)
+    {
+        std::wostringstream oss;
+        oss << L"[CursorWrap] [WRAP] Position change: (" << currentPos.x << L", " << currentPos.y
+            << L") -> (" << newPos.x << L", " << newPos.y << L")\n";
+        oss << L"[CursorWrap] [WRAP] Delta: (" << (newPos.x - currentPos.x) << L", " << (newPos.y - currentPos.y) << L")\n";
+        OutputDebugStringW(oss.str().c_str());
+    }
+    else
+    {
+        OutputDebugStringW(L"[CursorWrap] [WRAP] No position change (same-monitor wrap?)\n");
+    }
+#endif
+
+    return newPos;
+}

src/modules/MouseUtils/CursorWrap/CursorWrapCore.h

@@ -0,0 +1,33 @@
+// 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.
+
+#pragma once
+#include <windows.h>
+#include <vector>
+#include <string>
+#include "MonitorTopology.h"
+
+// Core cursor wrapping engine
+class CursorWrapCore
+{
+public:
+    CursorWrapCore();
+
+    void UpdateMonitorInfo();
+    
+    // Handle mouse move with wrap mode filtering
+    // wrapMode: 0=Both, 1=VerticalOnly, 2=HorizontalOnly
+    POINT HandleMouseMove(const POINT& currentPos, bool disableWrapDuringDrag, int wrapMode);
+
+    const std::vector<MonitorInfo>& GetMonitors() const { return m_monitors; }
+    const MonitorTopology& GetTopology() const { return m_topology; }
+
+private:
+#ifdef _DEBUG
+    std::wstring GenerateTopologyJSON() const;
+#endif
+
+    std::vector<MonitorInfo> m_monitors;
+    MonitorTopology m_topology;
+};

src/modules/MouseUtils/CursorWrap/MonitorTopology.cpp

@@ -0,0 +1,546 @@
+// 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.
+
+#include "pch.h"
+#include "MonitorTopology.h"
+#include "../../../common/logger/logger.h"
+#include <algorithm>
+#include <cmath>
+
+void MonitorTopology::Initialize(const std::vector<MonitorInfo>& monitors)
+{
+    Logger::info(L"======= TOPOLOGY INITIALIZATION START =======");
+    Logger::info(L"Initializing edge-based topology for {} monitors", monitors.size());
+
+    m_monitors = monitors;
+    m_outerEdges.clear();
+    m_edgeMap.clear();
+
+    if (monitors.empty())
+    {
+        Logger::warn(L"No monitors provided to Initialize");
+        return;
+    }
+
+    // Log monitor details
+    for (size_t i = 0; i < monitors.size(); ++i)
+    {
+        const auto& m = monitors[i];
+        Logger::info(L"Monitor {}: hMonitor={}, rect=({},{},{},{}), primary={}",
+            i, reinterpret_cast<uintptr_t>(m.hMonitor),
+            m.rect.left, m.rect.top, m.rect.right, m.rect.bottom,
+            m.isPrimary ? L"yes" : L"no");
+    }
+
+    BuildEdgeMap();
+    IdentifyOuterEdges();
+
+    Logger::info(L"Found {} outer edges", m_outerEdges.size());
+    for (const auto& edge : m_outerEdges)
+    {
+        const wchar_t* typeStr = L"Unknown";
+        switch (edge.type)
+        {
+        case EdgeType::Left: typeStr = L"Left"; break;
+        case EdgeType::Right: typeStr = L"Right"; break;
+        case EdgeType::Top: typeStr = L"Top"; break;
+        case EdgeType::Bottom: typeStr = L"Bottom"; break;
+        }
+        Logger::info(L"Outer edge: Monitor {} {} at position {}, range [{}, {}]",
+            edge.monitorIndex, typeStr, edge.position, edge.start, edge.end);
+    }
+    Logger::info(L"======= TOPOLOGY INITIALIZATION COMPLETE =======");
+}
+
+void MonitorTopology::BuildEdgeMap()
+{
+    // Create edges for each monitor using monitor index (not HMONITOR)
+    // This is important because HMONITOR handles can change when monitors are
+    // added/removed dynamically, but indices remain stable within a single
+    // topology configuration
+    for (size_t idx = 0; idx < m_monitors.size(); ++idx)
+    {
+        const auto& monitor = m_monitors[idx];
+        int monitorIndex = static_cast<int>(idx);
+
+        // Left edge
+        MonitorEdge leftEdge;
+        leftEdge.monitorIndex = monitorIndex;
+        leftEdge.type = EdgeType::Left;
+        leftEdge.position = monitor.rect.left;
+        leftEdge.start = monitor.rect.top;
+        leftEdge.end = monitor.rect.bottom;
+        leftEdge.isOuter = true; // Will be updated in IdentifyOuterEdges
+        m_edgeMap[{monitorIndex, EdgeType::Left}] = leftEdge;
+      
+        // Right edge
+        MonitorEdge rightEdge;
+        rightEdge.monitorIndex = monitorIndex;
+        rightEdge.type = EdgeType::Right;
+        rightEdge.position = monitor.rect.right - 1;
+        rightEdge.start = monitor.rect.top;
+        rightEdge.end = monitor.rect.bottom;
+        rightEdge.isOuter = true;
+        m_edgeMap[{monitorIndex, EdgeType::Right}] = rightEdge;
+
+        // Top edge
+        MonitorEdge topEdge;
+        topEdge.monitorIndex = monitorIndex;
+        topEdge.type = EdgeType::Top;
+        topEdge.position = monitor.rect.top;
+        topEdge.start = monitor.rect.left;
+        topEdge.end = monitor.rect.right;
+        topEdge.isOuter = true;
+        m_edgeMap[{monitorIndex, EdgeType::Top}] = topEdge;
+
+        // Bottom edge
+        MonitorEdge bottomEdge;
+        bottomEdge.monitorIndex = monitorIndex;
+        bottomEdge.type = EdgeType::Bottom;
+        bottomEdge.position = monitor.rect.bottom - 1;
+        bottomEdge.start = monitor.rect.left;
+        bottomEdge.end = monitor.rect.right;
+        bottomEdge.isOuter = true;
+        m_edgeMap[{monitorIndex, EdgeType::Bottom}] = bottomEdge;
+    }
+}
+
+void MonitorTopology::IdentifyOuterEdges()
+{
+    const int tolerance = 50;
+    
+    // Check each edge against all other edges to find adjacent ones
+    for (auto& [key1, edge1] : m_edgeMap)
+    {
+        for (const auto& [key2, edge2] : m_edgeMap)
+        {
+            if (edge1.monitorIndex == edge2.monitorIndex)
+            {
+                continue; // Same monitor
+            }
+
+            // Check if edges are adjacent
+            if (EdgesAreAdjacent(edge1, edge2, tolerance))
+            {
+                edge1.isOuter = false;
+                break; // This edge has an adjacent monitor
+            }
+        }
+
+        if (edge1.isOuter)
+        {
+            m_outerEdges.push_back(edge1);
+        }
+    }
+}
+
+bool MonitorTopology::EdgesAreAdjacent(const MonitorEdge& edge1, const MonitorEdge& edge2, int tolerance) const
+{
+    // Edges must be opposite types to be adjacent
+    bool oppositeTypes = false;
+
+    if ((edge1.type == EdgeType::Left && edge2.type == EdgeType::Right) ||
+        (edge1.type == EdgeType::Right && edge2.type == EdgeType::Left) ||
+        (edge1.type == EdgeType::Top && edge2.type == EdgeType::Bottom) ||
+        (edge1.type == EdgeType::Bottom && edge2.type == EdgeType::Top))
+    {
+        oppositeTypes = true;
+    }
+
+    if (!oppositeTypes)
+    {
+        return false;
+    }
+
+    // Check if positions are within tolerance
+    if (abs(edge1.position - edge2.position) > tolerance)
+    {
+        return false;
+    }
+
+    // Check if perpendicular ranges overlap
+    int overlapStart = max(edge1.start, edge2.start);
+    int overlapEnd = min(edge1.end, edge2.end);
+
+    return overlapEnd > overlapStart + tolerance;
+}
+
+bool MonitorTopology::IsOnOuterEdge(HMONITOR monitor, const POINT& cursorPos, EdgeType& outEdgeType, WrapMode wrapMode) const
+{
+    RECT monitorRect;
+    if (!GetMonitorRect(monitor, monitorRect))
+    {
+        Logger::warn(L"IsOnOuterEdge: GetMonitorRect failed for monitor handle {}", reinterpret_cast<uintptr_t>(monitor));
+        return false;
+    }
+
+    // Get monitor index for edge map lookup
+    int monitorIndex = GetMonitorIndex(monitor);
+    if (monitorIndex < 0)
+    {
+        Logger::warn(L"IsOnOuterEdge: Monitor index not found for handle {} at cursor ({}, {})", 
+            reinterpret_cast<uintptr_t>(monitor), cursorPos.x, cursorPos.y);
+        return false; // Monitor not found in our list
+    }
+
+    // Check each edge type
+    const int edgeThreshold = 1;
+
+    // At corners, multiple edges may match - collect all candidates and try each
+    // to find one with a valid wrap destination
+    std::vector<EdgeType> candidateEdges;
+
+    // Left edge - only if mode allows horizontal wrapping
+    if ((wrapMode == WrapMode::Both || wrapMode == WrapMode::HorizontalOnly) &&
+        cursorPos.x <= monitorRect.left + edgeThreshold)
+    {
+        auto it = m_edgeMap.find({monitorIndex, EdgeType::Left});
+        if (it != m_edgeMap.end() && it->second.isOuter)
+        {
+            candidateEdges.push_back(EdgeType::Left);
+        }
+    }
+
+    // Right edge - only if mode allows horizontal wrapping
+    if ((wrapMode == WrapMode::Both || wrapMode == WrapMode::HorizontalOnly) &&
+        cursorPos.x >= monitorRect.right - 1 - edgeThreshold)
+    {
+        auto it = m_edgeMap.find({monitorIndex, EdgeType::Right});
+        if (it != m_edgeMap.end())
+        {
+            if (it->second.isOuter)
+            {
+                candidateEdges.push_back(EdgeType::Right);
+            }
+            // Debug: Log why right edge isn't outer
+            else
+            {
+                Logger::trace(L"IsOnOuterEdge: Monitor {} right edge is NOT outer (inner edge)", monitorIndex);
+            }
+        }
+    }
+
+    // Top edge - only if mode allows vertical wrapping
+    if ((wrapMode == WrapMode::Both || wrapMode == WrapMode::VerticalOnly) &&
+        cursorPos.y <= monitorRect.top + edgeThreshold)
+    {
+        auto it = m_edgeMap.find({monitorIndex, EdgeType::Top});
+        if (it != m_edgeMap.end() && it->second.isOuter)
+        {
+            candidateEdges.push_back(EdgeType::Top);
+        }
+    }
+
+    // Bottom edge - only if mode allows vertical wrapping
+    if ((wrapMode == WrapMode::Both || wrapMode == WrapMode::VerticalOnly) &&
+        cursorPos.y >= monitorRect.bottom - 1 - edgeThreshold)
+    {
+        auto it = m_edgeMap.find({monitorIndex, EdgeType::Bottom});
+        if (it != m_edgeMap.end() && it->second.isOuter)
+        {
+            candidateEdges.push_back(EdgeType::Bottom);
+        }
+    }
+
+    if (candidateEdges.empty())
+    {
+        return false;
+    }
+
+    // Try each candidate edge and return first with valid wrap destination
+    for (EdgeType candidate : candidateEdges)
+    {
+        MonitorEdge oppositeEdge = FindOppositeOuterEdge(candidate,
+            (candidate == EdgeType::Left || candidate == EdgeType::Right) ? cursorPos.y : cursorPos.x);
+
+        if (oppositeEdge.monitorIndex >= 0)
+        {
+            outEdgeType = candidate;
+            return true;
+        }
+    }
+
+    return false;
+}
+
+POINT MonitorTopology::GetWrapDestination(HMONITOR fromMonitor, const POINT& cursorPos, EdgeType edgeType) const
+{
+    // Get monitor index for edge map lookup
+    int monitorIndex = GetMonitorIndex(fromMonitor);
+    if (monitorIndex < 0)
+    {
+        return cursorPos; // Monitor not found
+    }
+
+    auto it = m_edgeMap.find({monitorIndex, edgeType});
+    if (it == m_edgeMap.end())
+    {
+        return cursorPos; // Edge not found
+    }
+
+    const MonitorEdge& fromEdge = it->second;
+
+    // Calculate relative position on current edge (0.0 to 1.0)
+    double relativePos = GetRelativePosition(fromEdge,
+        (edgeType == EdgeType::Left || edgeType == EdgeType::Right) ? cursorPos.y : cursorPos.x);
+
+    // Find opposite outer edge
+    MonitorEdge oppositeEdge = FindOppositeOuterEdge(edgeType,
+        (edgeType == EdgeType::Left || edgeType == EdgeType::Right) ? cursorPos.y : cursorPos.x);
+
+    if (oppositeEdge.monitorIndex < 0)
+    {
+        // No opposite edge found, wrap within same monitor
+        RECT monitorRect;
+        if (GetMonitorRect(fromMonitor, monitorRect))
+        {
+            POINT result = cursorPos;
+            switch (edgeType)
+            {
+            case EdgeType::Left:
+                result.x = monitorRect.right - 2;
+                break;
+            case EdgeType::Right:
+                result.x = monitorRect.left + 1;
+                break;
+            case EdgeType::Top:
+                result.y = monitorRect.bottom - 2;
+                break;
+            case EdgeType::Bottom:
+                result.y = monitorRect.top + 1;
+                break;
+            }
+            return result;
+        }
+        return cursorPos;
+    }
+
+    // Calculate target position on opposite edge
+    POINT result;
+
+    if (edgeType == EdgeType::Left || edgeType == EdgeType::Right)
+    {
+        // Horizontal edge -> vertical movement
+        result.x = oppositeEdge.position;
+        result.y = GetAbsolutePosition(oppositeEdge, relativePos);
+    }
+    else
+    {
+        // Vertical edge -> horizontal movement
+        result.y = oppositeEdge.position;
+        result.x = GetAbsolutePosition(oppositeEdge, relativePos);
+    }
+
+    return result;
+}
+
+MonitorEdge MonitorTopology::FindOppositeOuterEdge(EdgeType fromEdge, int relativePosition) const
+{
+    EdgeType targetType;
+    bool findMax; // true = find max position, false = find min position
+
+    switch (fromEdge)
+    {
+    case EdgeType::Left:
+        targetType = EdgeType::Right;
+        findMax = true;
+        break;
+    case EdgeType::Right:
+        targetType = EdgeType::Left;
+        findMax = false;
+        break;
+    case EdgeType::Top:
+        targetType = EdgeType::Bottom;
+        findMax = true;
+        break;
+    case EdgeType::Bottom:
+        targetType = EdgeType::Top;
+        findMax = false;
+        break;
+    default:
+        return { .monitorIndex = -1 }; // Invalid edge type
+    }
+
+    MonitorEdge result = { .monitorIndex = -1 }; // -1 indicates not found
+    int extremePosition = findMax ? INT_MIN : INT_MAX;
+
+    for (const auto& edge : m_outerEdges)
+    {
+        if (edge.type != targetType)
+        {
+            continue;
+        }
+
+        // Check if this edge overlaps with the relative position
+        if (relativePosition >= edge.start && relativePosition <= edge.end)
+        {
+            if ((findMax && edge.position > extremePosition) ||
+                (!findMax && edge.position < extremePosition))
+            {
+                extremePosition = edge.position;
+                result = edge;
+            }
+        }
+    }
+
+    return result;
+}
+
+double MonitorTopology::GetRelativePosition(const MonitorEdge& edge, int coordinate) const
+{
+    if (edge.end == edge.start)
+    {
+        return 0.5; // Avoid division by zero
+    }
+
+    int clamped = max(edge.start, min(coordinate, edge.end));
+    // Use int64_t to avoid overflow warning C26451
+    int64_t numerator = static_cast<int64_t>(clamped) - static_cast<int64_t>(edge.start);
+    int64_t denominator = static_cast<int64_t>(edge.end) - static_cast<int64_t>(edge.start);
+    return static_cast<double>(numerator) / static_cast<double>(denominator);
+}
+
+int MonitorTopology::GetAbsolutePosition(const MonitorEdge& edge, double relativePosition) const
+{
+    // Use int64_t to prevent arithmetic overflow during subtraction and multiplication
+    int64_t range = static_cast<int64_t>(edge.end) - static_cast<int64_t>(edge.start);
+    int64_t offset = static_cast<int64_t>(relativePosition * static_cast<double>(range));
+    // Clamp result to int range before returning
+    int64_t result = static_cast<int64_t>(edge.start) + offset;
+    return static_cast<int>(result);
+}
+
+std::vector<MonitorTopology::GapInfo> MonitorTopology::DetectMonitorGaps() const
+{
+    std::vector<GapInfo> gaps;
+    const int gapThreshold = 50; // Same as ADJACENCY_TOLERANCE
+
+    // Check each pair of monitors
+    for (size_t i = 0; i < m_monitors.size(); ++i)
+    {
+        for (size_t j = i + 1; j < m_monitors.size(); ++j)
+        {
+            const auto& m1 = m_monitors[i];
+            const auto& m2 = m_monitors[j];
+
+            // Check vertical overlap
+            int vOverlapStart = max(m1.rect.top, m2.rect.top);
+            int vOverlapEnd = min(m1.rect.bottom, m2.rect.bottom);
+            int vOverlap = vOverlapEnd - vOverlapStart;
+
+            if (vOverlap <= 0)
+            {
+                continue; // No vertical overlap, skip
+            }
+
+            // Check horizontal gap
+            int hGap = min(abs(m1.rect.right - m2.rect.left), abs(m2.rect.right - m1.rect.left));
+
+            if (hGap > gapThreshold)
+            {
+                GapInfo gap;
+                gap.monitor1Index = static_cast<int>(i);
+                gap.monitor2Index = static_cast<int>(j);
+                gap.horizontalGap = hGap;
+                gap.verticalOverlap = vOverlap;
+                gaps.push_back(gap);
+            }
+        }
+    }
+
+    return gaps;
+}
+
+HMONITOR MonitorTopology::GetMonitorFromPoint(const POINT& pt) const
+{
+    return MonitorFromPoint(pt, MONITOR_DEFAULTTONEAREST);
+}
+
+bool MonitorTopology::GetMonitorRect(HMONITOR monitor, RECT& rect) const
+{
+    // First try direct HMONITOR comparison
+    for (const auto& monitorInfo : m_monitors)
+    {
+        if (monitorInfo.hMonitor == monitor)
+        {
+            rect = monitorInfo.rect;
+            return true;
+        }
+    }
+
+    // Fallback: If direct comparison fails, try matching by current monitor info
+    MONITORINFO mi{};
+    mi.cbSize = sizeof(MONITORINFO);
+    if (GetMonitorInfo(monitor, &mi))
+    {
+        for (const auto& monitorInfo : m_monitors)
+        {
+            if (monitorInfo.rect.left == mi.rcMonitor.left &&
+                monitorInfo.rect.top == mi.rcMonitor.top &&
+                monitorInfo.rect.right == mi.rcMonitor.right &&
+                monitorInfo.rect.bottom == mi.rcMonitor.bottom)
+            {
+                rect = monitorInfo.rect;
+                return true;
+            }
+        }
+    }
+    
+    return false;
+}
+
+HMONITOR MonitorTopology::GetMonitorFromRect(const RECT& rect) const
+{
+    return MonitorFromRect(&rect, MONITOR_DEFAULTTONEAREST);
+}
+
+int MonitorTopology::GetMonitorIndex(HMONITOR monitor) const
+{
+    // First try direct HMONITOR comparison (fast and accurate)
+    for (size_t i = 0; i < m_monitors.size(); ++i)
+    {
+        if (m_monitors[i].hMonitor == monitor)
+        {
+            return static_cast<int>(i);
+        }
+    }
+
+    // Fallback: If direct comparison fails (e.g., handle changed after display reconfiguration),
+    // try matching by position. Get the monitor's current rect and find matching stored rect.
+    MONITORINFO mi{};
+    mi.cbSize = sizeof(MONITORINFO);
+    if (GetMonitorInfo(monitor, &mi))
+    {
+        for (size_t i = 0; i < m_monitors.size(); ++i)
+        {
+            // Match by rect bounds
+            if (m_monitors[i].rect.left == mi.rcMonitor.left &&
+                m_monitors[i].rect.top == mi.rcMonitor.top &&
+                m_monitors[i].rect.right == mi.rcMonitor.right &&
+                m_monitors[i].rect.bottom == mi.rcMonitor.bottom)
+            {
+                Logger::trace(L"GetMonitorIndex: Found monitor {} via rect fallback (handle changed from {} to {})", 
+                    i, reinterpret_cast<uintptr_t>(m_monitors[i].hMonitor), reinterpret_cast<uintptr_t>(monitor));
+                return static_cast<int>(i);
+            }
+        }
+        
+        // Log all stored monitors vs the requested one for debugging
+        Logger::warn(L"GetMonitorIndex: No match found. Requested monitor rect=({},{},{},{})",
+            mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom);
+        for (size_t i = 0; i < m_monitors.size(); ++i)
+        {
+            Logger::warn(L"  Stored monitor {}: rect=({},{},{},{})",
+                i, m_monitors[i].rect.left, m_monitors[i].rect.top, 
+                m_monitors[i].rect.right, m_monitors[i].rect.bottom);
+        }
+    }
+    else
+    {
+        Logger::warn(L"GetMonitorIndex: GetMonitorInfo failed for handle {}", reinterpret_cast<uintptr_t>(monitor));
+    }
+
+    return -1; // Not found
+}
+

src/modules/MouseUtils/CursorWrap/MonitorTopology.h

@@ -0,0 +1,106 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#pragma once
+#include <windows.h>
+#include <vector>
+#include <map>
+
+// Monitor information structure
+struct MonitorInfo
+{
+    HMONITOR hMonitor; // Direct handle for accurate lookup after display changes
+    RECT rect;
+    bool isPrimary;
+    int monitorId;
+};
+
+// Edge type enumeration
+enum class EdgeType
+{
+    Left = 0,
+    Right = 1,
+    Top = 2,
+    Bottom = 3
+};
+
+// Wrap mode enumeration (matches Settings UI dropdown)
+enum class WrapMode
+{
+    Both = 0,           // Wrap in both directions
+    VerticalOnly = 1,   // Only wrap top/bottom
+    HorizontalOnly = 2  // Only wrap left/right
+};
+
+// Represents a single edge of a monitor
+struct MonitorEdge
+{
+    int monitorIndex;  // Index into m_monitors (stable across display changes)
+    EdgeType type;
+    int start;      // For vertical edges: Y start; horizontal: X start
+    int end;        // For vertical edges: Y end; horizontal: X end
+    int position;   // For vertical edges: X coord; horizontal: Y coord
+    bool isOuter;   // True if no adjacent monitor touches this edge
+};
+
+// Monitor topology helper - manages edge-based monitor layout
+struct MonitorTopology
+{
+    void Initialize(const std::vector<MonitorInfo>& monitors);
+
+    // Check if cursor is on an outer edge of the given monitor
+    // wrapMode filters which edges are considered (Both, VerticalOnly, HorizontalOnly)
+    bool IsOnOuterEdge(HMONITOR monitor, const POINT& cursorPos, EdgeType& outEdgeType, WrapMode wrapMode) const;
+
+    // Get the wrap destination point for a cursor on an outer edge
+    POINT GetWrapDestination(HMONITOR fromMonitor, const POINT& cursorPos, EdgeType edgeType) const;
+
+    // Get monitor at point (helper)
+    HMONITOR GetMonitorFromPoint(const POINT& pt) const;
+
+    // Get monitor rectangle (helper)
+    bool GetMonitorRect(HMONITOR monitor, RECT& rect) const;
+
+    // Get outer edges collection (for debugging)
+    const std::vector<MonitorEdge>& GetOuterEdges() const { return m_outerEdges; }
+
+    // Detect gaps between monitors that should be snapped together
+    struct GapInfo {
+        int monitor1Index;
+        int monitor2Index;
+        int horizontalGap;
+        int verticalOverlap;
+    };
+    std::vector<GapInfo> DetectMonitorGaps() const;
+
+private:
+    std::vector<MonitorInfo> m_monitors;
+    std::vector<MonitorEdge> m_outerEdges;
+
+    // Map from (monitor index, edge type) to edge info
+    // Using monitor index instead of HMONITOR because HMONITOR handles can change
+    // when monitors are added/removed dynamically
+    std::map<std::pair<int, EdgeType>, MonitorEdge> m_edgeMap;
+
+    // Helper to resolve HMONITOR to monitor index at runtime
+    int GetMonitorIndex(HMONITOR monitor) const;
+
+    // Helper to get consistent HMONITOR from RECT
+    HMONITOR GetMonitorFromRect(const RECT& rect) const;
+    
+    void BuildEdgeMap();
+    void IdentifyOuterEdges();
+
+    // Check if two edges are adjacent (within tolerance)
+    bool EdgesAreAdjacent(const MonitorEdge& edge1, const MonitorEdge& edge2, int tolerance = 50) const;
+
+    // Find the opposite outer edge for wrapping
+    MonitorEdge FindOppositeOuterEdge(EdgeType fromEdge, int relativePosition) const;
+
+    // Calculate relative position along an edge (0.0 to 1.0)
+    double GetRelativePosition(const MonitorEdge& edge, int coordinate) const;
+
+    // Convert relative position to absolute coordinate on target edge
+    int GetAbsolutePosition(const MonitorEdge& edge, double relativePosition) const;
+};

src/modules/Workspaces/WorkspacesCsharpLibrary/Data/ApplicationWrapper.cs

@@ -10,10 +10,10 @@ public struct ApplicationWrapper
 {
     public struct WindowPositionWrapper
     {
-        [JsonPropertyName("x")]
+        [JsonPropertyName("X")]
         public int X { get; set; }
 
-        [JsonPropertyName("y")]
+        [JsonPropertyName("Y")]
         public int Y { get; set; }
 
         [JsonPropertyName("width")]

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

@@ -21,7 +21,7 @@ public sealed partial class BuiltInsCommandProvider : CommandProvider
     public override ICommandItem[] TopLevelCommands() =>
         [
             new CommandItem(openSettings) { },
-            new CommandItem(_newExtension) { Title = _newExtension.Title, Subtitle = Properties.Resources.builtin_new_extension_subtitle },
+            new CommandItem(_newExtension) { Title = _newExtension.Title },
         ];
 
     public override IFallbackCommandItem[] FallbackCommands() =>

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

@@ -547,6 +547,15 @@ public partial class MainListPage : DynamicListPage,
         // above "git" from "whatever"
         max = max + extensionTitleMatch;
 
+        // Apply a penalty to fallback items so they rank below direct matches.
+        // Fallbacks that dynamically match queries (like RDP connections) should
+        // appear after apps and direct command matches.
+        if (isFallback && max > 1)
+        {
+            // Reduce fallback scores by 50% to prioritize direct matches
+            max = max * 0.5;
+        }
+
         var matchSomething = max
             + (isAliasMatch ? 9001 : (isAliasSubstringMatch ? 1 : 0));
 

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

@@ -2,7 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Reflection;
 using System.Runtime.CompilerServices;
 
 namespace Microsoft.CmdPal.UI.Helpers;
@@ -18,19 +17,41 @@ internal static class BuildInfo
     // Runtime AOT detection
     public static bool IsNativeAot => !RuntimeFeature.IsDynamicCodeSupported;
 
-    // From assembly metadata (build-time values)
-    public static bool PublishTrimmed => GetBoolMetadata("PublishTrimmed", false);
+    // build-time values
+    public static bool PublishTrimmed
+    {
+        get
+        {
+#if BUILD_INFO_PUBLISH_TRIMMED
+          return true;
+#else
+            return false;
+#endif
+        }
+    }
 
-    // From assembly metadata (build-time values)
-    public static bool PublishAot => GetBoolMetadata("PublishAot", false);
+    // build-time values
+    public static bool PublishAot
+    {
+        get
+        {
+#if BUILD_INFO_PUBLISH_AOT
+            return true;
+#else
+            return false;
+#endif
+        }
+    }
 
-    public static bool IsCiBuild => GetBoolMetadata("CIBuild", false);
-
-    private static string? GetMetadata(string key) =>
-        Assembly.GetExecutingAssembly()
-            .GetCustomAttributes<AssemblyMetadataAttribute>()
-            .FirstOrDefault(a => a.Key == key)?.Value;
-
-    private static bool GetBoolMetadata(string key, bool defaultValue) =>
-        bool.TryParse(GetMetadata(key), out var result) ? result : defaultValue;
+    public static bool IsCiBuild
+    {
+        get
+        {
+#if BUILD_INFO_CIBUILD
+            return true;
+#else
+            return false;
+#endif
+        }
+    }
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj

@@ -53,7 +53,7 @@
 
   <PropertyGroup>
     <!-- This disables the auto-generated main, so we can be single-instanced -->
-    <DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
+    <DefineConstants>$(DefineConstants);DISABLE_XAML_GENERATED_MAIN</DefineConstants>
   </PropertyGroup>
 
   <!-- BODGY: XES Versioning and WinAppSDK get into a fight about the app manifest, which breaks WinAppSDK. -->
@@ -291,24 +291,15 @@
   </ItemGroup>
   <!-- </AdaptiveCardsWorkaround> -->
 
-  <!-- Metadata for build information  -->
-  <ItemGroup>
-    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
-      <_Parameter1>PublishTrimmed</_Parameter1>
-      <_Parameter2>$(PublishTrimmed)</_Parameter2>
-    </AssemblyAttribute>
-    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
-      <_Parameter1>PublishAot</_Parameter1>
-      <_Parameter2>$(PublishAot)</_Parameter2>
-    </AssemblyAttribute>
-    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
-      <_Parameter1>CIBuild</_Parameter1>
-      <_Parameter2>$(CIBuild)</_Parameter2>
-    </AssemblyAttribute>
-    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
-      <_Parameter1>CommandPaletteBranding</_Parameter1>
-      <_Parameter2>$(CommandPaletteBranding)</_Parameter2>
-    </AssemblyAttribute>
-  </ItemGroup>
+  <!-- Build information  -->
+  <PropertyGroup Condition=" '$(PublishAot)' == 'true' ">
+	<DefineConstants>$(DefineConstants);BUILD_INFO_PUBLISH_AOT</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(PublishTrimmed)' == 'true' ">
+    <DefineConstants>$(DefineConstants);BUILD_INFO_PUBLISH_TRIMMED</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(CIBuild)' == 'true' ">
+    <DefineConstants>$(DefineConstants);BUILD_INFO_CIBUILD</DefineConstants>
+  </PropertyGroup>
 
 </Project>

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

@@ -372,7 +372,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>Windows Command Palette</value>
   </data>
   <data name="Settings_GeneralPage_About_SettingsExpander.Description" xml:space="preserve">
-    <value>© 2025. All rights reserved.</value>
+    <value>© 2026. All rights reserved.</value>
   </data>
   <data name="Settings_GeneralPage_About_GithubLink_Hyperlink.Content" xml:space="preserve">
     <value>View GitHub repository</value>

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

@@ -90,20 +90,5 @@ namespace Microsoft.CmdPal.Ext.TimeDate.UnitTests
             // Assert
             Assert.IsFalse(string.IsNullOrEmpty(displayName));
         }
-
-        [TestMethod]
-        public void GetTranslatedPluginDescriptionTest()
-        {
-            // Setup
-            var provider = new TimeDateCommandsProvider();
-
-            // Act
-            var commands = provider.TopLevelCommands();
-            var subtitle = commands[0].Subtitle;
-
-            // Assert
-            Assert.IsFalse(string.IsNullOrEmpty(subtitle));
-            Assert.IsTrue(subtitle.Contains("Show time and date values in different formats"));
-        }
     }
 }

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

@@ -55,7 +55,7 @@ public class BasicTests : CommandPaletteTestBase
 
         SetTimeAndDaterExtensionSearchBox("year");
 
-        Assert.IsNotNull(this.Find<NavigationViewItem>("2025"));
+        Assert.IsNotNull(this.Find<NavigationViewItem>("2026"));
     }
 
     [TestMethod]

src/modules/cmdpal/custom.props

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

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

@@ -17,12 +17,25 @@ public sealed partial class AppListItem : ListItem
 {
     private readonly AppCommand _appCommand;
     private readonly AppItem _app;
-    private readonly Lazy<Details> _details;
     private readonly Lazy<Task<IconInfo?>> _iconLoadTask;
+    private readonly Lazy<Task<Details>> _detailsLoadTask;
 
     private InterlockedBoolean _isLoadingIcon;
+    private InterlockedBoolean _isLoadingDetails;
 
-    public override IDetails? Details { get => _details.Value; set => base.Details = value; }
+    public override IDetails? Details
+    {
+        get
+        {
+            if (_isLoadingDetails.Set())
+            {
+                _ = LoadDetailsAsync();
+            }
+
+            return base.Details;
+        }
+        set => base.Details = value;
+    }
 
     public override IIconInfo? Icon
     {
@@ -52,16 +65,22 @@ public sealed partial class AppListItem : ListItem
 
         MoreCommands = AddPinCommands(_app.Commands!, isPinned);
 
-        _details = new Lazy<Details>(() =>
-        {
-            var t = BuildDetails();
-            t.Wait();
-            return t.Result;
-        });
-
+        _detailsLoadTask = new Lazy<Task<Details>>(BuildDetails);
         _iconLoadTask = new Lazy<Task<IconInfo?>>(async () => await FetchIcon(useThumbnails));
     }
 
+    private async Task LoadDetailsAsync()
+    {
+        try
+        {
+            Details = await _detailsLoadTask.Value;
+        }
+        catch (Exception ex)
+        {
+            Logger.LogWarning($"Failed to load details for {AppIdentifier}\n{ex}");
+        }
+    }
+
     private async Task LoadIconAsync()
     {
         try
@@ -98,18 +117,16 @@ public sealed partial class AppListItem : ListItem
         }
         else
         {
-            try
+            // do nothing if we fail to load an icon.
+            // Logging it would be too NOISY, there's really no need.
+            if (!string.IsNullOrEmpty(_app.IcoPath))
             {
-                var stream = await ThumbnailHelper.GetThumbnail(_app.ExePath, true);
-                if (stream is not null)
-                {
-                    heroImage = IconInfo.FromStream(stream);
-                }
+                heroImage = await TryLoadThumbnail(_app.IcoPath, jumbo: true, logOnFailure: false);
             }
-            catch (Exception)
+
+            if (heroImage == null && !string.IsNullOrEmpty(_app.ExePath))
             {
-                // do nothing if we fail to load an icon.
-                // Logging it would be too NOISY, there's really no need.
+                heroImage = await TryLoadThumbnail(_app.ExePath, jumbo: true, logOnFailure: false);
             }
         }
 
@@ -132,26 +149,19 @@ public sealed partial class AppListItem : ListItem
 
         if (useThumbnails)
         {
-            try
+            if (!string.IsNullOrEmpty(_app.IcoPath))
             {
-                var stream = await ThumbnailHelper.GetThumbnail(_app.ExePath);
-                if (stream is not null)
-                {
-                    icon = IconInfo.FromStream(stream);
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogDebug($"Failed to load icon for {AppIdentifier}:\n{ex}");
+                icon = await TryLoadThumbnail(_app.IcoPath, jumbo: false, logOnFailure: true);
             }
 
-            icon = icon ?? new IconInfo(_app.IcoPath);
-        }
-        else
-        {
-            icon = new IconInfo(_app.IcoPath);
+            if (icon == null && !string.IsNullOrEmpty(_app.ExePath))
+            {
+                icon = await TryLoadThumbnail(_app.ExePath, jumbo: false, logOnFailure: true);
+            }
         }
 
+        icon ??= new IconInfo(_app.IcoPath);
+
         return icon;
     }
 
@@ -183,4 +193,25 @@ public sealed partial class AppListItem : ListItem
 
         return newCommands.ToArray();
     }
+
+    private async Task<IconInfo?> TryLoadThumbnail(string path, bool jumbo, bool logOnFailure)
+    {
+        try
+        {
+            var stream = await ThumbnailHelper.GetThumbnail(path, jumbo);
+            if (stream is not null)
+            {
+                return IconInfo.FromStream(stream);
+            }
+        }
+        catch (Exception ex)
+        {
+            if (logOnFailure)
+            {
+                Logger.LogDebug($"Failed to load icon {path} for {AppIdentifier}:\n{ex}");
+            }
+        }
+
+        return null;
+    }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/Win32Program.cs

@@ -1052,9 +1052,6 @@ public class Win32Program : IProgram
                 app.FullPath) :
             app.IcoPath;
 
-        icoPath = icoPath.EndsWith(".lnk", System.StringComparison.InvariantCultureIgnoreCase) ?
-            app.FullPath :
-            icoPath;
         return new AppItem()
         {
             Name = app.Name,

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/CalculatorCommandProvider.cs

@@ -15,7 +15,6 @@ public partial class CalculatorCommandProvider : CommandProvider
     private static ISettingsInterface settings = new SettingsManager();
     private readonly ListItem _listItem = new(new CalculatorListPage(settings))
     {
-        Subtitle = Resources.calculator_top_level_subtitle,
         MoreCommands = [new CommandContextItem(((SettingsManager)settings).Settings.SettingsPage)],
     };
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/ClipboardHistoryCommandsProvider.cs

@@ -19,7 +19,6 @@ public partial class ClipboardHistoryCommandsProvider : CommandProvider
         _clipboardHistoryListItem = new ListItem(new ClipboardHistoryListPage(_settingsManager))
         {
             Title = Properties.Resources.list_item_title,
-            Subtitle = Properties.Resources.list_item_subtitle,
             Icon = Icons.ClipboardListIcon,
             MoreCommands = [
                 new CommandContextItem(_settingsManager.Settings.SettingsPage),

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PowerToys/Commands/FancyZones/FancyZonesMonitorListItem.cs

@@ -2,6 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.CommandPalette.Extensions;
@@ -41,15 +42,19 @@ internal sealed partial class FancyZonesMonitorListItem : ListItem
     public static Details BuildMonitorDetails(FancyZonesMonitorDescriptor monitor)
     {
         var currentVirtualDesktop = FancyZonesVirtualDesktop.GetCurrentVirtualDesktopIdString();
+
+        // Calculate physical resolution from logical pixels and DPI
+        var scaleFactor = monitor.Data.Dpi > 0 ? monitor.Data.Dpi / 96.0 : 1.0;
+        var physicalWidth = (int)Math.Round(monitor.Data.MonitorWidth * scaleFactor);
+        var physicalHeight = (int)Math.Round(monitor.Data.MonitorHeight * scaleFactor);
+        var resolution = $"{physicalWidth}\u00D7{physicalHeight}";
+
         var tags = new List<IDetailsElement>
         {
             DetailTag(Resources.FancyZones_Monitor, monitor.Data.Monitor),
-            DetailTag(Resources.FancyZones_Instance, monitor.Data.MonitorInstanceId),
-            DetailTag(Resources.FancyZones_Serial, monitor.Data.MonitorSerialNumber),
             DetailTag(Resources.FancyZones_Number, monitor.Data.MonitorNumber.ToString(CultureInfo.InvariantCulture)),
             DetailTag(Resources.FancyZones_VirtualDesktop, currentVirtualDesktop),
-            DetailTag(Resources.FancyZones_WorkArea, $"{monitor.Data.LeftCoordinate},{monitor.Data.TopCoordinate}  {monitor.Data.WorkAreaWidth}\u00D7{monitor.Data.WorkAreaHeight}"),
-            DetailTag(Resources.FancyZones_Resolution, $"{monitor.Data.MonitorWidth}\u00D7{monitor.Data.MonitorHeight}"),
+            DetailTag(Resources.FancyZones_Resolution, resolution),
             DetailTag(Resources.FancyZones_DPI, monitor.Data.Dpi.ToString(CultureInfo.InvariantCulture)),
         };
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PowerToys/Helpers/FancyZonesDataService.cs

@@ -41,16 +41,13 @@ internal static class FancyZonesDataService
 
         try
         {
-            if (!File.Exists(FZPaths.EditorParameters))
-            {
-                error = Resources.FancyZones_MonitorDataNotFound;
-                Logger.LogWarning($"TryGetMonitors: File not found. Path={FZPaths.EditorParameters}");
-                return false;
-            }
-
-            Logger.LogInfo($"TryGetMonitors: File exists, reading...");
-            var editorParams = FancyZonesDataIO.ReadEditorParameters();
-            Logger.LogInfo($"TryGetMonitors: ReadEditorParameters returned. Monitors={editorParams.Monitors?.Count ?? -1}");
+            // Request FancyZones to save current monitor configuration.
+            // The editor-parameters.json file is only written when:
+            // 1. Opening the FancyZones Editor
+            // 2. Receiving the WM_PRIV_SAVE_EDITOR_PARAMETERS message
+            // Without this, monitor changes (plug/unplug) won't be reflected in the file.
+            var editorParams = ReadEditorParametersWithRefresh();
+            Logger.LogInfo($"TryGetMonitors: ReadEditorParametersWithRefreshWithRefresh returned. Monitors={editorParams.Monitors?.Count ?? -1}");
 
             var editorMonitors = editorParams.Monitors;
             if (editorMonitors is null || editorMonitors.Count == 0)
@@ -74,6 +71,23 @@ internal static class FancyZonesDataService
         }
     }
 
+    /// <summary>
+    /// Requests FancyZones to save the current monitor configuration and reads the file.
+    /// This is a best-effort approach for performance: we send the save request and immediately
+    /// read the file without waiting. If the file hasn't been updated yet, the next call will
+    /// see the updated data since FancyZones processes the message asynchronously.
+    /// </summary>
+    private static EditorParameters.ParamsWrapper ReadEditorParametersWithRefresh()
+    {
+        // Request FancyZones to save the current monitor configuration.
+        // This is fire-and-forget for performance - we don't wait for the save to complete.
+        // If this is the first call after a monitor change, we may read stale data, but the
+        // next call will see the updated file since FancyZones will have processed the message.
+        FancyZonesNotifier.NotifySaveEditorParameters();
+
+        return FancyZonesDataIO.ReadEditorParameters();
+    }
+
     public static IReadOnlyList<FancyZonesLayoutDescriptor> GetLayouts()
     {
         Logger.LogInfo($"GetLayouts: Starting. LayoutTemplatesPath={FZPaths.LayoutTemplates} CustomLayoutsPath={FZPaths.CustomLayouts}");

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PowerToys/Helpers/FancyZonesMonitorDescriptor.cs

@@ -19,8 +19,12 @@ internal readonly record struct FancyZonesMonitorDescriptor(
     {
         get
         {
-            var size = $"{Data.MonitorWidth}×{Data.MonitorHeight}";
-            var scaling = Data.Dpi > 0 ? string.Format(CultureInfo.InvariantCulture, "{0}%", (int)Math.Round(Data.Dpi * 100 / 96.0)) : "n/a";
+            // MonitorWidth/Height are logical (DPI-scaled) pixels, calculate physical resolution
+            var scaleFactor = Data.Dpi > 0 ? Data.Dpi / 96.0 : 1.0;
+            var physicalWidth = (int)Math.Round(Data.MonitorWidth * scaleFactor);
+            var physicalHeight = (int)Math.Round(Data.MonitorHeight * scaleFactor);
+            var size = $"{physicalWidth}×{physicalHeight}";
+            var scaling = Data.Dpi > 0 ? string.Format(CultureInfo.InvariantCulture, "{0}%", (int)Math.Round(scaleFactor * 100)) : "n/a";
             return $"{size} \u2022 {scaling}";
         }
     }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PowerToys/Helpers/FancyZonesNotifier.cs

@@ -10,13 +10,25 @@ namespace PowerToysExtension.Helpers;
 internal static class FancyZonesNotifier
 {
     private const string AppliedLayoutsFileUpdateMessage = "{2ef2c8a7-e0d5-4f31-9ede-52aade2d284d}";
+    private const string SaveEditorParametersMessage = "{d8f9c0e3-5d77-4e83-8a4f-7c704c2bfb4a}";
+
     private static readonly uint WmPrivAppliedLayoutsFileUpdate = RegisterWindowMessageW(AppliedLayoutsFileUpdateMessage);
+    private static readonly uint WmPrivSaveEditorParameters = RegisterWindowMessageW(SaveEditorParametersMessage);
 
     public static void NotifyAppliedLayoutsChanged()
     {
         _ = PostMessageW(new IntPtr(0xFFFF), WmPrivAppliedLayoutsFileUpdate, UIntPtr.Zero, IntPtr.Zero);
     }
 
+    /// <summary>
+    /// Notifies FancyZones to save the current monitor configuration to editor-parameters.json.
+    /// This is needed because FancyZones only writes this file when opening the editor or when explicitly requested.
+    /// </summary>
+    public static void NotifySaveEditorParameters()
+    {
+        _ = PostMessageW(new IntPtr(0xFFFF), WmPrivSaveEditorParameters, UIntPtr.Zero, IntPtr.Zero);
+    }
+
     [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
     private static extern uint RegisterWindowMessageW(string lpString);
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PowerToys/Helpers/FancyZonesThumbnailRenderer.cs

@@ -485,12 +485,21 @@ internal static class FancyZonesThumbnailRenderer
 
     private static List<NormalizedRect> GetFocusRects(int zoneCount)
     {
+        // Focus layout parameters from FancyZonesEditor CanvasLayoutModel:
+        // - DefaultOffset = 100px from top-left (normalized: ~0.05 for typical screen)
+        // - OffsetShift = 50px per zone (normalized: ~0.025)
+        // - ZoneSizeMultiplier = 0.4 (zones are 40% of screen)
         zoneCount = Math.Clamp(zoneCount, 1, 8);
         var rects = new List<NormalizedRect>(zoneCount);
+
+        const float defaultOffset = 0.05f;  // ~100px on 1920px screen
+        const float offsetShift = 0.025f;   // ~50px on 1920px screen
+        const float zoneSize = 0.4f;        // 40% of screen
+
         for (var i = 0; i < zoneCount; i++)
         {
-            var offset = i * 0.06f;
-            rects.Add(new NormalizedRect(0.1f + offset, 0.1f + offset, 0.8f, 0.8f));
+            var offset = i * offsetShift;
+            rects.Add(new NormalizedRect(defaultOffset + offset, defaultOffset + offset, zoneSize, zoneSize));
         }
 
         return rects;

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PowerToys/Microsoft.CmdPal.Ext.PowerToys.csproj

@@ -7,6 +7,7 @@
 		<OutputType>WinExe</OutputType>
 		<RootNamespace>PowerToysExtension</RootNamespace>
 		<ApplicationManifest>app.manifest</ApplicationManifest>
+		<ApplicationIcon>..\..\..\..\runner\svgs\icon.ico</ApplicationIcon>
 		<PublishProfile>win-$(Platform).pubxml</PublishProfile>
 		<EnableMsixTooling>false</EnableMsixTooling>
 		<WindowsPackageType>None</WindowsPackageType>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/RemoteDesktopCommandProvider.cs

@@ -31,7 +31,6 @@ public partial class RemoteDesktopCommandProvider : CommandProvider
 
         listPageCommand = new CommandItem(listPage)
         {
-            Subtitle = Resources.remotedesktop_subtitle,
             Icon = Icons.RDPIcon,
             MoreCommands = [
                 new CommandContextItem(settingsManager.Settings.SettingsPage),

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/ShellCommandsProvider.cs

@@ -39,7 +39,6 @@ public partial class ShellCommandsProvider : CommandProvider
         {
             Icon = Icons.RunV2Icon,
             Title = Resources.shell_command_name,
-            Subtitle = Resources.cmd_plugin_description,
             MoreCommands = [
                 new CommandContextItem(Settings.SettingsPage),
             ],

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

@@ -28,7 +28,6 @@ public sealed partial class TimeDateCommandsProvider : CommandProvider
         {
             Icon = _timeDateExtensionPage.Icon,
             Title = Resources.Microsoft_plugin_timedate_plugin_name,
-            Subtitle = GetTranslatedPluginDescription(),
             MoreCommands = [new CommandContextItem(_settingsManager.Settings.SettingsPage)],
         };
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/WindowWalkerCommandsProvider.cs

@@ -26,7 +26,6 @@ public partial class WindowWalkerCommandsProvider : CommandProvider
         _windowWalkerPageItem = new CommandItem(new WindowWalkerListPage())
         {
             Title = Resources.window_walker_top_level_command_title,
-            Subtitle = Resources.windowwalker_name,
             MoreCommands = [
                 new CommandContextItem(Settings.SettingsPage),
             ],

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

@@ -30,7 +30,6 @@ public sealed partial class WindowsSettingsCommandsProvider : CommandProvider
         _searchSettingsListItem = new CommandItem(new WindowsSettingsListPage(_windowsSettings))
         {
             Title = Resources.settings_title,
-            Subtitle = Resources.settings_subtitle,
         };
         _fallback = new(_windowsSettings);
 

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

@@ -69,14 +69,14 @@ internal sealed partial class SampleMarkdownImagesPage : ContentPage
 
             ### Web URL
             ```xml
-            ![painting](https://i.imgur.com/93XJSNh.png)
+            ![painting](https://raw.githubusercontent.com/microsoft/PowerToys/refs/heads/main/doc/images/overview/Original/AdvancedPaste.png)
             ```
-            ![painting](https://i.imgur.com/93XJSNh.png)
+            ![painting](https://raw.githubusercontent.com/microsoft/PowerToys/refs/heads/main/doc/images/overview/Original/AdvancedPaste.png)
             
             ```xml
-            ![painting](https://i.imgur.com/93XJSNh.png?--x-cmdpal-fit=fit)
+            ![painting](https://raw.githubusercontent.com/microsoft/PowerToys/refs/heads/main/doc/images/overview/Original/AdvancedPaste.png?--x-cmdpal-fit=fit)
             ```
-            ![painting](https://i.imgur.com/93XJSNh.png?--x-cmdpal-fit=fit)
+            ![painting](https://raw.githubusercontent.com/microsoft/PowerToys/refs/heads/main/doc/images/overview/Original/AdvancedPaste.png?--x-cmdpal-fit=fit)
 
             ### File URL (PNG):
             ```xml

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

@@ -81,7 +81,7 @@ Result:
 
 Result:
 
-![painting](https://i.imgur.com/93XJSNh.png)
+![painting](https://raw.githubusercontent.com/microsoft/PowerToys/refs/heads/main/doc/images/overview/Original/AdvancedPaste.png)
 
 ### Links
 

src/modules/fancyzones/FancyZonesCLI/CommandLine/Commands/SetHotkeyCommand.cs

@@ -9,6 +9,7 @@ using System.CommandLine.Invocation;
 using System.Globalization;
 using System.Linq;
 
+using FancyZonesCLI.Utils;
 using FancyZonesEditorCommon.Data;
 using FancyZonesEditorCommon.Utils;
 
@@ -35,13 +36,19 @@ internal sealed partial class SetHotkeyCommand : FancyZonesBaseCommand
     {
         // FancyZones running guard is handled by FancyZonesBaseCommand.
         int key = context.ParseResult.GetValueForArgument(_key);
-        string layout = context.ParseResult.GetValueForArgument(_layout);
+        string layoutInput = context.ParseResult.GetValueForArgument(_layout);
 
         if (key < 0 || key > 9)
         {
             throw new InvalidOperationException(Properties.Resources.set_hotkey_error_invalid_key);
         }
 
+        // Normalize GUID to Windows format with braces (supports input with or without braces)
+        if (!GuidHelper.TryNormalizeGuid(layoutInput, out string layout))
+        {
+            throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, Properties.Resources.set_hotkey_error_not_custom, layoutInput));
+        }
+
         // Editor only allows assigning hotkeys to existing custom layouts.
         var customLayouts = FancyZonesDataIO.ReadCustomLayouts();
 
@@ -60,7 +67,7 @@ internal sealed partial class SetHotkeyCommand : FancyZonesBaseCommand
 
         if (!matchedLayout.HasValue)
         {
-            throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, Properties.Resources.set_hotkey_error_not_custom, layout));
+            throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, Properties.Resources.set_hotkey_error_not_custom, layoutInput));
         }
 
         string layoutName = matchedLayout.Value.Name;

src/modules/fancyzones/FancyZonesCLI/CommandLine/Commands/SetLayoutCommand.cs

@@ -140,9 +140,12 @@ internal sealed partial class SetLayoutCommand : FancyZonesBaseCommand
             return null;
         }
 
+        // Normalize GUID to Windows format with braces (supports input with or without braces)
+        string normalizedLayout = GuidHelper.NormalizeGuid(layout) ?? layout;
+
         foreach (var customLayout in customLayouts.CustomLayouts)
         {
-            if (customLayout.Uuid.Equals(layout, StringComparison.OrdinalIgnoreCase))
+            if (customLayout.Uuid.Equals(normalizedLayout, StringComparison.OrdinalIgnoreCase))
             {
                 return customLayout;
             }

src/modules/fancyzones/FancyZonesCLI/CommandLine/FancyZonesCliUsage.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.CommandLine;
+using System.Globalization;
 using System.Linq;
 
 namespace FancyZonesCLI.CommandLine;
@@ -13,15 +14,15 @@ internal static class FancyZonesCliUsage
     public static void PrintUsage()
     {
         Console.OutputEncoding = System.Text.Encoding.UTF8;
-        Console.WriteLine("FancyZones CLI - Command line interface for FancyZones");
+        Console.WriteLine(Properties.Resources.usage_title);
         Console.WriteLine();
 
         var cmd = FancyZonesCliCommandFactory.CreateRootCommand();
 
-        Console.WriteLine("Usage: FancyZonesCLI [command] [options]");
+        Console.WriteLine(Properties.Resources.usage_syntax);
         Console.WriteLine();
 
-        Console.WriteLine("Options:");
+        Console.WriteLine(Properties.Resources.usage_options);
         foreach (var option in cmd.Options)
         {
             var aliases = string.Join(", ", option.Aliases);
@@ -30,7 +31,7 @@ internal static class FancyZonesCliUsage
         }
 
         Console.WriteLine();
-        Console.WriteLine("Commands:");
+        Console.WriteLine(Properties.Resources.usage_commands);
         foreach (var command in cmd.Subcommands)
         {
             if (command.IsHidden)
@@ -51,7 +52,7 @@ internal static class FancyZonesCliUsage
         }
 
         Console.WriteLine();
-        Console.WriteLine("Examples:");
+        Console.WriteLine(Properties.Resources.usage_examples);
         Console.WriteLine("  FancyZonesCLI --help");
         Console.WriteLine("  FancyZonesCLI --version");
         Console.WriteLine("  FancyZonesCLI get-monitors");
@@ -59,4 +60,135 @@ internal static class FancyZonesCliUsage
         Console.WriteLine("  FancyZonesCLI set-layout <uuid> --monitor 1");
         Console.WriteLine("  FancyZonesCLI get-hotkeys");
     }
+
+    public static void PrintCommandUsage(string commandName)
+    {
+        Console.OutputEncoding = System.Text.Encoding.UTF8;
+
+        var rootCmd = FancyZonesCliCommandFactory.CreateRootCommand();
+
+        // Find matching subcommand by name or alias
+        var subcommand = rootCmd.Subcommands.FirstOrDefault(c =>
+            c.Aliases.Any(a => string.Equals(a, commandName, StringComparison.OrdinalIgnoreCase)));
+
+        if (subcommand == null)
+        {
+            Console.WriteLine(string.Format(CultureInfo.InvariantCulture, Properties.Resources.usage_unknown_command, commandName));
+            Console.WriteLine();
+            Console.WriteLine(Properties.Resources.usage_run_help);
+            return;
+        }
+
+        // Command name and description
+        Console.WriteLine($"{Properties.Resources.usage_command} {subcommand.Name}");
+        if (!string.IsNullOrEmpty(subcommand.Description))
+        {
+            Console.WriteLine($"  {subcommand.Description}");
+        }
+
+        Console.WriteLine();
+
+        // Usage line
+        string argsLabel = string.Join(" ", subcommand.Arguments.Select(a => $"<{a.Name}>"));
+        string optionsLabel = subcommand.Options.Any() ? " [options]" : string.Empty;
+        Console.WriteLine($"Usage: FancyZonesCLI {subcommand.Name} {argsLabel}{optionsLabel}".TrimEnd());
+        Console.WriteLine();
+
+        // Aliases
+        var aliases = subcommand.Aliases.Where(a => !string.Equals(a, subcommand.Name, StringComparison.OrdinalIgnoreCase)).ToList();
+        if (aliases.Count > 0)
+        {
+            Console.WriteLine($"{Properties.Resources.usage_aliases} {string.Join(", ", aliases)}");
+            Console.WriteLine();
+        }
+
+        // Arguments
+        if (subcommand.Arguments.Any())
+        {
+            Console.WriteLine(Properties.Resources.usage_arguments);
+            foreach (var arg in subcommand.Arguments)
+            {
+                var argDescription = arg.Description ?? string.Empty;
+                Console.WriteLine($"  <{arg.Name}>{(arg.Arity.MinimumNumberOfValues == 0 ? $" {Properties.Resources.usage_optional}" : string.Empty),-20} {argDescription}");
+            }
+
+            Console.WriteLine();
+        }
+
+        // Options
+        if (subcommand.Options.Any())
+        {
+            Console.WriteLine(Properties.Resources.usage_options);
+            foreach (var option in subcommand.Options)
+            {
+                var optAliases = string.Join(", ", option.Aliases);
+                var optDescription = option.Description ?? string.Empty;
+                Console.WriteLine($"  {optAliases,-25} {optDescription}");
+            }
+
+            Console.WriteLine();
+        }
+
+        // Command-specific examples
+        PrintCommandExamples(subcommand.Name);
+    }
+
+    private static void PrintCommandExamples(string commandName)
+    {
+        Console.WriteLine(Properties.Resources.usage_examples);
+
+        switch (commandName.ToLowerInvariant())
+        {
+            case "get-monitors":
+                Console.WriteLine("  FancyZonesCLI get-monitors");
+                Console.WriteLine("  FancyZonesCLI m");
+                break;
+
+            case "get-layouts":
+                Console.WriteLine("  FancyZonesCLI get-layouts");
+                Console.WriteLine("  FancyZonesCLI ls");
+                break;
+
+            case "get-active-layout":
+                Console.WriteLine("  FancyZonesCLI get-active-layout");
+                Console.WriteLine("  FancyZonesCLI active");
+                break;
+
+            case "set-layout":
+                Console.WriteLine("  FancyZonesCLI set-layout focus");
+                Console.WriteLine("  FancyZonesCLI set-layout columns --monitor 1");
+                Console.WriteLine("  FancyZonesCLI set-layout {uuid} --all");
+                Console.WriteLine("  FancyZonesCLI s rows -m 2");
+                break;
+
+            case "open-editor":
+                Console.WriteLine("  FancyZonesCLI open-editor");
+                Console.WriteLine("  FancyZonesCLI e");
+                break;
+
+            case "open-settings":
+                Console.WriteLine("  FancyZonesCLI open-settings");
+                Console.WriteLine("  FancyZonesCLI settings");
+                break;
+
+            case "get-hotkeys":
+                Console.WriteLine("  FancyZonesCLI get-hotkeys");
+                Console.WriteLine("  FancyZonesCLI hk");
+                break;
+
+            case "set-hotkey":
+                Console.WriteLine("  FancyZonesCLI set-hotkey 1 {layout-uuid}");
+                Console.WriteLine("  FancyZonesCLI shk 2 0CEBCBA9-9C32-4395-B93E-DC77485AD6D0");
+                break;
+
+            case "remove-hotkey":
+                Console.WriteLine("  FancyZonesCLI remove-hotkey 1");
+                Console.WriteLine("  FancyZonesCLI rhk 2");
+                break;
+
+            default:
+                Console.WriteLine($"  FancyZonesCLI {commandName}");
+                break;
+        }
+    }
 }

src/modules/fancyzones/FancyZonesCLI/Program.cs

@@ -12,6 +12,8 @@ namespace FancyZonesCLI;
 
 internal sealed class Program
 {
+    private static readonly string[] HelpFlags = ["--help", "-h", "-?"];
+
     private static async Task<int> Main(string[] args)
     {
         Logger.InitializeLogger();
@@ -21,14 +23,17 @@ internal sealed class Program
         NativeMethods.InitializeWindowMessages();
 
         // Intercept help requests early and print custom usage.
-        if (args.Any(a => string.Equals(a, "--help", StringComparison.OrdinalIgnoreCase) ||
-                          string.Equals(a, "-h", StringComparison.OrdinalIgnoreCase) ||
-                          string.Equals(a, "-?", StringComparison.OrdinalIgnoreCase)))
+        if (TryHandleHelpRequest(args))
         {
-            FancyZonesCliUsage.PrintUsage();
             return 0;
         }
 
+        // Detect PowerShell script block expansion (when {} is interpreted as script block)
+        if (DetectPowerShellScriptBlockArgs(args))
+        {
+            return 1;
+        }
+
         RootCommand rootCommand = FancyZonesCliCommandFactory.CreateRootCommand();
         int exitCode = await rootCommand.InvokeAsync(args);
 
@@ -43,4 +48,69 @@ internal sealed class Program
 
         return exitCode;
     }
+
+    /// <summary>
+    /// Handles help requests for root command and subcommands.
+    /// </summary>
+    /// <returns>True if help was printed, false otherwise.</returns>
+    private static bool TryHandleHelpRequest(string[] args)
+    {
+        bool hasHelpFlag = args.Any(a => HelpFlags.Any(h => string.Equals(a, h, StringComparison.OrdinalIgnoreCase)));
+        if (!hasHelpFlag)
+        {
+            return false;
+        }
+
+        // Get non-help arguments to identify subcommand
+        var nonHelpArgs = args.Where(a => !HelpFlags.Any(h => string.Equals(a, h, StringComparison.OrdinalIgnoreCase))).ToArray();
+
+        if (nonHelpArgs.Length == 0)
+        {
+            // Root help: fancyzones cli --help
+            FancyZonesCliUsage.PrintUsage();
+        }
+        else
+        {
+            // Subcommand help: fancyzones cli <command> --help
+            string subcommandName = nonHelpArgs[0];
+            FancyZonesCliUsage.PrintCommandUsage(subcommandName);
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Detects when PowerShell interprets {GUID} as a script block and converts it to encoded command args.
+    /// This happens when users forget to quote GUIDs with braces in PowerShell.
+    /// </summary>
+    /// <returns>True if PowerShell script block args were detected, false otherwise.</returns>
+    private static bool DetectPowerShellScriptBlockArgs(string[] args)
+    {
+        // PowerShell converts {scriptblock} to: -encodedCommand <base64> -inputFormat xml -outputFormat text
+        bool hasEncodedCommand = args.Any(a => string.Equals(a, "-encodedCommand", StringComparison.OrdinalIgnoreCase));
+        bool hasInputFormat = args.Any(a => string.Equals(a, "-inputFormat", StringComparison.OrdinalIgnoreCase));
+        bool hasOutputFormat = args.Any(a => string.Equals(a, "-outputFormat", StringComparison.OrdinalIgnoreCase));
+
+        if (hasEncodedCommand || (hasInputFormat && hasOutputFormat))
+        {
+            Console.ForegroundColor = ConsoleColor.Red;
+            Console.WriteLine(Properties.Resources.error_powershell_scriptblock_title);
+            Console.ResetColor();
+            Console.WriteLine();
+            Console.WriteLine(Properties.Resources.error_powershell_scriptblock_explanation);
+            Console.WriteLine(Properties.Resources.error_powershell_scriptblock_hint);
+            Console.WriteLine();
+            Console.WriteLine($"  {Properties.Resources.error_powershell_scriptblock_option1}");
+            Console.WriteLine($"    {Properties.Resources.error_powershell_scriptblock_option1_example}");
+            Console.WriteLine();
+            Console.WriteLine($"  {Properties.Resources.error_powershell_scriptblock_option2}");
+            Console.WriteLine($"    {Properties.Resources.error_powershell_scriptblock_option2_example}");
+            Console.WriteLine();
+
+            Logger.LogWarning("PowerShell script block expansion detected - user needs to quote GUID or omit braces");
+            return true;
+        }
+
+        return false;
+    }
 }

src/modules/fancyzones/FancyZonesCLI/Properties/Resources.Designer.cs

@@ -349,5 +349,113 @@ namespace FancyZonesCLI.Properties {
                 return ResourceManager.GetString("editor_params_timeout", resourceCulture);
             }
         }
+        
+        internal static string error_powershell_scriptblock_title {
+            get {
+                return ResourceManager.GetString("error_powershell_scriptblock_title", resourceCulture);
+            }
+        }
+        
+        internal static string error_powershell_scriptblock_explanation {
+            get {
+                return ResourceManager.GetString("error_powershell_scriptblock_explanation", resourceCulture);
+            }
+        }
+        
+        internal static string error_powershell_scriptblock_hint {
+            get {
+                return ResourceManager.GetString("error_powershell_scriptblock_hint", resourceCulture);
+            }
+        }
+        
+        internal static string error_powershell_scriptblock_option1 {
+            get {
+                return ResourceManager.GetString("error_powershell_scriptblock_option1", resourceCulture);
+            }
+        }
+        
+        internal static string error_powershell_scriptblock_option1_example {
+            get {
+                return ResourceManager.GetString("error_powershell_scriptblock_option1_example", resourceCulture);
+            }
+        }
+        
+        internal static string error_powershell_scriptblock_option2 {
+            get {
+                return ResourceManager.GetString("error_powershell_scriptblock_option2", resourceCulture);
+            }
+        }
+        
+        internal static string error_powershell_scriptblock_option2_example {
+            get {
+                return ResourceManager.GetString("error_powershell_scriptblock_option2_example", resourceCulture);
+            }
+        }
+        
+        internal static string usage_title {
+            get {
+                return ResourceManager.GetString("usage_title", resourceCulture);
+            }
+        }
+        
+        internal static string usage_syntax {
+            get {
+                return ResourceManager.GetString("usage_syntax", resourceCulture);
+            }
+        }
+        
+        internal static string usage_options {
+            get {
+                return ResourceManager.GetString("usage_options", resourceCulture);
+            }
+        }
+        
+        internal static string usage_commands {
+            get {
+                return ResourceManager.GetString("usage_commands", resourceCulture);
+            }
+        }
+        
+        internal static string usage_examples {
+            get {
+                return ResourceManager.GetString("usage_examples", resourceCulture);
+            }
+        }
+        
+        internal static string usage_arguments {
+            get {
+                return ResourceManager.GetString("usage_arguments", resourceCulture);
+            }
+        }
+        
+        internal static string usage_aliases {
+            get {
+                return ResourceManager.GetString("usage_aliases", resourceCulture);
+            }
+        }
+        
+        internal static string usage_command {
+            get {
+                return ResourceManager.GetString("usage_command", resourceCulture);
+            }
+        }
+        
+        internal static string usage_optional {
+            get {
+                return ResourceManager.GetString("usage_optional", resourceCulture);
+            }
+        }
+        
+        internal static string usage_unknown_command {
+            get {
+                return ResourceManager.GetString("usage_unknown_command", resourceCulture);
+            }
+        }
+        
+        internal static string usage_run_help {
+            get {
+                return ResourceManager.GetString("usage_run_help", resourceCulture);
+            }
+        }
     }
 }

src/modules/fancyzones/FancyZonesCLI/Properties/Resources.resx

@@ -230,4 +230,62 @@ Tip: For templates, use the type name (e.g., 'focus', 'columns', 'rows', 'grid',
   <data name="editor_params_timeout" xml:space="preserve">
     <value>Could not get current monitor information (timed out after {0}ms waiting for '{1}').</value>
   </data>
+
+  <!-- PowerShell Script Block Detection -->
+  <data name="error_powershell_scriptblock_title" xml:space="preserve">
+    <value>Error: Invalid GUID format detected.</value>
+  </data>
+  <data name="error_powershell_scriptblock_explanation" xml:space="preserve">
+    <value>PowerShell interprets curly braces {} as script blocks.</value>
+  </data>
+  <data name="error_powershell_scriptblock_hint" xml:space="preserve">
+    <value>Please quote your GUID or use it without braces:</value>
+  </data>
+  <data name="error_powershell_scriptblock_option1" xml:space="preserve">
+    <value>Option 1 - Quote the GUID:</value>
+  </data>
+  <data name="error_powershell_scriptblock_option1_example" xml:space="preserve">
+    <value>FancyZonesCLI shk 1 '{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}'</value>
+  </data>
+  <data name="error_powershell_scriptblock_option2" xml:space="preserve">
+    <value>Option 2 - Omit the braces (recommended):</value>
+  </data>
+  <data name="error_powershell_scriptblock_option2_example" xml:space="preserve">
+    <value>FancyZonesCLI shk 1 xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx</value>
+  </data>
+
+  <!-- CLI Usage -->
+  <data name="usage_title" xml:space="preserve">
+    <value>FancyZones CLI - Command line interface for FancyZones</value>
+  </data>
+  <data name="usage_syntax" xml:space="preserve">
+    <value>Usage: FancyZonesCLI [command] [options]</value>
+  </data>
+  <data name="usage_options" xml:space="preserve">
+    <value>Options:</value>
+  </data>
+  <data name="usage_commands" xml:space="preserve">
+    <value>Commands:</value>
+  </data>
+  <data name="usage_examples" xml:space="preserve">
+    <value>Examples:</value>
+  </data>
+  <data name="usage_arguments" xml:space="preserve">
+    <value>Arguments:</value>
+  </data>
+  <data name="usage_aliases" xml:space="preserve">
+    <value>Aliases:</value>
+  </data>
+  <data name="usage_command" xml:space="preserve">
+    <value>Command:</value>
+  </data>
+  <data name="usage_optional" xml:space="preserve">
+    <value>(optional)</value>
+  </data>
+  <data name="usage_unknown_command" xml:space="preserve">
+    <value>Unknown command: {0}</value>
+  </data>
+  <data name="usage_run_help" xml:space="preserve">
+    <value>Run 'FancyZonesCLI --help' to see available commands.</value>
+  </data>
 </root>

src/modules/fancyzones/FancyZonesCLI/Utils/GuidHelper.cs

@@ -0,0 +1,52 @@
+// 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.Diagnostics.CodeAnalysis;
+
+#nullable enable
+
+namespace FancyZonesCLI.Utils;
+
+/// <summary>
+/// Helper class for normalizing GUID strings to Windows format with braces.
+/// Supports input with or without braces: both "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+/// and "{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}" are accepted.
+/// </summary>
+internal static class GuidHelper
+{
+    /// <summary>
+    /// Normalizes a GUID string to Windows format with braces.
+    /// Returns null if the input is not a valid GUID.
+    /// </summary>
+    /// <param name="input">GUID string with or without braces.</param>
+    /// <returns>GUID in "{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}" format, or null if invalid.</returns>
+    public static string? NormalizeGuid(string? input)
+    {
+        if (string.IsNullOrWhiteSpace(input))
+        {
+            return null;
+        }
+
+        if (Guid.TryParse(input, out Guid guid))
+        {
+            // "B" format includes braces: {xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}
+            return guid.ToString("B").ToUpperInvariant();
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Tries to normalize a GUID string to Windows format with braces.
+    /// </summary>
+    /// <param name="input">GUID string with or without braces.</param>
+    /// <param name="normalizedGuid">The normalized GUID string, or the original input if normalization fails.</param>
+    /// <returns>True if the input was successfully normalized; otherwise, false.</returns>
+    public static bool TryNormalizeGuid(string? input, [NotNullWhen(true)] out string? normalizedGuid)
+    {
+        normalizedGuid = NormalizeGuid(input);
+        return normalizedGuid != null;
+    }
+}

src/modules/fancyzones/FancyZonesEditorCommon/Data/CustomLayouts.cs

@@ -4,6 +4,7 @@
 
 using System.Collections.Generic;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 
 using static FancyZonesEditorCommon.Data.CustomLayouts;
 
@@ -23,8 +24,10 @@ namespace FancyZonesEditorCommon.Data
         {
             public struct CanvasZoneWrapper
             {
+                [JsonPropertyName("X")]
                 public int X { get; set; }
 
+                [JsonPropertyName("Y")]
                 public int Y { get; set; }
 
                 public int Width { get; set; }

src/modules/fancyzones/FancyZonesLib/EditorParameters.cpp

@@ -191,27 +191,22 @@ bool EditorParameters::Save(const WorkAreaConfiguration& configuration, OnThread
 
             monitorJson.dpi = dpi;
             
-            MONITORINFOEX monitorInfo{};
+            // Get DPI-unaware values for dimensions (virtual coordinates for WPF sizing)
+            MONITORINFOEX monitorInfoUnaware{};
             dpiUnawareThread.submit(OnThreadExecutor::task_t{ [&] {
-                monitorInfo.cbSize = sizeof(monitorInfo);
-                if (!GetMonitorInfo(monitor, &monitorInfo))
-                {
-                    return;
-                }
+                monitorInfoUnaware.cbSize = sizeof(monitorInfoUnaware);
+                GetMonitorInfo(monitor, &monitorInfoUnaware);
             } }).wait();
 
-            float width = static_cast<float>(monitorInfo.rcMonitor.right - monitorInfo.rcMonitor.left);
-            float height = static_cast<float>(monitorInfo.rcMonitor.bottom - monitorInfo.rcMonitor.top);
-            DPIAware::Convert(monitor, width, height);
+            // Dimensions in virtual coordinates (from DPI-unaware thread)
+            monitorJson.monitorWidth = monitorInfoUnaware.rcMonitor.right - monitorInfoUnaware.rcMonitor.left;
+            monitorJson.monitorHeight = monitorInfoUnaware.rcMonitor.bottom - monitorInfoUnaware.rcMonitor.top;
+            monitorJson.workAreaWidth = monitorInfoUnaware.rcWork.right - monitorInfoUnaware.rcWork.left;
+            monitorJson.workAreaHeight = monitorInfoUnaware.rcWork.bottom - monitorInfoUnaware.rcWork.top;
 
-            monitorJson.monitorWidth = static_cast<int>(std::roundf(width));
-            monitorJson.monitorHeight = static_cast<int>(std::roundf(height));
-
-            // use dpi-unaware values
-            monitorJson.top = monitorInfo.rcWork.top;
-            monitorJson.left = monitorInfo.rcWork.left;
-            monitorJson.workAreaWidth = monitorInfo.rcWork.right - monitorInfo.rcWork.left;
-            monitorJson.workAreaHeight = monitorInfo.rcWork.bottom - monitorInfo.rcWork.top;
+            // Position in virtual coordinates (matched by DPI-unaware context in WPF editor)
+            monitorJson.left = monitorInfoUnaware.rcWork.left;
+            monitorJson.top = monitorInfoUnaware.rcWork.top;
 
             argsJson.monitors.emplace_back(std::move(monitorJson));
         }

src/modules/fancyzones/editor/FancyZonesEditor/Models/Monitor.cs

@@ -67,10 +67,18 @@ namespace FancyZonesEditor.Models
             Window.KeyUp += ((App)Application.Current).App_KeyUp;
             Window.KeyDown += ((App)Application.Current).App_KeyDown;
 
+            // Store for DPI-unaware positioning
+            _virtualWorkArea = workArea;
+
+            // Set initial WPF properties
             Window.Left = workArea.X;
             Window.Top = workArea.Y;
             Window.Width = workArea.Width;
             Window.Height = workArea.Height;
+
+            // After HWND is created, reposition using DPI-unaware context
+            // This matches the C++ backend which uses a DPI-unaware thread
+            Window.SourceInitialized += OnWindowSourceInitialized;
         }
 
         public Monitor(string monitorName, string monitorInstanceId, string monitorSerialNumber, string virtualDesktop, int dpi, Rect workArea, Size monitorSize)
@@ -80,16 +88,33 @@ namespace FancyZonesEditor.Models
         }
 
         private LayoutSettings _settings;
+        private Rect _virtualWorkArea;
+
+        private void OnWindowSourceInitialized(object sender, EventArgs e)
+        {
+            // Reposition window using DPI-unaware context to match the virtual coordinates
+            // from the FancyZones C++ backend (which uses a DPI-unaware thread)
+            Utils.NativeMethods.SetWindowPositionDpiUnaware(
+                Window,
+                (int)_virtualWorkArea.X,
+                (int)_virtualWorkArea.Y,
+                (int)_virtualWorkArea.Width,
+                (int)_virtualWorkArea.Height);
+        }
 
         public void Scale(double scaleFactor)
         {
             Device.Scale(scaleFactor);
 
-            var workArea = Device.WorkAreaRect;
-            Window.Left = workArea.X;
-            Window.Top = workArea.Y;
-            Window.Width = workArea.Width;
-            Window.Height = workArea.Height;
+            _virtualWorkArea = Device.WorkAreaRect;
+
+            // Use DPI-unaware positioning
+            Utils.NativeMethods.SetWindowPositionDpiUnaware(
+                Window,
+                (int)_virtualWorkArea.X,
+                (int)_virtualWorkArea.Y,
+                (int)_virtualWorkArea.Width,
+                (int)_virtualWorkArea.Height);
         }
 
         public void SetLayoutSettings(LayoutModel model)

src/modules/fancyzones/editor/FancyZonesEditor/Models/MonitorInfoModel.cs

@@ -69,7 +69,11 @@ namespace FancyZonesEditor.Utils
                 }
                 else
                 {
-                    return ScreenBoundsWidth + " × " + ScreenBoundsHeight;
+                    // Convert virtual coordinates to physical resolution by applying DPI scale
+                    double scale = DPI / 96.0;
+                    int physicalWidth = (int)Math.Round(ScreenBoundsWidth * scale);
+                    int physicalHeight = (int)Math.Round(ScreenBoundsHeight * scale);
+                    return physicalWidth + " × " + physicalHeight;
                 }
             }
         }

src/modules/fancyzones/editor/FancyZonesEditor/Utils/NativeMethods.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// 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.
 
@@ -17,14 +17,48 @@ namespace FancyZonesEditor.Utils
         [DllImport("user32.dll")]
         private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
 
+        [DllImport("user32.dll", SetLastError = true)]
+        private static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr SetThreadDpiAwarenessContext(IntPtr dpiContext);
+
         private const int GWL_EX_STYLE = -20;
         private const int WS_EX_APPWINDOW = 0x00040000;
         private const int WS_EX_TOOLWINDOW = 0x00000080;
+        private const uint SWP_NOZORDER = 0x0004;
+        private const uint SWP_NOACTIVATE = 0x0010;
+
+        private static readonly IntPtr DPI_AWARENESS_CONTEXT_UNAWARE = new IntPtr(-1);
 
         public static void SetWindowStyleToolWindow(Window hwnd)
         {
             var helper = new WindowInteropHelper(hwnd).Handle;
             _ = SetWindowLong(helper, GWL_EX_STYLE, (GetWindowLong(helper, GWL_EX_STYLE) | WS_EX_TOOLWINDOW) & ~WS_EX_APPWINDOW);
         }
+
+        /// <summary>
+        /// Positions a WPF window using DPI-unaware context to match the virtual coordinates
+        /// from the FancyZones C++ backend (which uses a DPI-unaware thread).
+        /// This fixes overlay positioning on mixed-DPI multi-monitor setups.
+        /// </summary>
+        public static void SetWindowPositionDpiUnaware(Window window, int x, int y, int width, int height)
+        {
+            var helper = new WindowInteropHelper(window).Handle;
+            if (helper != IntPtr.Zero)
+            {
+                // Temporarily switch to DPI-unaware context to position window.
+                // This matches how the C++ backend gets coordinates via dpiUnawareThread.
+                IntPtr oldContext = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE);
+                try
+                {
+                    SetWindowPos(helper, IntPtr.Zero, x, y, width, height, SWP_NOZORDER | SWP_NOACTIVATE);
+                }
+                finally
+                {
+                    SetThreadDpiAwarenessContext(oldContext);
+                }
+            }
+        }
     }
 }

src/modules/imageresizer/ImageResizerCLI/Program.cs

@@ -31,7 +31,7 @@ internal static class Program
         Console.InputEncoding = Encoding.Unicode;
 
         // Initialize logger to file (same as other modules)
-        CliLogger.Initialize("\\ImageResizer\\Logs");
+        CliLogger.Initialize("\\Image Resizer\\CLI");
         CliLogger.Info($"ImageResizerCLI started with {args.Length} argument(s)");
 
         try

src/modules/imageresizer/tests/Properties/SettingsTests.cs

@@ -126,13 +126,10 @@ namespace ImageResizer.Properties
                 h => ncc.CollectionChanged -= h,
                 () => settings.CustomSize = new CustomSize());
 
-            Assert.AreEqual(NotifyCollectionChangedAction.Replace, result.Arguments.Action);
-            Assert.AreEqual(1, result.Arguments.NewItems.Count);
-            Assert.AreEqual(settings.CustomSize, result.Arguments.NewItems[0]);
-            Assert.AreEqual(0, result.Arguments.NewStartingIndex);
-            Assert.AreEqual(1, result.Arguments.OldItems.Count);
-            Assert.AreEqual(originalCustomSize, result.Arguments.OldItems[0]);
-            Assert.AreEqual(0, result.Arguments.OldStartingIndex);
+            // Reset is used instead of Replace to avoid ArgumentOutOfRangeException
+            // when notifying changes for virtual items (CustomSize/AiSize) that exist
+            // outside the bounds of the underlying _sizes collection.
+            Assert.AreEqual(NotifyCollectionChangedAction.Reset, result.Arguments.Action);
         }
 
         [TestMethod]

src/modules/imageresizer/ui/App.xaml.cs

@@ -20,7 +20,7 @@ namespace ImageResizer
 {
     public partial class App : Application, IDisposable
     {
-        private const string LogSubFolder = "\\ImageResizer\\Logs";
+        private const string LogSubFolder = "\\Image Resizer\\Logs";
 
         /// <summary>
         /// Gets cached AI availability state, checked at app startup.
@@ -67,12 +67,27 @@ namespace ImageResizer
             // Fix for .net 3.1.19 making Image Resizer not adapt to DPI changes.
             NativeMethods.SetProcessDPIAware();
 
+            // TODO: Re-enable AI Super Resolution in next release by removing this #if block
+            // Temporarily disable AI Super Resolution feature (hide from UI but keep code)
+#if true // Set to false to re-enable AI Super Resolution
+            AiAvailabilityState = AiAvailabilityState.NotSupported;
+            ResizeBatch.SetAiSuperResolutionService(Services.NoOpAiSuperResolutionService.Instance);
+
+            // Skip AI detection mode as well
+            if (e?.Args?.Length > 0 && e.Args[0] == "--detect-ai")
+            {
+                Services.AiAvailabilityCacheService.SaveCache(AiAvailabilityState.NotSupported);
+                Environment.Exit(0);
+                return;
+            }
+#else
             // Check for AI detection mode (called by Runner in background)
             if (e?.Args?.Length > 0 && e.Args[0] == "--detect-ai")
             {
                 RunAiDetectionMode();
                 return;
             }
+#endif
 
             if (PowerToys.GPOWrapperProjection.GPOWrapper.GetConfiguredImageResizerEnabledValue() == PowerToys.GPOWrapperProjection.GpoRuleConfigured.Disabled)
             {
@@ -173,31 +188,8 @@ namespace ImageResizer
         /// </summary>
         private static AiAvailabilityState CheckAiAvailability()
         {
-            try
-            {
-                // Check Windows AI service model ready state
-                // it's so slow, why?
-                var readyState = Services.WinAiSuperResolutionService.GetModelReadyState();
-
-                // Map AI service state to our availability state
-                switch (readyState)
-                {
-                    case Microsoft.Windows.AI.AIFeatureReadyState.Ready:
-                        return AiAvailabilityState.Ready;
-
-                    case Microsoft.Windows.AI.AIFeatureReadyState.NotReady:
-                        return AiAvailabilityState.ModelNotReady;
-
-                    case Microsoft.Windows.AI.AIFeatureReadyState.DisabledByUser:
-                    case Microsoft.Windows.AI.AIFeatureReadyState.NotSupportedOnCurrentSystem:
-                    default:
-                        return AiAvailabilityState.NotSupported;
-                }
-            }
-            catch (Exception)
-            {
-                return AiAvailabilityState.NotSupported;
-            }
+            // AI feature disabled - always return NotSupported
+            return AiAvailabilityState.NotSupported;
         }
 
         /// <summary>

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

@@ -216,27 +216,15 @@ namespace ImageResizer.Properties
                 {
                     if (e.PropertyName == nameof(Models.CustomSize))
                     {
-                        var oldCustomSize = _customSize;
                         _customSize = settings.CustomSize;
 
-                        OnCollectionChanged(
-                            new NotifyCollectionChangedEventArgs(
-                                NotifyCollectionChangedAction.Replace,
-                                _customSize,
-                                oldCustomSize,
-                                _sizes.Count));
+                        OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
                     }
                     else if (e.PropertyName == nameof(Models.AiSize))
                     {
-                        var oldAiSize = _aiSize;
                         _aiSize = settings.AiSize;
 
-                        OnCollectionChanged(
-                            new NotifyCollectionChangedEventArgs(
-                                NotifyCollectionChangedAction.Replace,
-                                _aiSize,
-                                oldAiSize,
-                                _sizes.Count + 1));
+                        OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
                     }
                     else if (e.PropertyName == nameof(Sizes))
                     {

src/modules/imageresizer/ui/Services/AiAvailabilityCacheService.cs

@@ -39,29 +39,8 @@ namespace ImageResizer.Services
         /// </summary>
         public static AiAvailabilityState? LoadCache()
         {
-            try
-            {
-                if (!File.Exists(CachePath))
-                {
-                    return null;
-                }
-
-                var json = File.ReadAllText(CachePath);
-                var cache = JsonSerializer.Deserialize<AiCapabilityCache>(json);
-
-                if (!IsCacheValid(cache))
-                {
-                    return null;
-                }
-
-                return (AiAvailabilityState)cache.State;
-            }
-            catch (Exception ex)
-            {
-                // Read failure (file locked, corrupted JSON, etc.) - return null and use fallback
-                Logger.LogError($"Failed to load AI cache: {ex.Message}");
-                return null;
-            }
+            // Cache disabled - always return null to use default value
+            return null;
         }
 
         /// <summary>
@@ -70,32 +49,8 @@ namespace ImageResizer.Services
         /// </summary>
         public static void SaveCache(AiAvailabilityState state)
         {
-            try
-            {
-                var cache = new AiCapabilityCache
-                {
-                    Version = CacheVersion,
-                    State = (int)state,
-                    WindowsBuild = Environment.OSVersion.Version.ToString(),
-                    Architecture = RuntimeInformation.ProcessArchitecture.ToString(),
-                    Timestamp = DateTime.UtcNow.ToString("o"),
-                };
-
-                var dir = Path.GetDirectoryName(CachePath);
-                if (!Directory.Exists(dir))
-                {
-                    Directory.CreateDirectory(dir);
-                }
-
-                var json = JsonSerializer.Serialize(cache, SerializerOptions);
-                File.WriteAllText(CachePath, json);
-
-                Logger.LogInfo($"AI cache saved: {state}");
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError($"Failed to save AI cache: {ex.Message}");
-            }
+            // Cache disabled - do not save anything
+            return;
         }
 
         /// <summary>

src/modules/peek/Peek.UI/MainWindowViewModel.cs

@@ -388,6 +388,13 @@ namespace Peek.UI
             IsErrorVisible = true;
         }
 
+        public void ShowError(string message)
+        {
+            IsErrorVisible = false;
+            ErrorMessage = message;
+            IsErrorVisible = true;
+        }
+
         private void NavigationThrottleTimer_Tick(object? sender, object e)
         {
             if (sender == null)

src/modules/peek/Peek.UI/PeekXAML/MainWindow.xaml

@@ -50,7 +50,8 @@
             Item="{x:Bind ViewModel.CurrentItem, Mode=OneWay}"
             NumberOfFiles="{x:Bind ViewModel.DisplayItemCount, Mode=OneWay}"
             PreviewSizeChanged="FilePreviewer_PreviewSizeChanged"
-            ScalingFactor="{x:Bind ViewModel.ScalingFactor, Mode=OneWay}" />
+            ScalingFactor="{x:Bind ViewModel.ScalingFactor, Mode=OneWay}"
+            Visibility="{x:Bind ContentVisibility(ViewModel.IsErrorVisible), Mode=OneWay}" />
 
         <InfoBar
             x:Name="ErrorInfoBar"
@@ -59,6 +60,7 @@
             Grid.RowSpan="2"
             Margin="4,0,4,6"
             VerticalAlignment="Bottom"
+            Closed="ErrorInfoBar_Closed"
             IsOpen="{x:Bind ViewModel.IsErrorVisible, Mode=TwoWay}"
             Message="{x:Bind ViewModel.ErrorMessage, Mode=OneWay}"
             Severity="Error" />

src/modules/peek/Peek.UI/PeekXAML/MainWindow.xaml.cs

@@ -14,6 +14,7 @@ using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 using Peek.Common.Constants;
 using Peek.Common.Extensions;
+using Peek.Common.Helpers;
 using Peek.FilePreviewer.Models;
 using Peek.FilePreviewer.Previewers;
 using Peek.UI.Extensions;
@@ -195,6 +196,14 @@ namespace Peek.UI
             bootTime.Start();
 
             ViewModel.Initialize(selectedItem);
+
+            // If no files were found (e.g., user is typing in rename/search box, or in virtual folders),
+            // don't show anything - just return silently to avoid stealing focus
+            if (ViewModel.CurrentItem == null)
+            {
+                return;
+            }
+
             ViewModel.ScalingFactor = this.GetMonitorScale();
             this.Content.KeyUp += Content_KeyUp;
 
@@ -302,5 +311,24 @@ namespace Peek.UI
         {
             themeListener?.Dispose();
         }
+
+        /// <summary>
+        /// Returns Visibility.Collapsed when error is showing, Visibility.Visible when not.
+        /// </summary>
+        public Visibility ContentVisibility(bool isErrorVisible)
+        {
+            return isErrorVisible ? Visibility.Collapsed : Visibility.Visible;
+        }
+
+        /// <summary>
+        /// Handle InfoBar closed - if there's no current item, close the window.
+        /// </summary>
+        private void ErrorInfoBar_Closed(InfoBar sender, InfoBarClosedEventArgs args)
+        {
+            if (ViewModel.CurrentItem == null)
+            {
+                Uninitialize();
+            }
+        }
     }
 }

src/modules/peek/Peek.UI/Strings/en-us/Resources.resw

@@ -341,6 +341,10 @@
     <value>No more files to preview.</value>
     <comment>The message to show when there are no files remaining to preview.</comment>
   </data>
+  <data name="NoFilesSelected" xml:space="preserve">
+    <value>No files selected or this folder is not supported for preview.</value>
+    <comment>Displayed when Peek is activated in a virtual folder (like Home or Recent) where file selection cannot be retrieved.</comment>
+  </data>
   <data name="DeleteFileError_NotFound" xml:space="preserve">
     <value>The file cannot be found. Please check if the file has been moved, renamed, or deleted.</value>
     <comment>Displayed if the file or path was not found</comment>

src/modules/powerrename/lib/PowerRenameRegEx.cpp

@@ -33,23 +33,27 @@ static std::wstring SanitizeAndNormalize(const std::wstring& input)
 
     // Normalize to NFC (Precomposed).
     // Get the size needed for the normalized string, including null terminator.
-    int size = NormalizeString(NormalizationC, sanitized.c_str(), -1, nullptr, 0);
-    if (size <= 0)
+    int sizeEstimate = NormalizeString(NormalizationC, sanitized.c_str(), -1, nullptr, 0);
+    if (sizeEstimate <= 0)
     {
         return sanitized; // Return unaltered if normalization fails.
     }
 
     // Perform the normalization.
     std::wstring normalized;
-    normalized.resize(size);
-    NormalizeString(NormalizationC, sanitized.c_str(), -1, &normalized[0], size);
+    normalized.resize(sizeEstimate);
+    int actualSize = NormalizeString(NormalizationC, sanitized.c_str(), -1, &normalized[0], sizeEstimate);
 
-    // Remove the explicit null terminator added by NormalizeString.
-    if (!normalized.empty() && normalized.back() == L'\0')
+    if (actualSize <= 0)
     {
-        normalized.pop_back();
+        // Normalization failed, return sanitized string.
+        return sanitized;
     }
 
+    // Resize to actual size minus the null terminator.
+    // actualSize includes the null terminator when input length is -1.
+    normalized.resize(static_cast<size_t>(actualSize) - 1);
+
     return normalized;
 }
 

src/modules/powerrename/unittests/CommonRegExTests.h

@@ -695,6 +695,38 @@ TEST_METHOD(VerifyUnicodeAndWhitespaceNormalizationRegex)
     VerifyNormalizationHelper(UseRegularExpressions);
 }
 
+TEST_METHOD(VerifyRegexMetacharacterDollarSign)
+{
+    CComPtr<IPowerRenameRegEx> renameRegEx;
+    Assert::IsTrue(CPowerRenameRegEx::s_CreateInstance(&renameRegEx) == S_OK);
+    DWORD flags = UseRegularExpressions;
+    Assert::IsTrue(renameRegEx->PutFlags(flags) == S_OK);
+
+    PWSTR result = nullptr;
+    Assert::IsTrue(renameRegEx->PutSearchTerm(L"$") == S_OK);
+    Assert::IsTrue(renameRegEx->PutReplaceTerm(L"_end") == S_OK);
+    unsigned long index = {};
+    Assert::IsTrue(renameRegEx->Replace(L"test.txt", &result, index) == S_OK);
+    Assert::AreEqual(L"test.txt_end", result);
+    CoTaskMemFree(result);
+}
+
+TEST_METHOD(VerifyRegexMetacharacterCaret)
+{
+    CComPtr<IPowerRenameRegEx> renameRegEx;
+    Assert::IsTrue(CPowerRenameRegEx::s_CreateInstance(&renameRegEx) == S_OK);
+    DWORD flags = UseRegularExpressions;
+    Assert::IsTrue(renameRegEx->PutFlags(flags) == S_OK);
+
+    PWSTR result = nullptr;
+    Assert::IsTrue(renameRegEx->PutSearchTerm(L"^") == S_OK);
+    Assert::IsTrue(renameRegEx->PutReplaceTerm(L"start_") == S_OK);
+    unsigned long index = {};
+    Assert::IsTrue(renameRegEx->Replace(L"test.txt", &result, index) == S_OK);
+    Assert::AreEqual(L"start_test.txt", result);
+    CoTaskMemFree(result);
+}
+
 #ifndef TESTS_PARTIAL
 };
 }

src/runner/Resources.resx

@@ -173,6 +173,10 @@
     <value>Settings\tDouble-click</value>
     <comment>Don't localize "\t" as that is what separates the click portion to be right aligned in the menu.</comment>
   </data>
+  <data name="SETTINGS_MENU_TEXT_LEFTCLICK" xml:space="preserve">
+    <value>Settings\tLeft-click</value>
+    <comment>Don't localize "\t" as that is what separates the click portion to be right aligned in the menu. This is shown when Quick Access is disabled.</comment>
+  </data>
   <data name="DOCUMENTATION_MENU_TEXT" xml:space="preserve">
     <value>Documentation</value>
   </data>

src/runner/general_settings.cpp

@@ -193,6 +193,102 @@ GeneralSettings get_general_settings()
     return settings;
 }
 
+void apply_module_status_update(const json::JsonObject& module_config, bool save)
+{
+    Logger::info(L"apply_module_status_update: {}", std::wstring{ module_config.ToString() });
+
+    // Expected format: {"ModuleName": true/false} - only one module per update
+    auto iter = module_config.First();
+    if (!iter.HasCurrent())
+    {
+        Logger::warn(L"apply_module_status_update: Empty module config");
+        return;
+    }
+
+    const auto& element = iter.Current();
+    const auto value = element.Value();
+    if (value.ValueType() != json::JsonValueType::Boolean)
+    {
+        Logger::warn(L"apply_module_status_update: Invalid value type for module status");
+        return;
+    }
+
+    const std::wstring name{ element.Key().c_str() };
+    if (modules().find(name) == modules().end())
+    {
+        Logger::warn(L"apply_module_status_update: Module {} not found", name);
+        return;
+    }
+
+    PowertoyModule& powertoy = modules().at(name);
+    const bool module_inst_enabled = powertoy->is_enabled();
+    bool target_enabled = value.GetBoolean();
+
+    auto gpo_rule = powertoy->gpo_policy_enabled_configuration();
+    if (gpo_rule == powertoys_gpo::gpo_rule_configured_enabled || gpo_rule == powertoys_gpo::gpo_rule_configured_disabled)
+    {
+        // Apply the GPO Rule.
+        target_enabled = gpo_rule == powertoys_gpo::gpo_rule_configured_enabled;
+    }
+
+    if (module_inst_enabled == target_enabled)
+    {
+        Logger::info(L"apply_module_status_update: Module {} already in target state {}", name, target_enabled);
+        return;
+    }
+
+    if (target_enabled)
+    {
+        Logger::info(L"apply_module_status_update: Enabling powertoy {}", name);
+        powertoy->enable();
+        auto& hkmng = HotkeyConflictDetector::HotkeyConflictManager::GetInstance();
+        hkmng.EnableHotkeyByModule(name);
+
+        // Trigger AI capability detection when ImageResizer is enabled
+        if (name == L"Image Resizer")
+        {
+            Logger::info(L"ImageResizer enabled, triggering AI capability detection");
+            DetectAiCapabilitiesAsync(true);  // Skip settings check since we know it's being enabled
+        }
+    }
+    else
+    {
+        Logger::info(L"apply_module_status_update: Disabling powertoy {}", name);
+        powertoy->disable();
+        auto& hkmng = HotkeyConflictDetector::HotkeyConflictManager::GetInstance();
+        hkmng.DisableHotkeyByModule(name);
+    }
+    // Sync the hotkey state with the module state, so it can be removed for disabled modules.
+    powertoy.UpdateHotkeyEx();
+
+    if (save)
+    {
+        // Load existing settings and only update the specific module's enabled state
+        json::JsonObject current_settings = PTSettingsHelper::load_general_settings();
+        
+        json::JsonObject enabled;
+        if (current_settings.HasKey(L"enabled"))
+        {
+            enabled = current_settings.GetNamedObject(L"enabled");
+        }
+        
+        // Check if the saved state is different from the requested state
+        bool current_saved = enabled.HasKey(name) ? enabled.GetNamedBoolean(name, true) : true;
+        
+        if (current_saved != target_enabled)
+        {
+            // Update only this module's enabled state
+            enabled.SetNamedValue(name, json::value(target_enabled));
+            current_settings.SetNamedValue(L"enabled", enabled);
+            
+            PTSettingsHelper::save_general_settings(current_settings);
+            
+            GeneralSettings settings_for_trace = get_general_settings();
+            Trace::SettingsChanged(settings_for_trace);
+        }
+    }
+}
+
 void apply_general_settings(const json::JsonObject& general_configs, bool save)
 {
     std::wstring old_settings_json_string;
@@ -367,11 +463,21 @@ void apply_general_settings(const json::JsonObject& general_configs, bool save)
     if (json::has(general_configs, L"show_theme_adaptive_tray_icon", json::JsonValueType::Boolean))
     {
         bool new_theme_adaptive = general_configs.GetNamedBoolean(L"show_theme_adaptive_tray_icon");
+        Logger::info(L"apply_general_settings: show_theme_adaptive_tray_icon current={}, new={}",
+                     show_theme_adaptive_tray_icon, new_theme_adaptive);
         if (show_theme_adaptive_tray_icon != new_theme_adaptive)
         {
             show_theme_adaptive_tray_icon = new_theme_adaptive;
             set_tray_icon_theme_adaptive(show_theme_adaptive_tray_icon);
         }
+        else
+        {
+            Logger::info(L"apply_general_settings: show_theme_adaptive_tray_icon unchanged, skipping update");
+        }
+    }
+    else
+    {
+        Logger::warn(L"apply_general_settings: show_theme_adaptive_tray_icon not found in config");
     }
 
     if (json::has(general_configs, L"ignored_conflict_properties", json::JsonValueType::Object))

src/runner/general_settings.h

@@ -38,4 +38,5 @@ struct GeneralSettings
 json::JsonObject load_general_settings();
 GeneralSettings get_general_settings();
 void apply_general_settings(const json::JsonObject& general_configs, bool save = true);
+void apply_module_status_update(const json::JsonObject& module_config, bool save = true);
 void start_enabled_powertoys();

src/runner/settings_window.cpp

@@ -215,6 +215,12 @@ void dispatch_received_json(const std::wstring& json_to_parse)
             //         current_settings_ipc->send(settings_string);
             // }
         }
+        else if (name == L"module_status")
+        {
+            // Handle single module enable/disable update
+            // Expected format: {"module_status": {"ModuleName": true/false}}
+            apply_module_status_update(value.GetObjectW());
+        }
         else if (name == L"powertoys")
         {
             dispatch_json_config_to_modules(value.GetObjectW());

src/runner/trace.cpp

@@ -81,3 +81,36 @@ void Trace::UpdateDownloadCompleted(bool success, const std::wstring& version)
         TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
         TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }
+
+void Trace::TrayIconLeftClick(bool quickAccessEnabled)
+{
+    TraceLoggingWriteWrapper(
+        g_hProvider,
+        "TrayIcon_LeftClick",
+        TraceLoggingBoolean(quickAccessEnabled, "QuickAccessEnabled"),
+        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
+        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
+}
+
+void Trace::TrayIconDoubleClick(bool quickAccessEnabled)
+{
+    TraceLoggingWriteWrapper(
+        g_hProvider,
+        "TrayIcon_DoubleClick",
+        TraceLoggingBoolean(quickAccessEnabled, "QuickAccessEnabled"),
+        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
+        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
+}
+
+void Trace::TrayIconRightClick(bool quickAccessEnabled)
+{
+    TraceLoggingWriteWrapper(
+        g_hProvider,
+        "TrayIcon_RightClick",
+        TraceLoggingBoolean(quickAccessEnabled, "QuickAccessEnabled"),
+        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
+        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
+}

src/runner/trace.h

@@ -13,4 +13,9 @@ public:
     // Auto-update telemetry
     static void UpdateCheckCompleted(bool success, bool updateAvailable, const std::wstring& fromVersion, const std::wstring& toVersion);
     static void UpdateDownloadCompleted(bool success, const std::wstring& version);
+
+    // Tray icon interaction telemetry
+    static void TrayIconLeftClick(bool quickAccessEnabled);
+    static void TrayIconDoubleClick(bool quickAccessEnabled);
+    static void TrayIconRightClick(bool quickAccessEnabled);
 };

src/runner/tray_icon.cpp

@@ -7,6 +7,7 @@
 #include "centralized_kb_hook.h"
 #include "quick_access_host.h"
 #include "hotkey_conflict_detector.h"
+#include "trace.h"
 #include <Windows.h>
 
 #include <common/utils/resources.h>
@@ -14,6 +15,7 @@
 #include <common/logger/logger.h>
 #include <common/utils/elevation.h>
 #include <common/Themes/theme_listener.h>
+#include <common/Themes/theme_helpers.h>
 #include "bug_report.h"
 
 namespace
@@ -39,6 +41,7 @@ namespace
     bool double_click_timer_running = false;
     bool double_clicked = false;
     POINT tray_icon_click_point;
+    std::optional<bool> last_quick_access_state; // Track the last known Quick Access state
 
     static ThemeListener theme_listener;
     static bool theme_adaptive_enabled = false;
@@ -129,6 +132,9 @@ void click_timer_elapsed()
     double_click_timer_running = false;
     if (!double_clicked)
     {
+        // Log telemetry for single click (confirmed it's not a double click)
+        Trace::TrayIconLeftClick(get_general_settings().enableQuickAccess);
+
         if (get_general_settings().enableQuickAccess)
         {
             open_quick_access_flyout_window();
@@ -194,6 +200,21 @@ LRESULT __stdcall tray_icon_window_proc(HWND window, UINT message, WPARAM wparam
             case WM_RBUTTONUP:
             case WM_CONTEXTMENU:
             {
+                bool quick_access_enabled = get_general_settings().enableQuickAccess;
+
+                // Log telemetry
+                Trace::TrayIconRightClick(quick_access_enabled);
+
+                // Reload menu if Quick Access state has changed or is first time
+                if (h_menu && (!last_quick_access_state.has_value() || quick_access_enabled != last_quick_access_state.value()))
+                {
+                    DestroyMenu(h_menu);
+                    h_menu = nullptr;
+                    h_sub_menu = nullptr;
+                }
+
+                last_quick_access_state = quick_access_enabled;
+
                 if (!h_menu)
                 {
                     h_menu = LoadMenu(reinterpret_cast<HINSTANCE>(&__ImageBase), MAKEINTRESOURCE(ID_TRAY_MENU));
@@ -201,17 +222,39 @@ LRESULT __stdcall tray_icon_window_proc(HWND window, UINT message, WPARAM wparam
                 if (h_menu)
                 {
                     static std::wstring settings_menuitem_label = GET_RESOURCE_STRING(IDS_SETTINGS_MENU_TEXT);
+                    static std::wstring settings_menuitem_label_leftclick = GET_RESOURCE_STRING(IDS_SETTINGS_MENU_TEXT_LEFTCLICK);
                     static std::wstring close_menuitem_label = GET_RESOURCE_STRING(IDS_CLOSE_MENU_TEXT);
                     static std::wstring submit_bug_menuitem_label = GET_RESOURCE_STRING(IDS_SUBMIT_BUG_TEXT);
                     static std::wstring documentation_menuitem_label = GET_RESOURCE_STRING(IDS_DOCUMENTATION_MENU_TEXT);
                     static std::wstring quick_access_menuitem_label = GET_RESOURCE_STRING(IDS_QUICK_ACCESS_MENU_TEXT);
-                    change_menu_item_text(ID_SETTINGS_MENU_COMMAND, settings_menuitem_label.data());
+
+                    // Update Settings menu text based on Quick Access state
+                    if (quick_access_enabled)
+                    {
+                        change_menu_item_text(ID_SETTINGS_MENU_COMMAND, settings_menuitem_label.data());
+                    }
+                    else
+                    {
+                        change_menu_item_text(ID_SETTINGS_MENU_COMMAND, settings_menuitem_label_leftclick.data());
+                    }
+
                     change_menu_item_text(ID_CLOSE_MENU_COMMAND, close_menuitem_label.data());
                     change_menu_item_text(ID_REPORT_BUG_COMMAND, submit_bug_menuitem_label.data());
                     bool bug_report_disabled = is_bug_report_running();
                     EnableMenuItem(h_sub_menu, ID_REPORT_BUG_COMMAND, MF_BYCOMMAND | (bug_report_disabled ? MF_GRAYED : MF_ENABLED));
                     change_menu_item_text(ID_DOCUMENTATION_MENU_COMMAND, documentation_menuitem_label.data());
                     change_menu_item_text(ID_QUICK_ACCESS_MENU_COMMAND, quick_access_menuitem_label.data());
+
+                    // Hide or show Quick Access menu item based on setting
+                    if (!h_sub_menu)
+                    {
+                        h_sub_menu = GetSubMenu(h_menu, 0);
+                    }
+                    if (!quick_access_enabled)
+                    {
+                        // Remove Quick Access menu item when disabled
+                        DeleteMenu(h_sub_menu, ID_QUICK_ACCESS_MENU_COMMAND, MF_BYCOMMAND);
+                    }
                 }
                 if (!h_sub_menu)
                 {
@@ -242,6 +285,9 @@ LRESULT __stdcall tray_icon_window_proc(HWND window, UINT message, WPARAM wparam
             }
             case WM_LBUTTONDBLCLK:
             {
+                // Log telemetry
+                Trace::TrayIconDoubleClick(get_general_settings().enableQuickAccess);
+
                 double_clicked = true;
                 open_settings_window(std::nullopt);
                 break;
@@ -273,12 +319,19 @@ static HICON get_icon(Theme theme)
 {
     std::wstring icon_path = get_module_folderpath();
     icon_path += theme == Theme::Dark ? L"\\svgs\\PowerToysWhite.ico" : L"\\svgs\\PowerToysDark.ico";
-    return static_cast<HICON>(LoadImage(NULL,
+    Logger::trace(L"get_icon: Loading icon from path: {}", icon_path);
+
+    HICON icon = static_cast<HICON>(LoadImage(NULL,
                                         icon_path.c_str(),
                                         IMAGE_ICON,
                                         0,
                                         0,
                                         LR_LOADFROMFILE | LR_DEFAULTSIZE | LR_SHARED));
+    if (!icon)
+    {
+        Logger::warn(L"get_icon: Failed to load icon from {}, error: {}", icon_path, GetLastError());
+    }
+    return icon;
 }
 
 
@@ -286,7 +339,7 @@ static void handle_theme_change()
 {
     if (theme_adaptive_enabled)
     {
-        tray_icon_data.hIcon = get_icon(theme_listener.AppTheme);
+        tray_icon_data.hIcon = get_icon(ThemeHelpers::GetSystemTheme());
         Shell_NotifyIcon(NIM_MODIFY, &tray_icon_data);
     }
 }
@@ -303,7 +356,7 @@ void start_tray_icon(bool isProcessElevated, bool theme_adaptive)
 {
     theme_adaptive_enabled = theme_adaptive;
     auto h_instance = reinterpret_cast<HINSTANCE>(&__ImageBase);
-    HICON const icon = theme_adaptive ? get_icon(theme_listener.AppTheme) : LoadIcon(h_instance, MAKEINTRESOURCE(APPICON));
+    HICON const icon = theme_adaptive ? get_icon(ThemeHelpers::GetSystemTheme()) : LoadIcon(h_instance, MAKEINTRESOURCE(APPICON));
     if (icon)
     {
         UINT id_tray_icon = 1;
@@ -350,7 +403,7 @@ void start_tray_icon(bool isProcessElevated, bool theme_adaptive)
         ChangeWindowMessageFilterEx(hwnd, WM_COMMAND, MSGFLT_ALLOW, nullptr);
 
         tray_icon_created = Shell_NotifyIcon(NIM_ADD, &tray_icon_data) == TRUE;
-        theme_listener.AddChangedHandler(&handle_theme_change);
+        theme_listener.AddSystemThemeChangedHandler(&handle_theme_change);
 
         // Register callback to update bug report menu item status
         BugReportManager::instance().register_callback([](bool isRunning) {
@@ -374,13 +427,45 @@ void set_tray_icon_visible(bool shouldIconBeVisible)
 
 void set_tray_icon_theme_adaptive(bool theme_adaptive)
 {
-    theme_adaptive_enabled = theme_adaptive;
+    Logger::info(L"set_tray_icon_theme_adaptive: Called with theme_adaptive={}, current theme_adaptive_enabled={}",
+                 theme_adaptive, theme_adaptive_enabled);
+
     auto h_instance = reinterpret_cast<HINSTANCE>(&__ImageBase);
-    HICON const icon = theme_adaptive ? get_icon(theme_listener.AppTheme) : LoadIcon(h_instance, MAKEINTRESOURCE(APPICON));
+    HICON icon = nullptr;
+
+    if (theme_adaptive)
+    {
+        icon = get_icon(ThemeHelpers::GetSystemTheme());
+        if (!icon)
+        {
+            Logger::warn(L"set_tray_icon_theme_adaptive: Failed to load theme adaptive icon, falling back to default");
+        }
+    }
+
+    // If not requesting adaptive icon, or if adaptive icon failed to load, use default icon
+    if (!icon)
+    {
+        icon = LoadIcon(h_instance, MAKEINTRESOURCE(APPICON));
+        if (theme_adaptive && icon)
+        {
+            // We requested adaptive but had to fall back, so update the flag
+            theme_adaptive = false;
+            Logger::info(L"set_tray_icon_theme_adaptive: Using default icon as fallback");
+        }
+    }
+
+    theme_adaptive_enabled = theme_adaptive;
+
     if (icon)
     {
         tray_icon_data.hIcon = icon;
-        Shell_NotifyIcon(NIM_MODIFY, &tray_icon_data);
+        BOOL result = Shell_NotifyIcon(NIM_MODIFY, &tray_icon_data);
+        Logger::info(L"set_tray_icon_theme_adaptive: Icon updated, theme_adaptive_enabled={}, Shell_NotifyIcon result={}",
+                     theme_adaptive_enabled, result);
+    }
+    else
+    {
+        Logger::error(L"set_tray_icon_theme_adaptive: Failed to load any icon");
     }
 }
 

src/settings-ui/QuickAccess.UI/PowerToys.QuickAccess.csproj

@@ -7,6 +7,7 @@
     <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
     <RootNamespace>Microsoft.PowerToys.QuickAccess</RootNamespace>
     <AssemblyName>PowerToys.QuickAccess</AssemblyName>
+    <ApplicationIcon>..\..\runner\svgs\icon.ico</ApplicationIcon>
     <UseWinUI>true</UseWinUI>
     <WindowsPackageType>None</WindowsPackageType>
     <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>

src/settings-ui/QuickAccess.UI/QuickAccessXAML/Flyout/AppsListPage.xaml.cs

@@ -51,6 +51,7 @@ public sealed partial class AppsListPage : Page
         if (ViewModel != null)
         {
             ViewModel.DashboardSortOrder = DashboardSortOrder.Alphabetical;
+            ((ToggleMenuFlyoutItem)sender).IsChecked = true;
         }
     }
 
@@ -59,6 +60,7 @@ public sealed partial class AppsListPage : Page
         if (ViewModel != null)
         {
             ViewModel.DashboardSortOrder = DashboardSortOrder.ByStatus;
+            ((ToggleMenuFlyoutItem)sender).IsChecked = true;
         }
     }
 }

src/settings-ui/QuickAccess.UI/Services/IQuickAccessCoordinator.cs

@@ -3,7 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Threading.Tasks;
+
 using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
 
 namespace Microsoft.PowerToys.QuickAccess.Services;
 
@@ -19,10 +21,10 @@ public interface IQuickAccessCoordinator
 
     Task<bool> ShowDocumentationAsync();
 
-    void NotifyUserSettingsInteraction();
-
     bool UpdateModuleEnabled(ModuleType moduleType, bool isEnabled);
 
+    void SendSortOrderUpdate(GeneralSettings generalSettings);
+
     void ReportBug();
 
     void OnModuleLaunched(ModuleType moduleType);

src/settings-ui/QuickAccess.UI/Services/QuickAccessCoordinator.cs

@@ -55,37 +55,8 @@ internal sealed class QuickAccessCoordinator : IQuickAccessCoordinator, IDisposa
         return Task.FromResult(false);
     }
 
-    public void NotifyUserSettingsInteraction()
-    {
-        Logger.LogDebug("QuickAccessCoordinator.NotifyUserSettingsInteraction invoked.");
-    }
-
     public bool UpdateModuleEnabled(ModuleType moduleType, bool isEnabled)
-    {
-        GeneralSettings? updatedSettings = null;
-        lock (_generalSettingsLock)
-        {
-            var repository = SettingsRepository<GeneralSettings>.GetInstance(_settingsUtils);
-            var generalSettings = repository.SettingsConfig;
-            var current = ModuleHelper.GetIsModuleEnabled(generalSettings, moduleType);
-            if (current == isEnabled)
-            {
-                return false;
-            }
-
-            ModuleHelper.SetIsModuleEnabled(generalSettings, moduleType, isEnabled);
-            _settingsUtils.SaveSettings(generalSettings.ToJsonString());
-            Logger.LogInfo($"QuickAccess updated module '{moduleType}' enabled state to {isEnabled}.");
-            updatedSettings = generalSettings;
-        }
-
-        if (updatedSettings != null)
-        {
-            SendGeneralSettingsUpdate(updatedSettings);
-        }
-
-        return true;
-    }
+        => TrySendIpcMessage($"{{\"module_status\": {{\"{ModuleHelper.GetModuleKey(moduleType)}\": {isEnabled.ToString().ToLowerInvariant()}}}}}", "module status update");
 
     public void ReportBug()
     {
@@ -131,20 +102,10 @@ internal sealed class QuickAccessCoordinator : IQuickAccessCoordinator, IDisposa
         Logger.LogDebug($"QuickAccessCoordinator received IPC payload: {message}");
     }
 
-    private void SendGeneralSettingsUpdate(GeneralSettings updatedSettings)
+    public void SendSortOrderUpdate(GeneralSettings generalSettings)
     {
-        string payload;
-        try
-        {
-            payload = new OutGoingGeneralSettings(updatedSettings).ToString();
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError("QuickAccessCoordinator: failed to serialize general settings payload.", ex);
-            return;
-        }
-
-        TrySendIpcMessage(payload, "general settings update");
+        var outgoing = new OutGoingGeneralSettings(generalSettings);
+        TrySendIpcMessage(outgoing.ToString(), "sort order update");
     }
 
     private bool TrySendIpcMessage(string payload, string operationDescription)

src/settings-ui/QuickAccess.UI/ViewModels/AllAppsViewModel.cs

@@ -10,6 +10,7 @@ using global::PowerToys.GPOWrapper;
 using ManagedCommon;
 using Microsoft.PowerToys.QuickAccess.Helpers;
 using Microsoft.PowerToys.QuickAccess.Services;
+using Microsoft.PowerToys.Settings.UI.Controls;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
@@ -21,13 +22,18 @@ namespace Microsoft.PowerToys.QuickAccess.ViewModels;
 
 public sealed class AllAppsViewModel : Observable
 {
+    private readonly object _sortLock = new object();
     private readonly IQuickAccessCoordinator _coordinator;
     private readonly ISettingsRepository<GeneralSettings> _settingsRepository;
     private readonly SettingsUtils _settingsUtils;
     private readonly ResourceLoader _resourceLoader;
     private readonly DispatcherQueue _dispatcherQueue;
+    private readonly List<FlyoutMenuItem> _allFlyoutMenuItems = new();
     private GeneralSettings _generalSettings;
 
+    // Flag to prevent toggle operations during sorting to avoid race conditions.
+    private bool _isSorting;
+
     public ObservableCollection<FlyoutMenuItem> FlyoutMenuItems { get; }
 
     public DashboardSortOrder DashboardSortOrder
@@ -38,9 +44,9 @@ public sealed class AllAppsViewModel : Observable
             if (_generalSettings.DashboardSortOrder != value)
             {
                 _generalSettings.DashboardSortOrder = value;
-                _settingsUtils.SaveSettings(_generalSettings.ToJsonString(), _generalSettings.GetModuleName());
+                _coordinator.SendSortOrderUpdate(_generalSettings);
                 OnPropertyChanged();
-                RefreshFlyoutMenuItems();
+                SortFlyoutMenuItems();
             }
         }
     }
@@ -52,21 +58,38 @@ public sealed class AllAppsViewModel : Observable
         _settingsUtils = SettingsUtils.Default;
         _settingsRepository = SettingsRepository<GeneralSettings>.GetInstance(_settingsUtils);
         _generalSettings = _settingsRepository.SettingsConfig;
-        _generalSettings.AddEnabledModuleChangeNotification(ModuleEnabledChangedOnSettingsPage);
         _settingsRepository.SettingsChanged += OnSettingsChanged;
 
         _resourceLoader = Helpers.ResourceLoaderInstance.ResourceLoader;
         FlyoutMenuItems = new ObservableCollection<FlyoutMenuItem>();
 
+        BuildFlyoutMenuItems();
         RefreshFlyoutMenuItems();
     }
 
+    private void BuildFlyoutMenuItems()
+    {
+        _allFlyoutMenuItems.Clear();
+        foreach (ModuleType moduleType in Enum.GetValues<ModuleType>())
+        {
+            if (moduleType == ModuleType.GeneralSettings)
+            {
+                continue;
+            }
+
+            _allFlyoutMenuItems.Add(new FlyoutMenuItem
+            {
+                Tag = moduleType,
+                EnabledChangedCallback = EnabledChangedOnUI,
+            });
+        }
+    }
+
     private void OnSettingsChanged(GeneralSettings newSettings)
     {
         _dispatcherQueue.TryEnqueue(() =>
         {
             _generalSettings = newSettings;
-            _generalSettings.AddEnabledModuleChangeNotification(ModuleEnabledChangedOnSettingsPage);
             OnPropertyChanged(nameof(DashboardSortOrder));
             RefreshFlyoutMenuItems();
         });
@@ -82,91 +105,90 @@ public sealed class AllAppsViewModel : Observable
 
     private void RefreshFlyoutMenuItems()
     {
-        var desiredItems = new List<FlyoutMenuItem>();
-
-        foreach (ModuleType moduleType in Enum.GetValues<ModuleType>())
+        foreach (var item in _allFlyoutMenuItems)
         {
-            if (moduleType == ModuleType.GeneralSettings)
-            {
-                continue;
-            }
-
+            var moduleType = item.Tag;
             var gpo = Helpers.ModuleGpoHelper.GetModuleGpoConfiguration(moduleType);
             var isLocked = gpo is GpoRuleConfigured.Enabled or GpoRuleConfigured.Disabled;
             var isEnabled = gpo == GpoRuleConfigured.Enabled || (!isLocked && Microsoft.PowerToys.Settings.UI.Library.Helpers.ModuleHelper.GetIsModuleEnabled(_generalSettings, moduleType));
 
-            var existingItem = FlyoutMenuItems.FirstOrDefault(x => x.Tag == moduleType);
+            item.Label = _resourceLoader.GetString(Microsoft.PowerToys.Settings.UI.Library.Helpers.ModuleHelper.GetModuleLabelResourceName(moduleType));
+            item.IsLocked = isLocked;
+            item.Icon = Microsoft.PowerToys.Settings.UI.Library.Helpers.ModuleHelper.GetModuleTypeFluentIconName(moduleType);
 
-            if (existingItem != null)
+            if (item.IsEnabled != isEnabled)
             {
-                existingItem.Label = _resourceLoader.GetString(Microsoft.PowerToys.Settings.UI.Library.Helpers.ModuleHelper.GetModuleLabelResourceName(moduleType));
-                existingItem.IsLocked = isLocked;
-                existingItem.Icon = Microsoft.PowerToys.Settings.UI.Library.Helpers.ModuleHelper.GetModuleTypeFluentIconName(moduleType);
+                item.UpdateStatus(isEnabled);
+            }
+        }
 
-                if (existingItem.IsEnabled != isEnabled)
+        SortFlyoutMenuItems();
+    }
+
+    private void SortFlyoutMenuItems()
+    {
+        if (_isSorting)
+        {
+            return;
+        }
+
+        lock (_sortLock)
+        {
+            _isSorting = true;
+            try
+            {
+                var sortedItems = DashboardSortOrder switch
                 {
-                    var callback = existingItem.EnabledChangedCallback;
-                    existingItem.EnabledChangedCallback = null;
-                    existingItem.IsEnabled = isEnabled;
-                    existingItem.EnabledChangedCallback = callback;
+                    DashboardSortOrder.ByStatus => _allFlyoutMenuItems.OrderByDescending(x => x.IsEnabled).ThenBy(x => x.Label).ToList(),
+                    _ => _allFlyoutMenuItems.OrderBy(x => x.Label).ToList(),
+                };
+
+                if (FlyoutMenuItems.Count == 0)
+                {
+                    foreach (var item in sortedItems)
+                    {
+                        FlyoutMenuItems.Add(item);
+                    }
+
+                    return;
                 }
 
-                desiredItems.Add(existingItem);
-            }
-            else
-            {
-                desiredItems.Add(new FlyoutMenuItem
+                for (int i = 0; i < sortedItems.Count; i++)
                 {
-                    Label = _resourceLoader.GetString(Microsoft.PowerToys.Settings.UI.Library.Helpers.ModuleHelper.GetModuleLabelResourceName(moduleType)),
-                    IsEnabled = isEnabled,
-                    IsLocked = isLocked,
-                    Tag = moduleType,
-                    Icon = Microsoft.PowerToys.Settings.UI.Library.Helpers.ModuleHelper.GetModuleTypeFluentIconName(moduleType),
-                    EnabledChangedCallback = EnabledChangedOnUI,
+                    var item = sortedItems[i];
+                    var oldIndex = FlyoutMenuItems.IndexOf(item);
+
+                    if (oldIndex != -1 && oldIndex != i)
+                    {
+                        FlyoutMenuItems.Move(oldIndex, i);
+                    }
+                }
+            }
+            finally
+            {
+                // Use dispatcher to reset flag after UI updates complete
+                _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+                {
+                    _isSorting = false;
                 });
             }
         }
-
-        var sortedItems = DashboardSortOrder switch
-        {
-            DashboardSortOrder.ByStatus => desiredItems.OrderByDescending(x => x.IsEnabled).ThenBy(x => x.Label).ToList(),
-            _ => desiredItems.OrderBy(x => x.Label).ToList(),
-        };
-
-        for (int i = FlyoutMenuItems.Count - 1; i >= 0; i--)
-        {
-            if (!sortedItems.Contains(FlyoutMenuItems[i]))
-            {
-                FlyoutMenuItems.RemoveAt(i);
-            }
-        }
-
-        for (int i = 0; i < sortedItems.Count; i++)
-        {
-            var item = sortedItems[i];
-            var oldIndex = FlyoutMenuItems.IndexOf(item);
-
-            if (oldIndex < 0)
-            {
-                FlyoutMenuItems.Insert(i, item);
-            }
-            else if (oldIndex != i)
-            {
-                FlyoutMenuItems.Move(oldIndex, i);
-            }
-        }
     }
 
-    private void EnabledChangedOnUI(FlyoutMenuItem item)
+    private void EnabledChangedOnUI(ModuleListItem item)
     {
-        if (_coordinator.UpdateModuleEnabled(item.Tag, item.IsEnabled))
-        {
-            _coordinator.NotifyUserSettingsInteraction();
-        }
-    }
+        var flyoutItem = (FlyoutMenuItem)item;
+        var isEnabled = flyoutItem.IsEnabled;
 
-    private void ModuleEnabledChangedOnSettingsPage()
-    {
-        RefreshFlyoutMenuItems();
+        // Ignore toggle operations during sorting to prevent race conditions.
+        // Revert the toggle state since UI already changed due to TwoWay binding.
+        if (_isSorting)
+        {
+            flyoutItem.UpdateStatus(!isEnabled);
+            return;
+        }
+
+        _coordinator.UpdateModuleEnabled(flyoutItem.Tag, flyoutItem.IsEnabled);
+        SortFlyoutMenuItems();
     }
 }

src/settings-ui/QuickAccess.UI/ViewModels/FlyoutMenuItem.cs

@@ -22,21 +22,6 @@ public sealed class FlyoutMenuItem : ModuleListItem
         set => base.Tag = value;
     }
 
-    public override bool IsEnabled
-    {
-        get => base.IsEnabled;
-        set
-        {
-            if (base.IsEnabled != value)
-            {
-                base.IsEnabled = value;
-                EnabledChangedCallback?.Invoke(this);
-            }
-        }
-    }
-
-    public Action<FlyoutMenuItem>? EnabledChangedCallback { get; set; }
-
     public bool Visible
     {
         get => _visible;

src/settings-ui/Settings.UI.Controls/ModuleList/ModuleListItem.cs

@@ -2,6 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System; // For Action
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using System.Windows.Input;
@@ -17,6 +18,22 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
         private bool _isLocked;
         private object? _tag;
         private ICommand? _clickCommand;
+        private bool _isUpdating;
+
+        public Action<ModuleListItem>? EnabledChangedCallback { get; set; }
+
+        public void UpdateStatus(bool isEnabled)
+        {
+            _isUpdating = true;
+            try
+            {
+                IsEnabled = isEnabled;
+            }
+            finally
+            {
+                _isUpdating = false;
+            }
+        }
 
         public virtual string Label
         {
@@ -79,6 +96,11 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
                 {
                     _isEnabled = value;
                     OnPropertyChanged();
+
+                    if (!_isUpdating)
+                    {
+                        EnabledChangedCallback?.Invoke(this);
+                    }
                 }
             }
         }

src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessLauncher.cs

@@ -112,6 +112,13 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
                         eventHandle.Set();
                     }
 
+                    return true;
+                case ModuleType.LightSwitch:
+                    using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.LightSwitchToggleEvent()))
+                    {
+                        eventHandle.Set();
+                    }
+
                     return true;
                 default:
                     return false;

src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessViewModel.cs

@@ -64,6 +64,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             AddFlyoutMenuItem(ModuleType.EnvironmentVariables);
             AddFlyoutMenuItem(ModuleType.FancyZones);
             AddFlyoutMenuItem(ModuleType.Hosts);
+            AddFlyoutMenuItem(ModuleType.LightSwitch);
             AddFlyoutMenuItem(ModuleType.PowerLauncher);
             AddFlyoutMenuItem(ModuleType.PowerOCR);
             AddFlyoutMenuItem(ModuleType.RegistryPreview);
@@ -120,6 +121,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             {
                 ModuleType.ColorPicker => SettingsRepository<ColorPickerSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.ActivationShortcut.ToString(),
                 ModuleType.FancyZones => SettingsRepository<FancyZonesSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.FancyzonesEditorHotkey.Value.ToString(),
+                ModuleType.LightSwitch => SettingsRepository<LightSwitchSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.ToggleThemeHotkey.Value.ToString(),
                 ModuleType.PowerLauncher => SettingsRepository<PowerLauncherSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.OpenPowerLauncher.ToString(),
                 ModuleType.PowerOCR => SettingsRepository<PowerOcrSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.ActivationShortcut.ToString(),
                 ModuleType.Workspaces => SettingsRepository<WorkspacesSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.Hotkey.Value.ToString(),

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

@@ -34,21 +34,21 @@ public sealed class AdvancedPastePasteAsFileAction : Observable, IAdvancedPasteA
     public AdvancedPasteAdditionalAction PasteAsTxtFile
     {
         get => _pasteAsTxtFile;
-        init => Set(ref _pasteAsTxtFile, value);
+        init => Set(ref _pasteAsTxtFile, value ?? new());
     }
 
     [JsonPropertyName(PropertyNames.PasteAsPngFile)]
     public AdvancedPasteAdditionalAction PasteAsPngFile
     {
         get => _pasteAsPngFile;
-        init => Set(ref _pasteAsPngFile, value);
+        init => Set(ref _pasteAsPngFile, value ?? new());
     }
 
     [JsonPropertyName(PropertyNames.PasteAsHtmlFile)]
     public AdvancedPasteAdditionalAction PasteAsHtmlFile
     {
         get => _pasteAsHtmlFile;
-        init => Set(ref _pasteAsHtmlFile, value);
+        init => Set(ref _pasteAsHtmlFile, value ?? new());
     }
 
     [JsonIgnore]

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

@@ -93,11 +93,11 @@ namespace Microsoft.PowerToys.Settings.UI.Library
 
         [JsonPropertyName("custom-actions")]
         [CmdConfigureIgnoreAttribute]
-        public AdvancedPasteCustomActions CustomActions { get; init; }
+        public AdvancedPasteCustomActions CustomActions { get; set; }
 
         [JsonPropertyName("additional-actions")]
         [CmdConfigureIgnoreAttribute]
-        public AdvancedPasteAdditionalActions AdditionalActions { get; init; }
+        public AdvancedPasteAdditionalActions AdditionalActions { get; set; }
 
         [JsonPropertyName("paste-ai-configuration")]
         [CmdConfigureIgnoreAttribute]

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

@@ -32,14 +32,14 @@ public sealed class AdvancedPasteTranscodeAction : Observable, IAdvancedPasteAct
     public AdvancedPasteAdditionalAction TranscodeToMp3
     {
         get => _transcodeToMp3;
-        init => Set(ref _transcodeToMp3, value);
+        init => Set(ref _transcodeToMp3, value ?? new());
     }
 
     [JsonPropertyName(PropertyNames.TranscodeToMp4)]
     public AdvancedPasteAdditionalAction TranscodeToMp4
     {
         get => _transcodeToMp4;
-        init => Set(ref _transcodeToMp4, value);
+        init => Set(ref _transcodeToMp4, value ?? new());
     }
 
     [JsonIgnore]

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

@@ -22,11 +22,15 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         [JsonPropertyName("disable_wrap_during_drag")]
         public BoolProperty DisableWrapDuringDrag { get; set; }
 
+        [JsonPropertyName("wrap_mode")]
+        public IntProperty WrapMode { get; set; }
+
         public CursorWrapProperties()
         {
             ActivationShortcut = DefaultActivationShortcut;
             AutoActivate = new BoolProperty(false);
             DisableWrapDuringDrag = new BoolProperty(true);
+            WrapMode = new IntProperty(0); // 0=Both (default), 1=VerticalOnly, 2=HorizontalOnly
         }
     }
 }

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

@@ -47,7 +47,16 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         // This can be utilized in the future if the settings.json file is to be modified/deleted.
         public bool UpgradeSettingsConfiguration()
         {
-            return false;
+            bool settingsUpgraded = false;
+
+            // Add WrapMode property if it doesn't exist (for users upgrading from older versions)
+            if (Properties.WrapMode == null)
+            {
+                Properties.WrapMode = new IntProperty(0); // Default to Both
+                settingsUpgraded = true;
+            }
+
+            return settingsUpgraded;
         }
     }
 }

src/settings-ui/Settings.UI.Library/Helpers/ModuleHelper.cs

@@ -117,5 +117,47 @@ namespace Microsoft.PowerToys.Settings.UI.Library.Helpers
                 case ModuleType.GeneralSettings: generalSettingsConfig.EnableQuickAccess = isEnabled; break;
             }
         }
+
+        /// <summary>
+        /// Gets the module key name used in IPC messages and settings JSON.
+        /// These names match the JsonPropertyName attributes in EnabledModules class.
+        /// </summary>
+        public static string GetModuleKey(ModuleType moduleType)
+        {
+            return moduleType switch
+            {
+                ModuleType.AdvancedPaste => AdvancedPasteSettings.ModuleName,
+                ModuleType.AlwaysOnTop => AlwaysOnTopSettings.ModuleName,
+                ModuleType.Awake => AwakeSettings.ModuleName,
+                ModuleType.CmdPal => "CmdPal", // No dedicated settings class
+                ModuleType.ColorPicker => ColorPickerSettings.ModuleName,
+                ModuleType.CropAndLock => CropAndLockSettings.ModuleName,
+                ModuleType.CursorWrap => CursorWrapSettings.ModuleName,
+                ModuleType.EnvironmentVariables => EnvironmentVariablesSettings.ModuleName,
+                ModuleType.FancyZones => FancyZonesSettings.ModuleName,
+                ModuleType.FileLocksmith => FileLocksmithSettings.ModuleName,
+                ModuleType.FindMyMouse => FindMyMouseSettings.ModuleName,
+                ModuleType.Hosts => HostsSettings.ModuleName,
+                ModuleType.ImageResizer => ImageResizerSettings.ModuleName,
+                ModuleType.KeyboardManager => KeyboardManagerSettings.ModuleName,
+                ModuleType.LightSwitch => LightSwitchSettings.ModuleName,
+                ModuleType.MouseHighlighter => MouseHighlighterSettings.ModuleName,
+                ModuleType.MouseJump => MouseJumpSettings.ModuleName,
+                ModuleType.MousePointerCrosshairs => MousePointerCrosshairsSettings.ModuleName,
+                ModuleType.MouseWithoutBorders => MouseWithoutBordersSettings.ModuleName,
+                ModuleType.NewPlus => NewPlusSettings.ModuleName,
+                ModuleType.Peek => PeekSettings.ModuleName,
+                ModuleType.PowerRename => PowerRenameSettings.ModuleName,
+                ModuleType.PowerLauncher => PowerLauncherSettings.ModuleName,
+                ModuleType.PowerAccent => PowerAccentSettings.ModuleName,
+                ModuleType.RegistryPreview => RegistryPreviewSettings.ModuleName,
+                ModuleType.MeasureTool => MeasureToolSettings.ModuleName,
+                ModuleType.ShortcutGuide => ShortcutGuideSettings.ModuleName,
+                ModuleType.PowerOCR => PowerOcrSettings.ModuleName,
+                ModuleType.Workspaces => WorkspacesSettings.ModuleName,
+                ModuleType.ZoomIt => ZoomItSettings.ModuleName,
+                _ => moduleType.ToString(),
+            };
+        }
     }
 }

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

@@ -11,7 +11,7 @@ using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
-namespace Settings.UI.Library
+namespace Microsoft.PowerToys.Settings.UI.Library
 {
     public class LightSwitchSettings : BasePTModuleSettings, ISettingsConfig, ICloneable, IHotkeyConfig
     {

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

@@ -56,7 +56,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
     [JsonSerializable(typeof(HostsSettings))]
     [JsonSerializable(typeof(ImageResizerSettings))]
     [JsonSerializable(typeof(KeyboardManagerSettings))]
-    [JsonSerializable(typeof(SettingsUILibrary.LightSwitchSettings))]
+    [JsonSerializable(typeof(LightSwitchSettings))]
     [JsonSerializable(typeof(MeasureToolSettings))]
     [JsonSerializable(typeof(MouseHighlighterSettings))]
     [JsonSerializable(typeof(MouseJumpSettings))]