update

<!-- Enter a brief description/summary of your PR here. What does it
fix/what does it change/how was it tested (even manually, if necessary)?
-->
## Summary of the Pull Request
This pull request updates the tray icon context menu logic to better
reflect the state of the "Quick Access" feature. The menu now
dynamically updates its items and labels based on whether Quick Access
is enabled or disabled, improving clarity for users.

**Menu behavior improvements:**

* The tray icon menu now reloads itself when the Quick Access setting
changes, ensuring the menu always matches the current state.
* The "Settings" menu item label changes to "Settings\tLeft-click" when
Quick Access is disabled, providing clearer instructions to users.
[[1]](diffhunk://#diff-e5efbda4c356e159a6ca82a425db84438ab4014d1d90377b98a2eb6d9632d32dR176-R179)
[[2]](diffhunk://#diff-7139ecb2cf76e472c574a155268c19e919e2cce05d9d345c50c1f1bffc939e1aR198-R248)
* The Quick Access menu item is removed from the context menu when the
feature is disabled, preventing confusion.

**Internal state tracking:**

* Added a new variable `last_quick_access_state` to track the previous
Quick Access state and trigger menu reloads only when necessary.
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist

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

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

<img width="1537" height="312" alt="image"
src="https://github.com/user-attachments/assets/5d51f24e-ccb4-4973-afaa-8b64cc35db87"
/>

- When Quick Access is enabled
<img width="1601" height="201" alt="image"
src="https://github.com/user-attachments/assets/56366d10-bcec-4892-b2d2-f8213ad726aa"
/>

<!-- Describe how you validated the behavior. Add automated tests
wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed

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

@@ -103,7 +103,6 @@ ASYNCWINDOWPLACEMENT
 ASYNCWINDOWPOS
 atl
 ATRIOX
-ATX
 aumid
 authenticode
 AUTOBUDDY
@@ -298,7 +297,6 @@ cpcontrols
 cph
 cplusplus
 CPower
-cppcoreguidelines
 cpptools
 cppvsdbg
 cppwinrt
@@ -327,7 +325,7 @@ CURRENTDIR
 CURSORINFO
 cursorpos
 CURSORSHOWING
-CURSORWRAP
+cursorwrap
 customaction
 CUSTOMACTIONTEST
 CUSTOMFORMATPLACEHOLDER
@@ -888,6 +886,7 @@ Ldr
 LEFTALIGN
 LEFTSCROLLBAR
 LEFTTEXT
+leftclick
 LError
 LEVELID
 LExit
@@ -1013,6 +1012,7 @@ MENUITEMINFO
 MENUITEMINFOW
 MERGECOPY
 MERGEPAINT
+Metacharacter
 metadatamatters
 Metadatas
 metafile
@@ -1760,7 +1760,6 @@ SUBMODULEUPDATE
 subresource
 Superbar
 sut
-swe
 svchost
 SVGIn
 SVGIO

DATA_AND_PRIVACY.md

@@ -30,7 +30,11 @@ _If you want to find diagnostic data events in the source code, these two links
 - [C++ events](https://github.com/search?q=repo%3Amicrosoft%2FPowerToys+ProjectTelemetryPrivacyDataTag&type=code)
 
 ### General
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -43,6 +47,18 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.GeneralSettingsChanged</td>
     <td>Logs changes made to general settings within PowerToys.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.Install_Fail</td>
+    <td>Triggered when the PowerToys installation process encounters an error and fails to complete.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.Repair_Cancel</td>
+    <td>Triggered when a PowerToys repair operation is cancelled by the user before completion.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.Repair_Fail</td>
+    <td>Triggered when the PowerToys repair operation fails to complete successfully due to an error.</td>
+  </tr>
   <tr>
     <td>Microsoft.PowerToys.Runner_Launch</td>
     <td>Indicates when the PowerToys Runner is launched.</td>
@@ -59,6 +75,18 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.ScoobeStartedEvent</td>
     <td>Triggered when SCOOBE (Secondary Out-of-box experience) starts.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.ShortcutConflictControlClickedEvent</td>
+    <td>Triggered when a user clicks on the Shortcut Conflict Control button in the PowerToys Settings UI Dashboard.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.ShortcutConflictDetectedEvent</td>
+    <td>Triggered when keyboard shortcut conflicts are detected in the PowerToys Settings UI Dashboard.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.ShortcutConflictResolvedEvent</td>
+    <td>Triggered when a keyboard shortcut conflict is resolved in the PowerToys Settings UI.</td>
+  </tr>
   <tr>
     <td>Microsoft.PowerToys.TrayFlyoutActivatedEvent</td>
     <td>Indicates when the tray flyout menu is activated.</td>
@@ -67,6 +95,14 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.TrayFlyoutModuleRunEvent</td>
     <td>Logs when a utility from the tray flyout menu is run.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.UnInstall_Cancel</td>
+    <td>Triggered when the PowerToys uninstallation process is cancelled by the user before completion.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.UnInstall_Fail</td>
+    <td>Triggered when the PowerToys uninstallation process fails to complete successfully due to an error. </td>
+  </tr>
   <tr>
     <td>Microsoft.PowerToys.Uninstall_Success</td>
     <td>Logs when PowerToys is successfully uninstalled (who would do such a thing!).</td>
@@ -82,11 +118,19 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>
 
 ### OOBE (Out-of-box experience)
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.OobeModuleRunEvent</td>
+    <td>Triggered when a user clicks to run or launch a PowerToys module directly from the OOBE (out-of-box experience) interface.</td>
+  </tr>
   <tr>
     <td>Microsoft.PowerToys.OobeSectionEvent</td>
     <td>Occurs when OOBE is shown to the user.</td>
@@ -99,10 +143,18 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.OobeStartedEvent</td>
     <td>Indicates when the out-of-box experience has been initiated.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.OobeVariantAssignmentEvent</td>
+    <td>This event logs A/B testing assignments for experimental features, helping track which users are in control or alternate groups for feature experiments. </td>
+  </tr>
 </table>
 
 ### Advanced Paste
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -170,7 +222,11 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>
 
 ### Always on Top
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -190,7 +246,11 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>
 
 ### Awake
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -218,7 +278,11 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>
 
 ### Color Picker
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -235,18 +299,14 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.ColorPicker_Settings</td>
     <td>Triggered when the settings for the Color Picker are accessed or modified.</td>
   </tr>
-  <tr>
-    <td>Microsoft.PowerToys.ColorPickerCancelledEvent</td>
-    <td>Occurs when a color picking action is cancelled by the user.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.ColorPickerShowEvent</td>
-    <td>Triggered when the Color Picker UI is displayed on the screen.</td>
-  </tr>  
 </table>
 
 ### Command Not Found
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -259,10 +319,6 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.CmdNotFoundInstallEvent</td>
     <td>Triggered when a Command Not Found is installed.</td>
   </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdNotFoundInstanceCreatedEvent</td>
-    <td>Occurs when an instance of a Command Not Found is created.</td>
-  </tr>
   <tr>
     <td>Microsoft.PowerToys.CmdNotFoundUninstallEvent</td>
     <td>Triggered when Command Not Found is uninstalled after being previously installed.</td>
@@ -271,7 +327,11 @@ _If you want to find diagnostic data events in the source code, these two links
 
 ### Command Palette
 
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -335,7 +395,11 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>
 
 ### Crop And Lock
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -344,10 +408,26 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.CropAndLock_ActivateReparent</td>
     <td>Triggered when the cropping interface is activated for reparenting the cropped content.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.CropAndLock_ActivateScreenshot</td>
+    <td>Triggered when the screenshot mode is activated in Crop and Lock.</td>
+  </tr>
   <tr>
     <td>Microsoft.PowerToys.CropAndLock_ActivateThumbnail</td>
     <td>Occurs when the thumbnail view for cropped content is activated.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.CropAndLock_CreateReparentWindow</td>
+    <td>Triggered when a reparent window is created in Crop and Lock mode.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.CropAndLock_CreateScreenshotWindow</td>
+    <td>Triggered when a screenshot window is created in Crop and Lock mode.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.CropAndLock_CreateThumbnailWindow</td>
+    <td>Triggered when a thumbnail window is created in Crop and Lock mode.<-/td>
+  </tr>
   <tr>
     <td>Microsoft.PowerToys.CropAndLock_EnableCropAndLock</td>
     <td>Triggered when Crop and Lock is enabled.</td>
@@ -358,8 +438,28 @@ _If you want to find diagnostic data events in the source code, these two links
   </tr>  
 </table>
 
+### Cursor Wrap
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
+  <tr>
+    <th>Event Name</th>
+    <th>Description</th>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.CursorWrap_EnableCursorWrap</td>
+    <td>Triggered when Cursor Wrap is enabled or disabled.</td>
+  </tr>
+</table>
+
 ### Environment Variables
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -387,7 +487,11 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>
 
 ### FancyZones
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -404,6 +508,10 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.FancyZones_EnableFancyZones</td>
     <td>Occurs when FancyZones is enabled.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.FancyZones_Error</td>
+    <td>Triggered when an error occurs within the FancyZones module. This event logs critical errors to help diagnose and troubleshoot issues with FancyZones functionality, such as failures to set up Windows hooks or other system-level operations required for window management.</td>
+  </tr>
   <tr>
     <td>Microsoft.PowerToys.FancyZones_KeyboardSnapWindowToZone</td>
     <td>Triggered when a window is snapped to a zone using the keyboard.</td>
@@ -416,10 +524,6 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.FancyZones_MoveOrResizeStarted</td>
     <td>Triggered when a window move or resize action is initiated.</td>
   </tr>
-  <tr>
-    <td>Microsoft.PowerToys.FancyZones_MoveSizeEnd</td>
-    <td>Occurs when the moving or resizing of a window has ended.</td>
-  </tr>
   <tr>
     <td>Microsoft.PowerToys.FancyZones_OnKeyDown</td>
     <td>Triggered when a key is pressed down while interacting with zones.</td>
@@ -432,10 +536,6 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.FancyZones_Settings</td>
     <td>Triggered when FancyZones settings are accessed or modified.</td>
   </tr>
-  <tr>
-    <td>Microsoft.PowerToys.FancyZones_SettingsChanged</td>
-    <td>Occurs when there is a change in the FancyZones settings.</td>
-  </tr>
   <tr>
     <td>Microsoft.PowerToys.FancyZones_SnapNewWindowIntoZone</td>
     <td>Triggered when a new window is snapped into a zone.</td>
@@ -456,10 +556,50 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.FancyZones_CLICommand</td>
     <td>Triggered when a FancyZones CLI command is executed, logging the command name and success status.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.FancyZonesEditorStartEvent</td>
+    <td>Triggered when the FancyZones Editor application starts. This logs the initialization of the editor UI, which is used to create and configure custom zone layouts.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.FancyZonesEditorStartFinishEvent</td>
+    <td>Triggered when the FancyZones Editor has completed loading and is ready for user interaction.</td>
+  </tr>
+</table>
+
+### File Locksmith
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
+  <tr>
+    <th>Event Name</th>
+    <th>Description</th>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.FileLocksmith_EnableFileLocksmith</td>
+    <td>Triggered when File Locksmith is enabled.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.FileLocksmith_Invoked</td>
+    <td>Occurs when File Locksmith is invoked.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.FileLocksmith_InvokedRet</td>
+    <td>Triggered when File Locksmith invocation returns a result.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.FileLocksmith_QueryContextMenuError</td>
+    <td>Occurs when there is an error querying the context menu for File Locksmith.</td>
+  </tr>
 </table>
 
 ### FileExplorerAddOns
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -496,6 +636,10 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.MarkdownFilePreviewed</td>
     <td>Triggered when a Markdown file is previewed in File Explorer.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.MarkdownFilePreviewError</td>
+    <td>Triggered when there is an error previewing a Markdown file in File Explorer.</td>
+  </tr>
   <tr>
     <td>Microsoft.PowerToys.PdfFileHandlerLoaded</td>
     <td>Occurs when a PDF file handler is loaded.</td>
@@ -504,6 +648,10 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.PdfFilePreviewed</td>
     <td>Triggered when a PDF file is previewed in File Explorer.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.PdfFilePreviewError</td>
+    <td>Triggered when there is an error previewing a PDF file in File Explorer.</td>
+  </tr>
   <tr>
     <td>Microsoft.PowerToys.PowerPreview_Enabled</td>
     <td>Occurs when preview is enabled.</td>
@@ -520,6 +668,10 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.PowerPreview_TweakUISettings_InitSet__ErrorLoadingFile</td>
     <td>Triggered when there is an error loading a file during Tweak UI settings initialization.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.PowerPreview_TweakUISettings_SetConfig__InvalidJSONGiven</td>
+    <td>Triggered when invalid JSON is provided to the Power Preview settings configuration</td>
+  </tr>
   <tr>
     <td>Microsoft.PowerToys.PowerPreview_TweakUISettings_SuccessfullyUpdatedSettings</td>
     <td>Occurs when the Tweak UI settings for Power Preview are successfully updated.</td>
@@ -528,6 +680,10 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.QoiFilePreviewed</td>
     <td>Triggered when a QOI file is previewed in File Explorer.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.QoiFilePreviewError</td>
+    <td>Triggered when there is an error previewing a QOI (Quite OK Image) file in File Explorer.</td>
+  </tr>
   <tr>
     <td>Microsoft.PowerToys.SvgFileHandlerLoaded</td>
     <td>Occurs when an SVG file handler is loaded.</td>
@@ -542,32 +698,12 @@ _If you want to find diagnostic data events in the source code, these two links
   </tr>
 </table>
 
-### File Locksmith
-<table style="width:100%">
-  <tr>
-    <th>Event Name</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.FileLocksmith_EnableFileLocksmith</td>
-    <td>Triggered when File Locksmith is enabled.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.FileLocksmith_Invoked</td>
-    <td>Occurs when File Locksmith is invoked.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.FileLocksmith_InvokedRet</td>
-    <td>Triggered when File Locksmith invocation returns a result.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.FileLocksmith_QueryContextMenuError</td>
-    <td>Occurs when there is an error querying the context menu for File Locksmith.</td>
-  </tr>
-</table>
-
 ### Find My Mouse
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -583,7 +719,11 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>
 
 ### Hosts File Editor
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -600,10 +740,22 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.HostsFileEditorOpenedEvent</td>
     <td>Fires when Hosts File Editor is opened.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.HostEditorStartEvent</td>
+    <td>Triggered when the Hosts File Editor application starts. This logs the initialization of the Hosts File Editor UI with a timestamp.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.HostEditorStartFinishEvent</td>
+    <td>Triggered when the Hosts File Editor has completed loading and is ready for user interaction.</td>
+  </tr>
 </table>
 
 ### Image Resizer
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -620,10 +772,18 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.ImageResizer_InvokedRet</td>
     <td>Fires when the Image Resizer operation is completed and returns a result.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.ImageResizer_QueryContextMenuError</td>
+    <td>Triggered when there is an error querying the context menu for Image Resizer.</td>
+  </tr>
 </table>
 
 ### Keyboard Manager
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -636,10 +796,22 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.KeyboardManager_AppSpecificShortcutRemapCount</td>
     <td>Logs the number of application-specific shortcut remaps configured by the user.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.KeyboardManager_AppSpecificShortcutToKeyRemapInvoked</td>
+    <td>Logs each instance when an application-specific shortcut-to-key remap is used.</td>
+  </tr>
   <tr>
     <td>Microsoft.PowerToys.KeyboardManager_AppSpecificShortcutToShortcutRemapInvoked</td>
     <td>Logs each instance when an application-specific shortcut-to-shortcut remap is used.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.KeyboardManager_Error</td>
+    <td>Triggered when an error occurs in Keyboard Manager. This logs the error code, error message, and the method name where the error occurred.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.KeyboardManager_ErrorSendingKeyAndShortcutRemapLoadedConfiguration</td>
+    <td>Triggered when there is an error sending remapping configuration telemetry. This occurs when Keyboard Manager fails to report the loaded key and shortcut remap configurations</td>
+  </tr>
   <tr>
     <td>Microsoft.PowerToys.KeyboardManager_DailyAppSpecificShortcutToKeyRemapInvoked</td>
     <td>Logs the daily count of application-specific shortcut-to-key remaps executed by the user.</td>
@@ -703,7 +875,11 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>
 
 ### Light Switch
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -727,7 +903,11 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>
 
 ### Mouse Highlighter
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -740,10 +920,18 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.MouseHighlighter_StartHighlightingSession</td>
     <td>Occurs when a new highlighting session is started.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.MouseHighlighter_StartSpotlightSession</td>
+    <td>Triggered when a spotlight session is started in Mouse Highlighter. This occurs when the user activates the spotlight mode.</td>
+  </tr>
 </table>
 
 ### Mouse Jump
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -767,7 +955,11 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>
 
 ### Mouse Pointer Crosshairs
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -783,7 +975,11 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>
 
 ### Mouse Without Borders
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -835,7 +1031,11 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>
 
 ### New+
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -867,7 +1067,11 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>
 
 ### Peek
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -900,10 +1104,18 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.Peek_Settings</td>
     <td>Triggered when the settings for Peek are modified.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.Peek_SpaceModeEnabled</td>
+    <td>Triggered when the Space key activation mode is enabled or disabled in Peek</td>
+  </tr>
 </table>
 
 ### PowerRename
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -935,7 +1147,11 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>
 
 ### PowerToys Run
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -976,14 +1192,14 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.RunPluginsSettingsEvent</td>
     <td>Triggered when the settings for PowerToys Run plugins are accessed or modified.</td>
   </tr>
-  <tr>
-    <td>Microsoft.PowerToys.WindowWalker_EnableWindowWalker</td>
-    <td>Triggered when the Window Walker plugin is enabled.</td>
-  </tr>
 </table>
 
 ### Quick Accent
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -999,7 +1215,11 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>
 
 ### Registry Preview
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -1012,10 +1232,22 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.RegistryPreview_EnableRegistryPreview</td>
     <td>Occurs when Registry Preview is enabled.</td>
   </tr>
+  <tr>
+    <td>Microsoft.PowerToys.RegistryPreviewEditorStartEvent</td>
+    <td>Triggered when the Registry Preview application starts. This logs the initialization of the Registry Preview UI with a timestamp.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.RegistryPreviewEditorStartFinishEvent</td>
+    <td>Triggered when the Registry Preview application has completed loading and is ready for user interaction.</td>
+  </tr>
 </table>
 
 ### Screen Ruler
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -1035,7 +1267,11 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>
 
 ### Shortcut Guide
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -1051,7 +1287,11 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>
 
 ### Text Extractor
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
@@ -1075,15 +1315,15 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>
 
 ### Workspaces
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>
   </tr>
-  <tr>
-    <td>Microsoft.PowerToys.Projects_CLIUsage</td>
-    <td>Logs usage of command-line arguments for launching apps.</td>
-  </tr>
   <tr>
     <td>Microsoft.PowerToys.Workspaces_CreateEvent</td>
     <td>Triggered when a new workspace is created.</td>
@@ -1105,13 +1345,21 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Triggered when a workspace is launched.</td>
   </tr>
   <tr>
-    <td>Microsoft.PowerToys.Workspaces_Settings</td>
-    <td>Logs changes to workspaces settings.</td>
+    <td>Microsoft.PowerToys.WorkspacesEditorStartEvent</td>
+    <td>Triggered when the Workspaces Editor application starts. This logs the initialization of the Workspaces Editor UI with a timestamp.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.WorkspacesEditorStartFinishEvent</td>
+    <td>Triggered when the Workspaces Editor has completed loading and is ready for user interaction.</td>
   </tr>
 </table>
 
 ### ZoomIt
-<table style="width:100%">
+<table style="width:100%; table-layout:fixed">
+  <colgroup>
+    <col style="width:40%">
+    <col style="width:60%">
+  </colgroup>
   <tr>
     <th>Event Name</th>
     <th>Description</th>

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?>

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/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AppListItem.cs

@@ -98,18 +98,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 +130,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 +174,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/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/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;
@@ -293,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);
     }
 }
@@ -310,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;
@@ -357,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) {
@@ -389,7 +435,7 @@ void set_tray_icon_theme_adaptive(bool theme_adaptive)
 
     if (theme_adaptive)
     {
-        icon = get_icon(theme_listener.AppTheme);
+        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");

src/settings-ui/Settings.UI.Library/AsyncSettingsRepository`1.cs

@@ -1,259 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-
-namespace Microsoft.PowerToys.Settings.UI.Library
-{
-    /// <summary>
-    /// Async settings repository implementation with caching and thread-safe access.
-    /// Provides non-blocking settings operations suitable for UI applications.
-    /// </summary>
-    /// <typeparam name="T">The settings type.</typeparam>
-    public sealed class AsyncSettingsRepository<T> : IAsyncSettingsRepository<T>, IDisposable
-        where T : class, ISettingsConfig, new()
-    {
-        private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
-        private readonly ISettingsUtils _settingsUtils;
-        private readonly string _moduleName;
-        private readonly string _fileName;
-
-        private T _cachedSettings;
-        private FileSystemWatcher _watcher;
-        private bool _isDisposed;
-
-        /// <inheritdoc/>
-        public event Action<T> SettingsChanged;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AsyncSettingsRepository{T}"/> class.
-        /// </summary>
-        /// <param name="settingsUtils">The settings utilities instance.</param>
-        /// <param name="fileName">The settings file name.</param>
-        public AsyncSettingsRepository(ISettingsUtils settingsUtils, string fileName = "settings.json")
-        {
-            _settingsUtils = settingsUtils ?? throw new ArgumentNullException(nameof(settingsUtils));
-            _fileName = fileName;
-
-            // Get module name from type
-            var settingsItem = new T();
-            _moduleName = settingsItem.GetModuleName();
-
-            InitializeWatcher();
-        }
-
-        /// <inheritdoc/>
-        public T SettingsConfig
-        {
-            get
-            {
-                if (_cachedSettings == null)
-                {
-                    _semaphore.Wait();
-                    try
-                    {
-                        if (_cachedSettings == null)
-                        {
-                            _cachedSettings = LoadSettingsInternal();
-                        }
-                    }
-                    finally
-                    {
-                        _semaphore.Release();
-                    }
-                }
-
-                return _cachedSettings;
-            }
-
-            private set => _cachedSettings = value;
-        }
-
-        /// <inheritdoc/>
-        public async ValueTask<T> GetSettingsAsync(bool forceRefresh = false, CancellationToken cancellationToken = default)
-        {
-            if (!forceRefresh && _cachedSettings != null)
-            {
-                return _cachedSettings;
-            }
-
-            await _semaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
-            try
-            {
-                if (!forceRefresh && _cachedSettings != null)
-                {
-                    return _cachedSettings;
-                }
-
-                _cachedSettings = await Task.Run(() => LoadSettingsInternal(), cancellationToken).ConfigureAwait(false);
-                return _cachedSettings;
-            }
-            finally
-            {
-                _semaphore.Release();
-            }
-        }
-
-        /// <inheritdoc/>
-        public async ValueTask SaveSettingsAsync(T settings, CancellationToken cancellationToken = default)
-        {
-            ArgumentNullException.ThrowIfNull(settings);
-
-            await _semaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
-            try
-            {
-                // Temporarily stop watching to avoid self-triggered events
-                StopWatching();
-
-                await Task.Run(
-                    () => _settingsUtils.SaveSettings(settings.ToJsonString(), _moduleName, _fileName),
-                    cancellationToken).ConfigureAwait(false);
-
-                _cachedSettings = settings;
-            }
-            finally
-            {
-                StartWatching();
-                _semaphore.Release();
-            }
-        }
-
-        /// <inheritdoc/>
-        public bool ReloadSettings()
-        {
-            _semaphore.Wait();
-            try
-            {
-                var newSettings = LoadSettingsInternal();
-                if (newSettings != null)
-                {
-                    _cachedSettings = newSettings;
-                    return true;
-                }
-
-                return false;
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError($"Failed to reload settings for {_moduleName}", ex);
-                return false;
-            }
-            finally
-            {
-                _semaphore.Release();
-            }
-        }
-
-        /// <inheritdoc/>
-        public async ValueTask<bool> ReloadSettingsAsync(CancellationToken cancellationToken = default)
-        {
-            await _semaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
-            try
-            {
-                var newSettings = await Task.Run(() => LoadSettingsInternal(), cancellationToken).ConfigureAwait(false);
-                if (newSettings != null)
-                {
-                    _cachedSettings = newSettings;
-                    return true;
-                }
-
-                return false;
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError($"Failed to reload settings for {_moduleName}", ex);
-                return false;
-            }
-            finally
-            {
-                _semaphore.Release();
-            }
-        }
-
-        /// <inheritdoc/>
-        public void StopWatching()
-        {
-            if (_watcher != null)
-            {
-                _watcher.EnableRaisingEvents = false;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void StartWatching()
-        {
-            if (_watcher != null)
-            {
-                _watcher.EnableRaisingEvents = true;
-            }
-        }
-
-        private T LoadSettingsInternal()
-        {
-            try
-            {
-                return _settingsUtils.GetSettingsOrDefault<T>(_moduleName, _fileName);
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError($"Failed to load settings for {_moduleName}", ex);
-                return new T();
-            }
-        }
-
-        private void InitializeWatcher()
-        {
-            try
-            {
-                var filePath = _settingsUtils.GetSettingsFilePath(_moduleName, _fileName);
-                var directory = Path.GetDirectoryName(filePath);
-                var fileName = Path.GetFileName(filePath);
-
-                if (!Directory.Exists(directory))
-                {
-                    Directory.CreateDirectory(directory);
-                }
-
-                _watcher = new FileSystemWatcher(directory, fileName);
-                _watcher.NotifyFilter = NotifyFilters.LastWrite;
-                _watcher.Changed += OnWatcherChanged;
-                _watcher.EnableRaisingEvents = true;
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError($"Failed to initialize settings watcher for {typeof(T).Name}", ex);
-            }
-        }
-
-        private async void OnWatcherChanged(object sender, FileSystemEventArgs e)
-        {
-            // Wait a bit for the file write to complete and retry if needed
-            for (int i = 0; i < 5; i++)
-            {
-                await Task.Delay(100).ConfigureAwait(false);
-                if (await ReloadSettingsAsync().ConfigureAwait(false))
-                {
-                    SettingsChanged?.Invoke(_cachedSettings);
-                    return;
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            if (!_isDisposed)
-            {
-                _watcher?.Dispose();
-                _semaphore?.Dispose();
-                _isDisposed = true;
-            }
-        }
-    }
-}

src/settings-ui/Settings.UI.Library/Interfaces/IAsyncSettingsRepository`1.cs

@@ -1,69 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Microsoft.PowerToys.Settings.UI.Library.Interfaces
-{
-    /// <summary>
-    /// Interface for asynchronous settings repository operations.
-    /// Provides non-blocking access to settings with caching support.
-    /// </summary>
-    /// <typeparam name="T">The settings type.</typeparam>
-    public interface IAsyncSettingsRepository<T>
-        where T : class, ISettingsConfig, new()
-    {
-        /// <summary>
-        /// Occurs when the settings have been externally changed (e.g., by another process).
-        /// </summary>
-        event Action<T> SettingsChanged;
-
-        /// <summary>
-        /// Gets the current cached settings synchronously.
-        /// Returns the cached value immediately, or loads if not cached.
-        /// </summary>
-        T SettingsConfig { get; }
-
-        /// <summary>
-        /// Gets the settings asynchronously with optional refresh from disk.
-        /// </summary>
-        /// <param name="forceRefresh">If true, bypasses cache and reads from disk.</param>
-        /// <param name="cancellationToken">Cancellation token for the operation.</param>
-        /// <returns>The settings object.</returns>
-        ValueTask<T> GetSettingsAsync(bool forceRefresh = false, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Saves the settings asynchronously.
-        /// </summary>
-        /// <param name="settings">The settings to save.</param>
-        /// <param name="cancellationToken">Cancellation token for the operation.</param>
-        /// <returns>A task representing the save operation.</returns>
-        ValueTask SaveSettingsAsync(T settings, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Reloads the settings from disk, updating the cache.
-        /// </summary>
-        /// <returns>True if the reload was successful.</returns>
-        bool ReloadSettings();
-
-        /// <summary>
-        /// Reloads the settings from disk asynchronously, updating the cache.
-        /// </summary>
-        /// <param name="cancellationToken">Cancellation token for the operation.</param>
-        /// <returns>True if the reload was successful.</returns>
-        ValueTask<bool> ReloadSettingsAsync(CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Stops watching for external file changes.
-        /// </summary>
-        void StopWatching();
-
-        /// <summary>
-        /// Starts watching for external file changes.
-        /// </summary>
-        void StartWatching();
-    }
-}

src/settings-ui/Settings.UI.Library/Interfaces/ISettingsUtils.cs

@@ -1,62 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.PowerToys.Settings.UI.Library.Interfaces
-{
-    /// <summary>
-    /// Interface for settings utility operations to enable dependency injection and testability.
-    /// </summary>
-    public interface ISettingsUtils
-    {
-        /// <summary>
-        /// Checks if a settings file exists.
-        /// </summary>
-        /// <param name="powertoy">The module name.</param>
-        /// <param name="fileName">The settings file name.</param>
-        /// <returns>True if the settings file exists.</returns>
-        bool SettingsExists(string powertoy = "", string fileName = "settings.json");
-
-        /// <summary>
-        /// Deletes settings for the specified module.
-        /// </summary>
-        /// <param name="powertoy">The module name.</param>
-        void DeleteSettings(string powertoy = "");
-
-        /// <summary>
-        /// Gets settings for the specified module.
-        /// </summary>
-        /// <typeparam name="T">The settings type.</typeparam>
-        /// <param name="powertoy">The module name.</param>
-        /// <param name="fileName">The settings file name.</param>
-        /// <returns>The deserialized settings object.</returns>
-        T GetSettings<T>(string powertoy = "", string fileName = "settings.json")
-            where T : ISettingsConfig, new();
-
-        /// <summary>
-        /// Gets settings for the specified module, or returns default if not found.
-        /// </summary>
-        /// <typeparam name="T">The settings type.</typeparam>
-        /// <param name="powertoy">The module name.</param>
-        /// <param name="fileName">The settings file name.</param>
-        /// <returns>The deserialized settings object or default.</returns>
-        T GetSettingsOrDefault<T>(string powertoy = "", string fileName = "settings.json")
-            where T : ISettingsConfig, new();
-
-        /// <summary>
-        /// Saves settings to a JSON file.
-        /// </summary>
-        /// <param name="jsonSettings">The JSON settings string.</param>
-        /// <param name="powertoy">The module name.</param>
-        /// <param name="fileName">The settings file name.</param>
-        void SaveSettings(string jsonSettings, string powertoy = "", string fileName = "settings.json");
-
-        /// <summary>
-        /// Gets the file path to the settings file.
-        /// </summary>
-        /// <param name="powertoy">The module name.</param>
-        /// <param name="fileName">The settings file name.</param>
-        /// <returns>The full path to the settings file.</returns>
-        string GetSettingsFilePath(string powertoy = "", string fileName = "settings.json");
-    }
-}

src/settings-ui/Settings.UI.Library/SettingsRepository`1.cs

@@ -5,7 +5,6 @@
 using System;
 using System.IO;
 using System.Threading;
-using System.Threading.Tasks;
 using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 
@@ -78,12 +77,12 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             }
         }
 
-        private async void Watcher_Changed(object sender, FileSystemEventArgs e)
+        private void Watcher_Changed(object sender, FileSystemEventArgs e)
         {
             // Wait a bit for the file write to complete and retry if needed
             for (int i = 0; i < 5; i++)
             {
-                await Task.Delay(100).ConfigureAwait(false);
+                Thread.Sleep(100);
                 if (ReloadSettings())
                 {
                     SettingsChanged?.Invoke(SettingsConfig);

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

@@ -16,7 +16,7 @@ using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 namespace Microsoft.PowerToys.Settings.UI.Library
 {
     // Some functions are marked as virtual to allow mocking in unit tests.
-    public class SettingsUtils : ISettingsUtils
+    public class SettingsUtils
     {
         public const string DefaultFileName = "settings.json";
         private const string DefaultModuleName = "";

src/settings-ui/Settings.UI/Messages/BackupRestoreCompletedMessage.cs

@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using CommunityToolkit.Mvvm.Messaging.Messages;
-
-namespace Microsoft.PowerToys.Settings.UI.Messages
-{
-    /// <summary>
-    /// Message sent when backup/restore operations complete.
-    /// </summary>
-    public sealed class BackupRestoreCompletedMessage : ValueChangedMessage<BackupRestoreCompletedMessage.ResultData>
-    {
-        public BackupRestoreCompletedMessage(bool success, string message, bool isBackup)
-            : base(new ResultData(success, message, isBackup))
-        {
-        }
-
-        public record ResultData(bool Success, string Message, bool IsBackup);
-    }
-}

src/settings-ui/Settings.UI/Messages/GeneralSettingsUpdatedMessage.cs

@@ -1,20 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using CommunityToolkit.Mvvm.Messaging.Messages;
-using Microsoft.PowerToys.Settings.UI.Library;
-
-namespace Microsoft.PowerToys.Settings.UI.Messages
-{
-    /// <summary>
-    /// Message sent when general settings are updated.
-    /// </summary>
-    public sealed class GeneralSettingsUpdatedMessage : ValueChangedMessage<GeneralSettings>
-    {
-        public GeneralSettingsUpdatedMessage(GeneralSettings settings)
-            : base(settings)
-        {
-        }
-    }
-}

src/settings-ui/Settings.UI/Messages/HotkeyConflictDetectedMessage.cs

@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using CommunityToolkit.Mvvm.Messaging.Messages;
-
-namespace Microsoft.PowerToys.Settings.UI.Messages
-{
-    /// <summary>
-    /// Message sent when hotkey conflicts are detected.
-    /// </summary>
-    public sealed class HotkeyConflictDetectedMessage : ValueChangedMessage<HotkeyConflictDetectedMessage.ConflictData>
-    {
-        public HotkeyConflictDetectedMessage(string moduleName, string hotkeyDescription, bool isSystemConflict)
-            : base(new ConflictData(moduleName, hotkeyDescription, isSystemConflict))
-        {
-        }
-
-        public record ConflictData(string ModuleName, string HotkeyDescription, bool IsSystemConflict);
-    }
-}

src/settings-ui/Settings.UI/Messages/IPCMessageReceivedMessage.cs

@@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using CommunityToolkit.Mvvm.Messaging.Messages;
-
-namespace Microsoft.PowerToys.Settings.UI.Messages
-{
-    /// <summary>
-    /// Message sent when an IPC message is received from the PowerToys runner.
-    /// </summary>
-    public sealed class IPCMessageReceivedMessage : ValueChangedMessage<string>
-    {
-        public IPCMessageReceivedMessage(string message)
-            : base(message)
-        {
-        }
-    }
-}

src/settings-ui/Settings.UI/Messages/ModuleEnabledChangedMessage.cs

@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using CommunityToolkit.Mvvm.Messaging.Messages;
-
-namespace Microsoft.PowerToys.Settings.UI.Messages
-{
-    /// <summary>
-    /// Message sent when a module's enabled state changes.
-    /// </summary>
-    public sealed class ModuleEnabledChangedMessage : ValueChangedMessage<ModuleEnabledChangedMessage.ModuleStateData>
-    {
-        public ModuleEnabledChangedMessage(string moduleName, bool isEnabled)
-            : base(new ModuleStateData(moduleName, isEnabled))
-        {
-        }
-
-        public record ModuleStateData(string ModuleName, bool IsEnabled);
-    }
-}

src/settings-ui/Settings.UI/Messages/NavigateToPageMessage.cs

@@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using CommunityToolkit.Mvvm.Messaging.Messages;
-
-namespace Microsoft.PowerToys.Settings.UI.Messages
-{
-    /// <summary>
-    /// Message sent to request navigation to a specific page.
-    /// </summary>
-    public sealed class NavigateToPageMessage : ValueChangedMessage<System.Type>
-    {
-        public NavigateToPageMessage(System.Type pageType)
-            : base(pageType)
-        {
-        }
-    }
-}

src/settings-ui/Settings.UI/Messages/RestartRequestedMessage.cs

@@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.PowerToys.Settings.UI.Messages
-{
-    /// <summary>
-    /// Message sent to request a restart of PowerToys.
-    /// </summary>
-    public sealed class RestartRequestedMessage
-    {
-        public bool MaintainElevation { get; }
-
-        public RestartRequestedMessage(bool maintainElevation = true)
-        {
-            MaintainElevation = maintainElevation;
-        }
-    }
-}

src/settings-ui/Settings.UI/Messages/SettingsSavedMessage.cs

@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using CommunityToolkit.Mvvm.Messaging.Messages;
-
-namespace Microsoft.PowerToys.Settings.UI.Messages
-{
-    /// <summary>
-    /// Message sent when settings are saved.
-    /// </summary>
-    public sealed class SettingsSavedMessage : ValueChangedMessage<SettingsSavedMessage.SettingsSaveData>
-    {
-        public SettingsSavedMessage(string moduleName)
-            : base(new SettingsSaveData(moduleName))
-        {
-        }
-
-        public record SettingsSaveData(string ModuleName);
-    }
-}

src/settings-ui/Settings.UI/Messages/ThemeChangedMessage.cs

@@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using CommunityToolkit.Mvvm.Messaging.Messages;
-
-namespace Microsoft.PowerToys.Settings.UI.Messages
-{
-    /// <summary>
-    /// Message sent when the application theme changes.
-    /// </summary>
-    public sealed class ThemeChangedMessage : ValueChangedMessage<string>
-    {
-        public ThemeChangedMessage(string themeName)
-            : base(themeName)
-        {
-        }
-    }
-}

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

@@ -74,9 +74,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView" />
-		<PackageReference Include="CommunityToolkit.Mvvm" />
 		<PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
 		<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" />
 		<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" />
 		<PackageReference Include="CommunityToolkit.WinUI.Animations" />

src/settings-ui/Settings.UI/Services/INavigationService.cs

@@ -1,131 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media.Animation;
-using Microsoft.UI.Xaml.Navigation;
-
-namespace Microsoft.PowerToys.Settings.UI.Services
-{
-    /// <summary>
-    /// Interface for navigation services to enable testability and abstraction
-    /// from the static NavigationService class.
-    /// </summary>
-    public interface INavigationService
-    {
-        /// <summary>
-        /// Occurs when navigation has completed.
-        /// </summary>
-        event NavigatedEventHandler Navigated;
-
-        /// <summary>
-        /// Occurs when navigation has failed.
-        /// </summary>
-        event NavigationFailedEventHandler NavigationFailed;
-
-        /// <summary>
-        /// Gets or sets the navigation frame.
-        /// </summary>
-        Frame Frame { get; set; }
-
-        /// <summary>
-        /// Gets a value indicating whether navigation can go back.
-        /// </summary>
-        bool CanGoBack { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether navigation can go forward.
-        /// </summary>
-        bool CanGoForward { get; }
-
-        /// <summary>
-        /// Navigates back in the navigation stack.
-        /// </summary>
-        /// <returns>True if navigation was successful.</returns>
-        bool GoBack();
-
-        /// <summary>
-        /// Navigates forward in the navigation stack.
-        /// </summary>
-        void GoForward();
-
-        /// <summary>
-        /// Navigates to the specified page type.
-        /// </summary>
-        /// <param name="pageType">The type of page to navigate to.</param>
-        /// <param name="parameter">Optional navigation parameter.</param>
-        /// <param name="infoOverride">Optional navigation transition override.</param>
-        /// <returns>True if navigation was successful.</returns>
-        bool Navigate(Type pageType, object parameter = null, NavigationTransitionInfo infoOverride = null);
-
-        /// <summary>
-        /// Navigates to the specified page type.
-        /// </summary>
-        /// <typeparam name="T">The type of page to navigate to.</typeparam>
-        /// <param name="parameter">Optional navigation parameter.</param>
-        /// <param name="infoOverride">Optional navigation transition override.</param>
-        /// <returns>True if navigation was successful.</returns>
-        bool Navigate<T>(object parameter = null, NavigationTransitionInfo infoOverride = null)
-            where T : Page;
-
-        /// <summary>
-        /// Ensures a page of the specified type is selected.
-        /// </summary>
-        /// <param name="pageType">The type of page to ensure is selected.</param>
-        void EnsurePageIsSelected(Type pageType);
-    }
-
-    /// <summary>
-    /// Wrapper around the static NavigationService to implement INavigationService.
-    /// Allows for gradual migration and testability.
-    /// </summary>
-    public class NavigationServiceWrapper : INavigationService
-    {
-        /// <inheritdoc/>
-        public event NavigatedEventHandler Navigated
-        {
-            add => NavigationService.Navigated += value;
-            remove => NavigationService.Navigated -= value;
-        }
-
-        /// <inheritdoc/>
-        public event NavigationFailedEventHandler NavigationFailed
-        {
-            add => NavigationService.NavigationFailed += value;
-            remove => NavigationService.NavigationFailed -= value;
-        }
-
-        /// <inheritdoc/>
-        public Frame Frame
-        {
-            get => NavigationService.Frame;
-            set => NavigationService.Frame = value;
-        }
-
-        /// <inheritdoc/>
-        public bool CanGoBack => NavigationService.CanGoBack;
-
-        /// <inheritdoc/>
-        public bool CanGoForward => NavigationService.CanGoForward;
-
-        /// <inheritdoc/>
-        public bool GoBack() => NavigationService.GoBack();
-
-        /// <inheritdoc/>
-        public void GoForward() => NavigationService.GoForward();
-
-        /// <inheritdoc/>
-        public bool Navigate(Type pageType, object parameter = null, NavigationTransitionInfo infoOverride = null)
-            => NavigationService.Navigate(pageType, parameter, infoOverride);
-
-        /// <inheritdoc/>
-        public bool Navigate<T>(object parameter = null, NavigationTransitionInfo infoOverride = null)
-            where T : Page
-            => NavigationService.Navigate<T>(parameter, infoOverride);
-
-        /// <inheritdoc/>
-        public void EnsurePageIsSelected(Type pageType) => NavigationService.EnsurePageIsSelected(pageType);
-    }
-}

src/settings-ui/Settings.UI/Services/ServiceCollectionExtensions.cs

@@ -1,73 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-using Microsoft.PowerToys.Settings.UI.ViewModels;
-
-namespace Microsoft.PowerToys.Settings.UI.Services
-{
-    /// <summary>
-    /// Extension methods for configuring services in the dependency injection container.
-    /// </summary>
-    public static class ServiceCollectionExtensions
-    {
-        /// <summary>
-        /// Adds core Settings UI services to the service collection.
-        /// </summary>
-        /// <param name="services">The service collection.</param>
-        /// <returns>The service collection for chaining.</returns>
-        public static IServiceCollection AddSettingsServices(this IServiceCollection services)
-        {
-            // Register singleton services
-            services.AddSingleton<ISettingsUtils>(SettingsUtils.Default);
-            services.AddSingleton<ThemeService>(App.ThemeService);
-            services.AddSingleton<INavigationService, NavigationServiceWrapper>();
-
-            // Register settings repositories as singletons
-            services.AddSingleton(sp =>
-            {
-                var settingsUtils = sp.GetRequiredService<ISettingsUtils>();
-                return SettingsRepository<GeneralSettings>.GetInstance((SettingsUtils)settingsUtils);
-            });
-
-            return services;
-        }
-
-        /// <summary>
-        /// Adds ViewModel registrations to the service collection.
-        /// ViewModels are registered as transient to create new instances per request.
-        /// </summary>
-        /// <param name="services">The service collection.</param>
-        /// <returns>The service collection for chaining.</returns>
-        public static IServiceCollection AddViewModels(this IServiceCollection services)
-        {
-            // Register ViewModels as transient for fresh instances
-            // These can be migrated incrementally as each ViewModel is updated
-
-            // Tier 1 ViewModels (low complexity) - to be migrated first
-            // services.AddTransient<FileLocksmithViewModel>();
-            // services.AddTransient<RegistryPreviewViewModel>();
-            // services.AddTransient<CropAndLockViewModel>();
-
-            // Tier 2 ViewModels (medium complexity)
-            // services.AddTransient<ColorPickerViewModel>();
-            // services.AddTransient<AlwaysOnTopViewModel>();
-            // services.AddTransient<PowerOcrViewModel>();
-            // services.AddTransient<HostsViewModel>();
-
-            // Tier 3 ViewModels (medium-high complexity)
-            // services.AddTransient<FancyZonesViewModel>();
-            // services.AddTransient<PowerLauncherViewModel>();
-            // services.AddTransient<KeyboardManagerViewModel>();
-
-            // Tier 4 ViewModels (high complexity) - migrate last
-            // services.AddTransient<GeneralViewModel>();
-            // services.AddTransient<DashboardViewModel>();
-            // services.AddTransient<ShellViewModel>();
-            return services;
-        }
-    }
-}

src/settings-ui/Settings.UI/Services/ServiceProvider.cs

@@ -1,113 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Microsoft.PowerToys.Settings.UI.Services
-{
-    /// <summary>
-    /// Provides a static wrapper around <see cref="Microsoft.Extensions.DependencyInjection.ServiceProvider"/>
-    /// to enable gradual migration to dependency injection.
-    /// </summary>
-    public static class ServiceProvider
-    {
-        private static readonly object _lock = new object();
-        private static IServiceProvider _serviceProvider;
-
-        /// <summary>
-        /// Gets a value indicating whether the service provider has been initialized.
-        /// </summary>
-        public static bool IsInitialized => _serviceProvider != null;
-
-        /// <summary>
-        /// Initializes the service provider with the specified service collection.
-        /// This should be called once during application startup.
-        /// </summary>
-        /// <param name="services">The service collection containing all registered services.</param>
-        /// <exception cref="InvalidOperationException">Thrown if the service provider is already initialized.</exception>
-        public static void Initialize(IServiceCollection services)
-        {
-            ArgumentNullException.ThrowIfNull(services);
-
-            lock (_lock)
-            {
-                if (_serviceProvider != null)
-                {
-                    throw new InvalidOperationException("ServiceProvider is already initialized.");
-                }
-
-                _serviceProvider = services.BuildServiceProvider();
-            }
-        }
-
-        /// <summary>
-        /// Gets a service of the specified type.
-        /// </summary>
-        /// <typeparam name="T">The type of service to get.</typeparam>
-        /// <returns>The service instance, or null if not registered.</returns>
-        public static T GetService<T>()
-            where T : class
-        {
-            EnsureInitialized();
-            return _serviceProvider.GetService<T>();
-        }
-
-        /// <summary>
-        /// Gets a required service of the specified type.
-        /// </summary>
-        /// <typeparam name="T">The type of service to get.</typeparam>
-        /// <returns>The service instance.</returns>
-        /// <exception cref="InvalidOperationException">Thrown if the service is not registered.</exception>
-        public static T GetRequiredService<T>()
-            where T : class
-        {
-            EnsureInitialized();
-            return _serviceProvider.GetRequiredService<T>();
-        }
-
-        /// <summary>
-        /// Gets a service of the specified type.
-        /// </summary>
-        /// <param name="serviceType">The type of service to get.</param>
-        /// <returns>The service instance, or null if not registered.</returns>
-        public static object GetService(Type serviceType)
-        {
-            ArgumentNullException.ThrowIfNull(serviceType);
-            EnsureInitialized();
-            return _serviceProvider.GetService(serviceType);
-        }
-
-        /// <summary>
-        /// Gets a required service of the specified type.
-        /// </summary>
-        /// <param name="serviceType">The type of service to get.</param>
-        /// <returns>The service instance.</returns>
-        /// <exception cref="InvalidOperationException">Thrown if the service is not registered.</exception>
-        public static object GetRequiredService(Type serviceType)
-        {
-            ArgumentNullException.ThrowIfNull(serviceType);
-            EnsureInitialized();
-            return _serviceProvider.GetRequiredService(serviceType);
-        }
-
-        /// <summary>
-        /// Creates a new scope for scoped services.
-        /// </summary>
-        /// <returns>A new service scope.</returns>
-        public static IServiceScope CreateScope()
-        {
-            EnsureInitialized();
-            return _serviceProvider.CreateScope();
-        }
-
-        private static void EnsureInitialized()
-        {
-            if (_serviceProvider == null)
-            {
-                throw new InvalidOperationException("ServiceProvider has not been initialized. Call Initialize() first.");
-            }
-        }
-    }
-}

src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs

@@ -10,7 +10,6 @@ using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
 using ManagedCommon;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Telemetry.Events;
@@ -84,9 +83,6 @@ namespace Microsoft.PowerToys.Settings.UI
                 Microsoft.Windows.Globalization.ApplicationLanguages.PrimaryLanguageOverride = appLanguage;
             }
 
-            // Initialize dependency injection
-            InitializeServices();
-
             InitializeComponent();
 
             UnhandledException += App_UnhandledException;
@@ -99,14 +95,6 @@ namespace Microsoft.PowerToys.Settings.UI
             });
         }
 
-        private static void InitializeServices()
-        {
-            var services = new ServiceCollection();
-            services.AddSettingsServices();
-            services.AddViewModels();
-            Services.ServiceProvider.Initialize(services);
-        }
-
         private void App_UnhandledException(object sender, Microsoft.UI.Xaml.UnhandledExceptionEventArgs e)
         {
             Logger.LogError("Unhandled exception", e.Exception);

src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml.cs

@@ -22,19 +22,15 @@ namespace Microsoft.PowerToys.Settings.UI
 {
     public sealed partial class MainWindow : WindowEx
     {
-        private bool _isFullyInitialized;
-        private bool _createHidden;
-
         public MainWindow(bool createHidden = false)
         {
-            _createHidden = createHidden;
-
             var bootTime = new System.Diagnostics.Stopwatch();
             bootTime.Start();
 
             this.Activated += Window_Activated_SetIcon;
 
             App.ThemeService.ThemeChanged += OnThemeChanged;
+            App.ThemeService.ApplyTheme();
 
             this.ExtendsContentIntoTitleBar = true;
 
@@ -47,13 +43,8 @@ namespace Microsoft.PowerToys.Settings.UI
             {
                 placement.ShowCmd = NativeMethods.SW_HIDE;
 
-                // Defer full initialization until window is shown
-                this.Activated += Window_Activated_LazyInit;
-            }
-            else
-            {
-                // Full initialization for visible windows
-                CompleteInitialization();
+                // Restore the last known placement on the first activation
+                this.Activated += Window_Activated;
             }
 
             NativeMethods.SetWindowPlacement(hWnd, ref placement);
@@ -61,16 +52,6 @@ namespace Microsoft.PowerToys.Settings.UI
             var loader = ResourceLoaderInstance.ResourceLoader;
             Title = App.IsElevated ? loader.GetString("SettingsWindow_AdminTitle") : loader.GetString("SettingsWindow_Title");
 
-            // IPC callbacks must be set up immediately so messages can be received even when hidden
-            SetupIPCCallbacks();
-
-            bootTime.Stop();
-
-            PowerToysTelemetry.Log.WriteEvent(new SettingsBootEvent() { BootTimeMs = bootTime.ElapsedMilliseconds });
-        }
-
-        private void SetupIPCCallbacks()
-        {
             // send IPC Message
             ShellPage.SetDefaultSndMessageCallback(msg =>
             {
@@ -147,10 +128,13 @@ namespace Microsoft.PowerToys.Settings.UI
                 App.GetScoobeWindow().Activate();
             });
 
+            this.InitializeComponent();
+            SetAppTitleBar();
+
             // receive IPC Message
             App.IPCMessageReceivedCallback = (string msg) =>
             {
-                if (ShellPage.ShellHandler?.IPCResponseHandleList != null)
+                if (ShellPage.ShellHandler.IPCResponseHandleList != null)
                 {
                     var success = JsonObject.TryParse(msg, out JsonObject json);
                     if (success)
@@ -166,33 +150,10 @@ namespace Microsoft.PowerToys.Settings.UI
                     }
                 }
             };
-        }
 
-        private void CompleteInitialization()
-        {
-            if (_isFullyInitialized)
-            {
-                return;
-            }
+            bootTime.Stop();
 
-            _isFullyInitialized = true;
-
-            App.ThemeService.ApplyTheme();
-            this.InitializeComponent();
-            SetAppTitleBar();
-        }
-
-        private void Window_Activated_LazyInit(object sender, WindowActivatedEventArgs args)
-        {
-            if (args.WindowActivationState != WindowActivationState.Deactivated && !_isFullyInitialized)
-            {
-                CompleteInitialization();
-
-                // After lazy init, also restore placement
-                var hWnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
-                var placement = WindowHelper.DeserializePlacementOrDefault(hWnd);
-                NativeMethods.SetWindowPlacement(hWnd, ref placement);
-            }
+            PowerToysTelemetry.Log.WriteEvent(new SettingsBootEvent() { BootTimeMs = bootTime.ElapsedMilliseconds });
         }
 
         private void SetAppTitleBar()
@@ -204,8 +165,6 @@ namespace Microsoft.PowerToys.Settings.UI
 
         public void NavigateToSection(System.Type type)
         {
-            // Ensure full initialization before navigation
-            CompleteInitialization();
             ShellPage.Navigate(type);
         }
 
@@ -263,8 +222,6 @@ namespace Microsoft.PowerToys.Settings.UI
 
         internal void EnsurePageIsSelected()
         {
-            // Ensure full initialization before page selection
-            CompleteInitialization();
             ShellPage.EnsurePageIsSelected();
         }
     }

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

@@ -41,9 +41,9 @@ namespace Microsoft.PowerToys.Settings.UI.Views
 
             Action stateUpdatingAction = () =>
             {
-                this.DispatcherQueue.TryEnqueue(async () =>
+                this.DispatcherQueue.TryEnqueue(() =>
                 {
-                    await ViewModel.RefreshUpdatingStateAsync().ConfigureAwait(true);
+                    ViewModel.RefreshUpdatingState();
                 });
             };
 
@@ -92,16 +92,9 @@ namespace Microsoft.PowerToys.Settings.UI.Views
 
             CheckBugReportStatus();
 
-            this.Loaded += (s, e) =>
-            {
-                ViewModel.OnPageLoaded();
+            doRefreshBackupRestoreStatus(100);
 
-                // Defer backup status check to after page is loaded with low priority
-                this.DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Low, () =>
-                {
-                    doRefreshBackupRestoreStatus(100);
-                });
-            };
+            this.Loaded += (s, e) => ViewModel.OnPageLoaded();
         }
 
         private void OpenColorsSettings_Click(object sender, RoutedEventArgs e)
@@ -130,11 +123,11 @@ namespace Microsoft.PowerToys.Settings.UI.Views
 
         private void RefreshBackupRestoreStatus(int delayMs = 0)
         {
-            Task.Run(async () =>
+            Task.Run(() =>
             {
                 if (delayMs > 0)
                 {
-                    await Task.Delay(delayMs).ConfigureAwait(false);
+                    Thread.Sleep(delayMs);
                 }
 
                 var settingsBackupAndRestoreUtils = SettingsBackupAndRestoreUtils.Instance;
@@ -178,7 +171,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
 
         private async void ViewDiagnosticData_Click(object sender, RoutedEventArgs e)
         {
-            await ViewModel.ViewDiagnosticDataAsync().ConfigureAwait(false);
+            await Task.Run(ViewModel.ViewDiagnosticData);
         }
 
         private void BugReportToolClicked(object sender, RoutedEventArgs e)

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

@@ -1,92 +1,43 @@
-// 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.
 
 using System;
 using System.Globalization;
 using System.Text.Json;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
+
 using global::PowerToys.GPOWrapper;
 using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 using Microsoft.PowerToys.Settings.UI.SerializationContext;
-using Microsoft.PowerToys.Settings.UI.Services;
 
 namespace Microsoft.PowerToys.Settings.UI.ViewModels
 {
-    /// <summary>
-    /// ViewModel for the File Locksmith settings page.
-    /// Uses CommunityToolkit.Mvvm for MVVM pattern implementation.
-    /// </summary>
-    public partial class FileLocksmithViewModel : ObservableObject
+    public partial class FileLocksmithViewModel : Observable
     {
         private GeneralSettings GeneralSettingsConfig { get; set; }
 
-        private readonly ISettingsUtils _settingsUtils;
+        private readonly SettingsUtils _settingsUtils;
 
         private FileLocksmithSettings Settings { get; set; }
 
-        private const string ModuleNameConst = FileLocksmithSettings.ModuleName;
+        private const string ModuleName = FileLocksmithSettings.ModuleName;
 
         private string _settingsConfigFileFolder = string.Empty;
 
-        private GpoRuleConfigured _enabledGpoRuleConfiguration;
-
-        [ObservableProperty]
-        [NotifyPropertyChangedFor(nameof(IsEnabledGpoConfigured))]
-        private bool _enabledStateIsGPOConfigured;
-
-        [ObservableProperty]
-        private bool _isFileLocksmithEnabled;
-
-        [ObservableProperty]
-        private bool _enabledOnContextExtendedMenu;
-
-        private Func<string, int> SendConfigMSG { get; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FileLocksmithViewModel"/> class
-        /// using dependency injection (for new code).
-        /// </summary>
-        /// <param name="settingsUtils">The settings utilities.</param>
-        /// <param name="generalSettingsRepository">The general settings repository.</param>
-        /// <param name="sendConfigMSG">The IPC message callback.</param>
-        public FileLocksmithViewModel(
-            ISettingsUtils settingsUtils,
-            ISettingsRepository<GeneralSettings> generalSettingsRepository,
-            Func<string, int> sendConfigMSG)
-        {
-            _settingsUtils = settingsUtils ?? throw new ArgumentNullException(nameof(settingsUtils));
-            ArgumentNullException.ThrowIfNull(generalSettingsRepository);
-
-            GeneralSettingsConfig = generalSettingsRepository.SettingsConfig;
-            SendConfigMSG = sendConfigMSG ?? throw new ArgumentNullException(nameof(sendConfigMSG));
-
-            LoadSettings();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FileLocksmithViewModel"/> class
-        /// (backward compatible constructor for existing code).
-        /// </summary>
         public FileLocksmithViewModel(SettingsUtils settingsUtils, ISettingsRepository<GeneralSettings> settingsRepository, Func<string, int> ipcMSGCallBackFunc, string configFileSubfolder = "")
         {
             _settingsUtils = settingsUtils ?? throw new ArgumentNullException(nameof(settingsUtils));
+
+            // To obtain the general settings configurations of PowerToys Settings.
             ArgumentNullException.ThrowIfNull(settingsRepository);
 
-            _settingsConfigFileFolder = configFileSubfolder;
             GeneralSettingsConfig = settingsRepository.SettingsConfig;
-            SendConfigMSG = ipcMSGCallBackFunc;
 
-            LoadSettings();
-        }
-
-        private void LoadSettings()
-        {
             try
             {
-                FileLocksmithLocalProperties localSettings = ((SettingsUtils)_settingsUtils).GetSettingsOrDefault<FileLocksmithLocalProperties>(GetSettingsSubPath(), "file-locksmith-settings.json");
+                FileLocksmithLocalProperties localSettings = _settingsUtils.GetSettingsOrDefault<FileLocksmithLocalProperties>(GetSettingsSubPath(), "file-locksmith-settings.json");
                 Settings = new FileLocksmithSettings(localSettings);
             }
             catch (Exception)
@@ -97,12 +48,16 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
 
             InitializeEnabledValue();
-            EnabledOnContextExtendedMenu = Settings.Properties.ExtendedContextMenuOnly.Value;
+
+            // set the callback functions value to handle outgoing IPC message.
+            SendConfigMSG = ipcMSGCallBackFunc;
+
+            _fileLocksmithEnabledOnContextExtendedMenu = Settings.Properties.ExtendedContextMenuOnly.Value;
         }
 
         public string GetSettingsSubPath()
         {
-            return _settingsConfigFileFolder + "\\" + ModuleNameConst;
+            return _settingsConfigFileFolder + "\\" + ModuleName;
         }
 
         private void InitializeEnabledValue()
@@ -111,40 +66,65 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             if (_enabledGpoRuleConfiguration == GpoRuleConfigured.Disabled || _enabledGpoRuleConfiguration == GpoRuleConfigured.Enabled)
             {
                 // Get the enabled state from GPO.
-                EnabledStateIsGPOConfigured = true;
-                IsFileLocksmithEnabled = _enabledGpoRuleConfiguration == GpoRuleConfigured.Enabled;
+                _enabledStateIsGPOConfigured = true;
+                _isFileLocksmithEnabled = _enabledGpoRuleConfiguration == GpoRuleConfigured.Enabled;
             }
             else
             {
-                IsFileLocksmithEnabled = GeneralSettingsConfig.Enabled.FileLocksmith;
+                _isFileLocksmithEnabled = GeneralSettingsConfig.Enabled.FileLocksmith;
             }
         }
 
-        /// <summary>
-        /// Gets a value indicating whether the enabled state is configured by GPO.
-        /// </summary>
-        public bool IsEnabledGpoConfigured => EnabledStateIsGPOConfigured;
-
-        partial void OnIsFileLocksmithEnabledChanged(bool value)
+        public bool IsFileLocksmithEnabled
         {
-            if (EnabledStateIsGPOConfigured)
+            get => _isFileLocksmithEnabled;
+            set
             {
-                // If it's GPO configured, shouldn't be able to change this state.
-                return;
+                if (_enabledStateIsGPOConfigured)
+                {
+                    // If it's GPO configured, shouldn't be able to change this state.
+                    return;
+                }
+
+                if (_isFileLocksmithEnabled != value)
+                {
+                    _isFileLocksmithEnabled = value;
+
+                    GeneralSettingsConfig.Enabled.FileLocksmith = value;
+                    OnPropertyChanged(nameof(IsFileLocksmithEnabled));
+
+                    OutGoingGeneralSettings outgoing = new OutGoingGeneralSettings(GeneralSettingsConfig);
+                    SendConfigMSG(outgoing.ToString());
+
+                    // TODO: Implement when this module has properties.
+                    NotifySettingsChanged();
+                }
             }
-
-            GeneralSettingsConfig.Enabled.FileLocksmith = value;
-
-            OutGoingGeneralSettings outgoing = new OutGoingGeneralSettings(GeneralSettingsConfig);
-            SendConfigMSG(outgoing.ToString());
-
-            NotifySettingsChanged();
         }
 
-        partial void OnEnabledOnContextExtendedMenuChanged(bool value)
+        public bool EnabledOnContextExtendedMenu
         {
-            Settings.Properties.ExtendedContextMenuOnly.Value = value;
-            NotifySettingsChanged();
+            get
+            {
+                return _fileLocksmithEnabledOnContextExtendedMenu;
+            }
+
+            set
+            {
+                if (value != _fileLocksmithEnabledOnContextExtendedMenu)
+                {
+                    _fileLocksmithEnabledOnContextExtendedMenu = value;
+                    Settings.Properties.ExtendedContextMenuOnly.Value = value;
+                    OnPropertyChanged(nameof(EnabledOnContextExtendedMenu));
+
+                    NotifySettingsChanged();
+                }
+            }
+        }
+
+        public bool IsEnabledGpoConfigured
+        {
+            get => _enabledStateIsGPOConfigured;
         }
 
         private void NotifySettingsChanged()
@@ -158,10 +138,13 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                        JsonSerializer.Serialize(Settings, SourceGenerationContextContext.Default.FileLocksmithSettings)));
         }
 
-        /// <summary>
-        /// Refreshes the enabled state by re-reading GPO configuration.
-        /// </summary>
-        [RelayCommand]
+        private Func<string, int> SendConfigMSG { get; }
+
+        private GpoRuleConfigured _enabledGpoRuleConfiguration;
+        private bool _enabledStateIsGPOConfigured;
+        private bool _isFileLocksmithEnabled;
+        private bool _fileLocksmithEnabledOnContextExtendedMenu;
+
         public void RefreshEnabledState()
         {
             InitializeEnabledValue();

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

@@ -213,20 +213,14 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                 _fileWatcher = Helper.GetFileWatcher(string.Empty, UpdatingSettings.SettingsFile, dispatcherAction);
             }
 
-            // Defer diagnostic data cleanup to background task to avoid blocking UI
-            _ = Task.Run(CleanupDiagnosticDataAsync);
-
-            InitializeLanguages();
-        }
-
-        private void CleanupDiagnosticDataAsync()
-        {
-            // Diagnostic data retention policy - runs on background thread
+            // Diagnostic data retention policy
             string etwDirPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft\\PowerToys\\etw");
             DeleteDiagnosticDataOlderThan28Days(etwDirPath);
 
             string localLowEtwDirPath = Path.Combine(Environment.GetEnvironmentVariable("USERPROFILE"), "AppData", "LocalLow", "Microsoft", "PowerToys", "etw");
             DeleteDiagnosticDataOlderThan28Days(localLowEtwDirPath);
+
+            InitializeLanguages();
         }
 
         // Supported languages. Taken from Resources.wxs + default + en-US
@@ -1362,54 +1356,52 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             NotifyAllBackupAndRestoreProperties();
         }
 
-        public async Task RefreshUpdatingStateAsync()
+        public void RefreshUpdatingState()
         {
-            // Load settings with retry on background thread
-            var config = await Task.Run(async () =>
+            object oLock = new object();
+            lock (oLock)
             {
-                var loadedConfig = UpdatingSettings.LoadSettings();
+                var config = UpdatingSettings.LoadSettings();
 
                 // Retry loading if failed
-                for (int i = 0; i < 3 && loadedConfig == null; i++)
+                for (int i = 0; i < 3 && config == null; i++)
                 {
-                    await Task.Delay(100).ConfigureAwait(false);
-                    loadedConfig = UpdatingSettings.LoadSettings();
+                    System.Threading.Thread.Sleep(100);
+                    config = UpdatingSettings.LoadSettings();
                 }
 
-                return loadedConfig;
-            }).ConfigureAwait(true);
+                if (config == null)
+                {
+                    return;
+                }
 
-            if (config == null)
-            {
-                return;
+                UpdatingSettingsConfig = config;
+
+                if (PowerToysUpdatingState != config.State)
+                {
+                    IsNewVersionDownloading = false;
+                }
+                else
+                {
+                    bool dateChanged = UpdateCheckedDate == UpdatingSettingsConfig.LastCheckedDateLocalized;
+                    bool fileDownloaded = string.IsNullOrEmpty(UpdatingSettingsConfig.DownloadedInstallerFilename);
+                    IsNewVersionDownloading = !(dateChanged || fileDownloaded);
+                }
+
+                PowerToysUpdatingState = UpdatingSettingsConfig.State;
+                PowerToysNewAvailableVersion = UpdatingSettingsConfig.NewVersion;
+                PowerToysNewAvailableVersionLink = UpdatingSettingsConfig.ReleasePageLink;
+                UpdateCheckedDate = UpdatingSettingsConfig.LastCheckedDateLocalized;
+
+                _isNoNetwork = PowerToysUpdatingState == UpdatingSettings.UpdatingState.NetworkError;
+                NotifyPropertyChanged(nameof(IsNoNetwork));
+                NotifyPropertyChanged(nameof(IsNewVersionDownloading));
+                NotifyPropertyChanged(nameof(IsUpdatePanelVisible));
+                _isNewVersionChecked = PowerToysUpdatingState == UpdatingSettings.UpdatingState.UpToDate && !IsNewVersionDownloading;
+                NotifyPropertyChanged(nameof(IsNewVersionCheckedAndUpToDate));
+
+                NotifyPropertyChanged(nameof(IsDownloadAllowed));
             }
-
-            UpdatingSettingsConfig = config;
-
-            if (PowerToysUpdatingState != config.State)
-            {
-                IsNewVersionDownloading = false;
-            }
-            else
-            {
-                bool dateChanged = UpdateCheckedDate == UpdatingSettingsConfig.LastCheckedDateLocalized;
-                bool fileDownloaded = string.IsNullOrEmpty(UpdatingSettingsConfig.DownloadedInstallerFilename);
-                IsNewVersionDownloading = !(dateChanged || fileDownloaded);
-            }
-
-            PowerToysUpdatingState = UpdatingSettingsConfig.State;
-            PowerToysNewAvailableVersion = UpdatingSettingsConfig.NewVersion;
-            PowerToysNewAvailableVersionLink = UpdatingSettingsConfig.ReleasePageLink;
-            UpdateCheckedDate = UpdatingSettingsConfig.LastCheckedDateLocalized;
-
-            _isNoNetwork = PowerToysUpdatingState == UpdatingSettings.UpdatingState.NetworkError;
-            NotifyPropertyChanged(nameof(IsNoNetwork));
-            NotifyPropertyChanged(nameof(IsNewVersionDownloading));
-            NotifyPropertyChanged(nameof(IsUpdatePanelVisible));
-            _isNewVersionChecked = PowerToysUpdatingState == UpdatingSettings.UpdatingState.UpToDate && !IsNewVersionDownloading;
-            NotifyPropertyChanged(nameof(IsNewVersionCheckedAndUpToDate));
-
-            NotifyPropertyChanged(nameof(IsDownloadAllowed));
         }
 
         private void InitializeLanguages()
@@ -1497,7 +1489,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
-        internal async Task ViewDiagnosticDataAsync()
+        internal void ViewDiagnosticData()
         {
             string localLowEtwDirPath = Path.Combine(Environment.GetEnvironmentVariable("USERPROFILE"), "AppData", "LocalLow", "Microsoft", "PowerToys", "etw");
             string etwDirPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft\\PowerToys\\etw");
@@ -1530,7 +1522,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             string tracerptPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "system32");
 
             ETLConverter converter = new ETLConverter(etwDirPath, tracerptPath);
-            await converter.ConvertDiagnosticsETLsAsync().ConfigureAwait(false);
+            Task.Run(() => converter.ConvertDiagnosticsETLsAsync()).Wait();
 
             if (Directory.Exists(etwDirPath))
             {

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

@@ -1,242 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.PowerToys.Settings.UI.Helpers;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.PowerToys.Settings.UI.Library.HotkeyConflicts;
-using Microsoft.PowerToys.Settings.UI.Services;
-
-namespace Microsoft.PowerToys.Settings.UI.ViewModels
-{
-    /// <summary>
-    /// Base class for module-specific ViewModels that provides common functionality
-    /// such as enabled state, GPO management, and hotkey conflict handling.
-    /// </summary>
-    public abstract partial class ModuleViewModelBase : ViewModelBase
-    {
-        private readonly Dictionary<string, bool> _hotkeyConflictStatus = new Dictionary<string, bool>();
-        private readonly Dictionary<string, string> _hotkeyConflictTooltips = new Dictionary<string, string>();
-
-        [ObservableProperty]
-        [NotifyPropertyChangedFor(nameof(IsEnabledGpoConfigured))]
-        private bool _isEnabled;
-
-        [ObservableProperty]
-        private bool _isGpoManaged;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ModuleViewModelBase"/> class.
-        /// </summary>
-        protected ModuleViewModelBase()
-        {
-            if (GlobalHotkeyConflictManager.Instance != null)
-            {
-                GlobalHotkeyConflictManager.Instance.ConflictsUpdated += OnConflictsUpdated;
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ModuleViewModelBase"/> class with a custom messenger.
-        /// </summary>
-        /// <param name="messenger">The messenger instance to use.</param>
-        protected ModuleViewModelBase(IMessenger messenger)
-            : base(messenger)
-        {
-            if (GlobalHotkeyConflictManager.Instance != null)
-            {
-                GlobalHotkeyConflictManager.Instance.ConflictsUpdated += OnConflictsUpdated;
-            }
-        }
-
-        /// <summary>
-        /// Gets the module name used for settings and conflict detection.
-        /// </summary>
-        protected abstract string ModuleName { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether the enabled state is configured by GPO.
-        /// </summary>
-        public bool IsEnabledGpoConfigured => IsGpoManaged;
-
-        /// <inheritdoc/>
-        public override void OnPageLoaded()
-        {
-            base.OnPageLoaded();
-            Debug.WriteLine($"=== PAGE LOADED: {ModuleName} ===");
-            GlobalHotkeyConflictManager.Instance?.RequestAllConflicts();
-        }
-
-        /// <summary>
-        /// Gets all hotkey settings for this module.
-        /// Override in derived classes to return module-specific hotkey settings.
-        /// </summary>
-        /// <returns>A dictionary of module names to hotkey settings arrays.</returns>
-        public virtual Dictionary<string, HotkeySettings[]> GetAllHotkeySettings()
-        {
-            return null;
-        }
-
-        /// <summary>
-        /// Handles updates to hotkey conflicts for the module.
-        /// </summary>
-        protected virtual void OnConflictsUpdated(object sender, AllHotkeyConflictsEventArgs e)
-        {
-            UpdateHotkeyConflictStatus(e.Conflicts);
-            var allHotkeySettings = GetAllHotkeySettings();
-
-            void UpdateConflictProperties()
-            {
-                if (allHotkeySettings != null)
-                {
-                    foreach (KeyValuePair<string, HotkeySettings[]> kvp in allHotkeySettings)
-                    {
-                        var module = kvp.Key;
-                        var hotkeySettingsList = kvp.Value;
-
-                        for (int i = 0; i < hotkeySettingsList.Length; i++)
-                        {
-                            var key = $"{module.ToLowerInvariant()}_{i}";
-                            hotkeySettingsList[i].HasConflict = GetHotkeyConflictStatus(key);
-                            hotkeySettingsList[i].ConflictDescription = GetHotkeyConflictTooltip(key);
-                        }
-                    }
-                }
-            }
-
-            _ = Task.Run(() =>
-            {
-                try
-                {
-                    var settingsWindow = App.GetSettingsWindow();
-                    settingsWindow.DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal, UpdateConflictProperties);
-                }
-                catch
-                {
-                    UpdateConflictProperties();
-                }
-            });
-        }
-
-        /// <summary>
-        /// Gets module-related conflicts from all conflicts data.
-        /// </summary>
-        protected ModuleConflictsData GetModuleRelatedConflicts(AllHotkeyConflictsData allConflicts)
-        {
-            var moduleConflicts = new ModuleConflictsData();
-
-            if (allConflicts.InAppConflicts != null)
-            {
-                foreach (var conflict in allConflicts.InAppConflicts)
-                {
-                    if (IsModuleInvolved(conflict))
-                    {
-                        moduleConflicts.InAppConflicts.Add(conflict);
-                    }
-                }
-            }
-
-            if (allConflicts.SystemConflicts != null)
-            {
-                foreach (var conflict in allConflicts.SystemConflicts)
-                {
-                    if (IsModuleInvolved(conflict))
-                    {
-                        moduleConflicts.SystemConflicts.Add(conflict);
-                    }
-                }
-            }
-
-            return moduleConflicts;
-        }
-
-        /// <summary>
-        /// Updates the hotkey conflict status based on all conflicts data.
-        /// </summary>
-        protected virtual void UpdateHotkeyConflictStatus(AllHotkeyConflictsData allConflicts)
-        {
-            _hotkeyConflictStatus.Clear();
-            _hotkeyConflictTooltips.Clear();
-
-            if (allConflicts.InAppConflicts.Count > 0)
-            {
-                foreach (var conflictGroup in allConflicts.InAppConflicts)
-                {
-                    foreach (var conflict in conflictGroup.Modules)
-                    {
-                        if (string.Equals(conflict.ModuleName, ModuleName, StringComparison.OrdinalIgnoreCase))
-                        {
-                            var keyName = $"{conflict.ModuleName.ToLowerInvariant()}_{conflict.HotkeyID}";
-                            _hotkeyConflictStatus[keyName] = true;
-                            _hotkeyConflictTooltips[keyName] = ResourceLoaderInstance.ResourceLoader.GetString("InAppHotkeyConflictTooltipText");
-                        }
-                    }
-                }
-            }
-
-            if (allConflicts.SystemConflicts.Count > 0)
-            {
-                foreach (var conflictGroup in allConflicts.SystemConflicts)
-                {
-                    foreach (var conflict in conflictGroup.Modules)
-                    {
-                        if (string.Equals(conflict.ModuleName, ModuleName, StringComparison.OrdinalIgnoreCase))
-                        {
-                            var keyName = $"{conflict.ModuleName.ToLowerInvariant()}_{conflict.HotkeyID}";
-                            _hotkeyConflictStatus[keyName] = true;
-                            _hotkeyConflictTooltips[keyName] = ResourceLoaderInstance.ResourceLoader.GetString("SysHotkeyConflictTooltipText");
-                        }
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets whether a specific hotkey has a conflict.
-        /// </summary>
-        protected virtual bool GetHotkeyConflictStatus(string key)
-        {
-            return _hotkeyConflictStatus.ContainsKey(key) && _hotkeyConflictStatus[key];
-        }
-
-        /// <summary>
-        /// Gets the conflict tooltip for a specific hotkey.
-        /// </summary>
-        protected virtual string GetHotkeyConflictTooltip(string key)
-        {
-            return _hotkeyConflictTooltips.TryGetValue(key, out string value) ? value : null;
-        }
-
-        private bool IsModuleInvolved(HotkeyConflictGroupData conflict)
-        {
-            if (conflict.Modules == null)
-            {
-                return false;
-            }
-
-            return conflict.Modules.Any(module =>
-                string.Equals(module.ModuleName, ModuleName, StringComparison.OrdinalIgnoreCase));
-        }
-
-        /// <inheritdoc/>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                if (GlobalHotkeyConflictManager.Instance != null)
-                {
-                    GlobalHotkeyConflictManager.Instance.ConflictsUpdated -= OnConflictsUpdated;
-                }
-            }
-
-            base.Dispose(disposing);
-        }
-    }
-}

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

@@ -1,108 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Messaging;
-
-namespace Microsoft.PowerToys.Settings.UI.ViewModels
-{
-    /// <summary>
-    /// Base class for all ViewModels using CommunityToolkit.Mvvm.
-    /// Provides lifecycle methods and messaging support.
-    /// </summary>
-    public abstract class ViewModelBase : ObservableRecipient, IDisposable
-    {
-        private bool _isDisposed;
-        private bool _isActive;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
-        /// </summary>
-        protected ViewModelBase()
-            : base(WeakReferenceMessenger.Default)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ViewModelBase"/> class with a custom messenger.
-        /// </summary>
-        /// <param name="messenger">The messenger instance to use.</param>
-        protected ViewModelBase(IMessenger messenger)
-            : base(messenger)
-        {
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this ViewModel is currently active (visible).
-        /// </summary>
-        public bool IsViewModelActive => _isActive;
-
-        /// <summary>
-        /// Called when the view associated with this ViewModel is navigated to.
-        /// Override this method to perform initialization when the page is displayed.
-        /// </summary>
-        public virtual void OnNavigatedTo()
-        {
-            _isActive = true;
-            IsActive = true; // Activates message subscriptions in ObservableRecipient
-        }
-
-        /// <summary>
-        /// Called when the view associated with this ViewModel is navigated to.
-        /// Override this method to perform async initialization when the page is displayed.
-        /// </summary>
-        /// <returns>A task representing the async operation.</returns>
-        public virtual Task OnNavigatedToAsync()
-        {
-            OnNavigatedTo();
-            return Task.CompletedTask;
-        }
-
-        /// <summary>
-        /// Called when the view associated with this ViewModel is navigated away from.
-        /// Override this method to perform cleanup when the page is no longer displayed.
-        /// </summary>
-        public virtual void OnNavigatedFrom()
-        {
-            _isActive = false;
-            IsActive = false; // Deactivates message subscriptions in ObservableRecipient
-        }
-
-        /// <summary>
-        /// Called when the page is loaded. This is triggered from the Page's Loaded event.
-        /// </summary>
-        public virtual void OnPageLoaded()
-        {
-            // Default implementation does nothing.
-            // Override in derived classes to perform actions when the page is loaded.
-        }
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Releases unmanaged and optionally managed resources.
-        /// </summary>
-        /// <param name="disposing">True to release both managed and unmanaged resources.</param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!_isDisposed)
-            {
-                if (disposing)
-                {
-                    // Deactivate message subscriptions
-                    IsActive = false;
-                }
-
-                _isDisposed = true;
-            }
-        }
-    }
-}