Add Host Settings API for extension configuration

Introduced a Host Settings API to enable extensions to access and respond to the host application's settings. Key changes include: - Added `NotifyHostSettingsChanged` to `IExtensionService` and `IExtensionWrapper` for notifying extensions of settings updates. - Implemented `HostSettingsConverter` for converting `SettingsModel` to `IHostSettings`. - Introduced `HostSettingsManager` to cache settings and notify extensions via the `SettingsChanged` event. - Enhanced `CommandProvider` and `CommandProviderWrapper` to handle `IHostSettingsChanged` for initial and dynamic settings updates. - Added `HostSettingsPage` sample to demonstrate API usage. - Updated documentation and SDK specifications to include the new API. These changes ensure cross-process safety, real-time updates, and backward compatibility, allowing extensions to adapt to host settings dynamically.
[Hot Fix] Fix Image Resizer not working on Win10 (#43763 )
2026-01-08 13:27:02 +01:00 · 2025-11-24 22:49:48 +08:00 · 2025-11-24 10:42:35 +08:00 · 2025-11-24 10:08:12 +08:00 · 2025-11-24 09:51:27 +08:00 · 2025-11-24 09:12:54 +08:00
62 changed files with 2098 additions and 795 deletions
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@@ -291,6 +291,7 @@
                "Mono.Cecil.Rocks.dll",
                "Newtonsoft.Json.dll",
                "CommunityToolkit.WinUI.Controls.TitleBar.dll",
+                "CommunityToolkit.WinUI.Controls.OpacityMaskView.dll",

                "NLog.dll",
                "HtmlAgilityPack.dll",
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -7,6 +7,7 @@
    <PackageVersion Include="AdaptiveCards.ObjectModel.WinUI3" Version="2.0.0-beta" />
    <PackageVersion Include="AdaptiveCards.Rendering.WinUI3" Version="2.1.0-beta" />
    <PackageVersion Include="AdaptiveCards.Templating" Version="2.0.5" />
+    <PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView" Version="0.1.251101-build.2372" />
    <PackageVersion Include="Microsoft.Bot.AdaptiveExpressions.Core" Version="4.23.0" />
    <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
    <PackageVersion Include="CoenM.ImageSharp.ImageHash" Version="1.3.6" />
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1498,6 +1498,7 @@ SOFTWARE.
 - CoenM.ImageSharp.ImageHash
 - CommunityToolkit.Common
 - CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock
+- CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView
 - CommunityToolkit.Mvvm
 - CommunityToolkit.WinUI.Animations
 - CommunityToolkit.WinUI.Collections
--- a/README.md
+++ b/README.md
@@ -51,19 +51,20 @@ But to get started quickly, choose one of the installation methods below:
 Go to the [PowerToys GitHub releases][github-release-link], click Assets to reveal the downloads, and choose the installer that matches your architecture and install scope. For most devices, that's the x64 per-user installer.

 <!-- items that need to be updated release to release -->
-[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.96%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.95%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysUserSetup-0.95.1-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysUserSetup-0.95.1-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysSetup-0.95.1-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysSetup-0.95.1-arm64.exe
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.97%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.96%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.0/PowerToysUserSetup-0.96.0-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.0/PowerToysUserSetup-0.96.0-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.0/PowerToysSetup-0.96.0-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.0/PowerToysSetup-0.96.0-arm64.exe
 
 |  Description   | Filename |
 |----------------|----------|
-| Per user - x64       | [PowerToysUserSetup-0.95.1-x64.exe][ptUserX64] |
-| Per user - ARM64     | [PowerToysUserSetup-0.95.1-arm64.exe][ptUserArm64] |
-| Machine wide - x64   | [PowerToysSetup-0.95.1-x64.exe][ptMachineX64] |
-| Machine wide - ARM64 | [PowerToysSetup-0.95.1-arm64.exe][ptMachineArm64] |
+| Per user - x64       | [PowerToysUserSetup-0.96.0-x64.exe][ptUserX64] |
+| Per user - ARM64     | [PowerToysUserSetup-0.96.0-arm64.exe][ptUserArm64] |
+| Machine wide - x64   | [PowerToysSetup-0.96.0-x64.exe][ptMachineX64] |
+| Machine wide - ARM64 | [PowerToysSetup-0.96.0-arm64.exe][ptMachineArm64] |
+
 </details>

 <details>
@@ -102,156 +103,131 @@ There are [community driven install methods](./doc/unofficialInstallMethods.md)
 </details>

 ## ✨ What's new
-**Version 0.95 (October 2025)**
+**Version 0.96 (November 2025)**

 For an in-depth look at the latest changes, visit the [Windows Command Line blog](https://aka.ms/powertoys-releaseblog).

 **✨ Highlights**
- - **NEW:** The **Light Switch** utility in PowerToys allows you to automatically switch between light and dark themes in Windows based on the time of day.
- - Command Palette delivered major search performance gains (new fuzzy matcher and smarter fallbacks) improving relevance and speed.
- - Peek can now be activated using just the Spacebar!
- - Find My Mouse added transparent spotlight with independent backdrop opacity, boosting focus and accessibility.
- - Settings now lets you delete shortcuts entirely and ignore conflicts.
- - Mouse Pointer Crosshairs gained orientation options (vertical / horizontal / both) for customizable accessibility. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
- - PowerRename fixed enumeration counter skipping ensuring reliable batch renames. Thanks [@daverayment](https://github.com/daverayment)!
- - ZoomIt restored legacy draw and snipping behaviors, and fixed recording issues, improving reliability. Thanks [@chakrik73](https://github.com/chakrik73)!
+ - Advanced Paste now supports multiple online and on-device AI model providers: Azure OpenAI, OpenAI, Google Gemini, Mistral, Foundry Local and Ollama.
+ - Command Palette received extensive improvements including file search filters, better clipboard history metadata, context-menu styling, and dozens of bug fixes and enhancements.
+ - PowerRename can now extract and use photo metadata (EXIF, XMP) in renaming patterns like `%Camera`, `%Lens`, and `%ExposureTime`.
+
+### Advanced Paste
+ - Advanced Paste now lets you connect to multiple AI providers instead of being limited to a single OpenAI provider. See [Advanced Paste documentation](https://learn.microsoft.com/windows/powertoys/advanced-paste) for usage.
+
+### Awake
+ - The Awake countdown timer now stays accurate over long periods. Thanks [@daverayment](https://github.com/daverayment)!
+ - Fixed Awake context menu positioning. The fix removed the conversion of the mouse cursor from screen to client-window coordinates, instead using the raw screen coordinates returned by GetCursorPos; the context menu now appears at the correct screen position. Thanks [@lzandman](https://github.com/lzandman)!

 ### Command Palette
- - Applied conditional margin for icon-only tags to tighten layout. Thanks [@samrueby](https://github.com/samrueby)
- - Improved the reliability of accessing Command Palette settings through PowerToys Settings and executing other x-cmdpal:// protocol commands. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Enabled AOT by default for improved performance while simplifying publish configs.
- - Replaced service state color dots with play/pause/stop icons for enhanced accessibility. Thanks [@samrueby](https://github.com/samrueby)
- - Fixed filter dropdown sync and crash by binding SelectedValue and raising UI-thread notifications. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Ensured long links wrap correctly in details view.
- - Removed animation and enforced minimum width on filter dropdown for clarity. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Restored focus to More button after ESC closes context menu, improving keyboard flow. Thanks [@chatasweetie](https://github.com/chatasweetie)
- - Marked main and toast windows as tool windows to keep them out of Alt+Tab while preserving style. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Fixed AOT template and theming issues for filter separators. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Introduced grid layouts (small, medium, gallery) for richer page presentation.
- - Materialized result lists to avoid rescoring overhead.
- - Disabled problematic selection TextToSuggest behind environment flag.
- - Major search performance improvements (new fuzzy matcher, smarter fallbacks, fewer exceptions).
- - Added context menu "Show Details" command when details pane is hidden.
- - Reduced window flicker by avoiding unnecessary cloaking. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Restored EmptyContent rendering for blank states. Thanks [@DevLGuilherme](https://github.com/DevLGuilherme)
- - Saved new state even if prior app state file was corrupt (better resilience). Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Migrated settings window to WinUI TitleBar control. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Prevented crash on duplicate keybindings and simplified matching. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Hotkeys now always respect the “Ignore shortcut in fullscreen” setting. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Hid search box on content pages, improving focus and accessibility, and added Home title. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Blocked Ctrl+I from inserting stray tabs in search box.
- - Logged HRESULT codes in error logs for deeper diagnostics. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Advanced font and emoji icon classification and alignment improvements. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Ensured that fallback command icons are visible on the extension settings page. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Fixed breadcrumb margin misalignment (visual polish). Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Truncated overly long command labels with ellipsis to prevent overflow.
- - Added a setting to configure the page transition animation.
- - Collection of small improvements and nits for Run Commands.
- - Improved bookmarks performance and experience. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Added Ctrl+O shortcut in Clipboard History to open links directly.
- - Resolved conflict with external software that blocked Command Palette from hiding.
- - Updated context menu items to reflect name and icon changes, and ensured application icons are displayed correctly. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Added Alt+Home shortcut to return immediately to the Command Palette home page. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Fixed a crash when displaying code blocks in markdown on detail or content pages. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Fixed an issue where the search bar icon and title were not updated when rapidly switching pages. Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Improved the appearance of the search box in the context menu.
-
+ - The search field in context menus now matches the look of the Command Palette, with a smoke backdrop and improved padding.
+ - Fallback items such as math calculations or the Run command now appear in results more quickly. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Ensured the command bar updates correctly after navigating to another page and commands are displayed correctly. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - The Command Palette settings page has been reorganized. Activation-key options are grouped under an expander and extension settings are framed for improved readability.
+ - When you modify a command, its alias, hotkey, and tags now update in the top-level list, keeping the displayed information in sync. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Press `Ctrl + ,` to open Command Palette settings from anywhere. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - You can use `Page Up` and `Page Down` to navigate the list while focus is in the search box. Thanks [@samrueby](https://github.com/samrueby)!
+ - Fixed an issue where the search box could disappear when navigating pages. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Ensured search text is selected when *Go home when activated* and *Highlight search on activate* are both enabled. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed an issue where Command Palette window occasionally appeared on the taskbar under certain Windows settings. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Ensured that labels and icons of list items and menu items update when they change. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed visibility of list filters when navigating to a content page. Thanks [@DevLGuilherme](https://github.com/DevLGuilherme)!
+ - Added search to the extension list and a link to extensions on the Microsoft Store. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added options to open the Command Palette window at its last position or re-center it.
+ - The Command Palette now remembers its window size after restarting.
+ - Added a global error handler that logs fatal errors and provides feedback when unexpected failures force Command Palette to close. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed forms and extension settings not showing on some machines due to a missing VC++ runtime.
+ - Restored ranking of fallback commands for built-in extensions (Sleep, Shutdown, Windows settings, Web search, etc.). Thanks [@jiripolasek](https://github.com/jiripolasek).
+ - Improved and unified labels and texts across the application!
+ - Maintainance: Resolved numerous build warnings in Command Palette projects; no user-visible impact. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Maintainance: Fixed a logging issue so exception messages are properly recorded instead of placeholder text, improving troubleshooting. Thanks [@jiripolasek](https://github.com/jiripolasek)!

 ### Command Palette Extensions
- - Replaced localized WebSearch setting keys with stable literals and numeric history count. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Enabled advanced markdown tables and emphasis extensions. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added setting to choose Clipboard History primary action (Paste vs Copy). Thanks [@jiripolasek](https://github.com/jiripolasek)
- - Added actionable empty-state hints for File Search (search PC / open indexing settings). Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Ensured all WinGet extension assets copy reliably to output. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Improved Run command line parsing for paths with spaces; sped up related tests.
- - Updated WebSearch extension icon set for enhanced clarity and contrast. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added Terminal profile sort order setting including MRU tracking. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added Uninstall Application command (UWP direct, Win32 via Settings). Thanks [@mKpwnz](https://github.com/mKpwnz)!
- - Deferred WinGet details loading and added timing logs.
- - Removed LINQ from All Apps extension for performance.
- - Added standardized key chord system + shortcuts to File Search commands. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added Terminal channel filter & remembered selection option. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Enabled loading local/data/app images in markdown with sizing hints. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added external extension reload via x-cmdpal://reload (configurable). Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Instant WebSearch history updates with in-memory store & events. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added keep-after-paste option and safe delete with confirmation for Clipboard History. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-
-### Environment Variables
- - Replaced custom window chrome with WinUI TitleBar for cleaner, maintainable Environment Variables UI.
-
-### File Locksmith
- - Adopted WinUI TitleBar to simplify window chrome while preserving appearance.
+ - Bookmarks: Added hints about bookmark placeholders to the Add/Edit Bookmark form. — Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Bookmarks: Improved migration of bookmarks from older versions and fixed an issue where aliases or keyboard shortcuts could be lost after restart. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Clipboard history: Items shown in Command Palette’s clipboard history now include helpful metadata. For example, image items show dimensions, text files show names and sizes, web links include page titles, and text entries display word counts. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - File search: Added filter buttons to show *all items*, *files only*, or *folders only*. Selecting a filter adds `kind:folders` or `kind:not folders` to narrow results.
+ - System commands: Replaced the `:red_circle:` placeholder with an actual red-circle emoji so the correct icon appears in the UI. Thanks [@samrueby](https://github.com/samrueby)!
+ - WinGet: Search performance feels more responsive because typed input is now processed via a task queue rather than complex cancellation tokens!
+ - Window Walker: UWP apps no longer show a "not responding" label when suspended. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Window Walker: Now displays the actual icon of each window rather than using the process icon, improving recognition of PWAs and Python GUIs. Thanks [@Lee-WonJun](https://github.com/Lee-WonJun)!
+- Windows Terminal profiles: Fixed a rare crash in the Windows Terminal extension when the `LOCALAPPDATA` environment variable was missing. The path is now retrieved via a reliable API. Thanks [@jiripolasek](https://github.com/jiripolasek)!

 ### Find My Mouse
- - Added transparent spotlight support with separate backdrop opacity; migrated to Windows App SDK composition APIs.
+ - Activating Find My Mouse no longer makes the cursor change to the busy (hourglass) icon or steals focus from your active application.

 ### Hosts File Editor
- - Migrated to native WinUI TitleBar for cleaner, maintainable window chrome.
+ - Added customizable backup settings allowing users to configure backup frequency, location, and auto-deletion policies. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+
+### Image Resizer
+ - Fixed settings consistency during batch resize operations by capturing settings once before processing. Thanks [@daverayment](https://github.com/daverayment)!

 ### Light Switch
- - Introduced as a brand-new PowerToy module.
- - Automatically switches between light and dark themes.
- - Supports time-based scheduling or location-based sunrise/sunset switching.
- - Supports using a keyboard shortcut to force a change.
- - Supports filtering changes for Apps and/or System Theme.
+- Introduced new UI to allow users to manually enter their latitude and longitude in Sunrise to Sunset mode.
+- Refactored service with cleaner state management for stability.
+- Removed logs from every tick, only logging key events to largely reduce log size.

 ### Mouse Pointer Crosshairs
- - Added Esc key to cancel active gliding cursor sequence. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
- - Added orientation option (vertical / horizontal / both) for crosshairs customization. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
+ - Enabled switching between Mouse Pointer Crosshairs and Gliding Cursor modes. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!

 ### Mouse Without Borders
- - Continued Common class refactor (part 5/7) by extracting clipboard and init/cleanup logic into focused classes. Thanks [@mikeclayton](https://github.com/mikeclayton)!
-
- - Fix connection failures caused by conflicting MachineId across machines.  Thanks [@noraa-junker](https://github.com/noraa-junker) for troubleshooting!
+ - Added horizontal scrolling support. Thanks [@MasonBergstrom](https://github.com/MasonBergstrom)!

 ### Peek
- - Added the option to activate Peek with just the Spacebar.
+- Fixed media files remaining locked after preview window closes. Thanks [@daverayment](https://github.com/daverayment)!
+- Added a command-line interface for file previewing. See the [Peek documentation](https://learn.microsoft.com/windows/powertoys/peek) for usage. Thanks [@prochan2](https://github.com/prochan2)!

 ### PowerRename
- - Fixed enumeration counter skipping when regex replacement equals original filename (counters now advance reliably). Thanks [@daverayment](https://github.com/daverayment)!
+- PowerRename no longer crashes due to a missing resources file.
+- Added photo metadata extraction support using EXIF and XMP for pattern-based renaming with camera info, GPS coordinates, and date taken. See [PowerRename Documentation](https://learn.microsoft.com/en-us/windows/powertoys/powerrename).

-### Quick Accent
- - Expanded Welsh layout with acute, grave, and dieresis variants for vowels (consistent ordering). Thanks [@PesBandi](https://github.com/PesBandi)!
+### PowerToys Run
+ - Added retry logic with exponential backoff to handle DWM composition errors during theme changes. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Updated OneNote icons to reflect new Microsoft 365 design. Thanks [@trevorNgo](https://github.com/trevorNgo)!

-### Registry Preview
- - Migrated to native TitleBar and AppWindow APIs for cleaner window chrome.
+ ### Quick Accent
+ - Added diameter symbol (⌀) for Shift+O in Special Characters mode, thanks to [@anselumjuju](https://github.com/anselumjuju)!

-### Screen Ruler
- - Fixed ARM64 crash by aligning cursor position structure to 8-byte boundary.
+### Zoomit
+ - Smoothed out zoom-animation in ZoomIt by coalescing mouse-move and timer events, thanks to [@foxmsft](https://github.com/foxmsft)!
+ - Enabled GIF support for ZoomIt, thanks to [@MarioHewardt](https://github.com/MarioHewardt)!
+ - Fixed spelling mistakes, and refactored some literal strings to string constants, thanks to [@lzandman](https://github.com/lzandman)!
+ - Fixed inaccurate "actual size" screenshots in ZoomIt and resolves a GDI handle leak, improving capture fidelity and long-session stability. thanks to [@daverayment](https://github.com/daverayment)!

 ### Settings
- - Added ability to ignore specific hotkey conflicts to reduce noise.
- - Stopped creating backup directory during dry-run status checks (cleaner first-run). 
- - Standardized casing and localization for ZoomIt and modules header.
- - Improved search results page accessibility and conditional module grouping.
+- Fixed title bar overlapping issue at smaller window sizes.
+- Refined shortcut control visual design with improved consistency and spacing.
+- Added dashboard utilities sorting by name or status.
+- Made update notification InfoBar in flyout clickable for direct navigation to update page.
+- Expanded installation instructions by default in README.
+- Improved accessibility for shortcut conflict button with static resource-based automation properties.
+- Added ScrollViewer to Command Palette page in PowerToys Settings. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+- Fixed module list glitches and Sort Status checkmark issue. Thanks [@daverayment](https://github.com/daverayment)!

-### ZoomIt
- - Updated resource file to reflect standalone v9.01 and current copyright year. Thanks [@foxmsft](https://github.com/foxmsft)!
- - Restored legacy draw/snipping behaviors and fixed recording race conditions. Thanks [@chakrik73](https://github.com/chakrik73)!
- - Added smooth image option for improved zoom quality using GDI+ for static zoom and Magnifier API for live zoom. Thanks [@markrussinovich](https://github.com/markrussinovich)!
-
- ### Documentation
- - New Microsoft Learn documentation for the Light Switch module.
- - New dev docs for the Light Switch module.
-
-### Development (Area-Build & Area-Tests) 
- Allowed debug launches to continue when modules fail to load, speeding developer iteration. 
- Fixed spell checker dictionary entry (advapi) to eliminate false error. 
- Added VS Code development guide and launch configs to streamline cross-editor workflows. 
- Upgraded Windows App SDK and related dependencies to 1.8 for newer platform features. 
- Rewrote YAML comment to resolve new spell checker forbidden pattern. Thanks [@jiripolasek](https://github.com/jiripolasek)! 
- Corrected solution structure by returning misplaced Common project, reducing build confusion. 
- Modernized build scripts with shared helpers and VS environment autodetection for simpler CLI builds. 
- Standardized build scripts and platform detection to improve reliability and reuse. 
- Added missing Command Palette version bump to align module release cadence. 
- Added EXECUTEDEFAULT term to dictionary to prevent regression build failures. Thanks [@jiripolasek](https://github.com/jiripolasek)! 
- Introduced nightly pre-warm pipeline and configurable MSBuild cache mode to improve CI performance. 
- Resolved CI forbidden pattern spelling complaint to keep pipelines green. 
- Added AI contributor instruction set to clarify code area expectations. 
- Added accessibility IDs to settings and FancyZones toggles, stabilizing UI tests. 
- Added automatic log collection on UI test failures to speed root cause analysis. 
- Stabilized Mouse Utils tests by switching to AccessibilityId selectors. 
- Added Screen Ruler UI test coverage to validate core measurement workflows. 
+### Development
+- Fixed accessibility by associating controls with labels for screen readers.
+- Added accessible name to Shortcut Conflicts button for screen readers.
+- Excluded TitleBars from tab navigation across multiple utilities. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+- Migrated build infrastructure from Windows Server 2019 to Server 2022 with improved failure logging and predictable NuGet package paths.
+- Configured build agents to use larger P: drive for release builds to address disk space constraints.
+- Enhanced DSC v3 support by organizing resource manifests in a dedicated subfolder with PATH configuration.
+- Reduced installer bundle size by 6-7MB through centralized Hybrid CRT configuration across all C++ projects.
+- Updated .NET packages to version 9.0.10 for security fixes. Thanks [@snickler](https://github.com/snickler)!
+- Fixed spell check dictionary entries for consistency.
+- Restored accidentally deleted NuGet configuration file for Command Palette extensions.
+- Fixed package identity build by updating AppxManifest entry points to use PowerShell Core.
+- Optimized CI pipeline by replacing file copy operations with hard links and moves, reducing build time and disk usage by 10-15GB.
+- Updated Copilot guidance and PR prompt workflow.
+- Included high-volume bugs in issue template header. Thanks [@daverayment](https://github.com/daverayment)!
+- Fixed incorrect HRESULT logging for inner exceptions. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+- Introduced shared sparse package identity for PowerToys Win32 components to enable access to Windows platform APIs.
+- Consolidated installer builds to produce both machine and user installers simultaneously, reducing build time and complexity.
+- Migrated exclusively to WiX v5 installer infrastructure, removing legacy WiX v3 support.
+- Temporarily removed PowerToys installer path from PATH environment variable to prevent application crashes.
+- Added complete OCR UI test coverage with automated tests for activation, settings, language selection, and text extraction.
+- Fixed test input for drive path normalization in bookmark resolver unit tests.
+- Fixed Peek UI tests by restoring Ctrl+Space activation shortcut for test scenarios.
+- Hided apps in PowerToys.SpareApps package from Start Menu. Thanks [@jiripolasek](https://github.com/jiripolasek)!

 ## 🛣️ Roadmap 
 We are planning some nice new features and improvements for the next releases – a revamped Keyboard Manager UI, custom endpoint and local model support for Advanced Paste, Command Palette improvements and a brand-new Shortcut Guide experience! Stay tuned for [v0.96][github-next-release-work]!
--- a/doc/devdocs/modules/lightswitch.md
+++ b/doc/devdocs/modules/lightswitch.md
@@ -33,9 +33,12 @@ The **Light Switch** module lets users automatically transition between light an

  > **Note:** Using the shortcut overrides the current schedule until the next transition event.

-* **LightSwitchService**
-  Reads settings and applies theming. Runs a check every minute to ensure the state is correct.
-
+* **LightSwitchService.cpp**
+  is the heart beat of the module. Controls ticking every minute and depending on user actions (manual override, settings changing, etc) triggers the state manager to perform the corresponding operation.
+  
+* **LightSwitchStateManager.cpp**
+  handles updating the state based on the signals sent by LightSwitchService.
+  
 * **SettingsXAML/LightSwitch**
  Provides the settings UI for configuring schedules, syncing location, and customizing shortcuts.

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

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

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

-        cred = vault.Retrieve(L"https://platform.openai.com/api-keys", L"PowerToys_AdvancedPaste_OpenAIKey");
-        vault.Remove(cred);
+        winrt::Windows::Security::Credentials::PasswordVault vault;
+
+        auto hasPrefix = [](std::wstring_view value, wchar_t const* prefix) {
+            std::wstring_view prefixView{ prefix };
+            return value.compare(0, prefixView.size(), prefixView) == 0;
+        };
+
+        const wchar_t* resourcePrefixes[] = {
+            L"https://platform.openai.com/api-keys",
+            L"https://azure.microsoft.com/products/ai-services/openai-service",
+            L"https://azure.microsoft.com/products/ai-services/ai-inference",
+            L"https://console.mistral.ai/account/api-keys",
+            L"https://ai.google.dev/",
+        };
+
+        const wchar_t* usernamePrefixes[] = {
+            L"PowerToys_AdvancedPaste_",
+        };
+
+        auto credentials = vault.RetrieveAll();
+        for (auto const& credential : credentials)
+        {
+            bool shouldRemove = false;
+
+            std::wstring resource{ credential.Resource() };
+            for (auto const prefix : resourcePrefixes)
+            {
+                if (hasPrefix(resource, prefix))
+                {
+                    shouldRemove = true;
+                    break;
+                }
+            }
+
+            if (!shouldRemove)
+            {
+                std::wstring username{ credential.UserName() };
+                for (auto const prefix : usernamePrefixes)
+                {
+                    if (hasPrefix(username, prefix))
+                    {
+                        shouldRemove = true;
+                        break;
+                    }
+                }
+            }
+
+            if (!shouldRemove)
+            {
+                continue;
+            }
+
+            try
+            {
+                vault.Remove(credential);
+            }
+            catch (...)
+            {
+            }
+        }
    }
    catch (...)
    {
--- a/src/PackageIdentity/AppxManifest.xml
+++ b/src/PackageIdentity/AppxManifest.xml
@@ -42,7 +42,8 @@
        Description="PowerToys OCR Module"
        BackgroundColor="transparent"
        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png">
+        Square44x44Logo="Images\Square44x44Logo.png"
+        AppListEntry="none">
      </uap:VisualElements>
    </Application>
    <Application Id="PowerToys.SettingsUI" Executable="WinUI3Apps\PowerToys.Settings.exe" EntryPoint="Windows.FullTrustApplication">
@@ -51,7 +52,8 @@
        Description="PowerToys Settings UI"
        BackgroundColor="transparent"
        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png">
+        Square44x44Logo="Images\Square44x44Logo.png"
+        AppListEntry="none">
      </uap:VisualElements>
    </Application>
    <Application Id="PowerToys.ImageResizerUI" Executable="WinUI3Apps\PowerToys.ImageResizer.exe" EntryPoint="Windows.FullTrustApplication">
@@ -60,7 +62,8 @@
        Description="PowerToys Image Resizer UI"
        BackgroundColor="transparent"
        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png">
+        Square44x44Logo="Images\Square44x44Logo.png"
+        AppListEntry="none">
      </uap:VisualElements>
    </Application>
  </Applications>
--- a/src/common/LanguageModelProvider/FoundryLocal/FoundryClient.cs
+++ b/src/common/LanguageModelProvider/FoundryLocal/FoundryClient.cs
@@ -10,6 +10,23 @@ namespace LanguageModelProvider.FoundryLocal;
 internal sealed class FoundryClient
 {
    public static async Task<FoundryClient?> CreateAsync()
+    {
+        // First attempt with current environment
+        var client = await TryCreateClientAsync().ConfigureAwait(false);
+        if (client != null)
+        {
+            return client;
+        }
+
+        // If failed, refresh PATH from registry and retry once
+        // This handles cases where PowerToys was launched by MSI installer.
+        Logger.LogInfo("[FoundryClient] First attempt failed, refreshing PATH and retrying");
+        RefreshEnvironmentPath();
+
+        return await TryCreateClientAsync().ConfigureAwait(false);
+    }
+
+    private static async Task<FoundryClient?> TryCreateClientAsync()
    {
        try
        {
@@ -169,41 +186,23 @@ internal sealed class FoundryClient

    public async Task<bool> EnsureModelLoaded(string modelId)
    {
-        try
+        Logger.LogInfo($"[FoundryClient] EnsureModelLoaded called with: {modelId}");
+
+        // Check if already loaded
+        if (await IsModelLoaded(modelId).ConfigureAwait(false))
        {
-            Logger.LogInfo($"[FoundryClient] EnsureModelLoaded called with: {modelId}");
-
-            // Check if already loaded
-            if (await IsModelLoaded(modelId).ConfigureAwait(false))
-            {
-                Logger.LogInfo($"[FoundryClient] Model already loaded: {modelId}");
-                return true;
-            }
-
-            // Check if model exists in cache
-            var cachedModels = await ListCachedModels().ConfigureAwait(false);
-            Logger.LogInfo($"[FoundryClient] Cached models: {string.Join(", ", cachedModels.Select(m => m.Name))}");
-
-            if (!cachedModels.Any(m => m.Name == modelId))
-            {
-                Logger.LogWarning($"[FoundryClient] Model not found in cache: {modelId}");
-                return false;
-            }
-
-            // Load the model
-            Logger.LogInfo($"[FoundryClient] Loading model: {modelId}");
-            await _foundryManager.LoadModelAsync(modelId).ConfigureAwait(false);
-
-            // Verify it's loaded
-            var loaded = await IsModelLoaded(modelId).ConfigureAwait(false);
-            Logger.LogInfo($"[FoundryClient] Model load result: {loaded}");
-            return loaded;
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"[FoundryClient] EnsureModelLoaded exception: {ex.Message}");
-            return false;
+            Logger.LogInfo($"[FoundryClient] Model already loaded: {modelId}");
+            return true;
        }
+
+        // Load the model
+        Logger.LogInfo($"[FoundryClient] Loading model: {modelId}");
+        await _foundryManager.LoadModelAsync(modelId).ConfigureAwait(false);
+
+        // Verify it's loaded
+        var loaded = await IsModelLoaded(modelId).ConfigureAwait(false);
+        Logger.LogInfo($"[FoundryClient] Model load result: {loaded}");
+        return loaded;
    }

    public async Task EnsureRunning()
@@ -213,4 +212,68 @@ internal sealed class FoundryClient
            await _foundryManager.StartServiceAsync();
        }
    }
+
+    /// <summary>
+    /// Refreshes the PATH environment variable from the system registry.
+    /// This is necessary when tools are installed while PowerToys is running,
+    /// as the installer updates the system PATH but running processes don't see the change.
+    /// </summary>
+    private static void RefreshEnvironmentPath()
+    {
+        try
+        {
+            Logger.LogInfo("[FoundryClient] Refreshing PATH environment variable from system");
+
+            var currentPath = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Process) ?? string.Empty;
+            var machinePath = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Machine) ?? string.Empty;
+            var userPath = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.User) ?? string.Empty;
+
+            var pathsToAdd = new List<string>();
+
+            if (!string.IsNullOrWhiteSpace(currentPath))
+            {
+                pathsToAdd.AddRange(currentPath.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries));
+            }
+
+            if (!string.IsNullOrWhiteSpace(userPath))
+            {
+                var userPaths = userPath.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
+                foreach (var path in userPaths)
+                {
+                    if (!pathsToAdd.Contains(path, StringComparer.OrdinalIgnoreCase))
+                    {
+                        pathsToAdd.Add(path);
+                    }
+                }
+            }
+
+            if (!string.IsNullOrWhiteSpace(machinePath))
+            {
+                var machinePaths = machinePath.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
+                foreach (var path in machinePaths)
+                {
+                    if (!pathsToAdd.Contains(path, StringComparer.OrdinalIgnoreCase))
+                    {
+                        pathsToAdd.Add(path);
+                    }
+                }
+            }
+
+            var newPath = string.Join(Path.PathSeparator.ToString(), pathsToAdd);
+
+            if (currentPath != newPath)
+            {
+                Logger.LogInfo("[FoundryClient] Updating process PATH with latest system values");
+                Environment.SetEnvironmentVariable("PATH", newPath, EnvironmentVariableTarget.Process);
+            }
+            else
+            {
+                Logger.LogInfo("[FoundryClient] PATH is already up to date");
+            }
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError($"[FoundryClient] Failed to refresh PATH: {ex.Message}");
+        }
+    }
 }
--- a/src/common/LanguageModelProvider/FoundryLocalModelProvider.cs
+++ b/src/common/LanguageModelProvider/FoundryLocalModelProvider.cs
@@ -12,8 +12,8 @@ namespace LanguageModelProvider;

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

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

    public IChatClient? GetIChatClient(string modelId)
    {
-        try
-        {
-            Logger.LogInfo($"[FoundryLocal] GetIChatClient called with url: {modelId}");
-            InitializeAsync().GetAwaiter().GetResult();
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"[FoundryLocal] Failed to initialize: {ex.Message}");
-            return null;
-        }
-
-        if (string.IsNullOrWhiteSpace(_serviceUrl) || _foundryClient == null)
-        {
-            Logger.LogError("[FoundryLocal] Service URL or manager is null");
-            return null;
-        }
+        Logger.LogInfo($"[FoundryLocal] GetIChatClient called with url: {modelId}");
+        InitializeAsync().GetAwaiter().GetResult();

        if (string.IsNullOrWhiteSpace(modelId))
        {
@@ -47,39 +33,38 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
            return null;
        }

-        // Ensure the model is loaded before returning chat client
-        try
+        // Check if model is in catalog
+        var isInCatalog = _catalogModels?.Any(m => m.Name == modelId) ?? false;
+        if (!isInCatalog)
        {
-            var isLoaded = _foundryClient.EnsureModelLoaded(modelId).GetAwaiter().GetResult();
-            if (!isLoaded)
-            {
-                Logger.LogError($"[FoundryLocal] Failed to load model: {modelId}");
-                return null;
-            }
-
-            Logger.LogInfo($"[FoundryLocal] Model is loaded: {modelId}");
+            var errorMessage = $"{modelId} is not supported in Foundry Local. Please configure supported models in Settings.";
+            Logger.LogError($"[FoundryLocal] {errorMessage}");
+            throw new InvalidOperationException(errorMessage);
        }
-        catch (Exception ex)
+
+        // Ensure the model is loaded before returning chat client
+        var isLoaded = _foundryClient!.EnsureModelLoaded(modelId).GetAwaiter().GetResult();
+        if (!isLoaded)
        {
-            Logger.LogError($"[FoundryLocal] Exception ensuring model loaded: {ex.Message}");
-            return null;
+            Logger.LogError($"[FoundryLocal] Failed to load model: {modelId}");
+            throw new InvalidOperationException($"Failed to load the model '{modelId}'.");
        }

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

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

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

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

-        Logger.LogInfo($"[FoundryLocal] Returning {_downloadedModels?.Count() ?? 0} downloaded models");
-        return _downloadedModels ?? [];
-    }
-
-    private void Reset()
-    {
-        _downloadedModels = null;
-        _ = InitializeAsync();
-    }
-
-    private async Task InitializeAsync(CancellationToken cancelationToken = default)
-    {
-        if (_foundryClient != null && _downloadedModels != null && _downloadedModels.Any())
-        {
-            await _foundryClient.EnsureRunning().ConfigureAwait(false);
-            return;
-        }
-
-        Logger.LogInfo("[FoundryLocal] Initializing provider");
-        _foundryClient ??= await FoundryClient.CreateAsync();
-
        if (_foundryClient == null)
        {
-            Logger.LogError("[FoundryLocal] Failed to create Foundry client");
-            return;
+            return Array.Empty<ModelDetails>();
        }

-        _serviceUrl ??= await _foundryClient.GetServiceUrl();
-        Logger.LogInfo($"[FoundryLocal] Service URL: {_serviceUrl}");
-
        var cachedModels = await _foundryClient.ListCachedModels();
-        Logger.LogInfo($"[FoundryLocal] Found {cachedModels.Count} cached models");
-
        List<ModelDetails> downloadedModels = [];

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

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

    public async Task<bool> IsAvailable()
--- a/src/common/LanguageModelProvider/ILanguageModelProvider.cs
+++ b/src/common/LanguageModelProvider/ILanguageModelProvider.cs
@@ -12,7 +12,7 @@ public interface ILanguageModelProvider

    string ProviderDescription { get; }

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

    IChatClient? GetIChatClient(string modelId);

--- a/src/common/LanguageModelProvider/ModelDetails.cs
+++ b/src/common/LanguageModelProvider/ModelDetails.cs
@@ -24,8 +24,6 @@ public class ModelDetails

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

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

    public object? ProviderModelDetails { get; set; }
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml
@@ -558,7 +558,7 @@
                                <TextBlock
                                    x:Uid="AIProvidersFlyoutHeader"
                                    Grid.Row="0"
-                                    Style="{StaticResource BodyStrongTextBlockStyle}" />
+                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
                                <ListView
                                    x:Name="AIProviderListView"
                                    Grid.Row="1"
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml
@@ -299,47 +299,49 @@
                </StackPanel>
            </controls:PromptBox.Footer>
        </controls:PromptBox>
-        <Grid Grid.Row="2" RowSpacing="4">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="{x:Bind ViewModel.StandardPasteFormats.Count, Mode=OneWay, Converter={StaticResource standardPasteFormatsToHeightConverter}}" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" MinHeight="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource customActionsToMinHeightConverter}}" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <ListView
-                x:Name="PasteOptionsListView"
-                Grid.Row="0"
-                VerticalAlignment="Bottom"
-                IsItemClickEnabled="True"
-                ItemClick="PasteFormat_ItemClick"
-                ItemContainerTransitions="{x:Null}"
-                ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
-                ItemsSource="{x:Bind ViewModel.StandardPasteFormats, Mode=OneWay}"
-                ScrollViewer.VerticalScrollBarVisibility="Visible"
-                ScrollViewer.VerticalScrollMode="Auto"
-                SelectionMode="None"
-                TabIndex="1" />
-            <Rectangle
-                Grid.Row="1"
-                Height="1"
-                HorizontalAlignment="Stretch"
-                Fill="{ThemeResource DividerStrokeColorDefaultBrush}"
-                Visibility="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource countToVisibilityConverter}}" />
+        <ScrollViewer Grid.Row="2">
+            <Grid RowSpacing="4">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="{x:Bind ViewModel.StandardPasteFormats.Count, Mode=OneWay, Converter={StaticResource standardPasteFormatsToHeightConverter}}" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" MinHeight="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource customActionsToMinHeightConverter}}" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <ListView
+                    x:Name="PasteOptionsListView"
+                    Grid.Row="0"
+                    VerticalAlignment="Bottom"
+                    IsItemClickEnabled="True"
+                    ItemClick="PasteFormat_ItemClick"
+                    ItemContainerTransitions="{x:Null}"
+                    ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
+                    ItemsSource="{x:Bind ViewModel.StandardPasteFormats, Mode=OneWay}"
+                    ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                    ScrollViewer.VerticalScrollMode="Disabled"
+                    SelectionMode="None"
+                    TabIndex="1" />
+                <Rectangle
+                    Grid.Row="1"
+                    Height="1"
+                    HorizontalAlignment="Stretch"
+                    Fill="{ThemeResource DividerStrokeColorDefaultBrush}"
+                    Visibility="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource countToVisibilityConverter}}" />

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

            var properties = settings.Properties;
+            bool legacyAdvancedAIConsumed = properties.TryConsumeLegacyAdvancedAIEnabled(out var advancedFlag);
+            bool legacyAdvancedAIEnabled = legacyAdvancedAIConsumed && advancedFlag;
+            PasswordCredential legacyCredential = TryGetLegacyOpenAICredential();
+
+            if (legacyCredential is null)
+            {
+                return legacyAdvancedAIConsumed;
+            }
+
            var configuration = properties.PasteAIConfiguration;

            if (configuration is null)
@@ -176,30 +185,11 @@ namespace AdvancedPaste.Settings
                properties.PasteAIConfiguration = configuration;
            }

-            bool hasLegacyProviders = configuration.LegacyProviderConfigurations is { Count: > 0 };
-            bool legacyAdvancedAIConsumed = properties.TryConsumeLegacyAdvancedAIEnabled(out var advancedFlag);
-            bool legacyAdvancedAIEnabled = legacyAdvancedAIConsumed && advancedFlag;
-            PasswordCredential legacyCredential = TryGetLegacyOpenAICredential();
-
-            if (!hasLegacyProviders && legacyCredential is null && !legacyAdvancedAIConsumed)
-            {
-                return false;
-            }
-
            bool configurationUpdated = false;

-            if (hasLegacyProviders)
-            {
-                configurationUpdated |= AdvancedPasteMigrationHelper.MigrateLegacyProviderConfigurations(configuration);
-            }
-
-            PasteAIProviderDefinition openAIProvider = null;
-            if (legacyCredential is not null || hasLegacyProviders || legacyAdvancedAIConsumed)
-            {
-                var ensureResult = AdvancedPasteMigrationHelper.EnsureOpenAIProvider(configuration);
-                openAIProvider = ensureResult.Provider;
-                configurationUpdated |= ensureResult.Updated;
-            }
+            var ensureResult = AdvancedPasteMigrationHelper.EnsureOpenAIProvider(configuration);
+            PasteAIProviderDefinition openAIProvider = ensureResult.Provider;
+            configurationUpdated |= ensureResult.Updated;

            if (legacyAdvancedAIConsumed && openAIProvider is not null && openAIProvider.EnableAdvancedAI != legacyAdvancedAIEnabled)
            {
@@ -207,13 +197,13 @@ namespace AdvancedPaste.Settings
                configurationUpdated = true;
            }

-            if (legacyCredential is not null && openAIProvider is not null)
+            if (openAIProvider is not null)
            {
                StoreMigratedOpenAICredential(openAIProvider.Id, openAIProvider.ServiceType, legacyCredential.Password);
                RemoveLegacyOpenAICredential();
            }

-            bool shouldEnableAI = legacyCredential is not null;
+            const bool shouldEnableAI = true;
            bool enabledUpdated = false;
            if (properties.IsAIEnabled != shouldEnableAI)
            {
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/AdvancedAIKernelService.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/AdvancedAIKernelService.cs
@@ -215,7 +215,6 @@ public sealed class AdvancedAIKernelService : KernelServiceBase
        return new OpenAIPromptExecutionSettings
        {
            FunctionChoiceBehavior = FunctionChoiceBehavior.Auto(),
-            Temperature = 0.01,
        };
    }
 }
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/FoundryLocalPasteProvider.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/FoundryLocalPasteProvider.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using AdvancedPaste.Helpers;
 using AdvancedPaste.Models;
 using LanguageModelProvider;
 using Microsoft.Extensions.AI;
@@ -33,10 +34,6 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider
        _config = config;
    }

-    public string ProviderName => AIServiceType.FoundryLocal.ToNormalizedKey();
-
-    public string DisplayName => string.IsNullOrWhiteSpace(_config?.Model) ? "Foundry Local" : _config.Model;
-
    public async Task<bool> IsAvailableAsync(CancellationToken cancellationToken)
    {
        cancellationToken.ThrowIfCancellationRequested();
@@ -76,13 +73,20 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider
            }

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

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

        if (!string.IsNullOrWhiteSpace(systemPrompt))
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/SemanticKernelPasteProvider.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/SemanticKernelPasteProvider.cs
@@ -157,8 +157,6 @@ namespace AdvancedPaste.Services.CustomActions
            {
                AIServiceType.OpenAI or AIServiceType.AzureOpenAI => new OpenAIPromptExecutionSettings
                {
-                    Temperature = 0.01,
-                    MaxTokens = 2000,
                    FunctionChoiceBehavior = null,
                },
                _ => new PromptExecutionSettings(),
--- a/src/modules/AdvancedPaste/AdvancedPaste/Strings/en-us/Resources.resw
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Strings/en-us/Resources.resw
@@ -160,10 +160,10 @@
    <value>Active provider: {0}</value>
  </data>
  <data name="AIProvidersFlyoutHeader.Text" xml:space="preserve">
-    <value>AI providers</value>
+    <value>Configured models</value>
  </data>
  <data name="AIProvidersEmptyText.Text" xml:space="preserve">
-    <value>No AI providers configured</value>
+    <value>No models configured</value>
  </data>
  <data name="AIProvidersManageButtonContent.Content" xml:space="preserve">
    <value>Configure models in Settings</value>
@@ -364,8 +364,12 @@
  <data name="CustomEndpointWarning" xml:space="preserve">
    <value>You are using a custom endpoint. Verify all answers.</value>
  </data>
-  <data name="LocalModelBadge" xml:space="preserve">
+  <data name="LocalModelBadge.Text" xml:space="preserve">
    <value>Local</value>
    <comment>Badge label displayed next to local AI model providers (e.g., Ollama, Foundry Local) to indicate the model runs locally</comment>
  </data>
+  <data name="FoundryLocal_UnableToLoadModel" xml:space="preserve">
+    <value>Unable to load Foundry Local model: {0}</value>
+    <comment>{0} is the model identifier. Do not translate {0}.</comment>
+  </data>
 </root>
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp
@@ -271,7 +271,6 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)

        if (wait == WAIT_OBJECT_0 + (hParent ? (hManualOverride ? 3 : 2) : 2))
        {
-            Logger::info(L"[LightSwitchService] Settings file changed event detected.");
            ResetEvent(hSettingsChanged);
            LightSwitchSettings::instance().LoadSettings();
            stateManager.OnSettingsChanged();
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchStateManager.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchStateManager.cpp
@@ -17,12 +17,10 @@ LightSwitchStateManager::LightSwitchStateManager()
 void LightSwitchStateManager::OnSettingsChanged()
 {
    std::lock_guard<std::mutex> lock(_stateMutex);
-    Logger::info(L"[LightSwitchStateManager] Settings changed event received");

    // If manual override was active, clear it so new settings take effect
    if (_state.isManualOverride)
    {
-        Logger::info(L"[LightSwitchStateManager] Clearing manual override due to settings update.");
        _state.isManualOverride = false;
    }

@@ -33,7 +31,6 @@ void LightSwitchStateManager::OnSettingsChanged()
 void LightSwitchStateManager::OnTick(int currentMinutes)
 {
    std::lock_guard<std::mutex> lock(_stateMutex);
-    Logger::debug(L"[LightSwitchStateManager] Tick received: {}", currentMinutes);
    EvaluateAndApplyIfNeeded();
 }

@@ -51,7 +48,7 @@ void LightSwitchStateManager::OnManualOverride()

        _state.isAppsLightActive = GetCurrentAppsTheme();

-        Logger::info(L"[LightSwitchStateManager] Synced internal theme state to current system theme ({}) and apps theme ({}).",
+        Logger::debug(L"[LightSwitchStateManager] Synced internal theme state to current system theme ({}) and apps theme ({}).",
                     (_state.isSystemLightActive ? L"light" : L"dark"),
                     (_state.isAppsLightActive ? L"light" : L"dark"));
    }
@@ -79,9 +76,9 @@ void LightSwitchStateManager::SyncInitialThemeState()
    std::lock_guard<std::mutex> lock(_stateMutex);
    _state.isSystemLightActive = GetCurrentSystemTheme();
    _state.isAppsLightActive = GetCurrentAppsTheme();
-    Logger::info(L"[LightSwitchStateManager] Synced initial state to current system theme ({})",
+    Logger::debug(L"[LightSwitchStateManager] Synced initial state to current system theme ({})",
                 _state.isSystemLightActive ? L"light" : L"dark");
-    Logger::info(L"[LightSwitchStateManager] Synced initial state to current apps theme ({})",
+    Logger::debug(L"[LightSwitchStateManager] Synced initial state to current apps theme ({})",
                 _state.isAppsLightActive ? L"light" : L"dark");
 }

@@ -127,7 +124,6 @@ void LightSwitchStateManager::EvaluateAndApplyIfNeeded()
    // Early exit: OFF mode just pauses activity
    if (_currentSettings.scheduleMode == ScheduleMode::Off)
    {
-        Logger::debug(L"[LightSwitchStateManager] Mode is OFF — pausing service logic.");
        _state.lastTickMinutes = now;
        return;
    }
@@ -145,7 +141,6 @@ void LightSwitchStateManager::EvaluateAndApplyIfNeeded()

        if (newDay || modeChangedToSun)
        {
-            Logger::info(L"[LightSwitchStateManager] Recalculating sun times (mode/day change).");
            auto [newLightTime, newDarkTime] = update_sun_times(_currentSettings);
            _state.lastEvaluatedDay = st.wDay;
            _state.effectiveLightMinutes = newLightTime + _currentSettings.sunrise_offset;
@@ -188,12 +183,10 @@ void LightSwitchStateManager::EvaluateAndApplyIfNeeded()

        if (crossedBoundary)
        {
-            Logger::info(L"[LightSwitchStateManager] Manual override cleared after crossing boundary.");
            _state.isManualOverride = false;
        }
        else
        {
-            Logger::debug(L"[LightSwitchStateManager] Manual override active — skipping auto apply.");
            _state.lastTickMinutes = now;
            return;
        }
@@ -206,7 +199,7 @@ void LightSwitchStateManager::EvaluateAndApplyIfNeeded()
    bool appsNeedsToChange = _currentSettings.changeApps && (_state.isAppsLightActive != shouldBeLight);
    bool systemNeedsToChange = _currentSettings.changeSystem && (_state.isSystemLightActive != shouldBeLight);

-    Logger::debug(
+    /* Logger::debug(
        L"[LightSwitchStateManager] now = {:02d}:{:02d}, light boundary = {:02d}:{:02d} ({}), dark boundary = {:02d}:{:02d} ({})",
        now / 60,
        now % 60,
@@ -215,12 +208,12 @@ void LightSwitchStateManager::EvaluateAndApplyIfNeeded()
        _state.effectiveLightMinutes,
        _state.effectiveDarkMinutes / 60,
        _state.effectiveDarkMinutes % 60,
-        _state.effectiveDarkMinutes);
+        _state.effectiveDarkMinutes); */

-    Logger::debug("should be light = {}, apps needs change = {}, system needs change = {}",
+    /* Logger::debug("should be light = {}, apps needs change = {}, system needs change = {}",
                  shouldBeLight ? "true" : "false",
                  appsNeedsToChange ? "true" : "false",
-                  systemNeedsToChange ? "true" : "false");
+                  systemNeedsToChange ? "true" : "false"); */

    // Only apply theme if there's a change or no override active
    if (!_state.isManualOverride && (appsNeedsToChange || systemNeedsToChange))
@@ -230,10 +223,6 @@ void LightSwitchStateManager::EvaluateAndApplyIfNeeded()

        _state.isSystemLightActive = GetCurrentSystemTheme();
        _state.isAppsLightActive = GetCurrentAppsTheme();
-
-        Logger::debug(L"[LightSwitchStateManager] Synced post-apply theme state — System: {}, Apps: {}",
-                      _state.isSystemLightActive ? L"light" : L"dark",
-                      _state.isAppsLightActive ? L"light" : L"dark");
    }

    _state.lastTickMinutes = now;
--- a/src/modules/ZoomIt/ZoomIt/ZoomIt.h
+++ b/src/modules/ZoomIt/ZoomIt/ZoomIt.h
@@ -39,6 +39,10 @@ type_pEnableThemeDialogTexture    pEnableThemeDialogTexture;
 #define WIN7_VERSION		0x106
 #define WIN10_VERSION		0x206

+// Default recording format frame rates
+#define RECORDING_FORMAT_GIF_DEFAULT_FRAMERATE 15
+#define RECORDING_FORMAT_MP4_DEFAULT_FRAMERATE 30
+
 // Time that we'll cache live zoom window to avoid flicker
 // of live zooming on Vista/ws2k8
 #define LIVEZOOM_WINDOW_TIMEOUT	2*3600*1000
--- a/src/modules/ZoomIt/ZoomIt/ZoomIt.rc
+++ b/src/modules/ZoomIt/ZoomIt/ZoomIt.rc
@@ -121,7 +121,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
    DEFPUSHBUTTON   "OK",IDOK,166,306,50,14
    PUSHBUTTON      "Cancel",IDCANCEL,223,306,50,14
-    LTEXT           "ZoomIt v9.20",IDC_VERSION,42,7,73,10
+    LTEXT           "ZoomIt v9.21",IDC_VERSION,42,7,73,10
    LTEXT           "Copyright © 2006-2025 Mark Russinovich",IDC_COPYRIGHT,42,17,231,8
    CONTROL         "<a HREF=""https://www.sysinternals.com"">Sysinternals - www.sysinternals.com</a>",IDC_LINK,
                    "SysLink",WS_TABSTOP,42,26,150,9
--- a/src/modules/ZoomIt/ZoomIt/ZoomItSettings.h
+++ b/src/modules/ZoomIt/ZoomIt/ZoomItSettings.h
@@ -44,11 +44,11 @@ LOGFONT	g_LogFont;
 BOOLEAN g_DemoTypeUserDriven = false;
 TCHAR   g_DemoTypeFile[MAX_PATH] = {0};
 DWORD	g_DemoTypeSpeedSlider = static_cast<int>(((MIN_TYPING_SPEED - MAX_TYPING_SPEED) / 2) + MAX_TYPING_SPEED);
-DWORD	g_RecordFrameRate = 30;
+DWORD   g_RecordFrameRate = 30; // We default to 30 here, but g_RecordFrameRate can be different depending on recording format and gets set accordingly
 DWORD	g_RecordScaling = 100;
 DWORD	g_RecordScalingGIF = 50;
 DWORD	g_RecordScalingMP4 = 100;
-RecordingFormat g_RecordingFormat = RecordingFormat::GIF;
+RecordingFormat g_RecordingFormat = RecordingFormat::MP4;
 BOOLEAN g_CaptureAudio = FALSE;
 TCHAR	g_MicrophoneDeviceId[MAX_PATH] = {0};

@@ -87,8 +87,7 @@ REG_SETTING RegSettings[] = {
    { L"SnapToGrid", SETTING_TYPE_BOOLEAN, 0, &g_SnapToGrid, static_cast<DOUBLE>(g_SnapToGrid) },
    { L"ZoominSliderLevel", SETTING_TYPE_DWORD, 0, &g_SliderZoomLevel, static_cast<DOUBLE>(g_SliderZoomLevel) },
    { L"Font", SETTING_TYPE_BINARY, sizeof g_LogFont, &g_LogFont, static_cast<DOUBLE>(0) },
-    { L"RecordFrameRate", SETTING_TYPE_DWORD, 0, &g_RecordFrameRate, static_cast<DOUBLE>(g_RecordFrameRate) },
-    { L"RecordingFormat", SETTING_TYPE_DWORD, 0, &g_RecordingFormat, static_cast<DOUBLE>(0) },
+    { L"RecordingFormat", SETTING_TYPE_DWORD, 0, &g_RecordingFormat, static_cast<DOUBLE>(g_RecordingFormat) },
    { L"RecordScalingGIF", SETTING_TYPE_DWORD, 0, &g_RecordScalingGIF, static_cast<DOUBLE>(g_RecordScalingGIF) },
    { L"RecordScalingMP4", SETTING_TYPE_DWORD, 0, &g_RecordScalingMP4, static_cast<DOUBLE>(g_RecordScalingMP4) },
    { L"CaptureAudio", SETTING_TYPE_BOOLEAN, 0, &g_CaptureAudio, static_cast<DOUBLE>(g_CaptureAudio) },
--- a/src/modules/ZoomIt/ZoomIt/Zoomit.cpp
+++ b/src/modules/ZoomIt/ZoomIt/Zoomit.cpp
@@ -168,6 +168,7 @@ BOOL	g_RecordToggle = FALSE;
 BOOL	g_RecordCropping = FALSE;
 SelectRectangle g_SelectRectangle;
 std::wstring	g_RecordingSaveLocation;
+std::wstring	g_RecordingSaveLocationGIF;
 winrt::IDirect3DDevice	g_RecordDevice{ nullptr };
 std::shared_ptr<VideoRecordingSession> g_RecordingSession = nullptr;
 std::shared_ptr<GifRecordingSession> g_GifRecordingSession = nullptr;
@@ -2173,7 +2174,10 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
        CheckDlgButton( g_OptionsTabs[RECORD_PAGE].hPage, IDC_CAPTURE_AUDIO,
            g_CaptureAudio ? BST_CHECKED: BST_UNCHECKED );

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

        // Apply tray icon setting
        EnableDisableTrayIcon(hWnd, g_ShowTrayIcon);
--- a/src/modules/awake/Awake/Core/Manager.cs
+++ b/src/modules/awake/Awake/Core/Manager.cs
@@ -350,7 +350,7 @@ namespace Awake.Core
                            TrayHelper.TimedIcon,
                            TrayIconAction.Update);
                    },
-                    _ => HandleTimerCompletion("timed"),
+                    () => HandleTimerCompletion("timed"),
                    _tokenSource.Token);
        }

--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/IExtensionService.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/IExtensionService.cs
@@ -4,6 +4,7 @@

 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.CommandPalette.Extensions;
 using Windows.Foundation;

 namespace Microsoft.CmdPal.Core.Common.Services;
@@ -27,6 +28,12 @@ public interface IExtensionService

    void DisableExtension(string extensionUniqueId);

+    /// <summary>
+    /// Notifies all extensions that support the HostSettings capability about a settings change.
+    /// </summary>
+    /// <param name="settings">The updated host settings.</param>
+    void NotifyHostSettingsChanged(IHostSettings settings);
+
    ///// <summary>
    ///// Gets a boolean indicating whether the extension was disabled due to the corresponding Windows optional feature
    ///// being absent from the machine or in an unknown state.
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/IExtensionWrapper.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/IExtensionWrapper.cs
@@ -110,4 +110,10 @@ public interface IExtensionWrapper
    /// <returns>Nullable instance of the provider</returns>
    Task<IEnumerable<T>> GetListOfProvidersAsync<T>()
        where T : class;
+
+    /// <summary>
+    /// Notifies the extension that host settings have changed.
+    /// </summary>
+    /// <param name="settings">The updated host settings.</param>
+    void NotifyHostSettingsChanged(IHostSettings settings);
 }
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/AppExtensionHost.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/AppExtensionHost.cs
@@ -5,6 +5,7 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using Microsoft.CmdPal.Core.Common;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.Foundation;
@@ -13,6 +14,12 @@ namespace Microsoft.CmdPal.Core.ViewModels;

 public abstract partial class AppExtensionHost : IExtensionHost
 {
+    /// <summary>
+    /// Gets or sets a function that returns the current IHostSettings.
+    /// This is set by the application to provide settings to extensions.
+    /// </summary>
+    public static Func<IHostSettings?>? GetHostSettingsFunc { get; set; }
+
    private static readonly GlobalLogPageContext _globalLogPageContext = new();

    private static ulong _hostingHwnd;
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs
@@ -64,6 +64,8 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext

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

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

+        Id = page.Id;
        Name = page.Name;
        ModelIsLoading = page.IsLoading;
        Title = page.Title;
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandProviderWrapper.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandProviderWrapper.cs
@@ -214,10 +214,29 @@ public sealed class CommandProviderWrapper
        Logger.LogDebug($"Provider supports {apiExtensions.Length} extensions");
        foreach (var a in apiExtensions)
        {
-            if (a is IExtendedAttributesProvider command2)
+            if (a is IExtendedAttributesProvider)
            {
                Logger.LogDebug($"{ProviderId}: Found an IExtendedAttributesProvider");
            }
+
+            if (a is IHostSettingsChanged handler)
+            {
+                Logger.LogDebug($"{ProviderId}: Found an IHostSettingsChanged, sending initial settings");
+
+                // Send initial settings to the extension
+                try
+                {
+                    var settings = AppExtensionHost.GetHostSettingsFunc?.Invoke();
+                    if (settings != null)
+                    {
+                        handler.OnHostSettingsChanged(settings);
+                    }
+                }
+                catch (Exception e)
+                {
+                    Logger.LogDebug($"Failed to send initial settings to {ProviderId}: {e.Message}");
+                }
+            }
        }
    }

--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/HostSettingsConverter.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/HostSettingsConverter.cs
@@ -0,0 +1,49 @@
+// 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.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.UI.ViewModels;
+
+/// <summary>
+/// Provides conversion between SettingsModel and IHostSettings for extension communication.
+/// </summary>
+public static class HostSettingsConverter
+{
+    /// <summary>
+    /// Converts a SettingsModel to an IHostSettings object that can be passed to extensions.
+    /// </summary>
+    /// <param name="settings">The settings model to convert.</param>
+    /// <returns>An IHostSettings object with the current settings values.</returns>
+    public static IHostSettings ToHostSettings(this SettingsModel settings)
+    {
+        return new HostSettings
+        {
+            Hotkey = settings.Hotkey?.ToString() ?? string.Empty,
+            ShowAppDetails = settings.ShowAppDetails,
+            HotkeyGoesHome = settings.HotkeyGoesHome,
+            BackspaceGoesBack = settings.BackspaceGoesBack,
+            SingleClickActivates = settings.SingleClickActivates,
+            HighlightSearchOnActivate = settings.HighlightSearchOnActivate,
+            ShowSystemTrayIcon = settings.ShowSystemTrayIcon,
+            IgnoreShortcutWhenFullscreen = settings.IgnoreShortcutWhenFullscreen,
+            DisableAnimations = settings.DisableAnimations,
+            SummonOn = ConvertSummonTarget(settings.SummonOn),
+        };
+    }
+
+    private static SummonTarget ConvertSummonTarget(MonitorBehavior behavior)
+    {
+        return behavior switch
+        {
+            MonitorBehavior.ToMouse => SummonTarget.ToMouse,
+            MonitorBehavior.ToPrimary => SummonTarget.ToPrimary,
+            MonitorBehavior.ToFocusedWindow => SummonTarget.ToFocusedWindow,
+            MonitorBehavior.InPlace => SummonTarget.InPlace,
+            MonitorBehavior.ToLast => SummonTarget.ToLast,
+            _ => SummonTarget.ToMouse,
+        };
+    }
+}
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionService.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionService.cs
@@ -400,6 +400,29 @@ public partial class ExtensionService : IExtensionService, IDisposable
        _enabledExtensions.Remove(extension.First());
    }

+    /// <summary>
+    /// Notifies all extensions about a settings change.
+    /// </summary>
+    /// <param name="settings">The updated host settings.</param>
+    public void NotifyHostSettingsChanged(IHostSettings settings)
+    {
+        Task.Run(async () =>
+        {
+            var extensions = await GetInstalledExtensionsAsync();
+            foreach (var extension in extensions)
+            {
+                try
+                {
+                    extension.NotifyHostSettingsChanged(settings);
+                }
+                catch (Exception ex)
+                {
+                    Logger.LogError($"Failed to notify extension {extension.ExtensionUniqueId} of settings change", ex);
+                }
+            }
+        });
+    }
+
    /*
    ///// <inheritdoc cref="IExtensionService.DisableExtensionIfWindowsFeatureNotAvailable(IExtensionWrapper)"/>
    //public async Task<bool> DisableExtensionIfWindowsFeatureNotAvailable(IExtensionWrapper extension)
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionWrapper.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionWrapper.cs
@@ -12,6 +12,9 @@ using Windows.Win32;
 using Windows.Win32.System.Com;
 using WinRT;

+#pragma warning disable IDE0005 // Using directive is unnecessary - needed for HostSettings
+#pragma warning restore IDE0005
+
 namespace Microsoft.CmdPal.UI.ViewModels.Models;

 public class ExtensionWrapper : IExtensionWrapper
@@ -201,4 +204,37 @@ public class ExtensionWrapper : IExtensionWrapper
    public void AddProviderType(ProviderType providerType) => _providerTypes.Add(providerType);

    public bool HasProviderType(ProviderType providerType) => _providerTypes.Contains(providerType);
+
+    /// <summary>
+    /// Notifies the extension that host settings have changed.
+    /// </summary>
+    /// <param name="settings">The updated host settings.</param>
+    public void NotifyHostSettingsChanged(IHostSettings settings)
+    {
+        try
+        {
+            var provider = GetExtensionObject()?.GetProvider(ProviderType.Commands);
+            if (provider is not ICommandProvider2 provider2)
+            {
+                return;
+            }
+
+            // Get the IHostSettingsChanged handler from GetApiExtensionStubs().
+            // This pattern works reliably in OOP scenarios because the stub objects
+            // are properly marshalled across the process boundary.
+            var apiExtensions = provider2.GetApiExtensionStubs();
+            foreach (var stub in apiExtensions)
+            {
+                if (stub is IHostSettingsChanged handler)
+                {
+                    handler.OnHostSettingsChanged(settings);
+                    return;
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            Logger.LogDebug($"Failed to notify {ExtensionDisplayName} of settings change: {e.Message}");
+        }
+    }
 }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs
@@ -160,10 +160,23 @@ public partial class App : Application
        services.AddSingleton(sm);
        var state = AppStateModel.LoadState();
        services.AddSingleton(state);
-        services.AddSingleton<IExtensionService, ExtensionService>();
+        var extensionService = new ExtensionService();
+        services.AddSingleton<IExtensionService>(extensionService);
        services.AddSingleton<TrayIconService>();
        services.AddSingleton<IRunHistoryService, RunHistoryService>();

+        // Set up host settings for extensions
+        AppExtensionHost.GetHostSettingsFunc = () => sm.ToHostSettings();
+
+        // Subscribe to settings changes and notify extensions
+        sm.SettingsChanged += (sender, _) =>
+        {
+            if (sender is SettingsModel settings)
+            {
+                extensionService.NotifyHostSettingsChanged(settings.ToHostSettings());
+            }
+        };
+
        services.AddSingleton<IRootPageService, PowerToysRootPageService>();
        services.AddSingleton<IAppHostService, PowerToysAppHostService>();
        services.AddSingleton<ITelemetryService, TelemetryForwarder>();
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Events/OpenPage.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Events/OpenPage.cs
@@ -15,9 +15,12 @@ public class OpenPage : EventBase, IEvent
 {
    public int PageDepth { get; set; }

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

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

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

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

--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/launchSettings.json
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/launchSettings.json
@@ -5,6 +5,11 @@
      "nativeDebugging": false,
      "doNotLaunchApp": false
    },
+    "Microsoft.CmdPal.UI (Package) + Native debugging": {
+      "commandName": "MsixPackage",
+      "nativeDebugging": true,
+      "doNotLaunchApp": false
+    },
    "Microsoft.CmdPal.UI (Unpackaged)": {
      "commandName": "Project"
    }
--- a/src/modules/cmdpal/doc/Extension-HostSettings-Design.md
+++ b/src/modules/cmdpal/doc/Extension-HostSettings-Design.md
@@ -0,0 +1,442 @@
+---
+author: Yu Leng
+created on: 2025-01-24
+last updated: 2025-01-24
+---
+
+# Extension Host Settings API
+
+## Abstract
+
+This document describes the Host Settings API, which allows Command Palette extensions to access and respond to host application settings. Extensions can read settings like hotkey configuration, UI preferences, and behavior options, enabling them to adapt their behavior and display relevant information to users.
+
+## Table of Contents
+
+- [Background](#background)
+  - [Problem Statement](#problem-statement)
+  - [User Scenarios](#user-scenarios)
+  - [Design Goals](#design-goals)
+- [High-Level Design](#high-level-design)
+  - [Architecture Overview](#architecture-overview)
+  - [Key Design Decisions](#key-design-decisions)
+- [Detailed Design](#detailed-design)
+  - [Data Flow](#data-flow)
+  - [Cross-Process Communication](#cross-process-communication)
+  - [Implementation Files](#implementation-files)
+- [API Reference](#api-reference)
+  - [WinRT Interfaces](#winrt-interfaces)
+  - [Toolkit Classes](#toolkit-classes)
+- [Usage Examples](#usage-examples)
+- [Compatibility](#compatibility)
+- [Future Considerations](#future-considerations)
+
+## Background
+
+### Problem Statement
+
+Command Palette extensions run in separate processes (out-of-process/OOP) from the host application for security and stability. However, some extensions need to be aware of the host's configuration to provide a better user experience. For example:
+
+1. An extension displaying keyboard shortcuts needs to know the current hotkey setting
+2. An extension with animations should respect the "Disable Animations" preference
+3. A diagnostic extension might want to display all current settings for troubleshooting
+
+Without a formal API, extensions have no way to access this information, limiting their ability to integrate seamlessly with the host application.
+
+### User Scenarios
+
+**Scenario 1: Settings Display Extension**
+A developer creates a diagnostic page that displays all current Command Palette settings. This helps users understand their configuration and troubleshoot issues.
+
+**Scenario 2: Adaptive UI Extension**
+An extension with rich animations checks the `DisableAnimations` setting and disables its own animations when the user prefers reduced motion.
+
+**Scenario 3: Keyboard Shortcut Helper**
+An extension that teaches keyboard shortcuts displays the user's configured hotkey so instructions match their actual configuration.
+
+### Design Goals
+
+1. **Cross-Process Safety**: Work reliably across the OOP boundary between host and extension
+2. **Real-Time Updates**: Extensions receive notifications when settings change
+3. **AOT Compatibility**: All code must be compatible with Ahead-of-Time compilation
+4. **Minimal API Surface**: Simple, focused interfaces that are easy to use
+5. **Backward Compatibility**: Old extensions gracefully ignore new capabilities; old hosts don't break new extensions
+
+## High-Level Design
+
+### Architecture Overview
+
+```
+┌─────────────────────────────────────────────────────────────────┐
+│                     Host (CmdPal.UI)                            │
+│                                                                 │
+│  SettingsModel ──(SettingsChanged)──► ExtensionService          │
+│       │                                    │                    │
+│       │                                    ▼                    │
+│       │                            ExtensionWrapper             │
+│       │                                    │                    │
+│       │                      GetApiExtensionStubs()             │
+│       │                                    │                    │
+│       │                         ┌──────────┴──────────┐         │
+│       │                         ▼                     ▼         │
+│       │              IExtendedAttributesProvider  IHostSettingsChanged
+│       │                                               │         │
+│       └──(initial settings)───────────────────────────┤         │
+│                      via CommandProviderWrapper       │         │
+└───────────────────────────────────────────────────────│─────────┘
+                               OOP Boundary             │
+┌───────────────────────────────────────────────────────│─────────┐
+│                     Extension Process                 │         │
+│                                                       ▼         │
+│  CommandProvider                                                │
+│       │                                                         │
+│       ├── GetApiExtensionStubs() returns:                       │
+│       │      • SupportCommandsWithProperties                    │
+│       │      • HostSettingsChangedHandler ◄─────────────────┐   │
+│       │                                                     │   │
+│       └── OnHostSettingsChanged(settings) ◄─────────────────┘   │
+│                      │                                          │
+│                      ▼                                          │
+│            HostSettingsManager.Update(settings)                 │
+│                      │                                          │
+│                      ▼                                          │
+│            SettingsChanged event                                │
+│                      │                                          │
+│                      ▼                                          │
+│            Extension Pages (e.g., HostSettingsPage)             │
+└─────────────────────────────────────────────────────────────────┘
+```
+
+### Key Design Decisions
+
+#### 1. Cross-Process Interface Detection via GetApiExtensionStubs
+
+**Problem:** The `is` operator for interface detection doesn't work reliably across process boundaries in WinRT/COM scenarios. When the host tries to check `if (provider is IHostSettingsChanged)`, it fails because the interface isn't in the direct inheritance chain of the proxy object.
+
+**Solution:** Use the `GetApiExtensionStubs()` pattern. The extension returns stub objects that are properly marshalled across the process boundary, allowing reliable interface detection on the host side.
+
+```csharp
+// In CommandProvider.cs (Toolkit)
+public object[] GetApiExtensionStubs()
+{
+    return [
+        new SupportCommandsWithProperties(),      // For IExtendedAttributesProvider
+        new HostSettingsChangedHandler(this)      // For IHostSettingsChanged
+    ];
+}
+
+// In ExtensionWrapper.cs (Host)
+foreach (var stub in provider2.GetApiExtensionStubs())
+{
+    if (stub is IHostSettingsChanged handler)  // This works across OOP!
+    {
+        handler.OnHostSettingsChanged(settings);
+        return;
+    }
+}
+```
+
+#### 2. Unified Settings Delivery
+
+Both initial settings and change notifications use the same `OnHostSettingsChanged` path:
+
+- **Initial Settings:** Sent by `CommandProviderWrapper.UnsafePreCacheApiAdditions()` when discovering the handler during extension startup
+- **Change Notifications:** Sent by `ExtensionWrapper.NotifyHostSettingsChanged()` when the user modifies settings
+
+This simplifies the design by having a single code path for settings delivery.
+
+#### 3. Capability Detection via ICommandProvider2
+
+Use `is ICommandProvider2` as the capability gate. If an extension implements `ICommandProvider2`, it's using the modern toolkit and may support host settings (if it provides an `IHostSettingsChanged` stub).
+
+```csharp
+if (provider is ICommandProvider2 provider2)
+{
+    // Extension uses modern toolkit, check for settings support
+    var stubs = provider2.GetApiExtensionStubs();
+    // ...
+}
+```
+
+## Detailed Design
+
+### Data Flow
+
+#### Extension Startup (Initial Settings)
+
+```
+Extension starts
+    └─► CommandProviderWrapper created
+        └─► LoadTopLevelCommands()
+            └─► UnsafePreCacheApiAdditions(provider2)
+                └─► GetApiExtensionStubs()
+                    └─► Find IHostSettingsChanged handler
+                        └─► handler.OnHostSettingsChanged(currentSettings)
+                            └─► HostSettingsManager.Update(settings)
+```
+
+#### Settings Change Notification
+
+```
+User changes settings in CmdPal
+    └─► SettingsModel.SettingsChanged event
+        └─► ExtensionService.NotifyHostSettingsChanged(settings)
+            └─► foreach extension:
+                └─► ExtensionWrapper.NotifyHostSettingsChanged(settings)
+                    └─► GetApiExtensionStubs()
+                        └─► Find IHostSettingsChanged handler
+                            └─► handler.OnHostSettingsChanged(settings)
+                                └─► HostSettingsManager.Update(settings)
+                                    └─► SettingsChanged?.Invoke()
+```
+
+### Cross-Process Communication
+
+The settings are passed as an `IHostSettings` WinRT interface, which is automatically marshalled by the WinRT runtime across the process boundary. The host creates a `HostSettings` object (via `HostSettingsConverter.ToHostSettings()`), and the extension receives a proxy that implements the same interface.
+
+Key considerations:
+
+1. **No Reflection:** All type checking uses WinRT's native QueryInterface mechanism
+2. **AOT Safe:** All types are known at compile time
+3. **Error Handling:** All cross-process calls are wrapped in try-catch to handle extension crashes gracefully
+
+### Implementation Files
+
+#### Host Side
+
+| File | Purpose |
+|------|---------|
+| `App.xaml.cs` | Subscribes to `SettingsModel.SettingsChanged`, sets up `GetHostSettingsFunc` |
+| `AppExtensionHost.cs` | Provides `GetHostSettingsFunc` static property for settings access |
+| `HostSettingsConverter.cs` | Extension method to convert `SettingsModel` to `IHostSettings` |
+| `ExtensionService.cs` | Broadcasts settings changes to all extensions via `NotifyHostSettingsChanged()` |
+| `ExtensionWrapper.cs` | Sends settings to individual extension via `NotifyHostSettingsChanged()` |
+| `CommandProviderWrapper.cs` | Sends initial settings when discovering `IHostSettingsChanged` handler |
+
+#### Extension/Toolkit Side
+
+| File | Purpose |
+|------|---------|
+| `CommandProvider.cs` | Base class providing `IHostSettingsChanged` stub via `GetApiExtensionStubs()` |
+| `HostSettingsManager.cs` | Static manager with `Current` property and `SettingsChanged` event |
+| `HostSettings.cs` | Toolkit implementation of `IHostSettings` interface |
+
+## API Reference
+
+### WinRT Interfaces
+
+#### IHostSettings
+
+Represents the host application settings that can be passed to extensions.
+
+```idl
+[contract(Microsoft.CommandPalette.Extensions.ExtensionsContract, 1)]
+interface IHostSettings
+{
+    String Hotkey { get; };
+    Boolean ShowAppDetails { get; };
+    Boolean HotkeyGoesHome { get; };
+    Boolean BackspaceGoesBack { get; };
+    Boolean SingleClickActivates { get; };
+    Boolean HighlightSearchOnActivate { get; };
+    Boolean ShowSystemTrayIcon { get; };
+    Boolean IgnoreShortcutWhenFullscreen { get; };
+    Boolean DisableAnimations { get; };
+    SummonTarget SummonOn { get; };
+}
+```
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `Hotkey` | String | The keyboard shortcut to activate Command Palette (e.g., "Alt+Space") |
+| `ShowAppDetails` | Boolean | Whether to show application details in the UI |
+| `HotkeyGoesHome` | Boolean | Whether pressing the hotkey returns to the home page |
+| `BackspaceGoesBack` | Boolean | Whether backspace navigates back when search is empty |
+| `SingleClickActivates` | Boolean | Whether single-click activates items (vs double-click) |
+| `HighlightSearchOnActivate` | Boolean | Whether to highlight search text on activation |
+| `ShowSystemTrayIcon` | Boolean | Whether to show the system tray icon |
+| `IgnoreShortcutWhenFullscreen` | Boolean | Whether to ignore the hotkey when a fullscreen app is active |
+| `DisableAnimations` | Boolean | Whether animations are disabled |
+| `SummonOn` | SummonTarget | Where to position the window when summoned |
+
+#### SummonTarget
+
+Enum representing the position behavior when summoning Command Palette.
+
+```idl
+[contract(Microsoft.CommandPalette.Extensions.ExtensionsContract, 1)]
+enum SummonTarget
+{
+    ToMouse = 0,
+    ToPrimary = 1,
+    ToFocusedWindow = 2,
+    InPlace = 3,
+    ToLast = 4,
+};
+```
+
+#### IHostSettingsChanged
+
+Interface for extensions to receive settings change notifications.
+
+```idl
+[contract(Microsoft.CommandPalette.Extensions.ExtensionsContract, 1)]
+interface IHostSettingsChanged
+{
+    void OnHostSettingsChanged(IHostSettings settings);
+}
+```
+
+### Toolkit Classes
+
+#### HostSettingsManager
+
+Static class providing access to current host settings and change notifications.
+
+```csharp
+namespace Microsoft.CommandPalette.Extensions.Toolkit;
+
+public static class HostSettingsManager
+{
+    /// <summary>
+    /// Occurs when the host settings have changed.
+    /// </summary>
+    public static event Action? SettingsChanged;
+
+    /// <summary>
+    /// Gets the current host settings, or null if not yet initialized.
+    /// </summary>
+    public static IHostSettings? Current { get; }
+
+    /// <summary>
+    /// Gets whether host settings are available.
+    /// </summary>
+    public static bool IsAvailable { get; }
+}
+```
+
+#### CommandProvider Virtual Method
+
+Extensions can override this method for custom settings handling:
+
+```csharp
+public abstract partial class CommandProvider
+{
+    /// <summary>
+    /// Called when host settings change. Override to handle settings changes.
+    /// The default implementation updates HostSettingsManager.
+    /// </summary>
+    public virtual void OnHostSettingsChanged(IHostSettings settings)
+    {
+        HostSettingsManager.Update(settings);
+    }
+}
+```
+
+## Usage Examples
+
+### Reading Settings in a Page
+
+```csharp
+public class MyPage : ListPage
+{
+    public MyPage()
+    {
+        // Subscribe to changes
+        HostSettingsManager.SettingsChanged += () => RaiseItemsChanged();
+    }
+
+    public override IListItem[] GetItems()
+    {
+        var settings = HostSettingsManager.Current;
+        if (settings == null)
+        {
+            return [new ListItem(new NoOpCommand())
+            {
+                Title = "Settings not available"
+            }];
+        }
+
+        return [
+            new ListItem(new NoOpCommand())
+            {
+                Title = $"Hotkey: {settings.Hotkey}"
+            },
+            new ListItem(new NoOpCommand())
+            {
+                Title = $"Animations: {(settings.DisableAnimations ? "Off" : "On")}"
+            },
+        ];
+    }
+}
+```
+
+### Custom Settings Handler in CommandProvider
+
+```csharp
+public class MyCommandProvider : CommandProvider
+{
+    public override void OnHostSettingsChanged(IHostSettings settings)
+    {
+        base.OnHostSettingsChanged(settings);  // Update HostSettingsManager
+
+        // Custom logic
+        if (settings.DisableAnimations)
+        {
+            DisableMyAnimations();
+        }
+    }
+}
+```
+
+### Checking Settings Availability
+
+```csharp
+public void DoSomething()
+{
+    if (!HostSettingsManager.IsAvailable)
+    {
+        // Running with old host, use defaults
+        return;
+    }
+
+    var settings = HostSettingsManager.Current!;
+    // Use settings...
+}
+```
+
+## Compatibility
+
+### Extension Compatibility
+
+| Extension Type | Behavior |
+|----------------|----------|
+| Old extensions (no ICommandProvider2) | Won't receive settings, gracefully skipped |
+| Extensions without IHostSettingsChanged stub | Won't receive settings, gracefully skipped |
+| New extensions with IHostSettingsChanged | Receive initial settings and change notifications |
+
+### Host Compatibility
+
+| Host Version | Behavior |
+|--------------|----------|
+| Old hosts (no settings support) | `HostSettingsManager.Current` will be null |
+| New hosts | Full settings support |
+
+Extensions should always check `HostSettingsManager.IsAvailable` or handle null `Current` values.
+
+## Future Considerations
+
+### Adding New Settings
+
+To add a new setting property:
+
+1. Add property to `IHostSettings` interface in IDL
+2. Add property to `HostSettings.cs` class in Toolkit
+3. Update `HostSettingsConverter.ToHostSettings()` to include the new property
+
+### Extension-Specific Settings
+
+Future versions could allow extensions to register their own settings that the host would store and provide back, enabling a unified settings experience.
+
+### Bi-Directional Settings
+
+Currently, settings flow one-way from host to extension. A future enhancement could allow extensions to request settings changes (with user consent).
--- a/src/modules/cmdpal/doc/initial-sdk-spec/initial-sdk-spec.md
+++ b/src/modules/cmdpal/doc/initial-sdk-spec/initial-sdk-spec.md
@@ -74,6 +74,7 @@ functionality.
    - [Settings helpers](#settings-helpers)
  - [Advanced scenarios](#advanced-scenarios)
    - [Status messages](#status-messages)
+    - [Host Settings](#host-settings)
    - [Rendering of ICommandItems in Lists and Menus](#rendering-of-icommanditems-in-lists-and-menus)
  - [Class diagram](#class-diagram)
  - [Future considerations](#future-considerations)
@@ -1904,6 +1905,160 @@ instance from the host app.
 to remember that these are x-proc calls, and should be treated asynchronously.
 Should the other properties be async too?

+### Host Settings
+
+Extensions may need to be aware of the host application's settings to provide a
+better user experience. For example, an extension displaying keyboard shortcuts
+needs to know the current hotkey setting, or an extension with animations should
+respect the "Disable Animations" preference.
+
+The Host Settings API allows extensions to read host settings and receive
+notifications when those settings change. This works across the out-of-process
+(OOP) boundary using the `GetApiExtensionStubs()` pattern described in
+[Addenda I](#addenda-i-api-additions-icommandprovider2).
+
+#### IHostSettings Interface
+
+The `IHostSettings` interface provides read-only access to the host's current
+settings:
+
+```c#
+enum SummonTarget
+{
+    ToMouse = 0,
+    ToPrimary = 1,
+    ToFocusedWindow = 2,
+    InPlace = 3,
+    ToLast = 4,
+};
+
+interface IHostSettings
+{
+    String Hotkey { get; };
+    Boolean ShowAppDetails { get; };
+    Boolean HotkeyGoesHome { get; };
+    Boolean BackspaceGoesBack { get; };
+    Boolean SingleClickActivates { get; };
+    Boolean HighlightSearchOnActivate { get; };
+    Boolean ShowSystemTrayIcon { get; };
+    Boolean IgnoreShortcutWhenFullscreen { get; };
+    Boolean DisableAnimations { get; };
+    SummonTarget SummonOn { get; };
+}
+```
+
+| Property | Description |
+|----------|-------------|
+| `Hotkey` | The keyboard shortcut to activate Command Palette (e.g., "Alt+Space") |
+| `ShowAppDetails` | Whether to show application details in the UI |
+| `HotkeyGoesHome` | Whether pressing the hotkey returns to the home page |
+| `BackspaceGoesBack` | Whether backspace navigates back when search is empty |
+| `SingleClickActivates` | Whether single-click activates items (vs double-click) |
+| `HighlightSearchOnActivate` | Whether to highlight search text on activation |
+| `ShowSystemTrayIcon` | Whether to show the system tray icon |
+| `IgnoreShortcutWhenFullscreen` | Whether to ignore the hotkey when a fullscreen app is active |
+| `DisableAnimations` | Whether animations are disabled |
+| `SummonOn` | Where to position the window when summoned |
+
+#### IHostSettingsChanged Interface
+
+Extensions that want to receive settings must provide an `IHostSettingsChanged`
+stub via the `GetApiExtensionStubs()` pattern:
+
+```c#
+interface IHostSettingsChanged
+{
+    void OnHostSettingsChanged(IHostSettings settings);
+}
+```
+
+The host will call `OnHostSettingsChanged` in two scenarios:
+1. **Initial settings**: When the extension is first loaded
+2. **Settings changes**: When the user modifies Command Palette settings
+
+#### Using Host Settings (Toolkit)
+
+For extensions using the Toolkit, host settings are automatically managed. The
+`CommandProvider` base class provides the `IHostSettingsChanged` stub, and
+settings are cached in `HostSettingsManager`:
+
+```cs
+// Access current settings anywhere in your extension
+var settings = HostSettingsManager.Current;
+if (settings != null)
+{
+    var hotkey = settings.Hotkey;
+    var animationsDisabled = settings.DisableAnimations;
+}
+
+// Check if settings are available
+if (HostSettingsManager.IsAvailable)
+{
+    // Host supports settings
+}
+```
+
+To respond to settings changes, subscribe to the `SettingsChanged` event:
+
+```cs
+public class MyPage : ListPage
+{
+    public MyPage()
+    {
+        // Refresh the page when settings change
+        HostSettingsManager.SettingsChanged += () => RaiseItemsChanged();
+    }
+
+    public override IListItem[] GetItems()
+    {
+        var settings = HostSettingsManager.Current;
+        if (settings == null)
+        {
+            return [new ListItem(new NoOpCommand())
+            {
+                Title = "Settings not available"
+            }];
+        }
+
+        return [
+            new ListItem(new NoOpCommand())
+            {
+                Title = $"Current Hotkey: {settings.Hotkey}"
+            },
+        ];
+    }
+}
+```
+
+#### Custom Settings Handler
+
+Extensions can override `OnHostSettingsChanged` in their `CommandProvider` to
+add custom handling logic:
+
+```cs
+public class MyCommandProvider : CommandProvider
+{
+    public override void OnHostSettingsChanged(IHostSettings settings)
+    {
+        base.OnHostSettingsChanged(settings);  // Update HostSettingsManager
+
+        // Custom logic
+        if (settings.DisableAnimations)
+        {
+            DisableMyAnimations();
+        }
+    }
+}
+```
+
+#### Compatibility
+
+- **Old extensions** (no `ICommandProvider2`): Won't receive settings, gracefully skipped
+- **Old hosts** (no settings support): `HostSettingsManager.Current` will be null
+
+Extensions should always check `HostSettingsManager.IsAvailable` or handle null
+`Current` values to ensure compatibility with older hosts.
+
 ### Rendering of ICommandItems in Lists and Menus

 When displaying a list item:
@@ -2032,19 +2187,31 @@ public partial class SamplePagesCommandsProvider : CommandProvider, ICommandProv

    // Here is where we enable support for future additions to the API
    public object[] GetApiExtensionStubs() {
-        return [new SupportCommandsWithProperties()];
+        return [
+            new SupportCommandsWithProperties(),
+            new HostSettingsChangedHandler(this)
+        ];
    }
    private sealed partial class SupportCommandsWithProperties : IExtendedAttributesProvider {
        public IDictionary<string, object>? GetProperties() => null;
    }
+    private sealed partial class HostSettingsChangedHandler : IHostSettingsChanged {
+        private readonly SamplePagesCommandsProvider _provider;
+        public HostSettingsChangedHandler(SamplePagesCommandsProvider provider) => _provider = provider;
+        public void OnHostSettingsChanged(IHostSettings settings) => _provider.OnHostSettingsChanged(settings);
+    }
 }

 ```

+This pattern is used for multiple API extensions:
+- `IExtendedAttributesProvider`: Allows commands to expose additional properties
+- `IHostSettingsChanged`: Allows extensions to receive host settings updates (see [Host Settings](#host-settings))
+
 Fortunately, we can put all of that (`GetApiExtensionStubs`,
-`SupportCommandsWithProperties`) directly in `Toolkit.CommandProvider`, so
-developers won't have to do anything. The toolkit will just do the right thing
-for them.
+`SupportCommandsWithProperties`, `HostSettingsChangedHandler`) directly in
+`Toolkit.CommandProvider`, so developers won't have to do anything. The toolkit
+will just do the right thing for them.

 ## Class diagram

--- a/src/modules/cmdpal/ext/SamplePagesExtension/Pages/HostSettingsPage.cs
+++ b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/HostSettingsPage.cs
@@ -0,0 +1,83 @@
+// 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.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace SamplePagesExtension;
+
+/// <summary>
+/// A sample page that displays the current Host Settings values.
+/// This demonstrates how extensions can access and display the Command Palette's global settings.
+/// </summary>
+internal sealed partial class HostSettingsPage : ListPage
+{
+    public HostSettingsPage()
+    {
+        Icon = new IconInfo("\uE713"); // Settings icon
+        Name = "Host Settings";
+        Title = "Current Host Settings";
+
+        // Subscribe to settings changes to refresh the page when settings are updated
+        HostSettingsManager.SettingsChanged += OnSettingsChanged;
+        ExtensionHost.LogMessage($"[HostSettingsPage] Constructor called, subscribed to SettingsChanged");
+    }
+
+    private void OnSettingsChanged()
+    {
+        ExtensionHost.LogMessage($"[HostSettingsPage] OnSettingsChanged called, invoking RaiseItemsChanged");
+
+        // Notify the UI to refresh the items list
+        RaiseItemsChanged();
+        ExtensionHost.LogMessage($"[HostSettingsPage] RaiseItemsChanged completed");
+    }
+
+    public override IListItem[] GetItems()
+    {
+        ExtensionHost.LogMessage($"[HostSettingsPage] GetItems called");
+        var settings = HostSettingsManager.Current;
+
+        if (settings == null)
+        {
+            return [
+                new ListItem(new NoOpCommand())
+                {
+                    Title = "Host Settings not available",
+                    Subtitle = "Settings have not been received from the host yet",
+                    Icon = new IconInfo("\uE7BA"), // Warning icon
+                },
+            ];
+        }
+
+        return [
+            CreateSettingItem("Hotkey", settings.Hotkey, "\uE765"), // Keyboard icon
+            CreateSettingItem("Show App Details", settings.ShowAppDetails, "\uE946"), // View icon
+            CreateSettingItem("Hotkey Goes Home", settings.HotkeyGoesHome, "\uE80F"), // Home icon
+            CreateSettingItem("Backspace Goes Back", settings.BackspaceGoesBack, "\uE72B"), // Back icon
+            CreateSettingItem("Single Click Activates", settings.SingleClickActivates, "\uE8B0"), // Mouse icon
+            CreateSettingItem("Highlight Search On Activate", settings.HighlightSearchOnActivate, "\uE8D6"), // Highlight icon
+            CreateSettingItem("Show System Tray Icon", settings.ShowSystemTrayIcon, "\uE8A5"), // System icon
+            CreateSettingItem("Ignore Shortcut When Fullscreen", settings.IgnoreShortcutWhenFullscreen, "\uE740"), // Fullscreen icon
+            CreateSettingItem("Disable Animations", settings.DisableAnimations, "\uE916"), // Play icon
+            CreateSettingItem("Summon On", settings.SummonOn.ToString(), "\uE7C4"), // Position icon
+        ];
+    }
+
+    private static ListItem CreateSettingItem(string name, object value, string iconGlyph)
+    {
+        var displayValue = value switch
+        {
+            bool b => b ? "Enabled" : "Disabled",
+            string s when string.IsNullOrEmpty(s) => "(not set)",
+            _ => value?.ToString() ?? "null",
+        };
+
+        return new ListItem(new NoOpCommand())
+        {
+            Title = name,
+            Subtitle = displayValue,
+            Icon = new IconInfo(iconGlyph),
+        };
+    }
+}
--- a/src/modules/cmdpal/ext/SamplePagesExtension/SamplesListPage.cs
+++ b/src/modules/cmdpal/ext/SamplePagesExtension/SamplesListPage.cs
@@ -101,6 +101,14 @@ public partial class SamplesListPage : ListPage
            Subtitle = "A demo of the settings helpers",
        },

+        // Host Settings
+        new ListItem(new HostSettingsPage())
+        {
+            Title = "Host Settings",
+            Subtitle = "View current Command Palette host settings",
+            Icon = new IconInfo("\uE713"), // Settings icon
+        },
+
        // Evil edge cases
        // Anything weird that might break the palette - put that in here.
        new ListItem(new EvilSamplesPage())
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/CommandProvider.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/CommandProvider.cs
@@ -6,7 +6,7 @@ using Windows.Foundation;

 namespace Microsoft.CommandPalette.Extensions.Toolkit;

-public abstract partial class CommandProvider : ICommandProvider, ICommandProvider2
+public abstract partial class CommandProvider : ICommandProvider, ICommandProvider2, IHostSettingsChanged
 {
    public virtual string Id { get; protected set; } = string.Empty;

@@ -30,6 +30,16 @@ public abstract partial class CommandProvider : ICommandProvider, ICommandProvid

    public virtual void InitializeWithHost(IExtensionHost host) => ExtensionHost.Initialize(host);

+    /// <summary>
+    /// Called when the host settings have changed. Override this method to respond to settings changes.
+    /// The base implementation updates the HostSettingsManager cache.
+    /// </summary>
+    /// <param name="settings">The updated host settings.</param>
+    public virtual void OnHostSettingsChanged(IHostSettings settings)
+    {
+        HostSettingsManager.Update(settings);
+    }
+
 #pragma warning disable CA1816 // Dispose methods should call SuppressFinalize
    public virtual void Dispose()
    {
@@ -57,7 +67,7 @@ public abstract partial class CommandProvider : ICommandProvider, ICommandProvid
    /// <returns>an array of objects that implement all the leaf interfaces we support</returns>
    public object[] GetApiExtensionStubs()
    {
-        return [new SupportCommandsWithProperties()];
+        return [new SupportCommandsWithProperties(), new HostSettingsChangedHandler(this)];
    }

    /// <summary>
@@ -69,4 +79,18 @@ public abstract partial class CommandProvider : ICommandProvider, ICommandProvid
    {
        public IDictionary<string, object>? GetProperties() => null;
    }
+
+    /// <summary>
+    /// A stub class which implements IHostSettingsChanged. This is marshalled across
+    /// the ABI so that the host can call OnHostSettingsChanged on this object,
+    /// which then delegates to the CommandProvider's OnHostSettingsChanged method.
+    /// </summary>
+    private sealed partial class HostSettingsChangedHandler : IHostSettingsChanged
+    {
+        private readonly CommandProvider _provider;
+
+        public HostSettingsChangedHandler(CommandProvider provider) => _provider = provider;
+
+        public void OnHostSettingsChanged(IHostSettings settings) => _provider.OnHostSettingsChanged(settings);
+    }
 }
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/HostSettings.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/HostSettings.cs
@@ -0,0 +1,62 @@
+// 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.CommandPalette.Extensions.Toolkit;
+
+/// <summary>
+/// Concrete implementation of IHostSettings for the Command Palette host settings.
+/// This class is used by the host to create settings objects that can be passed to extensions.
+/// </summary>
+public partial class HostSettings : IHostSettings
+{
+    /// <summary>
+    /// Gets or sets the global hotkey for summoning the Command Palette.
+    /// </summary>
+    public string Hotkey { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether to show app details in the UI.
+    /// </summary>
+    public bool ShowAppDetails { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether pressing the hotkey goes to the home page.
+    /// </summary>
+    public bool HotkeyGoesHome { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether backspace navigates back.
+    /// </summary>
+    public bool BackspaceGoesBack { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether single click activates items.
+    /// </summary>
+    public bool SingleClickActivates { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether to highlight the search box on activation.
+    /// </summary>
+    public bool HighlightSearchOnActivate { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether to show the system tray icon.
+    /// </summary>
+    public bool ShowSystemTrayIcon { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether to ignore the shortcut when in fullscreen mode.
+    /// </summary>
+    public bool IgnoreShortcutWhenFullscreen { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether animations are disabled.
+    /// </summary>
+    public bool DisableAnimations { get; set; }
+
+    /// <summary>
+    /// Gets or sets the target monitor behavior when summoning the Command Palette.
+    /// </summary>
+    public SummonTarget SummonOn { get; set; }
+}
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/HostSettingsManager.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/HostSettingsManager.cs
@@ -0,0 +1,54 @@
+// 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.CommandPalette.Extensions.Toolkit;
+
+/// <summary>
+/// Provides static access to the current Command Palette host settings.
+/// Extensions can use this class to read the current settings values and respond to changes.
+/// </summary>
+public static class HostSettingsManager
+{
+    private static IHostSettings? _current;
+
+    /// <summary>
+    /// Occurs when the host settings have changed.
+    /// Extensions can subscribe to this event to refresh their UI when settings are updated.
+    /// </summary>
+    public static event Action? SettingsChanged;
+
+    /// <summary>
+    /// Gets the current host settings, or null if not yet initialized.
+    /// </summary>
+    public static IHostSettings? Current => _current;
+
+    /// <summary>
+    /// Gets a value indicating whether host settings are available.
+    /// Returns false if the extension is running with an older host that doesn't support settings.
+    /// </summary>
+    public static bool IsAvailable => _current != null;
+
+    /// <summary>
+    /// Initializes the host settings. Called internally by ExtensionHost during initialization.
+    /// </summary>
+    /// <param name="settings">The initial host settings.</param>
+    internal static void Initialize(IHostSettings settings) => _current = settings;
+
+    /// <summary>
+    /// Updates the cached host settings. Called internally when settings change.
+    /// </summary>
+    /// <param name="settings">The updated host settings.</param>
+    internal static void Update(IHostSettings settings)
+    {
+        _current = settings;
+#if DEBUG
+        var subscriberCount = SettingsChanged?.GetInvocationList().Length ?? 0;
+        ExtensionHost.LogMessage($"[HostSettingsManager] Update called, subscriber count: {subscriberCount}");
+#endif
+        SettingsChanged?.Invoke();
+#if DEBUG
+        ExtensionHost.LogMessage($"[HostSettingsManager] SettingsChanged event invoked");
+#endif
+    }
+}
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.idl
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.idl
@@ -391,6 +391,53 @@ namespace Microsoft.CommandPalette.Extensions
    {
        Object[] GetApiExtensionStubs();
    };
-    
+
+    // =========================================================================
+    // Host Settings and Capability System
+    // =========================================================================
+
+    /// <summary>
+    /// Represents the position behavior when summoning the Command Palette.
+    /// </summary>
+    [contract(Microsoft.CommandPalette.Extensions.ExtensionsContract, 1)]
+    enum SummonTarget
+    {
+        ToMouse = 0,
+        ToPrimary = 1,
+        ToFocusedWindow = 2,
+        InPlace = 3,
+        ToLast = 4,
+    };
+
+    /// <summary>
+    /// Interface for host settings that can be passed to extensions across process boundaries.
+    /// Extensions can access these settings to adapt their behavior accordingly.
+    /// The Toolkit provides a concrete HostSettings class that implements this interface.
+    /// </summary>
+    [contract(Microsoft.CommandPalette.Extensions.ExtensionsContract, 1)]
+    interface IHostSettings
+    {
+        String Hotkey { get; };
+        Boolean ShowAppDetails { get; };
+        Boolean HotkeyGoesHome { get; };
+        Boolean BackspaceGoesBack { get; };
+        Boolean SingleClickActivates { get; };
+        Boolean HighlightSearchOnActivate { get; };
+        Boolean ShowSystemTrayIcon { get; };
+        Boolean IgnoreShortcutWhenFullscreen { get; };
+        Boolean DisableAnimations { get; };
+        SummonTarget SummonOn { get; };
+    }
+
+    /// <summary>
+    /// Interface for extensions to receive notifications when host settings change.
+    /// Extensions implementing this interface will be notified whenever the user
+    /// modifies Command Palette settings, including initial settings on startup.
+    /// </summary>
+    [contract(Microsoft.CommandPalette.Extensions.ExtensionsContract, 1)]
+    interface IHostSettingsChanged
+    {
+        void OnHostSettingsChanged(IHostSettings settings);
+    }

 }
--- a/src/modules/imageresizer/ui/ImageResizerUI.csproj
+++ b/src/modules/imageresizer/ui/ImageResizerUI.csproj
@@ -24,13 +24,13 @@
    <ApplicationIcon>Resources\ImageResizer.ico</ApplicationIcon>
  </PropertyGroup>

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

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

  <ItemGroup>
    <EmbeddedResource Update="Properties\Resources.resx">
--- a/src/settings-ui/Settings.UI.Library/AIProviderConfigurationSnapshot.cs
+++ b/src/settings-ui/Settings.UI.Library/AIProviderConfigurationSnapshot.cs
@@ -1,35 +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.Text.Json.Serialization;
-
-namespace Microsoft.PowerToys.Settings.UI.Library
-{
-    /// <summary>
-    /// Stores provider-specific configuration overrides so each AI service can keep distinct settings.
-    /// </summary>
-    public class AIProviderConfigurationSnapshot
-    {
-        [JsonPropertyName("model-name")]
-        public string ModelName { get; set; } = string.Empty;
-
-        [JsonPropertyName("endpoint-url")]
-        public string EndpointUrl { get; set; } = string.Empty;
-
-        [JsonPropertyName("api-version")]
-        public string ApiVersion { get; set; } = string.Empty;
-
-        [JsonPropertyName("deployment-name")]
-        public string DeploymentName { get; set; } = string.Empty;
-
-        [JsonPropertyName("model-path")]
-        public string ModelPath { get; set; } = string.Empty;
-
-        [JsonPropertyName("system-prompt")]
-        public string SystemPrompt { get; set; } = string.Empty;
-
-        [JsonPropertyName("moderation-enabled")]
-        public bool ModerationEnabled { get; set; } = true;
-    }
-}
--- a/src/settings-ui/Settings.UI.Library/AIServiceTypeRegistry.cs
+++ b/src/settings-ui/Settings.UI.Library/AIServiceTypeRegistry.cs
@@ -19,7 +19,7 @@ public static class AIServiceTypeRegistry
        {
            ServiceType = AIServiceType.AzureAIInference,
            DisplayName = "Azure AI Inference",
-            IconPath = "ms-appx:///Assets/Settings/Icons/Models/FoundryLocal.svg", // No icon for Azure AI Inference, use Foundry Local temporarily
+            IconPath = "ms-appx:///Assets/Settings/Icons/Models/Azure.svg",
            IsOnlineService = true,
            LegalDescription = "AdvancedPaste_AzureAIInference_LegalDescription",
            TermsLabel = "AdvancedPaste_AzureAIInference_TermsLabel",
--- a/src/settings-ui/Settings.UI.Library/AdvancedPasteMigrationHelper.cs
+++ b/src/settings-ui/Settings.UI.Library/AdvancedPasteMigrationHelper.cs
@@ -13,56 +13,12 @@ namespace Microsoft.PowerToys.Settings.UI.Library
    /// </summary>
    public static class AdvancedPasteMigrationHelper
    {
-        /// <summary>
-        /// Moves legacy provider configuration snapshots into the strongly-typed providers collection.
-        /// </summary>
-        /// <param name="configuration">The configuration instance to migrate.</param>
-        /// <returns>True if the configuration was modified.</returns>
-        public static bool MigrateLegacyProviderConfigurations(PasteAIConfiguration configuration)
-        {
-            if (configuration is null)
-            {
-                return false;
-            }
-
-            configuration.Providers ??= new ObservableCollection<PasteAIProviderDefinition>();
-
-            bool configurationUpdated = false;
-
-            if (configuration.LegacyProviderConfigurations is { Count: > 0 })
-            {
-                foreach (var entry in configuration.LegacyProviderConfigurations)
-                {
-                    var result = EnsureProvider(configuration, entry.Key, entry.Value);
-                    configurationUpdated |= result.Updated;
-                }
-
-                configuration.LegacyProviderConfigurations = null;
-            }
-
-            configurationUpdated |= EnsureActiveProviderIsValid(configuration);
-
-            return configurationUpdated;
-        }
-
        /// <summary>
        /// Ensures an OpenAI provider exists in the configuration, creating one if necessary.
        /// </summary>
        /// <param name="configuration">The configuration instance.</param>
        /// <returns>The ensured provider and a flag indicating whether changes were made.</returns>
        public static (PasteAIProviderDefinition Provider, bool Updated) EnsureOpenAIProvider(PasteAIConfiguration configuration)
-        {
-            return EnsureProvider(configuration, AIServiceType.OpenAI.ToConfigurationString(), null);
-        }
-
-        /// <summary>
-        /// Ensures a provider for the supplied service type exists, optionally applying a legacy snapshot.
-        /// </summary>
-        /// <param name="configuration">The configuration instance.</param>
-        /// <param name="serviceTypeKey">The persisted service type key.</param>
-        /// <param name="snapshot">An optional snapshot containing legacy values.</param>
-        /// <returns>The ensured provider and whether the configuration was updated.</returns>
-        public static (PasteAIProviderDefinition Provider, bool Updated) EnsureProvider(PasteAIConfiguration configuration, string serviceTypeKey, AIProviderConfigurationSnapshot snapshot)
        {
            if (configuration is null)
            {
@@ -71,101 +27,45 @@ namespace Microsoft.PowerToys.Settings.UI.Library

            configuration.Providers ??= new ObservableCollection<PasteAIProviderDefinition>();

-            var normalizedServiceType = NormalizeServiceType(serviceTypeKey);
-            var existingProvider = configuration.Providers.FirstOrDefault(provider => string.Equals(provider.ServiceType, normalizedServiceType, StringComparison.OrdinalIgnoreCase));
-            bool configurationUpdated = false;
+            const string serviceTypeKey = "OpenAI";
+            var existingProvider = configuration.Providers.FirstOrDefault(provider => string.Equals(provider.ServiceType, serviceTypeKey, StringComparison.OrdinalIgnoreCase));
+            bool updated = false;

            if (existingProvider is null)
            {
-                existingProvider = CreateProvider(normalizedServiceType, snapshot);
+                existingProvider = CreateProvider(serviceTypeKey);
                configuration.Providers.Add(existingProvider);
-                configurationUpdated = true;
-            }
-            else if (snapshot is not null)
-            {
-                configurationUpdated |= ApplySnapshot(existingProvider, snapshot);
+                updated = true;
            }

-            configurationUpdated |= EnsureActiveProviderIsValid(configuration, existingProvider);
+            updated |= EnsureActiveProviderIsValid(configuration, existingProvider);

-            return (existingProvider, configurationUpdated);
+            return (existingProvider, updated);
        }

-        private static string NormalizeServiceType(string serviceTypeKey)
-        {
-            var serviceType = serviceTypeKey.ToAIServiceType();
-            return serviceType.ToConfigurationString();
-        }
-
-        private static PasteAIProviderDefinition CreateProvider(string serviceTypeKey, AIProviderConfigurationSnapshot snapshot)
+        /// <summary>
+        /// Creates a provider with default values for the requested service type.
+        /// </summary>
+        private static PasteAIProviderDefinition CreateProvider(string serviceTypeKey)
        {
            var serviceType = serviceTypeKey.ToAIServiceType();
            var metadata = AIServiceTypeRegistry.GetMetadata(serviceType);
            var provider = new PasteAIProviderDefinition
            {
                ServiceType = serviceTypeKey,
-                ModelName = !string.IsNullOrWhiteSpace(snapshot?.ModelName) ? snapshot.ModelName : PasteAIProviderDefaults.GetDefaultModelName(serviceType),
-                EndpointUrl = snapshot?.EndpointUrl ?? string.Empty,
-                ApiVersion = snapshot?.ApiVersion ?? string.Empty,
-                DeploymentName = snapshot?.DeploymentName ?? string.Empty,
-                ModelPath = snapshot?.ModelPath ?? string.Empty,
-                SystemPrompt = snapshot?.SystemPrompt ?? string.Empty,
-                ModerationEnabled = snapshot?.ModerationEnabled ?? true,
+                ModelName = PasteAIProviderDefaults.GetDefaultModelName(serviceType),
+                EndpointUrl = string.Empty,
+                ApiVersion = string.Empty,
+                DeploymentName = string.Empty,
+                ModelPath = string.Empty,
+                SystemPrompt = string.Empty,
+                ModerationEnabled = serviceType == AIServiceType.OpenAI,
                IsLocalModel = metadata.IsLocalModel,
            };

            return provider;
        }

-        private static bool ApplySnapshot(PasteAIProviderDefinition provider, AIProviderConfigurationSnapshot snapshot)
-        {
-            bool updated = false;
-
-            if (!string.IsNullOrWhiteSpace(snapshot.ModelName) && !string.Equals(provider.ModelName, snapshot.ModelName, StringComparison.Ordinal))
-            {
-                provider.ModelName = snapshot.ModelName;
-                updated = true;
-            }
-
-            if (!string.IsNullOrWhiteSpace(snapshot.EndpointUrl) && !string.Equals(provider.EndpointUrl, snapshot.EndpointUrl, StringComparison.Ordinal))
-            {
-                provider.EndpointUrl = snapshot.EndpointUrl;
-                updated = true;
-            }
-
-            if (!string.IsNullOrWhiteSpace(snapshot.ApiVersion) && !string.Equals(provider.ApiVersion, snapshot.ApiVersion, StringComparison.Ordinal))
-            {
-                provider.ApiVersion = snapshot.ApiVersion;
-                updated = true;
-            }
-
-            if (!string.IsNullOrWhiteSpace(snapshot.DeploymentName) && !string.Equals(provider.DeploymentName, snapshot.DeploymentName, StringComparison.Ordinal))
-            {
-                provider.DeploymentName = snapshot.DeploymentName;
-                updated = true;
-            }
-
-            if (!string.IsNullOrWhiteSpace(snapshot.ModelPath) && !string.Equals(provider.ModelPath, snapshot.ModelPath, StringComparison.Ordinal))
-            {
-                provider.ModelPath = snapshot.ModelPath;
-                updated = true;
-            }
-
-            if (!string.IsNullOrWhiteSpace(snapshot.SystemPrompt) && !string.Equals(provider.SystemPrompt, snapshot.SystemPrompt, StringComparison.Ordinal))
-            {
-                provider.SystemPrompt = snapshot.SystemPrompt;
-                updated = true;
-            }
-
-            if (provider.ModerationEnabled != snapshot.ModerationEnabled)
-            {
-                provider.ModerationEnabled = snapshot.ModerationEnabled;
-                updated = true;
-            }
-
-            return updated;
-        }
-
        private static bool EnsureActiveProviderIsValid(PasteAIConfiguration configuration, PasteAIProviderDefinition preferredProvider = null)
        {
            if (configuration?.Providers is null || configuration.Providers.Count == 0)
--- a/src/settings-ui/Settings.UI.Library/PasteAIConfiguration.cs
+++ b/src/settings-ui/Settings.UI.Library/PasteAIConfiguration.cs
@@ -20,8 +20,6 @@ namespace Microsoft.PowerToys.Settings.UI.Library
    {
        private string _activeProviderId = string.Empty;
        private ObservableCollection<PasteAIProviderDefinition> _providers = new();
-        private bool _useSharedCredentials = true;
-        private Dictionary<string, AIProviderConfigurationSnapshot> _legacyProviderConfigurations;

        public event PropertyChangedEventHandler PropertyChanged;

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

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

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

    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <InfoBar
+            x:Uid="AdvancedPaste_FL_PreviewMessage"
+            Grid.Row="1"
+            Padding="4"
+            IsClosable="False"
+            IsOpen="True"
+            Message="Foundry Local is still in Public Preview">
+            <InfoBar.ActionButton>
+                <HyperlinkButton
+                    x:Uid="AdvancedPaste_FL_LearnMoreFoundryLocal"
+                    Content="Learn more"
+                    NavigateUri="https://learn.microsoft.com/azure/ai-foundry/foundry-local/what-is-foundry-local" />
+            </InfoBar.ActionButton>
+        </InfoBar>
        <StackPanel
            x:Name="LoadingPanel"
            HorizontalAlignment="Center"
@@ -69,12 +87,12 @@
                        FontSize="24"
                        Glyph="&#xF158;" />
                    <TextBlock
-                        x:Uid="AdvancedPaste_FL_NoModelsDownloaded."
+                        x:Uid="AdvancedPaste_FL_NoModelsDownloaded"
                        HorizontalAlignment="Center"
                        Style="{StaticResource BodyStrongTextBlockStyle}"
                        TextAlignment="Center" />
                    <TextBlock
-                        x:Uid="AdvancedPaste_FL_RunFoundryLocalText.Text"
+                        x:Uid="AdvancedPaste_FL_RunFoundryLocalText"
                        HorizontalAlignment="Center"
                        FontSize="12"
                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
@@ -106,7 +124,7 @@
                            <ComboBox.Header>
                                <TextBlock>
                                    <Run x:Uid="AdvancedPaste_FL_LocalModel" /><LineBreak /><Run
-                                        x:Uid="AdvancedPaste_FL_UseCLIToDownloadModels"
+                                        x:Uid="AdvancedPaste_FL_UseCliToDownloadModels"
                                        FontSize="12"
                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
                                </TextBlock>
@@ -152,7 +170,7 @@
                Spacing="8">
                <Image Width="36" Source="ms-appx:///Assets/Settings/Icons/Models/FoundryLocal.svg" />
                <TextBlock
-                    x:Uid="AdvancedPaste_FL_FLNotavailableYet"
+                    x:Uid="AdvancedPaste_FL_FLNotAvailableYet"
                    HorizontalAlignment="Center"
                    FontWeight="SemiBold"
                    TextAlignment="Center"
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml.cs
@@ -30,7 +30,7 @@ public sealed partial class FoundryLocalModelPicker : UserControl

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

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

    public event ModelSelectionChangedEventHandler SelectionChanged;

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

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

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

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

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

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

    private void UpdateVisualStates()
@@ -444,14 +444,4 @@ public sealed partial class FoundryLocalModelPicker : UserControl
    {
        return string.IsNullOrWhiteSpace(license) ? Visibility.Collapsed : Visibility.Visible;
    }
-
-    public sealed class FoundryLoadRequestedEventArgs : EventArgs
-    {
-        public FoundryLoadRequestedEventArgs(bool refresh)
-        {
-            Refresh = refresh;
-        }
-
-        public bool Refresh { get; }
-    }
 }
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml.cs
@@ -82,7 +82,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
        {
            ViewModel.RefreshEnabledState();
            UpdatePasteAIUIVisibility();
-            _ = UpdateFoundryLocalUIAsync(refreshFoundry: true);
+            _ = UpdateFoundryLocalUIAsync();
        }

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

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

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

            return Task.CompletedTask;
        }

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

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

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

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

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

@@ -672,9 +679,9 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            UpdateFoundrySaveButtonState();
        }

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

        private sealed class FoundryDownloadableModel : INotifyPropertyChanged
@@ -1089,7 +1096,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                PasteAIProviderConfigurationDialog.Title = $"{displayName} provider configuration";
            }

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

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

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

-    <controls:SettingsPageControl x:Uid="CmdPal" ModuleImageSource="ms-appx:///Assets/Settings/Modules/CmdPal.png">
-        <controls:SettingsPageControl.ModuleContent>
-            <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
-                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
-                    <tkcontrols:SettingsCard
-                        Name="CmdPalEnableCmdPal"
-                        x:Uid="CmdPal_Enable_CmdPal"
-                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CmdPal.png}">
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
-                </controls:GPOInfoControl>
-                <controls:SettingsGroup x:Uid="CmdPal_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
-                    <tkcontrols:SettingsCard
-                        Name="CmdPalActivationShortcut"
-                        x:Uid="CmdPal_ActivationShortcut"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
-                        <controls:ShortcutControl
-                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                            HotkeySettings="{x:Bind Path=ViewModel.Hotkey, Mode=OneWay}"
-                            IsEnabled="False" />
-                        <tkcontrols:SettingsCard.Description>
-                            <HyperlinkButton
-                                x:Name="CmdPalSettingsDeeplink"
-                                x:Uid="CmdPal_DeeplinkContent"
-                                Click="CmdPalSettingsDeeplink_Click" />
-                        </tkcontrols:SettingsCard.Description>
-                    </tkcontrols:SettingsCard>
-                </controls:SettingsGroup>
-            </StackPanel>
-        </controls:SettingsPageControl.ModuleContent>
+                <Grid
+                    Grid.Row="1"
+                    Margin="0,-12,0,24"
+                    ColumnSpacing="32"
+                    RowSpacing="8">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <FontIcon
+                        HorizontalAlignment="Center"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        Glyph="&#xEB3B;" />
+                    <TextBlock
+                        Grid.Row="1"
+                        HorizontalAlignment="Center"
+                        TextAlignment="Center"
+                        TextWrapping="Wrap">
+                        <Run x:Uid="CmdPal_ExtensibleHeader" FontWeight="SemiBold" /> <LineBreak />
+                        <Run
+                            x:Uid="CmdPal_ExtensibleDescription"
+                            FontSize="12"
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                    </TextBlock>

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

-        private void CmdPalSettingsDeeplink_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+        private void SettingsCard_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
        {
            // Launch CmdPal settings window as normal user using explorer
            string launchPath = "explorer.exe";
            string launchArgs = "x-cmdpal://settings";
            LaunchApp(launchPath, launchArgs);
        }
+
+        private void LaunchCard_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+        {
+            // Launch CmdPal window as normal user using explorer
+            string launchPath = "explorer.exe";
+            string launchArgs = "x-cmdpal:";
+            LaunchApp(launchPath, launchArgs);
+        }
    }
 }
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -2703,7 +2703,7 @@ From there, simply click on one of the supported files in the File Explorer and
    <value>Mouse Pointer Crosshairs</value>
    <comment>Mouse as in the hardware peripheral.</comment>
  </data>
-  <data name="Oobe_MouseUtils_MousePointerCrosshairs.Description" xml:space="preserve">
+  <data name="Oobe_MouseUtils_MousePointerCrosshairs_Description.Text" xml:space="preserve">
    <value>Draw crosshairs centered around the mouse pointer.</value>
    <comment>Mouse as in the hardware peripheral.</comment>
  </data>
@@ -2827,7 +2827,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
    <comment>Refers to the utility name</comment>
  </data>
  <data name="MouseUtils_FindMyMouse.Description" xml:space="preserve">
-    <value>Find My Mouse highlights the position of the cursor when pressing the Ctrl key twice, using a custom shortcut or when shaking the mouse.</value>
+    <value>Highlight the position of the cursor when pressing the Ctrl key twice, using a custom shortcut or when shaking the mouse.</value>
    <comment>"Ctrl" is a keyboard key. "Find My Mouse" is the name of the utility</comment>
  </data>
  <data name="MouseUtils_Enable_FindMyMouse.Header" xml:space="preserve">
@@ -2916,7 +2916,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
    <comment>Refers to the utility name</comment>
  </data>
  <data name="MouseUtils_MouseHighlighter.Description" xml:space="preserve">
-    <value>Mouse Highlighter mode will highlight mouse clicks.</value>
+    <value>Highlight mouse clicks.</value>
    <comment>"Mouse Highlighter" is the name of the utility. Mouse is the hardware mouse.</comment>
  </data>
  <data name="MouseUtils_Enable_MouseHighlighter.Header" xml:space="preserve">
@@ -2961,7 +2961,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
    <comment>Refers to the utility name</comment>
  </data>
  <data name="MouseUtils_MousePointerCrosshairs.Description" xml:space="preserve">
-    <value>Mouse Pointer Crosshairs draws crosshairs centered on the mouse pointer.</value>
+    <value>Draw crosshairs centered on the mouse pointer.</value>
    <comment>"Mouse Pointer Crosshairs" is the name of the utility. Mouse is the hardware mouse.</comment>
  </data>
  <data name="MouseUtils_Enable_MousePointerCrosshairs.Header" xml:space="preserve">
@@ -3410,7 +3410,7 @@ Activate by holding the key for the character you want to add an accent to, then
    <value>An AI powered tool to put your clipboard content into any format you need, focused towards developer workflows.</value>
  </data>
  <data name="AdvancedPaste_EnableAISettingsCardDescription.Text" xml:space="preserve">
-    <value>Transform your clipboard content with the power of AI. An cloud or local endpoint is required.</value>
+    <value>Transform your clipboard content with the power of AI. A cloud or local endpoint is required.</value>
  </data>
  <data name="AdvancedPaste_EnableAISettingsCardDescriptionLearnMore.Content" xml:space="preserve">
    <value>Learn more</value>
@@ -5159,25 +5159,12 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
  <data name="Shell_TopLevelSystemTools.Content" xml:space="preserve">
    <value>System Tools</value>
  </data>
-  <data name="CmdPal.ModuleTitle" xml:space="preserve">
-    <value>Command Palette</value>
-  </data>
-  <data name="CmdPal_ShortDescription" xml:space="preserve">
-    <value>A better quick launcher</value>
-  </data>
-  <data name="CmdPal_ActivationDescription" xml:space="preserve">
-    <value>Open Command Palette</value>
-  </data>
  <data name="CmdPal_Enable_CmdPal.Header" xml:space="preserve">
    <value>Enable Command Palette</value>
-    <comment>"Command Palette" is the name of the utility.</comment>
-  </data>
-  <data name="CmdPal.ModuleDescription" xml:space="preserve">
-    <value>A fully extensible quick launcher with a richer display and additional capabilities without sacrificing performance.</value>
+    <comment>Command Palette is a product name, do not loc</comment>
  </data>
  <data name="LearnMore_CmdPal.Text" xml:space="preserve">
-    <value>Learn more about Command Palette</value>
-    <comment>Command Palette is a product name, do not loc</comment>
+    <value>Learn more</value>
  </data>
  <data name="Shell_CmdPal.Content" xml:space="preserve">
    <value>Command Palette</value>
@@ -5185,11 +5172,11 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
  </data>
  <data name="Oobe_CmdPal.Description" xml:space="preserve">
    <value>A fully extensible quick launcher with a richer display and additional capabilities without sacrificing performance.</value>
-    <comment>"Command Palette" is a product name</comment>
+    <comment>Command Palette is a product name, do not loc</comment>
  </data>
  <data name="Oobe_CmdPal.Title" xml:space="preserve">
    <value>Command Palette</value>
-    <comment>"Command Palette" is a product name</comment>
+    <comment>Command Palette is a product name, do not loc</comment>
  </data>
  <data name="Oobe_CmdPal_HowToUse.Text" xml:space="preserve">
    <value>and start typing!</value>
@@ -5222,14 +5209,8 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
  <data name="RetryLabel.Text" xml:space="preserve">
    <value>Retry</value>
  </data>
-  <data name="CmdPal_Activation_GroupSettings.Header" xml:space="preserve">
-    <value>Activation</value>
-  </data>
-  <data name="CmdPal_ActivationShortcut.Header" xml:space="preserve">
-    <value>Activation shortcut</value>
-  </data>
-  <data name="CmdPal_DeeplinkContent.Content" xml:space="preserve">
-    <value>Open Command Palette settings to customize the activation shortcut</value>
+  <data name="CmdPal_Settings.Header" xml:space="preserve">
+    <value>Settings</value>
  </data>
  <data name="Help_chromaCIE" xml:space="preserve">
    <value>chroma (CIE LCh)</value>
@@ -5693,14 +5674,14 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
    <value>Foundry Local model</value>
    <comment>Do not localize "Foundry Local", it's a product name</comment>
  </data>
-  <data name="AdvancedPaste_FL_UseCLIToDownloadModels.Text" xml:space="preserve">
+  <data name="AdvancedPaste_FL_UseCliToDownloadModels.Text" xml:space="preserve">
    <value>Use the Foundry Local CLI to download models that run locally on-device. They'll appear here.</value>
    <comment>Do not localize "Foundry Local", it's a product name</comment>
  </data>
  <data name="AdvancedPaste_FL_RefreshModelList.Text" xml:space="preserve">
    <value>Refresh model list</value>
  </data>
-  <data name="AdvancedPaste_FL_FLNotavailableYet.Text" xml:space="preserve">
+  <data name="AdvancedPaste_FL_FLNotAvailableYet.Text" xml:space="preserve">
    <value>Foundry Local is not available on this device yet.</value>
    <comment>Do not localize "Foundry Local", it's a product name</comment>
  </data>
@@ -5753,4 +5734,51 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
  <data name="AdvancedPaste_EnableClipboardPreview.Description" xml:space="preserve">
    <value>Display a preview of the current clipboard content</value>
  </data>
+  <data name="AdvancedPaste_FL_LearnMoreFoundryLocal.Content" xml:space="preserve">
+    <value>Learn more</value>
+  </data>
+  <data name="AdvancedPaste_FL_PreviewMessage.Message" xml:space="preserve">
+    <value>Foundry Local is still in public preview</value>
+    <comment>Do not loc "Foundry Local"</comment>
+  </data>
+  <data name="CmdPal_Settings.Description" xml:space="preserve">
+    <value>Configure the activation shortcut, extensions, behavior and much more</value>
+  </data>
+  <data name="CmdPal_Launch.Header" xml:space="preserve">
+    <value>Open Command Palette</value>
+    <comment>Command Palette is a product name, do not loc</comment>
+  </data>
+  <data name="CmdPal_ShortDescription" xml:space="preserve">
+    <value>A better quick launcher</value>
+  </data>
+  <data name="CmdPal_Description.Text" xml:space="preserve">
+    <value>Find files, launch apps, and do so much more with the most extensible quick launcher.</value>
+  </data>
+  <data name="CmdPal.ModuleTitle" xml:space="preserve">
+    <value>Command Palette</value>
+    <comment>Command Palette is a product name, do not loc</comment>
+  </data>
+  <data name="CmdPal_ActivationDescription" xml:space="preserve">
+    <value>Open Command Palette</value>
+    <comment>Command Palette is a product name, do not loc</comment>
+  </data>
+  <data name="CmdPal_ExtensibleDescription.Text" xml:space="preserve">
+    <value>Powerful extensions help you do more</value>
+  </data>
+  <data name="CmdPal_ExtensibleHeader.Text" xml:space="preserve">
+    <value>Extensible</value>
+  </data>
+  <data name="CmdPal_FastDescription.Text" xml:space="preserve">
+    <value>Find files and launch apps in an instant</value>
+  </data>
+  <data name="CmdPal_FastHeader.Text" xml:space="preserve">
+    <value>Fast</value>
+  </data>
+  <data name="CmdPal_ModernHeader.Text" xml:space="preserve">
+    <value>Beautiful</value>
+  </data>
+  <data name="CmdPal_ModernDescription.Text" xml:space="preserve">
+    <value>A modern UI built with Fluent Design</value>
+    <comment>Fluent Design is a product name, do not loc</comment>
+  </data>
 </root>
--- a/src/settings-ui/Settings.UI/ViewModels/AdvancedPasteViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/AdvancedPasteViewModel.cs
@@ -191,6 +191,18 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                return;
            }

+            PasswordCredential legacyCredential = TryGetLegacyOpenAICredential();
+
+            if (legacyCredential is null)
+            {
+                if (legacyAdvancedAIConsumed)
+                {
+                    SaveAndNotifySettings();
+                }
+
+                return;
+            }
+
            var configuration = properties.PasteAIConfiguration;
            if (configuration is null)
            {
@@ -198,28 +210,11 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                properties.PasteAIConfiguration = configuration;
            }

-            bool hasLegacyProviders = configuration.LegacyProviderConfigurations is { Count: > 0 };
-            PasswordCredential legacyCredential = TryGetLegacyOpenAICredential();
-
-            if (!hasLegacyProviders && legacyCredential is null && !legacyAdvancedAIConsumed)
-            {
-                return;
-            }
-
            bool configurationUpdated = false;

-            if (hasLegacyProviders)
-            {
-                configurationUpdated |= AdvancedPasteMigrationHelper.MigrateLegacyProviderConfigurations(configuration);
-            }
-
-            PasteAIProviderDefinition openAIProvider = null;
-            if (legacyCredential is not null || hasLegacyProviders || legacyAdvancedAIConsumed)
-            {
-                var ensureResult = AdvancedPasteMigrationHelper.EnsureOpenAIProvider(configuration);
-                openAIProvider = ensureResult.Provider;
-                configurationUpdated |= ensureResult.Updated;
-            }
+            var ensureResult = AdvancedPasteMigrationHelper.EnsureOpenAIProvider(configuration);
+            PasteAIProviderDefinition openAIProvider = ensureResult.Provider;
+            configurationUpdated |= ensureResult.Updated;

            if (legacyAdvancedAIConsumed && openAIProvider is not null && openAIProvider.EnableAdvancedAI != legacyAdvancedAIEnabled)
            {
@@ -233,7 +228,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                RemoveLegacyOpenAICredential();
            }

-            bool shouldEnableAI = legacyCredential is not null;
+            const bool shouldEnableAI = true;
            bool enabledChanged = false;
            if (properties.IsAIEnabled != shouldEnableAI)
            {
@@ -1248,11 +1243,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                return true;
            }

-            if (current.UseSharedCredentials != incoming.UseSharedCredentials)
-            {
-                return true;
-            }
-
            var currentProviders = current.Providers ?? new ObservableCollection<PasteAIProviderDefinition>();
            var incomingProviders = incoming.Providers ?? new ObservableCollection<PasteAIProviderDefinition>();

@@ -1408,8 +1398,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                return;
            }

-            if (string.Equals(e.PropertyName, nameof(PasteAIConfiguration.ActiveProviderId), StringComparison.Ordinal)
-                || string.Equals(e.PropertyName, nameof(PasteAIConfiguration.UseSharedCredentials), StringComparison.Ordinal))
+            if (string.Equals(e.PropertyName, nameof(PasteAIConfiguration.ActiveProviderId), StringComparison.Ordinal))
            {
                SaveAndNotifySettings();
            }
@@ -1426,15 +1415,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels

            pasteConfig.Providers ??= new ObservableCollection<PasteAIProviderDefinition>();

-            bool configurationUpdated = AdvancedPasteMigrationHelper.MigrateLegacyProviderConfigurations(pasteConfig);
-
            SubscribeToPasteAIProviders(pasteConfig);
-
-            if (configurationUpdated)
-            {
-                SaveAndNotifySettings();
-                OnPropertyChanged(nameof(PasteAIConfiguration));
-            }
        }

        private static string RetrieveCredentialValue(string credentialResource, string credentialUserName)
--- a/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs
@@ -40,6 +40,12 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels

        public ObservableCollection<DashboardListItem> ActionModules { get; set; } = new ObservableCollection<DashboardListItem>();

+        // Master list of module items that is sorted and projected into AllModules.
+        private List<DashboardListItem> _moduleItems = new List<DashboardListItem>();
+
+        // Flag to prevent circular updates when a UI toggle triggers settings changes.
+        private bool _isUpdatingFromUI;
+
        private AllHotkeyConflictsData _allHotkeyConflictsData = new AllHotkeyConflictsData();

        public AllHotkeyConflictsData AllHotkeyConflictsData
@@ -74,7 +80,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                    generalSettingsConfig.DashboardSortOrder = value;
                    OutGoingGeneralSettings outgoing = new OutGoingGeneralSettings(generalSettingsConfig);
                    SendConfigMSG(outgoing.ToString());
-                    RefreshModuleList();
+                    SortModuleList();
                }
            }
        }
@@ -96,8 +102,9 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
            // set the callback functions value to handle outgoing IPC message.
            SendConfigMSG = ipcMSGCallBackFunc;

-            RefreshModuleList();
-            GetShortcutModules();
+            BuildModuleList();
+            SortModuleList();
+            RefreshShortcutModules();
        }

        protected override void OnConflictsUpdated(object sender, AllHotkeyConflictsEventArgs e)
@@ -129,11 +136,13 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
            GlobalHotkeyConflictManager.Instance?.RequestAllConflicts();
        }

-        private void RefreshModuleList()
+        /// <summary>
+        /// Builds the master list of module items. Called once during initialization.
+        /// Each module item contains its configuration, enabled state, and GPO lock status.
+        /// </summary>
+        private void BuildModuleList()
        {
-            AllModules.Clear();
-
-            var moduleItems = new List<DashboardListItem>();
+            _moduleItems.Clear();

            foreach (ModuleType moduleType in Enum.GetValues<ModuleType>())
            {
@@ -149,47 +158,143 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                    DashboardModuleItems = GetModuleItems(moduleType),
                };
                newItem.EnabledChangedCallback = EnabledChangedOnUI;
-                moduleItems.Add(newItem);
-            }
-
-            // Sort based on current sort order
-            var sortedItems = DashboardSortOrder switch
-            {
-                DashboardSortOrder.ByStatus => moduleItems.OrderByDescending(x => x.IsEnabled).ThenBy(x => x.Label),
-                _ => moduleItems.OrderBy(x => x.Label), // Default alphabetical
-            };
-
-            foreach (var item in sortedItems)
-            {
-                AllModules.Add(item);
+                _moduleItems.Add(newItem);
            }
        }

+        /// <summary>
+        /// Sorts the module list according to the current sort order and updates the AllModules collection.
+        /// On first call, populates AllModules. On subsequent calls, uses Move() to reorder items in-place
+        /// to avoid destroying and recreating UI elements.
+        /// </summary>
+        private void SortModuleList()
+        {
+            var sortedItems = (DashboardSortOrder switch
+            {
+                DashboardSortOrder.ByStatus => _moduleItems.OrderByDescending(x => x.IsEnabled).ThenBy(x => x.Label),
+                _ => _moduleItems.OrderBy(x => x.Label), // Default alphabetical
+            }).ToList();
+
+            // If AllModules is empty (first load), just populate it.
+            if (AllModules.Count == 0)
+            {
+                foreach (var item in sortedItems)
+                {
+                    AllModules.Add(item);
+                }
+
+                return;
+            }
+
+            // Otherwise, update the collection in place using Move to avoid UI glitches.
+            for (int i = 0; i < sortedItems.Count; i++)
+            {
+                var currentItem = sortedItems[i];
+                var currentIndex = AllModules.IndexOf(currentItem);
+
+                if (currentIndex != -1 && currentIndex != i)
+                {
+                    AllModules.Move(currentIndex, i);
+                }
+            }
+
+            // Notify that DashboardSortOrder changed so the menu updates its checked state.
+            OnPropertyChanged(nameof(DashboardSortOrder));
+        }
+
+        /// <summary>
+        /// Refreshes module enabled/locked states by re-reading GPO configuration. Only
+        /// updates properties that have actually changed to minimize UI notifications
+        /// then re-sorts the list according to the current sort order.
+        /// </summary>
+        private void RefreshModuleList()
+        {
+            foreach (var item in _moduleItems)
+            {
+                GpoRuleConfigured gpo = ModuleHelper.GetModuleGpoConfiguration(item.Tag);
+
+                // GPO can force-enable (Enabled) or force-disable (Disabled) a module.
+                // If Enabled: module is on and the user cannot disable it.
+                // If Disabled: module is off and the user cannot enable it.
+                // Otherwise, the setting is unlocked and the user can enable/disable it.
+                bool newEnabledState = gpo == GpoRuleConfigured.Enabled || (gpo != GpoRuleConfigured.Disabled && ModuleHelper.GetIsModuleEnabled(generalSettingsConfig, item.Tag));
+
+                // Lock the toggle when GPO is controlling the module.
+                bool newLockedState = gpo == GpoRuleConfigured.Enabled || gpo == GpoRuleConfigured.Disabled;
+
+                // Only update if there's an actual change to minimize UI notifications.
+                if (item.IsEnabled != newEnabledState)
+                {
+                    item.IsEnabled = newEnabledState;
+                }
+
+                if (item.IsLocked != newLockedState)
+                {
+                    item.IsLocked = newLockedState;
+                }
+            }
+
+            SortModuleList();
+        }
+
+        /// <summary>
+        /// Callback invoked when a user toggles a module's enabled state in the UI.
+        /// Sets the _isUpdatingFromUI flag to prevent circular updates, then updates
+        /// settings, re-sorts if needed, and refreshes dependent collections.
+        /// </summary>
        private void EnabledChangedOnUI(DashboardListItem dashboardListItem)
        {
-            Views.ShellPage.UpdateGeneralSettingsCallback(dashboardListItem.Tag, dashboardListItem.IsEnabled);
-
-            if (dashboardListItem.Tag == ModuleType.NewPlus && dashboardListItem.IsEnabled == true)
+            _isUpdatingFromUI = true;
+            try
            {
-                var settingsUtils = new SettingsUtils();
-                var settings = NewPlusViewModel.LoadSettings(settingsUtils);
-                NewPlusViewModel.CopyTemplateExamples(settings.Properties.TemplateLocation.Value);
-            }
+                Views.ShellPage.UpdateGeneralSettingsCallback(dashboardListItem.Tag, dashboardListItem.IsEnabled);

-            // Request updated conflicts after module state change
-            RequestConflictData();
+                if (dashboardListItem.Tag == ModuleType.NewPlus && dashboardListItem.IsEnabled == true)
+                {
+                    var settingsUtils = new SettingsUtils();
+                    var settings = NewPlusViewModel.LoadSettings(settingsUtils);
+                    NewPlusViewModel.CopyTemplateExamples(settings.Properties.TemplateLocation.Value);
+                }
+
+                // Re-sort only required if sorting by enabled status.
+                if (DashboardSortOrder == DashboardSortOrder.ByStatus)
+                {
+                    SortModuleList();
+                }
+
+                // Always refresh shortcuts/actions to reflect enabled state changes.
+                RefreshShortcutModules();
+
+                // Request updated conflicts after module state change.
+                RequestConflictData();
+            }
+            finally
+            {
+                _isUpdatingFromUI = false;
+            }
        }

+        /// <summary>
+        /// Callback invoked when module enabled state changes from other parts of the
+        /// settings UI. Ignores the notification if it was triggered by a UI toggle
+        /// we're already handling, to prevent circular updates.
+        /// </summary>
        public void ModuleEnabledChangedOnSettingsPage()
        {
+            // Ignore if this was triggered by a UI change that we're already handling.
+            if (_isUpdatingFromUI)
+            {
+                return;
+            }
+
            try
            {
                RefreshModuleList();
-                GetShortcutModules();
+                RefreshShortcutModules();

                OnPropertyChanged(nameof(ShortcutModules));

-                // Request updated conflicts after module state change
+                // Request updated conflicts after module state change.
                RequestConflictData();
            }
            catch (Exception ex)
@@ -198,7 +303,11 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
            }
        }

-        private void GetShortcutModules()
+        /// <summary>
+        /// Rebuilds ShortcutModules and ActionModules collections by filtering AllModules
+        /// to only include enabled modules and their respective shortcut/action items.
+        /// </summary>
+        private void RefreshShortcutModules()
        {
            ShortcutModules.Clear();
            ActionModules.Clear();