Resolving comments

Add new highlight and fix spelling issue
Reorder, and some text alignment
2025-12-30 17:07:23 +01:00 · 2025-08-12 06:16:35 -07:00 · 2025-08-08 01:53:24 -07:00 · 2025-08-07 19:50:43 -07:00 · 2025-08-07 17:47:47 -07:00 · 2025-08-07 07:09:16 -07:00
62 changed files with 1940 additions and 1514 deletions
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -1440,6 +1440,7 @@ secpol
 securestring
 SEEMASKINVOKEIDLIST
 SELCHANGE
+selfhost
 SENDCHANGE
 sendvirtualinput
 serverside
@@ -1879,6 +1880,7 @@ winexe
 winforms
 winget
 wingetcreate
+wingetpkgs
 Winhook
 WINL
 winlogon
--- a/.pipelines/v2/templates/job-test-project.yml
+++ b/.pipelines/v2/templates/job-test-project.yml
@@ -45,7 +45,6 @@ jobs:
    BuildConfiguration: ${{ parameters.configuration }}
    SrcPath: $(Build.Repository.LocalPath)
    TestArtifactsName: build-${{ variables.BuildPlatform }}-${{ parameters.configuration }}${{ parameters.inputArtifactStem }}
-    isBuildNow: ${{ eq(parameters.buildSource, 'buildNow') }}
  pool:
    ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
      ${{ if ne(parameters.platform, 'ARM64') }}:
@@ -116,7 +115,7 @@ jobs:
      & '$(build.sourcesdirectory)\.pipelines\InstallWinAppDriver.ps1'
    displayName: Download and install WinAppDriver

-  - ${{ if not(variables.isBuildNow) }}:
+  - ${{ if ne(parameters.buildSource, 'buildNow') }}:
    - task: DownloadPipelineArtifact@2
      inputs:
        buildType: 'specific'
@@ -137,7 +136,7 @@ jobs:
          patterns: |
            **/PowerToysSetup*.exe

-  - ${{ if not(variables.isBuildNow) }}:
+  - ${{ if ne(parameters.buildSource, 'buildNow') }}:
    - ${{ if eq(parameters.installMode, 'peruser') }}:
      - pwsh: |-
          & "$(build.sourcesdirectory)\.pipelines\installPowerToys.ps1" -InstallMode "PerUser"
@@ -173,7 +172,7 @@ jobs:
          !**\UITests-FancyZones\**\UITests-FancyZonesEditor.dll
      env:
        platform: '$(TestPlatform)'
-        useInstallerForTest: ${{ not(variables.isBuildNow) }}
+        useInstallerForTest: ${{ ne(parameters.buildSource, 'buildNow') }}

  - ${{ if ne(length(parameters.uiTestModules), 0) }}:
    - ${{ each module in parameters.uiTestModules }}:
@@ -195,4 +194,4 @@ jobs:
            !**\UITests-FancyZones\**\UITests-FancyZonesEditor.dll
        env:
          platform: '$(TestPlatform)'
-          useInstallerForTest: ${{ not(variables.isBuildNow) }}
+          useInstallerForTest: ${{ ne(parameters.buildSource, 'buildNow') }}
--- a/.pipelines/v2/templates/pipeline-ui-tests-automation.yml
+++ b/.pipelines/v2/templates/pipeline-ui-tests-automation.yml
@@ -3,8 +3,6 @@ variables:
    value: false
  - name: EnablePipelineCache
    value: true
-  - name: isBuildNow
-    value: ${{ eq(parameters.buildSource, 'buildNow') }}

 parameters:
  - name: buildPlatforms
@@ -39,140 +37,22 @@ parameters:

 stages:
  - ${{ each platform in parameters.buildPlatforms }}:
-    - ${{ if variables.isBuildNow }}:
-      - stage: Build_${{ platform }}
-        displayName: Build ${{ platform }}
-        dependsOn: []
-        jobs:
-          - template: job-build-project.yml
-            parameters:
-              pool:
-                ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
-                  name: SHINE-INT-L
-                ${{ else }}:
-                  name: SHINE-OSS-L
-                ${{ if eq(parameters.useVSPreview, true) }}:
-                  demands: ImageOverride -equals SHINE-VS17-Preview
-              buildPlatforms:
-                - ${{ platform }}
-              buildConfigurations: [Release]
-              enablePackageCaching: true
-              enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
-              runTests: false
-              buildTests: true
-              useVSPreview: ${{ parameters.useVSPreview }}
-              timeoutInMinutes: 90
+    # Full build path: build PowerToys + UI tests + run tests
+    - ${{ if eq(parameters.buildSource, 'buildNow') }}:
+      - template: pipeline-ui-tests-full-build.yml
+        parameters:
+          platform: ${{ platform }}
+          enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+          useVSPreview: ${{ parameters.useVSPreview }}
+          useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+          uiTestModules: ${{ parameters.uiTestModules }}

-    - ${{ if not(variables.isBuildNow) }}:
-      - stage: BuildUITests_${{ platform }}
-        displayName: Build UI Tests Only
-        dependsOn: []
-        jobs:
-          - template: job-build-ui-tests.yml
-            parameters:
-              pool:
-                ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
-                  name: SHINE-INT-L
-                ${{ else }}:
-                  name: SHINE-OSS-L
-                ${{ if eq(parameters.useVSPreview, true) }}:
-                  demands: ImageOverride -equals SHINE-VS17-Preview
-              buildPlatforms:
-                - ${{ platform }}
-              uiTestModules: ${{ parameters.uiTestModules }}
-
-    - ${{ if eq(platform, 'x64') }}:
-      - stage: Test_x64Win10
-        displayName: Test x64Win10
-        ${{ if not(variables.isBuildNow) }}:
-          dependsOn:
-            - BuildUITests_${{ platform }}
-        ${{ else }}:
-          dependsOn:
-            - Build_${{ platform }}
-        jobs:
-            - template: job-test-project.yml
-              parameters:
-                platform: x64Win10
-                configuration: Release
-                useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-                buildSource: ${{ parameters.buildSource }}
-                specificBuildId: ${{ parameters.specificBuildId }}
-                uiTestModules: ${{ parameters.uiTestModules }}
-
-            # Additional per-user installation test
-            - ${{ if not(variables.isBuildNow) }}:
-              - template: job-test-project.yml
-                parameters:
-                  platform: x64Win10
-                  configuration: Release
-                  useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-                  buildSource: ${{ parameters.buildSource }}
-                  specificBuildId: ${{ parameters.specificBuildId }}
-                  uiTestModules: ${{ parameters.uiTestModules }}
-                  installMode: 'peruser'
-                  jobSuffix: '_PerUser'
-
-    - ${{ if eq(platform, 'x64') }}:
-      - stage: Test_x64Win11
-        displayName: Test x64Win11
-        ${{ if not(variables.isBuildNow) }}:
-          dependsOn:
-            - BuildUITests_${{ platform }}
-        ${{ else }}:
-          dependsOn:
-            - Build_${{ platform }}
-        jobs:
-            - template: job-test-project.yml
-              parameters:
-                platform: x64Win11
-                configuration: Release
-                useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-                buildSource: ${{ parameters.buildSource }}
-                specificBuildId: ${{ parameters.specificBuildId }}
-                uiTestModules: ${{ parameters.uiTestModules }}
-
-            # Additional per-user installation test
-            - ${{ if not(variables.isBuildNow) }}:
-              - template: job-test-project.yml
-                parameters:
-                  platform: x64Win11
-                  configuration: Release
-                  useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-                  buildSource: ${{ parameters.buildSource }}
-                  specificBuildId: ${{ parameters.specificBuildId }}
-                  uiTestModules: ${{ parameters.uiTestModules }}
-                  installMode: 'peruser'
-                  jobSuffix: '_PerUser'
-
-    - ${{ if ne(platform, 'x64') }}:
-      - stage: Test_${{ platform }}
-        displayName: Test ${{ platform }}
-        ${{ if not(variables.isBuildNow) }}:
-          dependsOn:
-            - BuildUITests_${{ platform }}
-        ${{ else }}:
-          dependsOn:
-            - Build_${{ platform }}
-        jobs:
-          - template: job-test-project.yml
-            parameters:
-              platform: ${{ platform }}
-              configuration: Release
-              useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-              buildSource: ${{ parameters.buildSource }}
-              specificBuildId: ${{ parameters.specificBuildId }}
-              uiTestModules: ${{ parameters.uiTestModules }}
-
-          # Additional per-user installation test
-          - ${{ if not(variables.isBuildNow) }}:
-            - template: job-test-project.yml
-              parameters:
-                platform: ${{ platform }}
-                configuration: Release
-                useLatestWebView2: ${{ parameters.useLatestWebView2 }}
-                buildSource: ${{ parameters.buildSource }}
-                specificBuildId: ${{ parameters.specificBuildId }}
-                uiTestModules: ${{ parameters.uiTestModules }}
-                installMode: 'peruser'
-                jobSuffix: '_PerUser'
+    # Official build path: build UI tests only + download official build + run tests  
+    - ${{ if ne(parameters.buildSource, 'buildNow') }}:
+      - template: pipeline-ui-tests-official-build.yml
+        parameters:
+          platform: ${{ platform }}
+          buildSource: ${{ parameters.buildSource }}
+          specificBuildId: ${{ parameters.specificBuildId }}
+          useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+          uiTestModules: ${{ parameters.uiTestModules }}
--- a/.pipelines/v2/templates/pipeline-ui-tests-full-build.yml
+++ b/.pipelines/v2/templates/pipeline-ui-tests-full-build.yml
@@ -0,0 +1,80 @@
+# Template for full build path: Build PowerToys + Build UI Tests + Run Tests
+parameters:
+  - name: platform
+    type: string
+  - name: enableMsBuildCaching
+    type: boolean
+    default: false
+  - name: useVSPreview
+    type: boolean
+    default: false
+  - name: useLatestWebView2
+    type: boolean
+    default: false
+  - name: uiTestModules
+    type: object
+    default: []
+
+stages:
+  # Stage 1: Build full PowerToys project
+  - stage: Build_${{ parameters.platform }}
+    displayName: Build PowerToys ${{ parameters.platform }}
+    dependsOn: []
+    jobs:
+      - template: job-build-project.yml
+        parameters:
+          pool:
+            ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
+              name: SHINE-INT-L
+            ${{ else }}:
+              name: SHINE-OSS-L
+            ${{ if eq(parameters.useVSPreview, true) }}:
+              demands: ImageOverride -equals SHINE-VS17-Preview
+          buildPlatforms:
+            - ${{ parameters.platform }}
+          buildConfigurations: [Release]
+          enablePackageCaching: true
+          enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+          runTests: false
+          buildTests: true
+          useVSPreview: ${{ parameters.useVSPreview }}
+          timeoutInMinutes: 90
+
+  # Stage 2: Run UI Tests
+  - ${{ if eq(parameters.platform, 'x64') }}:
+    - stage: Test_x64Win10_FullBuild
+      displayName: Test x64Win10 (Full Build)
+      dependsOn: Build_${{ parameters.platform }}
+      jobs:
+        - template: job-test-project.yml
+          parameters:
+            platform: x64Win10
+            configuration: Release
+            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+            buildSource: 'buildNow'
+            uiTestModules: ${{ parameters.uiTestModules }}
+
+    - stage: Test_x64Win11_FullBuild
+      displayName: Test x64Win11 (Full Build)
+      dependsOn: Build_${{ parameters.platform }}
+      jobs:
+        - template: job-test-project.yml
+          parameters:
+            platform: x64Win11
+            configuration: Release
+            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+            buildSource: 'buildNow'
+            uiTestModules: ${{ parameters.uiTestModules }}
+
+  - ${{ if ne(parameters.platform, 'x64') }}:
+    - stage: Test_${{ parameters.platform }}_FullBuild
+      displayName: Test ${{ parameters.platform }} (Full Build)
+      dependsOn: Build_${{ parameters.platform }}
+      jobs:
+        - template: job-test-project.yml
+          parameters:
+            platform: ${{ parameters.platform }}
+            configuration: Release
+            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+            buildSource: 'buildNow'
+            uiTestModules: ${{ parameters.uiTestModules }}
--- a/.pipelines/v2/templates/pipeline-ui-tests-official-build.yml
+++ b/.pipelines/v2/templates/pipeline-ui-tests-official-build.yml
@@ -0,0 +1,110 @@
+# Template for official build path: Download Official Build + Build UI Tests Only + Run Tests
+parameters:
+  - name: platform
+    type: string
+  - name: buildSource
+    type: string
+  - name: specificBuildId
+    type: string
+    default: 'xxxx'
+  - name: useLatestWebView2
+    type: boolean
+    default: false
+  - name: uiTestModules
+    type: object
+    default: []
+
+stages:
+  # Stage 1: Build UI Tests Only
+  - stage: BuildUITests_${{ parameters.platform }}
+    displayName: Build UI Tests Only ${{ parameters.platform }}
+    dependsOn: []
+    jobs:
+      - template: job-build-ui-tests.yml
+        parameters:
+          pool:
+            ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
+              name: SHINE-INT-L
+            ${{ else }}:
+              name: SHINE-OSS-L
+          buildPlatforms:
+            - ${{ parameters.platform }}
+          uiTestModules: ${{ parameters.uiTestModules }}
+
+  # Stage 2: Run UI Tests with Official Build
+  - ${{ if eq(parameters.platform, 'x64') }}:
+    - stage: Test_x64Win10_OfficialBuild
+      displayName: Test x64Win10 (Official Build)
+      dependsOn: BuildUITests_${{ parameters.platform }}
+      jobs:
+        - template: job-test-project.yml
+          parameters:
+            platform: x64Win10
+            configuration: Release
+            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+            buildSource: ${{ parameters.buildSource }}
+            specificBuildId: ${{ parameters.specificBuildId }}
+            uiTestModules: ${{ parameters.uiTestModules }}
+
+        # Additional per-user installation test
+        - template: job-test-project.yml
+          parameters:
+            platform: x64Win10
+            configuration: Release
+            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+            buildSource: ${{ parameters.buildSource }}
+            specificBuildId: ${{ parameters.specificBuildId }}
+            uiTestModules: ${{ parameters.uiTestModules }}
+            installMode: 'peruser'
+            jobSuffix: '_PerUser'
+
+    - stage: Test_x64Win11_OfficialBuild
+      displayName: Test x64Win11 (Official Build)
+      dependsOn: BuildUITests_${{ parameters.platform }}
+      jobs:
+        - template: job-test-project.yml
+          parameters:
+            platform: x64Win11
+            configuration: Release
+            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+            buildSource: ${{ parameters.buildSource }}
+            specificBuildId: ${{ parameters.specificBuildId }}
+            uiTestModules: ${{ parameters.uiTestModules }}
+
+        # Additional per-user installation test
+        - template: job-test-project.yml
+          parameters:
+            platform: x64Win11
+            configuration: Release
+            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+            buildSource: ${{ parameters.buildSource }}
+            specificBuildId: ${{ parameters.specificBuildId }}
+            uiTestModules: ${{ parameters.uiTestModules }}
+            installMode: 'peruser'
+            jobSuffix: '_PerUser'
+
+  - ${{ if ne(parameters.platform, 'x64') }}:
+    - stage: Test_${{ parameters.platform }}_OfficialBuild
+      displayName: Test ${{ parameters.platform }} (Official Build)
+      dependsOn: BuildUITests_${{ parameters.platform }}
+      jobs:
+        - template: job-test-project.yml
+          parameters:
+            platform: ${{ parameters.platform }}
+            configuration: Release
+            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+            buildSource: ${{ parameters.buildSource }}
+            specificBuildId: ${{ parameters.specificBuildId }}
+            uiTestModules: ${{ parameters.uiTestModules }}
+
+        # Additional per-user installation test
+        - template: job-test-project.yml
+          parameters:
+            platform: ${{ parameters.platform }}
+            configuration: Release
+            useLatestWebView2: ${{ parameters.useLatestWebView2 }}
+            buildSource: ${{ parameters.buildSource }}
+            specificBuildId: ${{ parameters.specificBuildId }}
+            uiTestModules: ${{ parameters.uiTestModules }}
+            installMode: 'peruser'
+            jobSuffix: '_PerUser'
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 | [Color Picker](https://aka.ms/PowerToysOverview_ColorPicker) | [Command Not Found](https://aka.ms/PowerToysOverview_CmdNotFound) | [Command Palette](https://aka.ms/PowerToysOverview_CmdPal) |
 | [Crop And Lock](https://aka.ms/PowerToysOverview_CropAndLock) | [Environment Variables](https://aka.ms/PowerToysOverview_EnvironmentVariables) | [FancyZones](https://aka.ms/PowerToysOverview_FancyZones) |
 | [File Explorer Add-ons](https://aka.ms/PowerToysOverview_FileExplorerAddOns) | [File Locksmith](https://aka.ms/PowerToysOverview_FileLocksmith) | [Hosts File Editor](https://aka.ms/PowerToysOverview_HostsFileEditor) |
-| [Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) | [Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) | [Mouse utilities](https://aka.ms/PowerToysOverview_MouseUtilities) |
+| [Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) | [Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) | [Mouse Utilities](https://aka.ms/PowerToysOverview_MouseUtilities) |
 | [Mouse Without Borders](https://aka.ms/PowerToysOverview_MouseWithoutBorders) | [New+](https://aka.ms/PowerToysOverview_NewPlus) | [Paste as Plain Text](https://aka.ms/PowerToysOverview_PastePlain) |
 | [Peek](https://aka.ms/PowerToysOverview_Peek) | [PowerRename](https://aka.ms/PowerToysOverview_PowerRename) | [PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) |
 | [Quick Accent](https://aka.ms/PowerToysOverview_QuickAccent) | [Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) | [Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) |
@@ -35,19 +35,19 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 Go to the [Microsoft PowerToys GitHub releases page][github-release-link] and click on `Assets` at the bottom to show the files available in the release. Please use the appropriate PowerToys installer that matches your machine's architecture and install scope. For most, it is `x64` and per-user.

 <!-- 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.93%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.92%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.92.1/PowerToysUserSetup-0.92.1-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.92.1/PowerToysUserSetup-0.92.1-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.92.1/PowerToysSetup-0.92.1-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.92.1/PowerToysSetup-0.92.1-arm64.exe
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.94%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.93%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysUserSetup-0.93.0-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysUserSetup-0.93.0-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysSetup-0.93.0-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.93.0/PowerToysSetup-0.93.0-arm64.exe
 
 |  Description   | Filename |
 |----------------|----------|
-| Per user - x64       | [PowerToysUserSetup-0.92.1-x64.exe][ptUserX64] |
-| Per user - ARM64     | [PowerToysUserSetup-0.92.1-arm64.exe][ptUserArm64] |
-| Machine wide - x64   | [PowerToysSetup-0.92.1-x64.exe][ptMachineX64] |
-| Machine wide - ARM64 | [PowerToysSetup-0.92.1-arm64.exe][ptMachineArm64] |
+| Per user - x64       | [PowerToysUserSetup-0.93.0-x64.exe][ptUserX64] |
+| Per user - ARM64     | [PowerToysUserSetup-0.93.0-arm64.exe][ptUserArm64] |
+| Machine wide - x64   | [PowerToysSetup-0.93.0-x64.exe][ptMachineX64] |
+| Machine wide - ARM64 | [PowerToysSetup-0.93.0-arm64.exe][ptMachineArm64] |

 This is our preferred method.

@@ -93,139 +93,119 @@ For guidance on developing for PowerToys, please read the [developer docs](./doc

 Our [prioritized roadmap][roadmap] of features and utilities that the core team is focusing on.

-### 0.92 - June 2025 Update
+### 0.93 - Aug 2025 Update

 In this release, we focused on new features, stability, optimization improvements, and automation.

 **✨Highlights**

- - PowerToys settings now has a toggle for the system tray icon, giving users control over its visibility based on personal preference. Thanks [@BLM16](https://github.com/BLM16)!  
- - Command Palette now has Ahead-of-Time ([AOT](https://learn.microsoft.com/en-us/dotnet/core/deploying/native-aot)) compatibility for all first-party extensions, improved extensibility, and core UX fixes, resulting in better performance and stability across commands.
- - Color Picker now has customizable mouse button actions, enabling more personalized workflows by assigning functions to left, right, and middle clicks. Thanks [@PesBandi](https://github.com/PesBandi)!
- - Bug Report Tool now has a faster and clearer reporting process, with progress indicators, improved compression, auto-cleanup of old trace logs, and inclusion of MSIX installer logs for more efficient diagnostics.
- - File Explorer add-ons now have improved rendering stability, resolving issues with PDF previews, blank thumbnails, and text file crashes during file browsing.
-
-### Color Picker
-
- - Added mouse button actions so you can choose what left, right, or middle click does. Thanks [@PesBandi](https://github.com/PesBandi)!  
-
-### Crop & Lock
-
- - Aligned window styling with current Windows theme for a cleaner look. Thanks [@sadirano](https://github.com/sadirano)!  
+ - PowerToys settings debuts a modern, card-based dashboard with clearer descriptions and faster navigation for a streamlined user experience.
+ - Command Palette had over 99 issues resolved, including bringing back Clipboard History, adding context menu shortcuts, pinning favorite apps, and supporting history in Run.
+ - Command Palette reduced its startup memory usage by ~15%, load time by ~40%, built-in extensions loading time by ~70%, and installation size by ~55%—all due to using the full Ahead-of-Time (AOT) compilation mode in Windows App SDK.
+ - Peek now supports instant previews and embedded thumbnails for Binary G-code (.bgcode) 3D printing files, making it easy to inspect models at a glance. Thanks [@pedrolamas](https://github.com/pedrolamas)!
+ - Mouse Utilities introduces a new spotlight highlighting mode that dims the screen and draws attention to your cursor, perfect for presentations.
+ - Test coverage improvements for multiple PowerToys modules including Command Palette, Advanced Paste, Peek, Text Extractor, and PowerRename — ensuring better reliability and quality, with over 600 new unit tests (mostly for Command Palette) and doubled UI automation coverage.

 ### Command Palette

- - Enhanced performance by resolving a regression in page loading.
- - Applied consistent hotkey handling across all Command Palette commands for a smoother user experience.
- - Improved graceful closing of Command Palette. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Fixed consistency issue for extensions' alias with "Direct" setting and enabled localization for "Direct" and "Indirect" for better user understanding. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Improved visual clarity by styling critical context items correctly.
- - Automatically focused the field when only one is present on the content page.
- - Improved stability and efficiency when loading file icons in SDK ThumbnailHelper.cs by removing unnecessary operations. Thanks [@OldUser101](https://github.com/OldUser101)!
- - Enhanced details view with commands implementation. (See [Extension sample](./src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleListPageWithDetails.cs))
+ - Ensured screen readers are notified when the selected item in the list changes for better accessibility.
+ - Fixed command title changes not being properly notified to screen readers. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Made icon controls excluded from keyboard navigation by default for better accessibility. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Improved UI design with better text sizing and alignment.
+ - Fixed keyboard shortcuts to work better in text boxes and context menus.
+ - Added right-click context menus with critical command styling and separators.
+ - Improved various context menu issues, improving item selection, handling of long titles, search bar text scaling, initial item behavior, and primary button functionality.
+ - Fixed context menu crashes with better type handling.
+ - Fixed "Reload" command to work with both uppercase and lowercase letters.
+ - Added mouse back button support for easier navigation. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed Alt+Left Arrow navigation not working when search box contains text. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Updated back button tooltip to show keyboard shortcut information. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed Command Palette window not appearing properly when activated. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed Command Palette window staying hidden from taskbar after File Explorer restarts. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed window focus not returning to previous app properly.
+ - Fixed Command Palette window to always appear on top when shown and move to bottom when hidden. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed window hiding to properly work on UI thread. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed crashes and improved stability with better synchronization of Command list updates. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Improved extension disposal with better error handling to prevent crashes. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Improved stability by fixing a UI threading issue when loading more results, preventing possible crashes and ensuring the loading state resets if loading fails. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Enhanced icon loading stability with better exception handling. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added thread safety to recent commands to prevent crashes. Thanks [@MaoShengelia](https://github.com/MaoShengelia)!
+ - Fixed acrylic (frosted glass) system backdrop display issues by ensuring proper UI thread handling. Thanks [@jiripolasek](https://github.com/jiripolasek)!

 ### Command Palette extensions

- - Added "Copy Path" command to *App* search results for convenience. Thanks [@PesBandi](https://github.com/PesBandi)!
- - Improved *Calculator* input experience by ignoring leading equal signs. Thanks [@PesBandi](https://github.com/PesBandi)!
- - Corrected input handling in the *Calculator* extension to avoid showing errors for input with only leading whitespace.
- - Improved *New Extension* wizard by validating names to prevent namespace errors.
- - Ensured consistent context items display for the *Run* extension between fallback and top-level results.
- - Fixed missing *Time & Date* commands in fallback results. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Fixed outdated results in the *Time & Date* extension. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Fixed an issue where *Web Search* always opened Microsoft Edge instead of the user's default browser on Windows 11 24H2 and later. Thanks [@RuggMatt](https://github.com/RuggMatt)!
- - Improved ordering of *Windows Settings* extension search results from alphabetical to relevance-based for quicker access.
- - Added "Restart Windows Explorer" command to the *Windows System Commands* provider for gracefully terminate and relaunch explorer.exe. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added settings to each provider to control which fallback commands are enabled. Thanks [@jiripolasek](https://github.com/jiripolasek)! for fixing a regression in this feature.
+ - Added sample code showing how Command Palette extensions can track when their pages are loaded or unloaded. [Check it out here](./src/modules/cmdpal/ext/SamplePagesExtension/OnLoadPage.cs).
+ - Fixed *Calculator* to accept regular spaces in numbers that use space separators. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Added a new setting to *Calculator* to make "Copy" the primary button (replacing “Save”) and enable "Close on Enter", streamlining the workflow. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Improved *Apps* indexing error handling and removed obsolete code. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Prevented apps from showing in search when the *Apps* extension is disabled. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added ability to pin/unpin *Apps* using Ctrl+P shortcut.
+ - Added keyboard shortcuts to the *Apps* context menu items for faster access. 
+ - Added all file context menu options to the *Apps* items context menu, making all file actions available there for better functionality.
+ - Streamlined All *Apps* extension settings by removing redundant descriptions, making the UI clearer.
+ - Added command history to the *Run* page for easier access to previous commands.
+ - Fixed directory path handling in *Run* fallback for better file navigation.
+ - Fixed URL fallback item hiding properly in *Web Search* extension when search query becomes invalid. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added proper empty state message for *Web Search* extension when no results found. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added fallback command to *Windows Settings* extension for better search results.
+ - Re-enabled *Clipboard History* feature with proper window handling.
+ - Improved *Add Bookmark* extension to automatically detect file, folder, or URL types without manual input.
+ - Updated terminology from "Kill process" to "End task" in *Window Walker* for consistency with Windows.
+ - Fixed minor grammar error in SamplePagesExtension code comments. Thanks [@purofle](https://github.com/purofle)!

-### Command Palette Ahead-of-Time (AOT) readiness
+### Mouse Utilities

- - We’ve made foundational changes to prepare the Command Palette for future Ahead-of-Time (AOT) publishing. This includes replacing the calculator library with ExprTk, improving COM object handling, refining Win32 interop, and correcting trimming behavior—all to ensure compatibility, performance, and reliability under AOT constraints. All first-party extensions are now AOT-compatible. These improvements lay the groundwork for publishing Command Palette as an AOT application in the next release.
- - Special thanks to [@Sergio0694](https://github.com/Sergio0694) for guidance on making COM APIs AOT-compatible, [@jtschuster](https://github.com/jtschuster) for fixing COM object handling, [@ArashPartow](https://github.com/ArashPartow) from ExprTk for integration suggestions, and [@tian-lt](https://github.com/tian-lt) from the Windows Calculator team for valuable suggestion throughout the migration journey and review.
- - As part of the upcoming release, we’re also enabling AOT compatibility for key dependencies, including markdown rendering, Adaptive Cards, internal logging and telemetry library, and the core Command Palette UX.
-
-### FancyZones
-
- - Fixed DPI-scaling issues to ensure FancyZones Editor displays crisply on high-resolution monitors. Thanks [@HO-COOH](https://github.com/HO-COOH)! This inspired us a broader review across other PowerToys modules, leading to DPI display optimizations in Awake, Color Picker, PowerAccent, and more.
-
-### File Explorer add-ons
-
- - Fixed potential failures in PDF previewer and thumbnail generation, improving reliability when browsing PDF files. Thanks [@mohiuddin-khan-shiam](https://github.com/mohiuddin-khan-shiam)!  
- - Prevented Monaco Preview Handler crash when opening UTF-8-BOM text files.  
-
-### Hosts File Editor
-
- - Added an in-app *“Learn more”* link to warning dialogs for quick guidance. Thanks [@PesBandi](https://github.com/PesBandi)!  
-
-### Mouse Without Borders
-
- - Fixed firewall rule so MWB now accepts connections from IPs outside your local subnet.
- - Cleaned legacy logs to reduce disk usage and noise.  
+ - Added a new spotlight highlighting mode that creates a large transparent circle around your cursor with a backdrop effect, providing an alternative to the traditional circle highlight. Perfect for presentations where you want to focus attention on a specific area while dimming the rest of the screen.

 ### Peek

- - Updated QOI reader so 3-channel QOI images preview correctly in Peek and File Explorer. Thanks [@mbartlett21](https://github.com/mbartlett21)!  
- - Added codec detection with a clear warning when a video can’t be previewed, along with a link to the Microsoft Store to download the required codec.
+ - Added preview and thumbnail support for Binary G-code (.bgcode) files used in 3D printing. You can now see embedded thumbnails and preview these compressed 3D printing files directly in Peek and File Explorer. Thanks [@pedrolamas](https://github.com/pedrolamas)!

-### PowerRename
+### Quick Accent

- - Added support for $YY-$MM-$DD in ModificationTime and AccessTime to enable flexible date-based renaming.
-
-### PowerToys Run
-
- - Suppressed error UI for known WPF-related crashes to reduce user confusion, while retaining diagnostic logging for analysis. This targets COMException 0xD0000701 and 0x80263001 caused by temporary DWM unavailability.
-
-### Registry Preview
-
- - Added "Extended data preview" via magnifier icon and context menu in the Data Grid, enabled easier inspection of complex registry types like REG_BINARY, REG_EXPAND_SZ, and REG_MULTI_SZ, etc. Thanks [@htcfreek](https://github.com/htcfreek)! 
- - Improved file-saving experience in Registry Preview by aligning with Notepad-like behavior, enhancing user prompts, error handling, and preventing crashes during unsaved or interrupted actions. Thanks [@htcfreek](https://github.com/htcfreek)!  
+ - Added Vietnamese language support to Quick Accent, mappings for Vietnamese vowels (a, e, i, o, u, y) and the letter d. Thanks [@octastylos-pseudodipteros](https://github.com/octastylos-pseudodipteros)!

 ### Settings

- - Added an option to hide or show the PowerToys system tray icon. Thanks [@BLM16](https://github.com/BLM16)!
- - Improved settings to show progress while a bug report package is being generated.
-
-### Workspaces
-
- - Stored Workspaces icons in user AppData to ensure profile portability and prevent loss during temporary folder cleanup.
- - Enabled capture and launch of PWAs on non-default Edge or Chrome profiles, ensuring consistent behavior during creation and execution.
+ - Completely redesigned the Settings dashboard with a modern card-based layout featuring organized sections for quick actions and shortcuts overview, replacing the old module list.
+ - Rewrote setting descriptions to be more concise and follow Windows writing style guidelines, making them easier to understand.
+ - Improved formatting and readability of release notes in the "What's New" section with better typography and spacing.
+ - Added missing deep link support for various settings pages (Peek, Quick Accent, PowerToys Run, etc.) so you can jump directly to specific settings.
+ - Resolved an issue where the settings page header would drift away from its position when resizing the settings window.
+ - Resolved a settings crash related to incompatible property names in ZoomIt configuration.

 ### Documentation

- - Added SpeedTest and Dictionary Definition to the third-party plugins documentation for PowerToys Run. Thanks [@ruslanlap](https://github.com/ruslanlap)!
- - Corrected sample links and typo in Command Palette documentation. Thanks [@daverayment](https://github.com/daverayment) and [@roycewilliams](https://github.com/roycewilliams)!
+ - Added detailed step-by-step instructions for first-time developers building the Command Palette module, including prerequisites and Visual Studio setup guidance. Thanks [@chatasweetie](https://github.com/chatasweetie)!
+ - **Fixed Broken SDK Link**: Corrected a broken markdown link in the Command Palette SDK README that was pointing to an incorrect directory path. Thanks [@ChrisGuzak](https://github.com/ChrisGuzak)!
+ - Added documentation for the "Open With Cursor" plugin that enables opening Visual Studio and VS Code recent files using Cursor AI. Thanks [@VictorNoxx](https://github.com/VictorNoxx)!
+ - Added documentation for two new community plugins - Hotkeys plugin for creating custom keyboard shortcuts, and RandomGen plugin for generating random data like passwords, colors, and placeholder text. Thanks [@ruslanlap](https://github.com/ruslanlap)!

 ### Development

- - Updated .NET libraries to 9.0.6 for performance and security. Thanks [@snickler](https://github.com/snickler)!  
- - Updated WinAppSDK to 1.7.2 for better stability and Windows support.  
- - Introduced a one-step local build script that generates a signed installer, enhancing developer productivity.
- - Generated portable PDBs so cross-platform debuggers can read symbol files, improving debugging experience in VSCode and other tools.
- - Simplified WinGet configuration files by using the [Microsoft.Windows.Settings](https://www.powershellgallery.com/packages/Microsoft.Windows.Settings) module to enable Developer Mode. Thanks [@mdanish-kh](https://github.com/mdanish-kh)! 
- - Adjusted build scripts for the latest Az.Accounts module to keep CI green.
- - Streamlined release pipeline by removing hard-coded telemetry version numbers, and unified Command Palette versioning with Windows Terminal's versioning method for consistent updates.
- - Enhanced the build validation step to show detailed differences between NOTICE.md and actual package dependencies and versions.
- - Improved spell-checking accuracy across the repo. Thanks [@rovercoder](https://github.com/rovercoder)!  
- - Upgraded CI to TouchdownBuild v5 for faster pipelines.  
- - Added context comments to *Resources.resw* to help translators.
- - Expanded fuzz testing coverage to include FancyZones.
- - Integrated all unit tests into the CI pipeline, increasing from ~3,000 to ~5,000 tests.
- - Enabled daily UI test automation on the main branch, now covering over 370 UI tests for end-to-end validation.
- - Newly added unit tests for WorkspacesLib to improve reliability and maintainability.
+ - Updated .NET libraries to 9.0.8 for performance and security. Thanks [@snickler](https://github.com/snickler)!
+ - Updated the spell check system to version 0.0.25 with better GitHub integration and SARIF reporting, plus fixed numerous spelling errors throughout the codebase including property names and documentation. Thanks [@jsoref](https://github.com/jsoref)!
+ - Cleaned up spelling check configuration to eliminate false positives and excessive noise that was appearing in every pull request, making the development process smoother.
+ - Replaced NuGet feed with Azure Artifacts for better package management.
+ - Implemented configurable UI test pipeline that can use pre-built official releases instead of building everything from scratch, reducing test execution time from 2+ hours.
+ - Replaced brittle pixel-by-pixel image comparison with perceptual hash (pHash) technology that's more robust to minor rendering differences - no more test failures due to anti-aliasing or compression artifacts.
+ - Reduced CI/fuzzing/UI test timeouts from 4 hours to 90 minutes, dramatically improving developer feedback loops and preventing long waits when builds get stuck.
+ - Standardized test project naming across the entire codebase and improved pipeline result identification by adding platform/install mode context to test run titles. Thanks [@khmyznikov](https://github.com/khmyznikov)!
+ - Added comprehensive UI test suites for multiple PowerToys modules including Command Palette, Advanced Paste, Peek, Text Extractor, and PowerRename - ensuring better reliability and quality.
+ - Enhanced UI test automation with command-line argument support, better session management, and improved element location methods using pattern matching to avoid failures from minor differences in exact matches.

-### General
+### What is being planned over the next few releases

- Updated bug report compression library (cziplib 0.3.3) for faster and more reliable package creation. Thanks [@Chubercik](https://github.com/Chubercik)!
- Included App Installer (“AppX Deployment Server”) event logs in bug reports for more thorough diagnostics.  
-
-### What is being planned for version 0.93
-
-For [v0.93][github-next-release-work], we'll work on the items below:
+For [v0.94][github-next-release-work], we'll work on the items below:

 - Continued Command Palette polish
- - New UI automation tests
- - Working on installer upgrades
+ - Working on Shortcut Guide v2 (Thanks [@noraa-junker](https://github.com/noraa-junker)!)
+ - Working on upgrading the installer to WiX 5
 - Working on shortcut conflict detection
+ - Working on setting search
 - Upgrading Keyboard Manager's editor UI
+ - New UI automation tests
 - Stability, bug fixes

 ## PowerToys Community
--- a/doc/devdocs/core/installer.md
+++ b/doc/devdocs/core/installer.md
@@ -87,6 +87,13 @@

 ### Building PowerToys Locally

+#### One stop script for building installer
+1. Open developer powershell for vs 2022
+2. Run tools\build\build-installer.ps1
+> For the first-time setup, please run the installer as an administrator. This ensures that the Wix tool can move wix.target to the desired location and trust the certificate used to sign the MSIX packages.
+
+The following manual steps will not install the MSIX apps (such as Command Palette) on your local installer.
+
 #### Prerequisites for building the MSI installer

 1. Install the [WiX Toolset Visual Studio 2022 Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2022Extension).
--- a/doc/devdocs/development/test-winget-install-locally.md
+++ b/doc/devdocs/development/test-winget-install-locally.md
@@ -0,0 +1,33 @@
+## If for any reason, you'd like to test winget install scenario, you can follow this doc:
+
+### Powertoys winget manifest definition:
+[winget repository](https://github.com/microsoft/winget-pkgs/tree/master/manifests/m/Microsoft/PowerToys)
+
+### How to test a winget installation locally:
+1. Get artifacts from release CI pipeline  Pipelines - Runs for PowerToys Signed YAML Release Build, or you can build one yourself by execute the 
+ 'tools\build\build-installer.ps1' script
+
+2. Get the artifact hash, this is required to define winget manifest
+```powershell
+cd /path/to/your/directory/contains/installer
+Get-FileHash -Path ".\<Installer-name>.exe" -Algorithm SHA256
+```
+ 3.  Host your installer.exe - Attention: staged github release artifacts or artifacts in release pipeline is not OK in this step
+You can self-host it or you can upload to a publicly available endpoint  
+**How to selfhost it** (A extremely simple way):
+```powershell
+python -m http.server 8000
+```
+
+4. Download a version folder from wingetpkgs like: [version 0.92.1](https://github.com/microsoft/winget-pkgs/tree/master/manifests/m/Microsoft/PowerToys/0.92.1)
+and you get **a folder contains 3 yml files**
+>note: Do not put any files other than these three in this folder
+
+5. Modify the yml files based on your version and the self hosted artifact link, and modify the sha256 hash for the installer you'd like to use
+
+6. Start winget install:
+```powershell
+#execute as admin
+winget settings --enable LocalManifestFiles
+winget install --manifest "<folder_path_of_manifest_files>" --architecture x64 --scope user
+```
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs
@@ -6,6 +6,7 @@ using System.Collections.Immutable;
 using System.Collections.Specialized;
 using CommunityToolkit.Mvvm.Messaging;
 using ManagedCommon;
+using Microsoft.CmdPal.Common.Helpers;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Ext.Apps;
 using Microsoft.CommandPalette.Extensions;
@@ -29,9 +30,13 @@ public partial class MainListPage : DynamicListPage,
    private bool _includeApps;
    private bool _filteredItemsIncludesApps;

+    private InterlockedBoolean _refreshRunning;
+    private InterlockedBoolean _refreshRequested;
+
    public MainListPage(IServiceProvider serviceProvider)
    {
        Icon = IconHelpers.FromRelativePath("Assets\\StoreLogo.scale-200.png");
+        PlaceholderText = Properties.Resources.builtin_main_list_page_searchbar_placeholder;
        _serviceProvider = serviceProvider;

        _tlcManager = _serviceProvider.GetService<TopLevelCommandManager>()!;
@@ -82,18 +87,47 @@ public partial class MainListPage : DynamicListPage,

    private void ReapplySearchInBackground()
    {
-        _ = Task.Run(() =>
+        _refreshRequested.Set();
+        if (!_refreshRunning.Set())
        {
-            try
+            return;
+        }
+
+        _ = Task.Run(RunRefreshLoop);
+    }
+
+    private void RunRefreshLoop()
+    {
+        try
+        {
+            do
            {
+                _refreshRequested.Clear();
+                lock (_tlcManager.TopLevelCommands)
+                {
+                    if (_filteredItemsIncludesApps == _includeApps)
+                    {
+                        break;
+                    }
+                }
+
                var currentSearchText = SearchText;
                UpdateSearchText(currentSearchText, currentSearchText);
            }
-            catch (Exception e)
+            while (_refreshRequested.Value);
+        }
+        catch (Exception e)
+        {
+            Logger.LogError("Failed to reload search", e);
+        }
+        finally
+        {
+            _refreshRunning.Clear();
+            if (_refreshRequested.Value && _refreshRunning.Set())
            {
-                Logger.LogError("Failed to reload search", e);
+                _ = Task.Run(RunRefreshLoop);
            }
-        });
+        }
    }

    public override IListItem[] GetItems()
@@ -125,6 +159,15 @@ public partial class MainListPage : DynamicListPage,
            var aliases = _serviceProvider.GetService<AliasManager>()!;
            if (aliases.CheckAlias(newSearch))
            {
+                if (_filteredItemsIncludesApps != _includeApps)
+                {
+                    lock (_tlcManager.TopLevelCommands)
+                    {
+                        _filteredItemsIncludesApps = _includeApps;
+                        _filteredItems = null;
+                    }
+                }
+
                return;
            }
        }
@@ -137,6 +180,7 @@ public partial class MainListPage : DynamicListPage,
            // Cleared out the filter text? easy. Reset _filteredItems, and bail out.
            if (string.IsNullOrEmpty(newSearch))
            {
+                _filteredItemsIncludesApps = _includeApps;
                _filteredItems = null;
                RaiseItemsChanged(commands.Count);
                return;
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentFormViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentFormViewModel.cs
@@ -98,35 +98,107 @@ public partial class ContentFormViewModel(IFormContent _form, WeakReference<IPag

    public void HandleSubmit(IAdaptiveActionElement action, JsonObject inputs)
    {
-        if (action is AdaptiveOpenUrlAction openUrlAction)
-        {
-            WeakReferenceMessenger.Default.Send<LaunchUriMessage>(new(openUrlAction.Url));
-            return;
-        }
+        // BODGY circa GH #40979
+        // Usually, you're supposed to try to cast the action to a specific
+        // type, and use those objects to get the data you need.
+        // However, there's something weird with AdaptiveCards and the way it
+        // works when we consume it when built in Release, with AOT (and
+        // trimming) enabled. Any sort of `action.As<IAdaptiveSubmitAction>()`
+        // or similar will throw a System.InvalidCastException.
+        //
+        // Instead we have this horror show.
+        //
+        // The `action.ToJson()` blob ACTUALLY CONTAINS THE `type` field, which
+        // we can use to determine what kind of action it is. Then we can parse
+        // the JSON manually based on the type.
+        var actionJson = action.ToJson();

-        if (action is AdaptiveSubmitAction or AdaptiveExecuteAction)
+        if (actionJson.TryGetValue("type", out var actionTypeValue))
        {
-            // Get the data and inputs
-            var dataString = (action as AdaptiveSubmitAction)?.DataJson.Stringify() ?? string.Empty;
-            var inputString = inputs.Stringify();
+            var actionTypeString = actionTypeValue.GetString();
+            Logger.LogTrace($"atString={actionTypeString}");

-            _ = Task.Run(() =>
+            var actionType = actionTypeString switch
            {
-                try
-                {
-                    var model = _formModel.Unsafe!;
-                    if (model != null)
+                "Action.Submit" => ActionType.Submit,
+                "Action.Execute" => ActionType.Execute,
+                "Action.OpenUrl" => ActionType.OpenUrl,
+                _ => ActionType.Unsupported,
+            };
+
+            Logger.LogDebug($"{actionTypeString}->{actionType}");
+
+            switch (actionType)
+            {
+                case ActionType.OpenUrl:
                    {
-                        var result = model.SubmitForm(inputString, dataString);
-                        WeakReferenceMessenger.Default.Send<HandleCommandResultMessage>(new(new(result)));
+                        HandleOpenUrlAction(action, actionJson);
                    }
-                }
-                catch (Exception ex)
-                {
-                    ShowException(ex);
-                }
-            });
+
+                    break;
+                case ActionType.Submit:
+                case ActionType.Execute:
+                    {
+                        HandleSubmitAction(action, actionJson, inputs);
+                    }
+
+                    break;
+                default:
+                    Logger.LogError($"{actionType} was an unexpected action `type`");
+                    break;
+            }
        }
+        else
+        {
+            Logger.LogError($"actionJson.TryGetValue(type) failed");
+        }
+    }
+
+    private void HandleOpenUrlAction(IAdaptiveActionElement action, JsonObject actionJson)
+    {
+        if (actionJson.TryGetValue("url", out var actionUrlValue))
+        {
+            var actionUrl = actionUrlValue.GetString() ?? string.Empty;
+            if (Uri.TryCreate(actionUrl, default(UriCreationOptions), out var uri))
+            {
+                WeakReferenceMessenger.Default.Send<LaunchUriMessage>(new(uri));
+            }
+            else
+            {
+                Logger.LogError($"Failed to produce URI for {actionUrlValue}");
+            }
+        }
+    }
+
+    private void HandleSubmitAction(
+        IAdaptiveActionElement action,
+        JsonObject actionJson,
+        JsonObject inputs)
+    {
+        var dataString = string.Empty;
+        if (actionJson.TryGetValue("data", out var actionDataValue))
+        {
+            dataString = actionDataValue.Stringify() ?? string.Empty;
+        }
+
+        var inputString = inputs.Stringify();
+        _ = Task.Run(() =>
+        {
+            try
+            {
+                var model = _formModel.Unsafe!;
+                if (model != null)
+                {
+                    var result = model.SubmitForm(inputString, dataString);
+                    Logger.LogDebug($"SubmitForm() returned {result}");
+                    WeakReferenceMessenger.Default.Send<HandleCommandResultMessage>(new(new(result)));
+                }
+            }
+            catch (Exception ex)
+            {
+                ShowException(ex);
+            }
+        });
    }

    private static readonly string ErrorCardJson = """
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.Designer.cs
@@ -321,6 +321,15 @@ namespace Microsoft.CmdPal.UI.ViewModels.Properties {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Search for apps, files and commands....
+        /// </summary>
+        public static string builtin_main_list_page_searchbar_placeholder {
+            get {
+                return ResourceManager.GetString("builtin_main_list_page_searchbar_placeholder", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to Creates a project for a new Command Palette extension.
        /// </summary>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.resx
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.resx
@@ -227,4 +227,7 @@
  <data name="builtin_disabled_extension" xml:space="preserve">
    <value>Disabled</value>
  </data>
+  <data name="builtin_main_list_page_searchbar_placeholder" xml:space="preserve">
+    <value>Search for apps, files and commands...</value>
+  </data>
 </root>
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/WindowExtensions.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/WindowExtensions.cs
@@ -29,7 +29,7 @@ public static class WindowExtensions
        }
        catch (NotImplementedException)
        {
-            // SetShownInSwitchers failed. This can happen if the Explorer is not running.
+            // Setting IsShownInSwitchers failed. This can happen if the Explorer is not running.
        }
    }
 }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs
@@ -176,7 +176,11 @@ public sealed partial class MainWindow : WindowEx,

    private void UpdateAcrylic()
    {
-        _acrylicController?.RemoveAllSystemBackdropTargets();
+        if (_acrylicController != null)
+        {
+            _acrylicController.RemoveAllSystemBackdropTargets();
+            _acrylicController.Dispose();
+        }

        _acrylicController = GetAcrylicConfig(Content);

--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsSettings.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsSettings.cs
@@ -44,25 +44,25 @@ public class AllAppsSettings : JsonSettingsManager
    private readonly ToggleSetting _enableStartMenuSource = new(
        Namespaced(nameof(EnableStartMenuSource)),
        Resources.enable_start_menu_source,
-        Resources.enable_start_menu_source,
+        string.Empty,
        true);

    private readonly ToggleSetting _enableDesktopSource = new(
        Namespaced(nameof(EnableDesktopSource)),
        Resources.enable_desktop_source,
-        Resources.enable_desktop_source,
+        string.Empty,
        true);

    private readonly ToggleSetting _enableRegistrySource = new(
        Namespaced(nameof(EnableRegistrySource)),
        Resources.enable_registry_source,
-        Resources.enable_registry_source,
+        string.Empty,
        false); // This one is very noisy

    private readonly ToggleSetting _enablePathEnvironmentVariableSource = new(
        Namespaced(nameof(EnablePathEnvironmentVariableSource)),
        Resources.enable_path_environment_variable_source,
-        Resources.enable_path_environment_variable_source,
+        string.Empty,
        false); // this one is very VERY noisy

    public double MinScoreThreshold { get; set; } = 0.75;
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Data/IndexerListItem.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Data/IndexerListItem.cs
@@ -85,6 +85,10 @@ internal sealed partial class IndexerListItem : ListItem
                commands.Add(new CommandContextItem(openCommand));
            }
        }
+        else
+        {
+            commands.Add(new CommandContextItem(openCommand));
+        }

        commands.Add(new CommandContextItem(new OpenWithCommand(fullPath)));
        commands.Add(new CommandContextItem(new ShowFileInFolderCommand(fullPath) { Name = Resources.Indexer_Command_ShowInFolder }));
--- a/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleContentPage.cs
+++ b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleContentPage.cs
@@ -225,6 +225,11 @@ internal sealed partial class SampleContentForm : FormContent
                    }
                ]
            }
+        },
+        {
+            "type": "Action.OpenUrl",
+            "title": "Action.OpenUrl",
+            "url": "https://adaptivecards.microsoft.com/"
        }
    ]
 }
--- a/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.xaml.cpp
+++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.xaml.cpp
@@ -126,11 +126,12 @@ void App::OnLaunched(LaunchActivatedEventArgs const&)
    }

    auto args = std::wstring{ GetCommandLine() };
-    
+    size_t pipePos{ args.rfind(L"\\\\.\\pipe\\") };
+
    // Try to parse command line arguments first
    std::vector<std::wstring> cmdLineFiles = ParseCommandLineArgs(args);
    
-    if (!cmdLineFiles.empty())
+    if (pipePos == std::wstring::npos && !cmdLineFiles.empty())
    {
        // Use command line arguments for UI testing
        for (const auto& filePath : cmdLineFiles)
@@ -142,12 +143,10 @@ void App::OnLaunched(LaunchActivatedEventArgs const&)
    else
    {
        // Use original pipe/stdin logic for normal operation
-        size_t pos{ args.rfind(L"\\\\.\\pipe\\") };
-
        std::wstring pipe_name;
-        if (pos != std::wstring::npos)
+        if (pipePos != std::wstring::npos)
        {
-            pipe_name = args.substr(pos);
+            pipe_name = args.substr(pipePos);
        }

        HANDLE hStdin;
--- a/src/modules/previewpane/BgcodePreviewHandler/Program.cs
+++ b/src/modules/previewpane/BgcodePreviewHandler/Program.cs
@@ -49,7 +49,7 @@ namespace Microsoft.PowerToys.PreviewHandler.Bgcode
                    _previewHandlerControl.DoPreview(filePath);

                    NativeEventWaiter.WaitForEventLoop(
-                        Constants.GcodePreviewResizeEvent(),
+                        Constants.BgcodePreviewResizeEvent(),
                        () =>
                        {
                            Rectangle s = default;
--- a/src/settings-ui/Settings.UI.Library/HotkeySettings.cs
+++ b/src/settings-ui/Settings.UI.Library/HotkeySettings.cs
@@ -120,9 +120,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library

            if (Shift)
            {
-                shortcutList.Add("Shift");
-
-                // shortcutList.Add(16); // The Shift key or button.
+                shortcutList.Add(16); // The Shift key or button.
            }

            if (Code > 0)
--- a/src/settings-ui/Settings.UI/Converters/KeyVisualTemplateSelector.cs
+++ b/src/settings-ui/Settings.UI/Converters/KeyVisualTemplateSelector.cs
@@ -1,23 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-
-namespace Microsoft.PowerToys.Settings.UI.Converters
-{
-    internal sealed partial class KeyVisualTemplateSelector : DataTemplateSelector
-    {
-        public DataTemplate KeyVisualTemplate { get; set; }
-
-        public DataTemplate CommaTemplate { get; set; }
-
-        protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
-        {
-            var stringValue = item as string;
-            return stringValue == KeysDataModel.CommaSeparator ? CommaTemplate : KeyVisualTemplate;
-        }
-    }
-}
--- a/src/settings-ui/Settings.UI/Converters/ModuleItemTemplateSelector.cs
+++ b/src/settings-ui/Settings.UI/Converters/ModuleItemTemplateSelector.cs
@@ -10,23 +10,17 @@ namespace Microsoft.PowerToys.Settings.UI.Converters
 {
    public partial class ModuleItemTemplateSelector : DataTemplateSelector
    {
-        public DataTemplate TextTemplate { get; set; }
-
-        public DataTemplate ButtonTemplate { get; set; }
-
        public DataTemplate ShortcutTemplate { get; set; }

-        public DataTemplate KBMTemplate { get; set; }
+        public DataTemplate ActivationTemplate { get; set; }

        protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
        {
            switch (item)
            {
-                case DashboardModuleButtonItem: return ButtonTemplate;
                case DashboardModuleShortcutItem: return ShortcutTemplate;
-                case DashboardModuleTextItem: return TextTemplate;
-                case DashboardModuleKBMItem: return KBMTemplate;
-                default: return TextTemplate;
+                case DashboardModuleActivationItem: return ActivationTemplate;
+                default: return ActivationTemplate;
            }
        }
    }
--- a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
+++ b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
@@ -22,6 +22,9 @@
  <ItemGroup>
    <None Remove="Assets\Settings\Modules\APDialog.dark.png" />
    <None Remove="Assets\Settings\Modules\APDialog.light.png" />
+    <None Remove="SettingsXAML\Controls\Dashboard\CheckUpdateControl.xaml" />
+    <None Remove="SettingsXAML\Controls\Dashboard\ShortcutConflictControl.xaml" />
+    <None Remove="SettingsXAML\Controls\KeyVisual\KeyCharPresenter.xaml" />
  </ItemGroup>
  <ItemGroup>
    <Page Remove="SettingsXAML\App.xaml" />
@@ -132,6 +135,15 @@
    <None Update="Assets\Settings\Scripts\DisableModule.ps1">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
+    <Page Update="SettingsXAML\Controls\KeyVisual\KeyCharPresenter.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Update="SettingsXAML\Controls\Dashboard\ShortcutConflictControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Update="SettingsXAML\Controls\Dashboard\CheckUpdateControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
  </ItemGroup>

  <ItemGroup>
--- a/src/settings-ui/Settings.UI/SettingsXAML/App.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/App.xaml
@@ -3,17 +3,20 @@
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
    xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters">
    <Application.Resources>
        <ResourceDictionary>
            <ResourceDictionary.MergedDictionaries>
                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
                <ResourceDictionary Source="/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml" />
+                <ResourceDictionary Source="/SettingsXAML/Controls/KeyVisual/KeyCharPresenter.xaml" />
                <ResourceDictionary Source="/SettingsXAML/Styles/TextBlock.xaml" />
                <ResourceDictionary Source="/SettingsXAML/Styles/Button.xaml" />
                <ResourceDictionary Source="/SettingsXAML/Styles/InfoBadge.xaml" />
                <ResourceDictionary Source="/SettingsXAML/Themes/Colors.xaml" />
                <ResourceDictionary Source="/SettingsXAML/Themes/Generic.xaml" />
+
                <!--  Other merged dictionaries here  -->
            </ResourceDictionary.MergedDictionaries>

@@ -26,19 +29,28 @@
                x:Key="BoolToVisibilityConverter"
                FalseValue="Collapsed"
                TrueValue="Visible" />
-
            <tkconverters:BoolToObjectConverter
                x:Key="BoolToComboBoxIndexConverter"
                FalseValue="0"
                TrueValue="1" />
-
            <tkconverters:BoolToObjectConverter
                x:Key="ReverseBoolToComboBoxIndexConverter"
                FalseValue="1"
                TrueValue="0" />
-
+            <tkconverters:DoubleToVisibilityConverter
+                x:Name="DoubleToVisibilityConverter"
+                FalseValue="Collapsed"
+                GreaterThan="0"
+                TrueValue="Visible" />
+            <tkconverters:DoubleToVisibilityConverter
+                x:Name="DoubleToInvertedVisibilityConverter"
+                FalseValue="Visible"
+                GreaterThan="0"
+                TrueValue="Collapsed" />
            <tkconverters:StringFormatConverter x:Key="StringFormatConverter" />
            <tkconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
+            <converters:UpdateStateToBoolConverter x:Key="UpdateStateToBoolConverter" />
+
            <x:Double x:Key="SettingsCardSpacing">2</x:Double>

            <!--  Overrides  -->
@@ -46,6 +58,7 @@
            <Thickness x:Key="InfoBarContentRootPadding">16,0,0,0</Thickness>
            <x:Double x:Key="SettingActionControlMinWidth">240</x:Double>

+            <x:Double x:Key="PageMaxWidth">1000</x:Double>

            <Style TargetType="ListViewItem">
                <Setter Property="Margin" Value="0,0,0,2" />
@@ -55,7 +68,6 @@
            </Style>

            <Style BasedOn="{StaticResource DefaultCheckBoxStyle}" TargetType="controls:CheckBoxWithDescriptionControl" />
-            <!--  Other app resources here  -->

            <TransitionCollection x:Key="SettingsCardsAnimations">
                <EntranceThemeTransition FromVerticalOffset="50" />
@@ -63,6 +75,9 @@
                <RepositionThemeTransition IsStaggeringEnabled="False" />
                <!--  Smoothly animates individual cards upon whenever Expanders are expanded/collapsed  -->
            </TransitionCollection>
+
+            <!--  Additional resources or settings can be added here  -->
+
        </ResourceDictionary>
    </Application.Resources>
 </Application>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/Card.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/Card.xaml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="Microsoft.PowerToys.Settings.UI.Controls.Card"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Padding="8"
+    HorizontalContentAlignment="Stretch"
+    VerticalContentAlignment="Stretch"
+    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+    BorderThickness="1"
+    CornerRadius="{StaticResource OverlayCornerRadius}"
+    mc:Ignorable="d">
+    <Grid
+        VerticalAlignment="{x:Bind VerticalContentAlignment, Mode=OneWay}"
+        Background="{x:Bind Background, Mode=OneWay}"
+        BorderBrush="{x:Bind BorderBrush, Mode=OneWay}"
+        BorderThickness="{x:Bind BorderThickness, Mode=OneWay}"
+        CornerRadius="{x:Bind CornerRadius, Mode=OneWay}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" MinHeight="44" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <Grid x:Name="TitleGrid">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <TextBlock
+                Margin="16,0,0,0"
+                VerticalAlignment="Center"
+                FontSize="16"
+                FontWeight="SemiBold"
+                Text="{x:Bind Title, Mode=OneWay}" />
+            <ContentPresenter
+                Grid.Column="2"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Content="{x:Bind TitleContent, Mode=OneWay}" />
+        </Grid>
+        <Rectangle
+            x:Name="Divider"
+            Grid.Row="1"
+            Height="1"
+            HorizontalAlignment="Stretch"
+            Fill="{ThemeResource DividerStrokeColorDefaultBrush}"
+            Visibility="{x:Bind DividerVisibility, Mode=OneWay}" />
+
+        <ContentPresenter
+            Grid.Row="2"
+            Margin="{x:Bind Padding, Mode=OneWay}"
+            HorizontalAlignment="{x:Bind HorizontalContentAlignment, Mode=OneWay}"
+            VerticalAlignment="{x:Bind VerticalContentAlignment, Mode=OneWay}"
+            Content="{x:Bind Content, Mode=OneWay}" />
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="TitleGridVisibilityStates">
+                <VisualState x:Name="TitleGridVisible" />
+                <VisualState x:Name="TitleGridCollapsed">
+                    <VisualState.Setters>
+                        <Setter Target="TitleGrid.Visibility" Value="Collapsed" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
+    </Grid>
+</UserControl>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/Card.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/Card.xaml.cs
@@ -0,0 +1,73 @@
+// 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.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.PowerToys.Settings.UI.Controls
+{
+    public sealed partial class Card : UserControl
+    {
+        public static readonly DependencyProperty TitleContentProperty = DependencyProperty.Register(nameof(TitleContent), typeof(object), typeof(Card), new PropertyMetadata(defaultValue: null, OnVisualPropertyChanged));
+
+        public object TitleContent
+        {
+            get => (object)GetValue(TitleContentProperty);
+            set => SetValue(TitleContentProperty, value);
+        }
+
+        public static readonly DependencyProperty TitleProperty = DependencyProperty.Register(nameof(Title), typeof(string), typeof(Card), new PropertyMetadata(defaultValue: null, OnVisualPropertyChanged));
+
+        public string Title
+        {
+            get => (string)GetValue(TitleProperty);
+            set => SetValue(TitleProperty, value);
+        }
+
+        public static new readonly DependencyProperty ContentProperty = DependencyProperty.Register(nameof(Content), typeof(object), typeof(Card), new PropertyMetadata(defaultValue: null));
+
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1061:Do not hide base class methods", Justification = "We need to hide the base class method")]
+        public new object Content
+        {
+            get => (object)GetValue(ContentProperty);
+            set => SetValue(ContentProperty, value);
+        }
+
+        public static readonly DependencyProperty DividerVisibilityProperty = DependencyProperty.Register(nameof(DividerVisibility), typeof(Visibility), typeof(Card), new PropertyMetadata(defaultValue: null));
+
+        public Visibility DividerVisibility
+        {
+            get => (Visibility)GetValue(DividerVisibilityProperty);
+            set => SetValue(DividerVisibilityProperty, value);
+        }
+
+        public Card()
+        {
+            InitializeComponent();
+            SetVisualStates();
+        }
+
+        private static void OnVisualPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is Card card)
+            {
+                card.SetVisualStates();
+            }
+        }
+
+        private void SetVisualStates()
+        {
+            if (string.IsNullOrEmpty(Title) && TitleContent == null)
+            {
+                VisualStateManager.GoToState(this, "TitleGridCollapsed", true);
+                DividerVisibility = Visibility.Collapsed;
+            }
+            else
+            {
+                VisualStateManager.GoToState(this, "TitleGridVisible", true);
+                DividerVisibility = Visibility.Visible;
+            }
+        }
+    }
+}
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/CheckUpdateControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/CheckUpdateControl.xaml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="Microsoft.PowerToys.Settings.UI.Controls.CheckUpdateControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <StackPanel Orientation="Horizontal">
+        <Button
+            Click="SWVersionButtonClicked"
+            Style="{StaticResource SubtleButtonStyle}"
+            Visibility="{x:Bind UpdateAvailable, Mode=OneWay}">
+            <Grid ColumnSpacing="16">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <Border
+                    Width="20"
+                    Height="20"
+                    CornerRadius="10">
+                    <Border.Background>
+                        <LinearGradientBrush StartPoint="0,0" EndPoint="0.5,1">
+                            <GradientStop Offset="0.0" Color="#239DE0" />
+                            <GradientStop Offset="1.0" Color="#037CD6" />
+                        </LinearGradientBrush>
+                    </Border.Background>
+                    <FontIcon
+                        AutomationProperties.AccessibilityView="Raw"
+                        FontSize="11"
+                        Foreground="White"
+                        Glyph="&#xE895;" />
+                </Border>
+                <StackPanel Grid.Column="1" Orientation="Vertical">
+                    <TextBlock x:Uid="UpdateAvailableTextBlock" FontWeight="SemiBold" />
+                    <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Style="{StaticResource CaptionTextBlockStyle}">
+                        <Run x:Uid="GeneralVersion" />
+                        <Run Text="{x:Bind UpdateSettingsConfig.NewVersion, Mode=OneWay}" />
+                    </TextBlock>
+                </StackPanel>
+            </Grid>
+        </Button>
+        <Grid
+            Padding="0,0,4,0"
+            VerticalAlignment="Center"
+            ColumnSpacing="16"
+            Visibility="{x:Bind UpdateAvailable, Converter={StaticResource ReverseBoolToVisibilityConverter}, Mode=OneWay}">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <Border
+                Width="20"
+                Height="20"
+                CornerRadius="10">
+                <Border.Background>
+                    <LinearGradientBrush StartPoint="0,0" EndPoint="0.5,1">
+                        <GradientStop Offset="0.0" Color="#6FB538" />
+                        <GradientStop Offset="1.0" Color="#397A24" />
+                    </LinearGradientBrush>
+                </Border.Background>
+                <FontIcon
+                    AutomationProperties.AccessibilityView="Raw"
+                    FontSize="11"
+                    Foreground="White"
+                    Glyph="&#xE73E;" />
+            </Border>
+            <StackPanel Grid.Column="1" Orientation="Vertical">
+                <TextBlock x:Uid="YoureUpToDate" FontWeight="SemiBold" />
+                <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Style="{StaticResource CaptionTextBlockStyle}">
+                    <Run x:Uid="General_VersionLastChecked" />
+                    <Run Text="{x:Bind UpdateSettingsConfig.LastCheckedDateLocalized, Mode=OneWay}" />
+                </TextBlock>
+            </StackPanel>
+        </Grid>
+    </StackPanel>
+</UserControl>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/CheckUpdateControl.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/CheckUpdateControl.xaml.cs
@@ -0,0 +1,30 @@
+// 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.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Services;
+using Microsoft.PowerToys.Settings.UI.Views;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.PowerToys.Settings.UI.Controls
+{
+    public sealed partial class CheckUpdateControl : UserControl
+    {
+        public bool UpdateAvailable { get; set; }
+
+        public UpdatingSettings UpdateSettingsConfig { get; set; }
+
+        public CheckUpdateControl()
+        {
+            InitializeComponent();
+            UpdateSettingsConfig = UpdatingSettings.LoadSettings();
+            UpdateAvailable = UpdateSettingsConfig != null && (UpdateSettingsConfig.State == UpdatingSettings.UpdatingState.ReadyToInstall || UpdateSettingsConfig.State == UpdatingSettings.UpdatingState.ReadyToDownload);
+        }
+
+        private void SWVersionButtonClicked(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+        {
+            NavigationService.Navigate(typeof(GeneralPage));
+        }
+    }
+}
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictControl.xaml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="Microsoft.PowerToys.Settings.UI.Controls.ShortcutConflictControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid>
+        <Button Click="ShortcutConflictBtn_Click" Style="{StaticResource SubtleButtonStyle}">
+            <Grid ColumnSpacing="16">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <FontIcon
+                    AutomationProperties.AccessibilityView="Raw"
+                    FontSize="20"
+                    Foreground="{ThemeResource SystemFillColorCriticalBrush}"
+                    Glyph="&#xE814;" />
+                <StackPanel Grid.Column="1" Orientation="Vertical">
+                    <TextBlock FontWeight="SemiBold" Text="Shortcut conflicts" />
+                    <TextBlock
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        Style="{StaticResource CaptionTextBlockStyle}"
+                        Text="2 conflicts found" />
+                </StackPanel>
+            </Grid>
+        </Button>
+    </Grid>
+</UserControl>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictControl.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictControl.xaml.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+namespace Microsoft.PowerToys.Settings.UI.Controls
+{
+    public sealed partial class ShortcutConflictControl : UserControl
+    {
+        public ShortcutConflictControl()
+        {
+            InitializeComponent();
+            GetShortcutConflicts();
+        }
+
+        private void GetShortcutConflicts()
+        {
+            // TO DO: Implement the logic to retrieve and display shortcut conflicts. Make sure to Collapse this control if not conflicts are found.
+        }
+
+        private void ShortcutConflictBtn_Click(object sender, RoutedEventArgs e)
+        {
+            // TO DO: Handle the button click event to show the shortcut conflicts window.
+        }
+    }
+}
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/FlyoutMenuButton/FlyoutMenuButton.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/FlyoutMenuButton/FlyoutMenuButton.xaml
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/FlyoutMenuButton/FlyoutMenuButton.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/FlyoutMenuButton/FlyoutMenuButton.cs
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyCharPresenter.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyCharPresenter.xaml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:ui="using:CommunityToolkit.WinUI">
+
+    <Style BasedOn="{StaticResource DefaultKeyCharPresenterStyle}" TargetType="local:KeyCharPresenter" />
+
+    <Style x:Key="DefaultKeyCharPresenterStyle" TargetType="local:KeyCharPresenter">
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="AutomationProperties.AccessibilityView" Value="Raw" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="local:KeyCharPresenter">
+                    <Grid Height="{TemplateBinding FontSize}">
+                        <TextBlock
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            FontFamily="{TemplateBinding FontFamily}"
+                            FontSize="{TemplateBinding FontSize}"
+                            FontWeight="{TemplateBinding FontWeight}"
+                            Text="{TemplateBinding Content}"
+                            TextLineBounds="Tight" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style
+        x:Key="WindowsKeyCharPresenterStyle"
+        BasedOn="{StaticResource DefaultKeyCharPresenterStyle}"
+        TargetType="local:KeyCharPresenter">
+        <!--  Scale to visually align the height of the Windows logo and text  -->
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="local:KeyCharPresenter">
+                    <Grid Height="{TemplateBinding FontSize}">
+                        <Viewbox>
+                            <PathIcon Data="M9 20H0V11H9V20ZM20 20H11V11H20V20ZM9 9H0V0H9V9ZM20 9H11V0H20V9Z" />
+                        </Viewbox>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style
+        x:Key="GlyphKeyCharPresenterStyle"
+        BasedOn="{StaticResource DefaultKeyCharPresenterStyle}"
+        TargetType="local:KeyCharPresenter">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="local:KeyCharPresenter">
+                    <Grid>
+                        <Viewbox>
+                            <FontIcon
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                FontSize="{TemplateBinding FontSize}"
+                                FontWeight="{TemplateBinding FontWeight}"
+                                Glyph="{TemplateBinding Content}" />
+                        </Viewbox>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyCharPresenter.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyCharPresenter.xaml.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Documents;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+
+namespace Microsoft.PowerToys.Settings.UI.Controls;
+
+public sealed partial class KeyCharPresenter : Control
+{
+    public KeyCharPresenter()
+    {
+        DefaultStyleKey = typeof(KeyCharPresenter);
+    }
+
+    public object Content
+    {
+        get => (object)GetValue(ContentProperty);
+        set => SetValue(ContentProperty, value);
+    }
+
+    public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(nameof(Content), typeof(object), typeof(KeyCharPresenter), new PropertyMetadata(default(string)));
+}
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.cs
@@ -1,191 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Markup;
-using Windows.System;
-
-namespace Microsoft.PowerToys.Settings.UI.Controls
-{
-    [TemplatePart(Name = KeyPresenter, Type = typeof(ContentPresenter))]
-    [TemplateVisualState(Name = "Normal", GroupName = "CommonStates")]
-    [TemplateVisualState(Name = "Disabled", GroupName = "CommonStates")]
-    [TemplateVisualState(Name = "Default", GroupName = "StateStates")]
-    [TemplateVisualState(Name = "Error", GroupName = "StateStates")]
-    public sealed partial class KeyVisual : Control
-    {
-        private const string KeyPresenter = "KeyPresenter";
-        private KeyVisual _keyVisual;
-        private ContentPresenter _keyPresenter;
-
-        public object Content
-        {
-            get => (object)GetValue(ContentProperty);
-            set => SetValue(ContentProperty, value);
-        }
-
-        public static readonly DependencyProperty ContentProperty = DependencyProperty.Register("Content", typeof(object), typeof(KeyVisual), new PropertyMetadata(default(string), OnContentChanged));
-
-        public VisualType VisualType
-        {
-            get => (VisualType)GetValue(VisualTypeProperty);
-            set => SetValue(VisualTypeProperty, value);
-        }
-
-        public static readonly DependencyProperty VisualTypeProperty = DependencyProperty.Register("VisualType", typeof(VisualType), typeof(KeyVisual), new PropertyMetadata(default(VisualType), OnSizeChanged));
-
-        public bool IsError
-        {
-            get => (bool)GetValue(IsErrorProperty);
-            set => SetValue(IsErrorProperty, value);
-        }
-
-        public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register("IsError", typeof(bool), typeof(KeyVisual), new PropertyMetadata(false, OnIsErrorChanged));
-
-        public KeyVisual()
-        {
-            this.DefaultStyleKey = typeof(KeyVisual);
-            this.Style = GetStyleSize("TextKeyVisualStyle");
-        }
-
-        protected override void OnApplyTemplate()
-        {
-            IsEnabledChanged -= KeyVisual_IsEnabledChanged;
-            _keyVisual = (KeyVisual)this;
-            _keyPresenter = (ContentPresenter)_keyVisual.GetTemplateChild(KeyPresenter);
-            Update();
-            SetEnabledState();
-            SetErrorState();
-            IsEnabledChanged += KeyVisual_IsEnabledChanged;
-            base.OnApplyTemplate();
-        }
-
-        private static void OnContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((KeyVisual)d).Update();
-        }
-
-        private static void OnSizeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((KeyVisual)d).Update();
-        }
-
-        private static void OnIsErrorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((KeyVisual)d).SetErrorState();
-        }
-
-        private void Update()
-        {
-            if (_keyVisual == null)
-            {
-                return;
-            }
-
-            if (_keyVisual.Content != null)
-            {
-                if (_keyVisual.Content.GetType() == typeof(string))
-                {
-                    _keyVisual.Style = GetStyleSize("TextKeyVisualStyle");
-                    _keyVisual._keyPresenter.Content = _keyVisual.Content;
-                }
-                else
-                {
-                    _keyVisual.Style = GetStyleSize("IconKeyVisualStyle");
-
-                    switch ((int)_keyVisual.Content)
-                    {
-                        /* We can enable other glyphs in the future
-                        case 13: // The Enter key or button.
-                            _keyVisual._keyPresenter.Content = "\uE751"; break;
-
-                        case 8: // The Back key or button.
-                            _keyVisual._keyPresenter.Content = "\uE750"; break;
-
-                        case 16: // The right Shift key or button.
-                        case 160: // The left Shift key or button.
-                        case 161: // The Shift key or button.
-                            _keyVisual._keyPresenter.Content = "\uE752"; break; */
-
-                        case 38: _keyVisual._keyPresenter.Content = "\uE0E4"; break; // The Up Arrow key or button.
-                        case 40: _keyVisual._keyPresenter.Content = "\uE0E5"; break; // The Down Arrow key or button.
-                        case 37: _keyVisual._keyPresenter.Content = "\uE0E2"; break; // The Left Arrow key or button.
-                        case 39: _keyVisual._keyPresenter.Content = "\uE0E3"; break; // The Right Arrow key or button.
-
-                        case 91: // The left Windows key
-                        case 92: // The right Windows key
-                            PathIcon winIcon = XamlReader.Load(@"<PathIcon xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation"" Data=""M683 1229H0V546h683v683zm819 0H819V546h683v683zm-819 819H0v-683h683v683zm819 0H819v-683h683v683z"" />") as PathIcon;
-                            Viewbox winIconContainer = new Viewbox();
-                            winIconContainer.Child = winIcon;
-                            winIconContainer.HorizontalAlignment = HorizontalAlignment.Center;
-                            winIconContainer.VerticalAlignment = VerticalAlignment.Center;
-
-                            double iconDimensions = GetIconSize();
-                            winIconContainer.Height = iconDimensions;
-                            winIconContainer.Width = iconDimensions;
-                            _keyVisual._keyPresenter.Content = winIconContainer;
-                            break;
-                        default: _keyVisual._keyPresenter.Content = ((VirtualKey)_keyVisual.Content).ToString(); break;
-                    }
-                }
-            }
-        }
-
-        public Style GetStyleSize(string styleName)
-        {
-            if (VisualType == VisualType.Small)
-            {
-                return (Style)App.Current.Resources["Small" + styleName];
-            }
-            else if (VisualType == VisualType.SmallOutline)
-            {
-                return (Style)App.Current.Resources["SmallOutline" + styleName];
-            }
-            else if (VisualType == VisualType.TextOnly)
-            {
-                return (Style)App.Current.Resources["Only" + styleName];
-            }
-            else
-            {
-                return (Style)App.Current.Resources["Default" + styleName];
-            }
-        }
-
-        public double GetIconSize()
-        {
-            if (VisualType == VisualType.Small || VisualType == VisualType.SmallOutline)
-            {
-                return (double)App.Current.Resources["SmallIconSize"];
-            }
-            else
-            {
-                return (double)App.Current.Resources["DefaultIconSize"];
-            }
-        }
-
-        private void KeyVisual_IsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            SetEnabledState();
-        }
-
-        private void SetErrorState()
-        {
-            VisualStateManager.GoToState(this, IsError ? "Error" : "Default", true);
-        }
-
-        private void SetEnabledState()
-        {
-            VisualStateManager.GoToState(this, IsEnabled ? "Normal" : "Disabled", true);
-        }
-    }
-
-    public enum VisualType
-    {
-        Small,
-        SmallOutline,
-        TextOnly,
-        Large,
-    }
-}
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml
@@ -1,66 +1,70 @@
 <ResourceDictionary
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls">
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls">

-    <x:Double x:Key="DefaultIconSize">16</x:Double>
-    <x:Double x:Key="SmallIconSize">12</x:Double>
-    <Style x:Key="DefaultTextKeyVisualStyle" TargetType="controls:KeyVisual">
-        <Setter Property="MinWidth" Value="56" />
-        <Setter Property="MinHeight" Value="48" />
-        <Setter Property="Background" Value="{ThemeResource AccentButtonBackground}" />
-        <Setter Property="Foreground" Value="{ThemeResource AccentButtonForeground}" />
-        <Setter Property="BorderBrush" Value="{ThemeResource AccentButtonBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
-        <Setter Property="Padding" Value="16,8,16,8" />
-        <Setter Property="FontWeight" Value="SemiBold" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
+    <Style BasedOn="{StaticResource DefaultKeyVisualStyle}" TargetType="local:KeyVisual" />
+
+    <Style x:Key="DefaultKeyVisualStyle" TargetType="local:KeyVisual">
+        <Setter Property="MinWidth" Value="16" />
+        <Setter Property="AutomationProperties.AccessibilityView" Value="Raw" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="MinHeight" Value="16" />
+        <Setter Property="Background" Value="{ThemeResource SubtleFillColorTransparentBrush}" />
+        <Setter Property="Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource ControlStrokeColorDefaultBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="4,4,4,4" />
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="CornerRadius" Value="2" />
+        <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="18" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
        <Setter Property="Template">
            <Setter.Value>
-                <ControlTemplate TargetType="controls:KeyVisual">
-                    <Grid>
-                        <Grid>
-                            <Rectangle
-                                x:Name="ContentHolder"
-                                Height="{TemplateBinding Height}"
-                                MinWidth="{TemplateBinding MinWidth}"
-                                Fill="{TemplateBinding Background}"
-                                RadiusX="4"
-                                RadiusY="4"
-                                Stroke="{TemplateBinding BorderBrush}"
-                                StrokeThickness="{TemplateBinding BorderThickness}" />
-                            <ContentPresenter
-                                x:Name="KeyPresenter"
-                                Margin="{TemplateBinding Padding}"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="Center"
-                                Content="{TemplateBinding Content}"
-                                FontSize="{TemplateBinding FontSize}"
-                                FontWeight="{TemplateBinding FontWeight}"
-                                Foreground="{TemplateBinding Foreground}" />
-                        </Grid>
+                <ControlTemplate TargetType="local:KeyVisual">
+                    <Grid
+                        x:Name="KeyHolder"
+                        MinWidth="{TemplateBinding MinWidth}"
+                        MinHeight="{TemplateBinding MinHeight}"
+                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid.BackgroundTransition>
+                            <BrushTransition Duration="0:0:0.083" />
+                        </Grid.BackgroundTransition>
+                        <local:KeyCharPresenter
+                            x:Name="KeyPresenter"
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            AutomationProperties.AccessibilityView="Raw"
+                            Content="{TemplateBinding Content}"
+                            FontSize="{TemplateBinding FontSize}"
+                            FontWeight="{TemplateBinding FontWeight}"
+                            Foreground="{TemplateBinding Foreground}" />
                        <VisualStateManager.VisualStateGroups>
                            <VisualStateGroup x:Name="CommonStates">
                                <VisualState x:Name="Normal" />
                                <VisualState x:Name="Disabled">
                                    <VisualState.Setters>
-                                        <Setter Target="ContentHolder.Fill" Value="{ThemeResource AccentButtonBackgroundDisabled}" />
-                                        <Setter Target="KeyPresenter.Foreground" Value="{ThemeResource AccentButtonForegroundDisabled}" />
-                                        <Setter Target="ContentHolder.Stroke" Value="{ThemeResource AccentButtonBorderBrushDisabled}" />
-                                        <!--<Setter Target="ContentHolder.StrokeThickness" Value="{TemplateBinding BorderThickness}" />-->
+                                        <Setter Target="KeyHolder.Background" Value="{ThemeResource SubtleFillColorTransparentBrush}" />
+                                        <Setter Target="KeyHolder.BorderBrush" Value="{ThemeResource CardStrokeColorDefaultSolidBrush}" />
+                                        <Setter Target="KeyPresenter.Foreground" Value="{ThemeResource ControlStrokeColorDefaultBrush}" />
                                    </VisualState.Setters>
                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="StateStates">
-                                <VisualState x:Name="Default" />
-                                <VisualState x:Name="Error">
+                                <VisualState x:Name="Invalid">
                                    <VisualState.Setters>
-                                        <Setter Target="ContentHolder.Fill" Value="{ThemeResource InfoBarErrorSeverityBackgroundBrush}" />
-                                        <Setter Target="KeyPresenter.Foreground" Value="{ThemeResource InfoBarErrorSeverityIconBackground}" />
-                                        <Setter Target="ContentHolder.Stroke" Value="{ThemeResource InfoBarErrorSeverityIconBackground}" />
-                                        <Setter Target="ContentHolder.StrokeThickness" Value="2" />
+                                        <Setter Target="KeyHolder.Background" Value="{ThemeResource SystemFillColorCriticalBackgroundBrush}" />
+                                        <Setter Target="KeyHolder.BorderBrush" Value="{ThemeResource SystemFillColorCriticalBrush}" />
+                                        <Setter Target="KeyHolder.BorderThickness" Value="2" />
+                                        <Setter Target="KeyPresenter.Foreground" Value="{ThemeResource SystemFillColorCriticalBrush}" />
                                    </VisualState.Setters>
                                </VisualState>
                            </VisualStateGroup>
@@ -72,103 +76,116 @@
    </Style>

    <Style
-        x:Key="SmallTextKeyVisualStyle"
-        BasedOn="{StaticResource DefaultTextKeyVisualStyle}"
-        TargetType="controls:KeyVisual">
-        <Setter Property="MinWidth" Value="40" />
-        <Setter Property="Height" Value="36" />
-        <Setter Property="FontWeight" Value="SemiBold" />
-        <Setter Property="Padding" Value="12,0,12,2" />
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        x:Key="SubtleKeyVisualStyle"
+        BasedOn="{StaticResource DefaultKeyVisualStyle}"
+        TargetType="local:KeyVisual">
+        <Setter Property="Background" Value="{ThemeResource SubtleFillColorTransparentBrush}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource SubtleFillColorTransparentBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="local:KeyVisual">
+                    <Grid
+                        x:Name="KeyHolder"
+                        MinWidth="{TemplateBinding MinWidth}"
+                        MinHeight="{TemplateBinding MinHeight}"
+                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid.BackgroundTransition>
+                            <BrushTransition Duration="0:0:0.083" />
+                        </Grid.BackgroundTransition>
+                        <local:KeyCharPresenter
+                            x:Name="KeyPresenter"
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            AutomationProperties.AccessibilityView="Raw"
+                            Content="{TemplateBinding Content}"
+                            FontSize="{TemplateBinding FontSize}"
+                            FontWeight="{TemplateBinding FontWeight}"
+                            Foreground="{TemplateBinding Foreground}" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="Disabled">
+                                    <VisualState.Setters>
+                                        <Setter Target="KeyPresenter.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="Invalid">
+                                    <VisualState.Setters>
+                                        <Setter Target="KeyPresenter.Foreground" Value="{ThemeResource SystemFillColorCriticalBrush}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
    </Style>

    <Style
-        x:Key="SmallOutlineTextKeyVisualStyle"
-        BasedOn="{StaticResource DefaultTextKeyVisualStyle}"
-        TargetType="controls:KeyVisual">
-        <Setter Property="MinWidth" Value="40" />
-        <Setter Property="Background" Value="{ThemeResource ButtonBackground}" />
-        <Setter Property="Foreground" Value="{ThemeResource ButtonForeground}" />
-        <Setter Property="BorderBrush" Value="{ThemeResource ButtonBorderBrush}" />
-        <Setter Property="Height" Value="36" />
-        <Setter Property="FontWeight" Value="SemiBold" />
-        <Setter Property="Padding" Value="8,0,8,2" />
-        <Setter Property="FontSize" Value="13" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        x:Key="AccentKeyVisualStyle"
+        BasedOn="{StaticResource DefaultKeyVisualStyle}"
+        TargetType="local:KeyVisual">
+
+        <Setter Property="Background" Value="{ThemeResource AccentFillColorDefaultBrush}" />
+        <Setter Property="Foreground" Value="{ThemeResource TextOnAccentFillColorPrimaryBrush}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource AccentControlElevationBorderBrush}" />
+        <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="local:KeyVisual">
+                    <Grid
+                        x:Name="KeyHolder"
+                        MinWidth="{TemplateBinding MinWidth}"
+                        MinHeight="{TemplateBinding MinHeight}"
+                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                        AutomationProperties.AccessibilityView="Raw"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid.BackgroundTransition>
+                            <BrushTransition Duration="0:0:0.083" />
+                        </Grid.BackgroundTransition>
+                        <local:KeyCharPresenter
+                            x:Name="KeyPresenter"
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding Content}"
+                            FontSize="{TemplateBinding FontSize}"
+                            FontWeight="{TemplateBinding FontWeight}"
+                            Foreground="{TemplateBinding Foreground}" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="Disabled">
+                                    <VisualState.Setters>
+                                        <Setter Target="KeyHolder.Background" Value="{ThemeResource AccentButtonBackgroundDisabled}" />
+                                        <Setter Target="KeyHolder.BorderBrush" Value="{ThemeResource AccentButtonBorderBrushDisabled}" />
+                                        <Setter Target="KeyPresenter.Foreground" Value="{ThemeResource AccentButtonForegroundDisabled}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="Invalid">
+                                    <VisualState.Setters>
+                                        <Setter Target="KeyHolder.Background" Value="{ThemeResource SystemFillColorCriticalBackgroundBrush}" />
+                                        <Setter Target="KeyHolder.BorderBrush" Value="{ThemeResource SystemFillColorCriticalBrush}" />
+                                        <Setter Target="KeyHolder.BorderThickness" Value="2" />
+                                        <Setter Target="KeyPresenter.Foreground" Value="{ThemeResource SystemFillColorCriticalBrush}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
    </Style>
-
-
-
-    <Style
-        x:Key="DefaultIconKeyVisualStyle"
-        BasedOn="{StaticResource DefaultTextKeyVisualStyle}"
-        TargetType="controls:KeyVisual">
-        <Setter Property="MinWidth" Value="56" />
-        <Setter Property="MinHeight" Value="48" />
-        <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
-        <Setter Property="Padding" Value="16,8,16,8" />
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-    </Style>
-
-    <Style
-        x:Key="SmallIconKeyVisualStyle"
-        BasedOn="{StaticResource DefaultTextKeyVisualStyle}"
-        TargetType="controls:KeyVisual">
-        <Setter Property="MinWidth" Value="40" />
-        <Setter Property="Height" Value="36" />
-        <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="FontSize" Value="10" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-    </Style>
-
-    <Style
-        x:Key="SmallOutlineIconKeyVisualStyle"
-        BasedOn="{StaticResource DefaultTextKeyVisualStyle}"
-        TargetType="controls:KeyVisual">
-        <Setter Property="MinWidth" Value="40" />
-        <Setter Property="Background" Value="{ThemeResource ButtonBackground}" />
-        <Setter Property="Foreground" Value="{ThemeResource ButtonForeground}" />
-        <Setter Property="BorderBrush" Value="{ThemeResource ButtonBorderBrush}" />
-        <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
-        <Setter Property="Height" Value="36" />
-        <Setter Property="FontWeight" Value="SemiBold" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="FontSize" Value="9" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-    </Style>
-
-    <Style
-        x:Key="OnlyTextKeyVisualStyle"
-        BasedOn="{StaticResource DefaultTextKeyVisualStyle}"
-        TargetType="controls:KeyVisual">
-        <Setter Property="MinHeight" Value="12" />
-        <Setter Property="MinWidth" Value="12" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground" Value="{ThemeResource ButtonForeground}" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="FontSize" Value="12" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-    </Style>
-
-    <Style
-        x:Key="OnlyIconKeyVisualStyle"
-        BasedOn="{StaticResource DefaultTextKeyVisualStyle}"
-        TargetType="controls:KeyVisual">
-        <Setter Property="MinHeight" Value="10" />
-        <Setter Property="MinWidth" Value="10" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground" Value="{ThemeResource ButtonForeground}" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="Padding" Value="0,0,0,3" />
-        <!--<Setter Property="FontSize" Value="9" />-->
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-    </Style>
-</ResourceDictionary>
+</ResourceDictionary>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml.cs
@@ -0,0 +1,166 @@
+// 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.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Windows.System;
+
+namespace Microsoft.PowerToys.Settings.UI.Controls
+{
+    [TemplatePart(Name = KeyPresenter, Type = typeof(KeyCharPresenter))]
+    [TemplateVisualState(Name = NormalState, GroupName = "CommonStates")]
+    [TemplateVisualState(Name = DisabledState, GroupName = "CommonStates")]
+    [TemplateVisualState(Name = InvalidState, GroupName = "CommonStates")]
+    public sealed partial class KeyVisual : Control
+    {
+        private const string KeyPresenter = "KeyPresenter";
+        private const string NormalState = "Normal";
+        private const string DisabledState = "Disabled";
+        private const string InvalidState = "Invalid";
+        private KeyCharPresenter _keyPresenter;
+
+        public object Content
+        {
+            get => (object)GetValue(ContentProperty);
+            set => SetValue(ContentProperty, value);
+        }
+
+        public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(nameof(Content), typeof(object), typeof(KeyVisual), new PropertyMetadata(default(string), OnContentChanged));
+
+        public bool IsInvalid
+        {
+            get => (bool)GetValue(IsInvalidProperty);
+            set => SetValue(IsInvalidProperty, value);
+        }
+
+        public static readonly DependencyProperty IsInvalidProperty = DependencyProperty.Register(nameof(IsInvalid), typeof(bool), typeof(KeyVisual), new PropertyMetadata(false, OnIsInvalidChanged));
+
+        public bool RenderKeyAsGlyph
+        {
+            get => (bool)GetValue(RenderKeyAsGlyphProperty);
+            set => SetValue(RenderKeyAsGlyphProperty, value);
+        }
+
+        public static readonly DependencyProperty RenderKeyAsGlyphProperty = DependencyProperty.Register(nameof(RenderKeyAsGlyph), typeof(bool), typeof(KeyVisual), new PropertyMetadata(false, OnContentChanged));
+
+        public KeyVisual()
+        {
+            this.DefaultStyleKey = typeof(KeyVisual);
+        }
+
+        protected override void OnApplyTemplate()
+        {
+            IsEnabledChanged -= KeyVisual_IsEnabledChanged;
+            _keyPresenter = (KeyCharPresenter)this.GetTemplateChild(KeyPresenter);
+            Update();
+            SetVisualStates();
+            IsEnabledChanged += KeyVisual_IsEnabledChanged;
+            base.OnApplyTemplate();
+        }
+
+        private static void OnContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((KeyVisual)d).SetVisualStates();
+        }
+
+        private static void OnIsInvalidChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((KeyVisual)d).SetVisualStates();
+        }
+
+        private void SetVisualStates()
+        {
+            if (this != null)
+            {
+                if (IsInvalid)
+                {
+                    VisualStateManager.GoToState(this, InvalidState, true);
+                }
+                else if (!IsEnabled)
+                {
+                    VisualStateManager.GoToState(this, DisabledState, true);
+                }
+                else
+                {
+                    VisualStateManager.GoToState(this, NormalState, true);
+                }
+            }
+        }
+
+        private void Update()
+        {
+            if (Content == null)
+            {
+                return;
+            }
+
+            if (Content is string)
+            {
+                _keyPresenter.Style = (Style)Application.Current.Resources["DefaultKeyCharPresenterStyle"];
+                return;
+            }
+
+            if (Content is int keyCode)
+            {
+                VirtualKey virtualKey = (VirtualKey)keyCode;
+                switch (virtualKey)
+                {
+                    case VirtualKey.Enter:
+                        SetGlyphOrText("\uE751", virtualKey);
+                        break;
+
+                    case VirtualKey.Back:
+                        SetGlyphOrText("\uE750", virtualKey);
+                        break;
+
+                    case VirtualKey.Shift:
+                    case (VirtualKey)160: // Left Shift
+                    case (VirtualKey)161: // Right Shift
+                        SetGlyphOrText("\uE752", virtualKey);
+                        break;
+
+                    case VirtualKey.Up:
+                        _keyPresenter.Content = "\uE0E4";
+                        break;
+
+                    case VirtualKey.Down:
+                        _keyPresenter.Content = "\uE0E5";
+                        break;
+
+                    case VirtualKey.Left:
+                        _keyPresenter.Content = "\uE0E2";
+                        break;
+
+                    case VirtualKey.Right:
+                        _keyPresenter.Content = "\uE0E3";
+                        break;
+
+                    case VirtualKey.LeftWindows:
+                    case VirtualKey.RightWindows:
+                        _keyPresenter.Style = (Style)Application.Current.Resources["WindowsKeyCharPresenterStyle"];
+                        break;
+                }
+            }
+        }
+
+        private void SetGlyphOrText(string glyph, VirtualKey key)
+        {
+            if (RenderKeyAsGlyph)
+            {
+                _keyPresenter.Content = glyph;
+                _keyPresenter.Style = (Style)Application.Current.Resources["GlyphKeyCharPresenterStyle"];
+            }
+            else
+            {
+                _keyPresenter.Content = key.ToString();
+                _keyPresenter.Style = (Style)Application.Current.Resources["DefaultKeyCharPresenterStyle"];
+            }
+        }
+
+        private void KeyVisual_IsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            SetVisualStates();
+        }
+    }
+}
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/OOBEPageControl/OOBEPageControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/OOBEPageControl/OOBEPageControl.xaml
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/OOBEPageControl/OOBEPageControl.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/OOBEPageControl/OOBEPageControl.xaml.cs
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/PowerAccentShortcutControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/PowerAccentShortcutControl.xaml
@@ -31,8 +31,7 @@
                        VerticalAlignment="Center"
                        AutomationProperties.AccessibilityView="Raw"
                        Content="{Binding}"
-                        IsTabStop="False"
-                        VisualType="SmallOutline" />
+                        IsTabStop="False" />
                </DataTemplate>
            </ItemsControl.ItemTemplate>
        </ItemsControl>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroup.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroup.xaml.cs
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml
@@ -6,20 +6,12 @@
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
-    xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
    Loaded="UserControl_Loaded"
    mc:Ignorable="d">
-
    <UserControl.Resources>
        <x:Double x:Key="PageMaxWidth">1000</x:Double>
        <x:Double x:Key="PageHeaderMaxWidth">1020</x:Double>
-        <tkconverters:DoubleToVisibilityConverter
-            x:Name="doubleToVisibilityConverter"
-            FalseValue="Collapsed"
-            GreaterThan="0"
-            TrueValue="Visible" />
    </UserControl.Resources>
-
    <Grid Padding="20,0,0,0" RowSpacing="24">
        <Grid.RowDefinitions>
            <RowDefinition Height="Auto" />
@@ -62,7 +54,7 @@
                        MaxWidth="160"
                        HorizontalAlignment="Left"
                        VerticalAlignment="Top"
-                        CornerRadius="4">
+                        CornerRadius="{StaticResource OverlayCornerRadius}">
                        <Image AutomationProperties.AccessibilityView="Raw">
                            <Image.Source>
                                <BitmapImage UriSource="{x:Bind ModuleImageSource}" />
@@ -113,7 +105,7 @@
                    MaxWidth="{StaticResource PageMaxWidth}"
                    AutomationProperties.Name="{x:Bind SecondaryLinksHeader}"
                    Orientation="Vertical"
-                    Visibility="{x:Bind SecondaryLinks.Count, Converter={StaticResource doubleToVisibilityConverter}}">
+                    Visibility="{x:Bind SecondaryLinks.Count, Converter={StaticResource DoubleToVisibilityConverter}}">
                    <TextBlock
                        Margin="2,8,0,0"
                        AutomationProperties.HeadingLevel="Level2"
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml
@@ -11,43 +11,74 @@
    mc:Ignorable="d">

    <Grid HorizontalAlignment="Right">
-        <StackPanel Orientation="Horizontal">
-            <Button
-                x:Name="EditButton"
-                Padding="0"
-                Click="OpenDialogButton_Click"
-                CornerRadius="8">
+        <Button
+            x:Name="EditButton"
+            Padding="0"
+            HorizontalAlignment="Right"
+            Click="OpenDialogButton_Click"
+            Style="{StaticResource SubtleButtonStyle}">
+            <StackPanel Orientation="Horizontal" Spacing="8">
+                <ItemsControl
+                    x:Name="PreviewKeysControl"
+                    Margin="2"
+                    VerticalAlignment="Center"
+                    IsEnabled="{Binding ElementName=EditButton, Path=IsEnabled}"
+                    IsTabStop="False"
+                    Visibility="Collapsed">
+                    <ItemsControl.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <StackPanel Orientation="Horizontal" Spacing="4" />
+                        </ItemsPanelTemplate>
+                    </ItemsControl.ItemsPanel>
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <controls:KeyVisual
+                                Padding="12,8,12,8"
+                                VerticalAlignment="Center"
+                                AutomationProperties.AccessibilityView="Raw"
+                                Content="{Binding}"
+                                CornerRadius="{StaticResource ControlCornerRadius}"
+                                FontWeight="SemiBold"
+                                IsTabStop="False"
+                                Style="{StaticResource AccentKeyVisualStyle}" />
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
                <StackPanel
-                    Margin="12,6,12,6"
+                    x:Name="PlaceholderPanel"
+                    Padding="8,4"
+                    BorderThickness="1"
+                    CornerRadius="{StaticResource ControlCornerRadius}"
                    Orientation="Horizontal"
-                    Spacing="16">
-                    <ItemsControl
-                        x:Name="PreviewKeysControl"
+                    Spacing="8">
+                    <!--<FontIcon
+                        AutomationProperties.AccessibilityView="Raw"
+                        FontSize="12"
+                        Glyph="&#xEDA7;" />-->
+                    <TextBlock
+                        x:Uid="ConfigureShortcutText"
                        VerticalAlignment="Center"
-                        IsEnabled="{Binding ElementName=EditButton, Path=IsEnabled}"
-                        IsTabStop="False">
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <StackPanel Orientation="Horizontal" Spacing="4" />
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate>
-                                <controls:KeyVisual
-                                    VerticalAlignment="Center"
-                                    AutomationProperties.AccessibilityView="Raw"
-                                    Content="{Binding}"
-                                    IsTabStop="False"
-                                    VisualType="Small" />
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
-                    <FontIcon
-                        FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                        FontSize="16"
-                        Glyph="&#xE70F;" />
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
                </StackPanel>
-            </Button>
-        </StackPanel>
+                <FontIcon
+                    Margin="0,0,4,0"
+                    AutomationProperties.Name=""
+                    FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                    FontSize="14"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Glyph="&#xE70F;" />
+            </StackPanel>
+        </Button>
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="CommonStates">
+                <VisualState x:Name="Normal" />
+                <VisualState x:Name="Configured">
+                    <VisualState.Setters>
+                        <Setter Target="PlaceholderPanel.Visibility" Value="Collapsed" />
+                        <Setter Target="PreviewKeysControl.Visibility" Value="Visible" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
    </Grid>
 </UserControl>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.

 using System;
-
 using CommunityToolkit.WinUI;
 using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library;
@@ -11,6 +10,7 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Automation;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
+using Microsoft.Windows.ApplicationModel.Resources;
 using Windows.System;

 namespace Microsoft.PowerToys.Settings.UI.Controls
@@ -36,6 +36,8 @@ namespace Microsoft.PowerToys.Settings.UI.Controls

        public static readonly DependencyProperty AllowDisableProperty = DependencyProperty.Register("AllowDisable", typeof(bool), typeof(ShortcutControl), new PropertyMetadata(false, OnAllowDisableChanged));

+        private static ResourceLoader resourceLoader = Helpers.ResourceLoaderInstance.ResourceLoader;
+
        private static void OnAllowDisableChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
        {
            var me = d as ShortcutControl;
@@ -50,8 +52,6 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
                return;
            }

-            var resourceLoader = Helpers.ResourceLoaderInstance.ResourceLoader;
-
            var newValue = (bool)(e?.NewValue ?? false);

            var text = newValue ? resourceLoader.GetString("Activation_Shortcut_With_Disable_Description") : resourceLoader.GetString("Activation_Shortcut_Description");
@@ -103,8 +103,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
                {
                    hotkeySettings = value;
                    SetValue(HotkeySettingsProperty, value);
-                    PreviewKeysControl.ItemsSource = HotkeySettings.GetKeysList();
-                    AutomationProperties.SetHelpText(EditButton, HotkeySettings.ToString());
+                    SetKeys();
                    c.Keys = HotkeySettings.GetKeysList();
                }
            }
@@ -118,8 +117,6 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
            this.Unloaded += ShortcutControl_Unloaded;
            this.Loaded += ShortcutControl_Loaded;

-            var resourceLoader = Helpers.ResourceLoaderInstance.ResourceLoader;
-
            // We create the Dialog in C# because doing it in XAML is giving WinUI/XAML Island bugs when using dark theme.
            shortcutDialog = new ContentDialog
            {
@@ -433,11 +430,9 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
            hotkeySettings = null;

            SetValue(HotkeySettingsProperty, hotkeySettings);
-            PreviewKeysControl.ItemsSource = HotkeySettings.GetKeysList();
+            SetKeys();

            lastValidSettings = hotkeySettings;
-
-            AutomationProperties.SetHelpText(EditButton, HotkeySettings.ToString());
            shortcutDialog.Hide();
        }

@@ -448,8 +443,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
                HotkeySettings = lastValidSettings with { };
            }

-            PreviewKeysControl.ItemsSource = hotkeySettings.GetKeysList();
-            AutomationProperties.SetHelpText(EditButton, HotkeySettings.ToString());
+            SetKeys();
            shortcutDialog.Hide();
        }

@@ -462,9 +456,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls

            var empty = new HotkeySettings();
            HotkeySettings = empty;
-
-            PreviewKeysControl.ItemsSource = HotkeySettings.GetKeysList();
-            AutomationProperties.SetHelpText(EditButton, HotkeySettings.ToString());
+            SetKeys();
            shortcutDialog.Hide();
        }

@@ -525,5 +517,22 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
            Dispose(disposing: true);
            GC.SuppressFinalize(this);
        }
+
+        private void SetKeys()
+        {
+            var keys = HotkeySettings.GetKeysList();
+
+            if (keys != null && keys.Count > 0)
+            {
+                VisualStateManager.GoToState(this, "Configured", true);
+                PreviewKeysControl.ItemsSource = keys;
+                AutomationProperties.SetHelpText(EditButton, HotkeySettings.ToString());
+            }
+            else
+            {
+                VisualStateManager.GoToState(this, "Normal", true);
+                AutomationProperties.SetHelpText(EditButton, resourceLoader.GetString("ConfigureShortcut"));
+            }
+        }
    }
 }
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
@@ -14,9 +14,6 @@
            <RowDefinition MinHeight="110" />
            <RowDefinition Height="Auto" />
        </Grid.RowDefinitions>
-
-        <TextBlock Grid.Row="0" />
-
        <ItemsControl
            x:Name="KeysControl"
            Grid.Row="1"
@@ -34,12 +31,15 @@
            <ItemsControl.ItemTemplate>
                <DataTemplate>
                    <controls:KeyVisual
-                        Height="56"
+                        Padding="20,16"
                        AutomationProperties.AccessibilityView="Raw"
                        Content="{Binding}"
-                        IsError="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay}"
+                        CornerRadius="{StaticResource ControlCornerRadius}"
+                        FontSize="16"
+                        FontWeight="SemiBold"
+                        IsInvalid="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay}"
                        IsTabStop="False"
-                        VisualType="Large" />
+                        Style="{StaticResource AccentKeyVisualStyle}" />
                </DataTemplate>
            </ItemsControl.ItemTemplate>
        </ItemsControl>
@@ -51,14 +51,12 @@
            Orientation="Vertical"
            Spacing="8">
            <Grid Height="62">
-
                <InfoBar
                    x:Uid="InvalidShortcut"
                    IsClosable="False"
                    IsOpen="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay}"
                    IsTabStop="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay}"
                    Severity="Error" />
-
                <InfoBar
                    x:Uid="WarningShortcutAltGr"
                    IsClosable="False"
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
@@ -28,11 +28,11 @@
            <ItemsControl.ItemTemplate>
                <DataTemplate>
                    <controls:KeyVisual
-                        VerticalAlignment="Center"
+                        Padding="12,8,12,8"
                        AutomationProperties.AccessibilityView="Raw"
                        Content="{Binding}"
-                        IsTabStop="False"
-                        VisualType="SmallOutline" />
+                        FontSize="12"
+                        IsTabStop="False" />
                </DataTemplate>
            </ItemsControl.ItemTemplate>
        </ItemsControl>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Flyout/AppsListPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Flyout/AppsListPage.xaml
@@ -7,17 +7,8 @@
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
    xmlns:viewModels="using:Microsoft.PowerToys.Settings.UI.ViewModels"
    mc:Ignorable="d">
-
-    <Page.Resources>
-        <tkconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
-        <tkconverters:BoolToVisibilityConverter
-            x:Key="BoolToInvertedVisibilityConverter"
-            FalseValue="Visible"
-            TrueValue="Collapsed" />
-    </Page.Resources>
    <Grid Background="{ThemeResource LayerOnAcrylicFillColorDefaultBrush}">
        <Grid.RowDefinitions>
            <RowDefinition Height="Auto" />
@@ -89,7 +80,7 @@
                            VerticalAlignment="Center"
                            FontSize="16"
                            Glyph="&#xE72E;"
-                            Visibility="{x:Bind IsLocked, Converter={StaticResource BoolToInvertedVisibilityConverter}, ConverterParameter=True, Mode=OneWay}">
+                            Visibility="{x:Bind IsLocked, Converter={StaticResource ReverseBoolToVisibilityConverter}, ConverterParameter=True, Mode=OneWay}">
                            <ToolTipService.ToolTip>
                                <TextBlock x:Uid="GPO_SettingIsManaged_ToolTip" TextWrapping="WrapWholeWords" />
                            </ToolTipService.ToolTip>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Flyout/LaunchPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Flyout/LaunchPage.xaml
@@ -21,7 +21,6 @@
            <Setter Property="Height" Value="32" />
            <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
        </Style>
-
        <tkconverters:StringVisibilityConverter x:Key="StringVisibilityConverter" />
    </Page.Resources>
    <Grid>
@@ -110,7 +109,7 @@
        </Grid>
        <Grid Grid.Row="2">
            <InfoBar
-                x:Uid="UpdateAvailable"
+                x:Uid="UpdateAvailableInfoBar"
                IsClosable="False"
                IsOpen="{x:Bind ViewModel.IsUpdateAvailable, Mode=OneWay}"
                Severity="Success" />
--- a/src/settings-ui/Settings.UI/SettingsXAML/Themes/Generic.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Themes/Generic.xaml
@@ -2,7 +2,7 @@

    <ResourceDictionary.MergedDictionaries>
        <ResourceDictionary Source="ms-appx:///SettingsXAML/Controls/SettingsGroup/SettingsGroup.xaml" />
-        <ResourceDictionary Source="ms-appx:///SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml" />
-        <ResourceDictionary Source="ms-appx:///SettingsXAML/Controls/FlyoutMenuButton/FlyoutMenuButton.xaml" />
+        <ResourceDictionary Source="ms-appx:///SettingsXAML/Controls/IsEnabledTextBlock.xaml" />
+        <ResourceDictionary Source="ms-appx:///SettingsXAML/Controls/FlyoutMenuButton.xaml" />
    </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml
@@ -10,13 +10,6 @@
    xmlns:ui="using:CommunityToolkit.WinUI"
    AutomationProperties.LandmarkType="Main"
    mc:Ignorable="d">
-    <Page.Resources>
-        <tkconverters:BoolToVisibilityConverter
-            x:Key="BoolToInvertedVisibilityConverter"
-            FalseValue="Visible"
-            TrueValue="Collapsed" />
-        <tkconverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-    </Page.Resources>
    <controls:SettingsPageControl x:Uid="CmdNotFound" ModuleImageSource="ms-appx:///Assets/Settings/Modules/CmdNotFound.png">
        <controls:SettingsPageControl.ModuleContent>
            <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml
@@ -14,14 +14,8 @@
    d:DataContext="{d:DesignInstance Type=viewModels:ColorPickerViewModel}"
    AutomationProperties.LandmarkType="Main"
    mc:Ignorable="d">
-
-    <Page.Resources>
-        <tkconverters:BoolToVisibilityConverter x:Key="BoolToVis" />
-    </Page.Resources>
-
    <controls:SettingsPageControl x:Uid="ColorPicker" ModuleImageSource="ms-appx:///Assets/Settings/Modules/ColorPicker.png">
        <controls:SettingsPageControl.ModuleContent>
-
            <StackPanel
                x:Name="ColorPickerView"
                ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml
@@ -9,497 +9,357 @@
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
    xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
-    xmlns:viewModels="using:Microsoft.PowerToys.Settings.UI.ViewModels"
+    xmlns:viewmodels="using:Microsoft.PowerToys.Settings.UI.ViewModels"
    AutomationProperties.LandmarkType="Main"
    DataContext="DashboardViewModel"
    mc:Ignorable="d">
-
    <Page.Resources>
-        <DataTemplate x:Key="KeyVisualTemplate">
-            <controls:KeyVisual
-                VerticalAlignment="Center"
-                AutomationProperties.AccessibilityView="Raw"
-                Content="{Binding}"
-                IsTabStop="False"
-                VisualType="TextOnly" />
-        </DataTemplate>
-        <DataTemplate x:Key="CommaTemplate">
-            <StackPanel Background="{ThemeResource SystemFillColorSolidAttentionBackground}">
-                <TextBlock
-                    Margin="4,0"
-                    VerticalAlignment="Bottom"
-                    Text="," />
-            </StackPanel>
-        </DataTemplate>
-        <converters:KeyVisualTemplateSelector
-            x:Key="KeyVisualTemplateSelector"
-            CommaTemplate="{StaticResource CommaTemplate}"
-            KeyVisualTemplate="{StaticResource KeyVisualTemplate}" />
        <converters:ModuleItemTemplateSelector
            x:Key="ModuleItemTemplateSelector"
-            ButtonTemplate="{StaticResource ModuleItemButtonTemplate}"
-            KBMTemplate="{StaticResource ModuleItemKBMTemplate}"
-            ShortcutTemplate="{StaticResource ModuleItemShortcutTemplate}"
-            TextTemplate="{StaticResource ModuleItemTextTemplate}" />
-        <tkconverters:CollectionVisibilityConverter x:Key="CollectionVisibilityConverter" />
-        <Style x:Name="KeysListViewContainerStyle" TargetType="ListViewItem">
-            <Setter Property="IsTabStop" Value="False" />
-        </Style>
-        <converters:UpdateStateToBoolConverter x:Key="UpdateStateToBoolConverter" />
-        <tkconverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-        <tkconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
-        <tkconverters:BoolToVisibilityConverter
-            x:Key="BoolToInvertedVisibilityConverter"
-            FalseValue="Visible"
-            TrueValue="Collapsed" />
-        <DataTemplate x:Key="OriginalKeyTemplate" x:DataType="x:String">
-            <controls:KeyVisual Content="{Binding}" VisualType="SmallOutline" />
-        </DataTemplate>
-
-        <DataTemplate x:Key="RemappedKeyTemplate" x:DataType="x:String">
-            <controls:KeyVisual Content="{Binding}" VisualType="Small" />
-        </DataTemplate>
-
-        <DataTemplate x:Key="ModuleItemTextTemplate" x:DataType="viewModels:DashboardModuleTextItem">
-            <TextBlock
-                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                Style="{StaticResource CaptionTextBlockStyle}"
-                Text="{x:Bind Label, Mode=OneWay}"
-                TextWrapping="WrapWholeWords" />
-        </DataTemplate>
-
-        <DataTemplate x:Key="ModuleItemButtonTemplate" x:DataType="viewModels:DashboardModuleButtonItem">
-            <Button
-                HorizontalAlignment="Stretch"
-                Click="{x:Bind ButtonClickHandler, Mode=OneWay}"
-                Content="{x:Bind ButtonTitle}" />
-        </DataTemplate>
-
-        <DataTemplate x:Key="ModuleItemShortcutTemplate" x:DataType="viewModels:DashboardModuleShortcutItem">
-            <Grid ColumnSpacing="12">
+            ActivationTemplate="{StaticResource ModuleItemActivationTemplate}"
+            ShortcutTemplate="{StaticResource ModuleItemShortcutTemplate}" />
+        <DataTemplate x:Key="ModuleItemShortcutTemplate" x:DataType="viewmodels:DashboardModuleShortcutItem">
+            <Grid MinHeight="36" ColumnSpacing="12">
                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" MinWidth="140" />
                </Grid.ColumnDefinitions>
-                <Border
-                    Padding="8,4"
-                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                    BorderThickness="1"
-                    CornerRadius="{StaticResource ControlCornerRadius}">
-                    <ItemsControl
-                        AutomationProperties.AccessibilityView="Raw"
-                        IsTabStop="False"
-                        ItemsSource="{x:Bind Shortcut, Mode=TwoWay}">
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <StackPanel Orientation="Horizontal" Spacing="12" />
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate>
-                                <controls:KeyVisual
-                                    VerticalAlignment="Center"
-                                    AutomationProperties.AccessibilityView="Raw"
-                                    Content="{Binding}"
-                                    IsTabStop="False"
-                                    VisualType="TextOnly" />
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
-                </Border>
-
-                <TextBlock
+                <ItemsControl
                    Grid.Column="1"
+                    HorizontalAlignment="Left"
+                    AutomationProperties.AccessibilityView="Raw"
+                    IsTabStop="False"
+                    ItemsSource="{x:Bind Shortcut, Mode=OneWay}">
+                    <ItemsControl.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <StackPanel Orientation="Horizontal" Spacing="4" />
+                        </ItemsPanelTemplate>
+                    </ItemsControl.ItemsPanel>
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <controls:KeyVisual
+                                VerticalAlignment="Center"
+                                AutomationProperties.AccessibilityView="Raw"
+                                Content="{Binding}"
+                                FontSize="12"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                IsTabStop="False"
+                                RenderKeyAsGlyph="True" />
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+                <TextBlock
                    VerticalAlignment="Center"
-                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                    Style="{StaticResource CaptionTextBlockStyle}"
                    Text="{x:Bind Label, Mode=OneWay}"
                    TextWrapping="WrapWholeWords" />
            </Grid>
        </DataTemplate>
-        <DataTemplate x:Key="ModuleItemKBMTemplate" x:DataType="viewModels:DashboardModuleKBMItem">
-            <Button x:Uid="DashboardKBMShowMappingsButton" HorizontalAlignment="Stretch">
-                <Button.Flyout>
-                    <Flyout
-                        x:Name="DetailsFlyout"
-                        Placement="Bottom"
-                        ShouldConstrainToRootBounds="False">
-                        <StackPanel Orientation="Vertical" Spacing="4">
-                            <ItemsControl ItemsSource="{x:Bind RemapKeys, Mode=OneWay}">
-                                <ItemsControl.ItemsPanel>
-                                    <ItemsPanelTemplate>
-                                        <StackPanel Spacing="4" />
-                                    </ItemsPanelTemplate>
-                                </ItemsControl.ItemsPanel>
-                                <ItemsControl.ItemTemplate>
-                                    <DataTemplate x:DataType="Lib:KeysDataModel">
-                                        <StackPanel Orientation="Horizontal">
-                                            <Border
-                                                Padding="8,4"
-                                                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                                                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                                                BorderThickness="1"
-                                                CornerRadius="{StaticResource ControlCornerRadius}">
-                                                <ItemsControl
-                                                    AutomationProperties.AccessibilityView="Raw"
-                                                    IsTabStop="False"
-                                                    ItemsSource="{x:Bind GetMappedOriginalKeys()}">
-                                                    <ItemsControl.ItemsPanel>
-                                                        <ItemsPanelTemplate>
-                                                            <StackPanel Orientation="Horizontal" Spacing="12" />
-                                                        </ItemsPanelTemplate>
-                                                    </ItemsControl.ItemsPanel>
-                                                    <ItemsControl.ItemTemplate>
-                                                        <DataTemplate>
-                                                            <controls:KeyVisual
-                                                                VerticalAlignment="Center"
-                                                                AutomationProperties.AccessibilityView="Raw"
-                                                                Content="{Binding}"
-                                                                IsTabStop="False"
-                                                                VisualType="TextOnly" />
-                                                        </DataTemplate>
-                                                    </ItemsControl.ItemTemplate>
-                                                </ItemsControl>
-                                            </Border>
-                                            <controls:IsEnabledTextBlock
-                                                x:Uid="To"
-                                                Margin="8,0,8,0"
-                                                VerticalAlignment="Center"
-                                                Style="{StaticResource SecondaryIsEnabledTextBlockStyle}" />
-                                            <Border
-                                                Padding="8,4"
-                                                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                                                BorderBrush="{ThemeResource AccentFillColorDefaultBrush}"
-                                                BorderThickness="1"
-                                                CornerRadius="{StaticResource ControlCornerRadius}">
-                                                <ItemsControl
-                                                    AutomationProperties.AccessibilityView="Raw"
-                                                    IsTabStop="False"
-                                                    ItemsSource="{x:Bind GetMappedNewRemapKeys(15)}">
-                                                    <ItemsControl.ItemsPanel>
-                                                        <ItemsPanelTemplate>
-                                                            <StackPanel Orientation="Horizontal" Spacing="12" />
-                                                        </ItemsPanelTemplate>
-                                                    </ItemsControl.ItemsPanel>
-                                                    <ItemsControl.ItemTemplate>
-                                                        <DataTemplate>
-                                                            <controls:KeyVisual
-                                                                VerticalAlignment="Center"
-                                                                AutomationProperties.AccessibilityView="Raw"
-                                                                Content="{Binding}"
-                                                                FontSize="12"
-                                                                Foreground="{ThemeResource AccentFillColorDefaultBrush}"
-                                                                IsTabStop="False"
-                                                                VisualType="TextOnly" />
-                                                        </DataTemplate>
-                                                    </ItemsControl.ItemTemplate>
-                                                </ItemsControl>
-                                            </Border>
-                                        </StackPanel>
-                                    </DataTemplate>
-                                </ItemsControl.ItemTemplate>
-                            </ItemsControl>
-                            <ItemsControl ItemsSource="{x:Bind RemapShortcuts, Mode=OneWay}">
-                                <ItemsControl.ItemsPanel>
-                                    <ItemsPanelTemplate>
-                                        <StackPanel Spacing="4" />
-                                    </ItemsPanelTemplate>
-                                </ItemsControl.ItemsPanel>
-                                <ItemsControl.ItemTemplate>
-                                    <DataTemplate x:DataType="Lib:AppSpecificKeysDataModel">
-                                        <StackPanel Orientation="Horizontal">
-                                            <Border
-                                                Padding="8,0"
-                                                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                                                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                                                BorderThickness="1"
-                                                CornerRadius="{StaticResource ControlCornerRadius}">
-                                                <ItemsControl
-                                                    AutomationProperties.AccessibilityView="Raw"
-                                                    IsTabStop="False"
-                                                    ItemTemplateSelector="{StaticResource KeyVisualTemplateSelector}"
-                                                    ItemsSource="{x:Bind GetMappedOriginalKeysWithSplitChord()}">
-                                                    <ItemsControl.ItemsPanel>
-                                                        <ItemsPanelTemplate>
-                                                            <StackPanel Orientation="Horizontal" Spacing="12" />
-                                                        </ItemsPanelTemplate>
-                                                    </ItemsControl.ItemsPanel>
-                                                </ItemsControl>
-                                            </Border>
-                                            <controls:IsEnabledTextBlock
-                                                x:Uid="To"
-                                                Margin="8,0,8,0"
-                                                VerticalAlignment="Center"
-                                                Style="{StaticResource SecondaryIsEnabledTextBlockStyle}"
-                                                Visibility="{x:Bind Path=IsOpenUriOrIsRunProgram, Mode=OneWay, Converter={StaticResource BoolToInvertedVisibilityConverter}}" />
-                                            <controls:IsEnabledTextBlock
-                                                x:Uid="Starts"
-                                                Margin="8,0,8,0"
-                                                VerticalAlignment="Center"
-                                                Style="{StaticResource SecondaryIsEnabledTextBlockStyle}"
-                                                Visibility="{x:Bind Path=IsOpenUriOrIsRunProgram, Mode=OneWay}" />
-                                            <Border
-                                                Padding="8,4"
-                                                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                                                BorderBrush="{ThemeResource AccentFillColorDefaultBrush}"
-                                                BorderThickness="1"
-                                                CornerRadius="{StaticResource ControlCornerRadius}">
-                                                <ItemsControl
-                                                    AutomationProperties.AccessibilityView="Raw"
-                                                    IsTabStop="False"
-                                                    ItemsSource="{x:Bind GetMappedNewRemapKeys(15)}">
-                                                    <ItemsControl.ItemsPanel>
-                                                        <ItemsPanelTemplate>
-                                                            <StackPanel Orientation="Horizontal" Spacing="12" />
-                                                        </ItemsPanelTemplate>
-                                                    </ItemsControl.ItemsPanel>
-                                                    <ItemsControl.ItemTemplate>
-                                                        <DataTemplate>
-                                                            <controls:KeyVisual
-                                                                VerticalAlignment="Center"
-                                                                AutomationProperties.AccessibilityView="Raw"
-                                                                Content="{Binding}"
-                                                                Foreground="{ThemeResource AccentFillColorDefaultBrush}"
-                                                                IsTabStop="False"
-                                                                VisualType="TextOnly" />
-                                                        </DataTemplate>
-                                                    </ItemsControl.ItemTemplate>
-                                                </ItemsControl>
-                                            </Border>
-                                            <TextBlock
-                                                Margin="4,0,0,0"
-                                                VerticalAlignment="Center"
-                                                Foreground="{ThemeResource AccentFillColorDefaultBrush}"
-                                                Text="{x:Bind TargetApp}" />
-                                        </StackPanel>
-                                    </DataTemplate>
-                                </ItemsControl.ItemTemplate>
-                            </ItemsControl>
-                        </StackPanel>
-                    </Flyout>
-                </Button.Flyout>
-            </Button>
+        <DataTemplate x:Key="ModuleItemActivationTemplate" x:DataType="viewmodels:DashboardModuleActivationItem">
+            <Grid MinHeight="36" ColumnSpacing="12">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" MinWidth="140" />
+                </Grid.ColumnDefinitions>
+                <TextBlock
+                    VerticalAlignment="Center"
+                    Text="{x:Bind Label, Mode=OneWay}"
+                    TextWrapping="WrapWholeWords" />
+                <TextBlock
+                    Grid.Column="1"
+                    VerticalAlignment="Center"
+                    FontSize="12"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Text="{x:Bind Activation, Mode=OneWay}"
+                    TextWrapping="WrapWholeWords" />
+            </Grid>
        </DataTemplate>
    </Page.Resources>
-    <Grid Margin="16,0,0,0" RowSpacing="24">
+    <Grid Margin="16,0,0,0" RowSpacing="12">
        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
            <RowDefinition Height="Auto" />
            <RowDefinition Height="*" />
        </Grid.RowDefinitions>
        <TextBlock
            x:Uid="DashboardTitle"
+            MaxWidth="{StaticResource PageMaxWidth}"
+            Margin="1,0,0,0"
            VerticalAlignment="Center"
            Style="{StaticResource TitleTextBlockStyle}" />
-
-        <InfoBar
-            x:Uid="UpdateAvailable"
-            Margin="0,0,16,0"
-            HorizontalAlignment="Right"
-            VerticalAlignment="Center"
-            CornerRadius="8"
-            IsClosable="False"
-            IsOpen="{x:Bind ViewModel.UpdateAvailable, Mode=OneWay}"
-            Severity="Informational">
-            <InfoBar.ActionButton>
-                <Button x:Uid="LearnMore" Click="SWVersionButtonClicked" />
-            </InfoBar.ActionButton>
-        </InfoBar>
-
-        <ScrollViewer x:Name="MainScrollViewer" Grid.Row="1">
-            <StackPanel Padding="0,0,16,16" Orientation="Vertical">
-                <TextBlock
-                    x:Uid="EnabledModules"
-                    Margin="0,0,0,12"
-                    Style="{StaticResource SubtitleTextBlockStyle}" />
-                <ItemsRepeater x:Name="DashboardView" ItemsSource="{x:Bind ViewModel.ActiveModules, Mode=OneWay}">
-                    <ItemsRepeater.Layout>
-                        <tkcontrols:StaggeredLayout
-                            ColumnSpacing="8"
-                            DesiredColumnWidth="378"
-                            RowSpacing="8" />
-                    </ItemsRepeater.Layout>
-                    <ItemsRepeater.ItemTemplate>
-                        <DataTemplate x:DataType="viewModels:DashboardListItem">
-                            <Button
-                                Padding="0"
-                                HorizontalAlignment="Stretch"
-                                HorizontalContentAlignment="Stretch"
-                                AutomationProperties.Name="{x:Bind Label}"
-                                Background="Transparent"
-                                BorderThickness="0"
-                                Click="DashboardListItemClick"
-                                CornerRadius="{StaticResource OverlayCornerRadius}"
-                                Tag="{x:Bind Tag, Mode=OneWay}">
-                                <Grid
-                                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                                    BorderThickness="1"
-                                    CornerRadius="{StaticResource OverlayCornerRadius}"
-                                    RowSpacing="0">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                    </Grid.RowDefinitions>
-                                    <Grid Margin="16,8,16,0" ColumnSpacing="12">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="*" />
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="Auto" />
-                                        </Grid.ColumnDefinitions>
-                                        <Image
-                                            Grid.Column="0"
-                                            Width="20"
-                                            Margin="0,0,0,0">
-                                            <Image.Source>
-                                                <BitmapImage UriSource="{x:Bind Icon, Mode=OneWay}" />
-                                            </Image.Source>
-                                        </Image>
-                                        <StackPanel
-                                            Grid.Column="1"
-                                            VerticalAlignment="Center"
-                                            Orientation="Horizontal">
-                                            <TextBlock
-                                                VerticalAlignment="Center"
-                                                FontWeight="SemiBold"
-                                                Text="{x:Bind Label, Mode=OneWay}"
-                                                TextTrimming="CharacterEllipsis" />
-                                            <InfoBadge
-                                                Margin="4,0,0,0"
-                                                Style="{StaticResource NewInfoBadge}"
-                                                Visibility="{x:Bind IsNew, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
-                                        </StackPanel>
-                                        <FontIcon
-                                            Grid.Column="2"
-                                            Width="20"
-                                            Margin="0,0,-12,0"
-                                            FontSize="16"
-                                            Glyph="&#xE72E;"
-                                            Visibility="{x:Bind IsLocked, Converter={StaticResource BoolToInvertedVisibilityConverter}, ConverterParameter=True, Mode=OneWay}">
-                                            <ToolTipService.ToolTip>
-                                                <TextBlock x:Uid="GPO_SettingIsManaged_ToolTip" TextWrapping="WrapWholeWords" />
-                                            </ToolTipService.ToolTip>
-                                        </FontIcon>
-                                        <ToggleSwitch
-                                            x:Uid="Enable_Module"
-                                            Grid.Column="3"
-                                            Margin="0,-2,0,0"
-                                            HorizontalAlignment="Right"
-                                            AutomationProperties.HelpText="{x:Bind Label}"
-                                            IsEnabled="{x:Bind IsLocked, Converter={StaticResource BoolNegationConverter}, ConverterParameter=True, Mode=OneWay}"
-                                            IsOn="{x:Bind IsEnabled, Mode=TwoWay}"
-                                            OffContent=""
-                                            OnContent=""
-                                            Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" />
-                                    </Grid>
-
-                                    <ItemsControl
-                                        Grid.Row="1"
-                                        Margin="16,8,16,16"
-                                        IsTabStop="False"
-                                        ItemTemplateSelector="{StaticResource ModuleItemTemplateSelector}"
-                                        ItemsSource="{x:Bind DashboardModuleItems, Mode=OneWay}"
-                                        Visibility="{x:Bind IsEnabled, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
-                                        <ItemsControl.ItemsPanel>
-                                            <ItemsPanelTemplate>
-                                                <StackPanel Spacing="4" />
-                                            </ItemsPanelTemplate>
-                                        </ItemsControl.ItemsPanel>
-                                    </ItemsControl>
-                                </Grid>
-                            </Button>
-                        </DataTemplate>
-                    </ItemsRepeater.ItemTemplate>
-                </ItemsRepeater>
-
-                <TextBlock
-                    x:Uid="DisabledModules"
-                    Margin="0,24,0,12"
-                    Style="{StaticResource SubtitleTextBlockStyle}" />
-
-                <ItemsRepeater ItemsSource="{x:Bind ViewModel.DisabledModules, Mode=OneWay}">
-                    <ItemsRepeater.Layout>
-                        <tkcontrols:StaggeredLayout
-                            ColumnSpacing="8"
-                            DesiredColumnWidth="378"
-                            RowSpacing="8" />
-                    </ItemsRepeater.Layout>
-                    <ItemsRepeater.ItemTemplate>
-                        <DataTemplate x:DataType="viewModels:DashboardListItem">
-                            <Button
-                                Padding="0"
-                                HorizontalAlignment="Stretch"
-                                HorizontalContentAlignment="Stretch"
-                                AutomationProperties.Name="{x:Bind Label}"
-                                Background="Transparent"
-                                BorderThickness="0"
-                                Click="DashboardListItemClick"
-                                CornerRadius="{StaticResource OverlayCornerRadius}"
-                                Tag="{x:Bind Tag, Mode=OneWay}">
-                                <Grid
-                                    Padding="16,12"
-                                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                                    BorderThickness="1"
-                                    CornerRadius="{StaticResource OverlayCornerRadius}"
-                                    RowSpacing="12">
-                                    <Grid ColumnSpacing="12">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="*" />
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="Auto" />
-                                        </Grid.ColumnDefinitions>
-                                        <Image Grid.Column="0" Width="20">
-                                            <Image.Source>
-                                                <BitmapImage UriSource="{x:Bind Icon, Mode=OneWay}" />
-                                            </Image.Source>
-                                        </Image>
-                                        <StackPanel
-                                            Grid.Column="1"
-                                            VerticalAlignment="Center"
-                                            Orientation="Horizontal">
-                                            <TextBlock
-                                                VerticalAlignment="Center"
-                                                FontWeight="SemiBold"
-                                                Text="{x:Bind Label, Mode=OneWay}"
-                                                TextTrimming="CharacterEllipsis" />
-                                            <InfoBadge
-                                                Margin="4,0,0,0"
-                                                Style="{StaticResource NewInfoBadge}"
-                                                Visibility="{x:Bind IsNew, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
-                                        </StackPanel>
-                                        <FontIcon
-                                            Grid.Column="2"
-                                            Width="20"
-                                            Margin="0,0,-12,0"
-                                            FontSize="16"
-                                            Glyph="&#xE72E;"
-                                            Visibility="{x:Bind IsLocked, Converter={StaticResource BoolToInvertedVisibilityConverter}, ConverterParameter=True, Mode=OneWay}">
-                                            <ToolTipService.ToolTip>
-                                                <TextBlock x:Uid="GPO_SettingIsManaged_ToolTip" TextWrapping="WrapWholeWords" />
-                                            </ToolTipService.ToolTip>
-                                        </FontIcon>
-                                        <ToggleSwitch
-                                            x:Uid="Enable_Module"
-                                            Grid.Column="3"
-                                            Margin="0,-2,0,0"
-                                            HorizontalAlignment="Right"
-                                            AutomationProperties.HelpText="{x:Bind Label}"
-                                            IsEnabled="{x:Bind IsLocked, Converter={StaticResource BoolNegationConverter}, ConverterParameter=True, Mode=OneWay}"
-                                            IsOn="{x:Bind IsEnabled, Mode=TwoWay}"
-                                            OffContent=""
-                                            OnContent=""
-                                            Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" />
-                                    </Grid>
-                                </Grid>
-                            </Button>
-                        </DataTemplate>
-                    </ItemsRepeater.ItemTemplate>
-                </ItemsRepeater>
+        <Grid
+            Grid.Row="1"
+            MaxWidth="{StaticResource PageMaxWidth}"
+            Padding="0,0,20,0"
+            ColumnSpacing="16">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Button
+                Padding="0,0,8,0"
+                AutomationProperties.Name="WhatsNewButton"
+                Click="WhatsNewButton_Click"
+                Style="{StaticResource SubtleButtonStyle}">
+                <Grid ColumnSpacing="16">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <Grid CornerRadius="{StaticResource OverlayCornerRadius}">
+                        <Image
+                            Width="120"
+                            AutomationProperties.AccessibilityView="Raw"
+                            Source="ms-appx:///Assets/Settings/Modules/PT.png" />
+                        <Grid Background="{ThemeResource SmokeFillColorDefaultBrush}" />
+                    </Grid>
+                    <StackPanel
+                        Grid.Column="1"
+                        VerticalAlignment="Center"
+                        Orientation="Vertical">
+                        <TextBlock x:Uid="LearnWhatsNew" FontWeight="SemiBold" />
+                        <TextBlock
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{x:Bind ViewModel.PowerToysVersion, Mode=OneWay}" />
+                    </StackPanel>
+                </Grid>
+            </Button>
+            <StackPanel
+                x:Name="TopButtonPanel"
+                Grid.Column="1"
+                Orientation="Horizontal"
+                Spacing="16">
+                <!--<controls:ShortcutConflictControl/>-->
+                <controls:CheckUpdateControl />
            </StackPanel>
+        </Grid>
+        <ScrollViewer x:Name="MainScrollViewer" Grid.Row="2">
+            <Grid>
+                <!--  This grid is required to ensure that the content is horizontally aligned  -->
+                <Grid
+                    MaxWidth="{StaticResource PageMaxWidth}"
+                    Padding="0,0,20,48"
+                    ColumnSpacing="16"
+                    RowSpacing="16">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <controls:Card x:Uid="QuickAccessTitle" VerticalAlignment="Top">
+                        <Grid>
+                            <ItemsControl
+                                x:Name="QuickAccessItemsControl"
+                                Margin="8,0,12,12"
+                                ItemsSource="{x:Bind ViewModel.ActionModules, Mode=OneWay}"
+                                Visibility="{x:Bind ViewModel.ActionModules.Count, Mode=OneWay, Converter={StaticResource DoubleToVisibilityConverter}}">

+                                <ItemsControl.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <tkcontrols:WrapPanel
+                                            Padding="12"
+                                            HorizontalSpacing="16"
+                                            VerticalSpacing="24" />
+                                    </ItemsPanelTemplate>
+                                </ItemsControl.ItemsPanel>
+
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate x:DataType="viewmodels:DashboardListItem">
+                                        <ItemsControl IsTabStop="False" ItemsSource="{x:Bind DashboardModuleItems, Mode=OneWay}">
+                                            <ItemsControl.ItemTemplate>
+                                                <DataTemplate x:DataType="viewmodels:DashboardModuleButtonItem">
+                                                    <controls:FlyoutMenuButton AutomationProperties.Name="{x:Bind ButtonTitle}" Click="{x:Bind ButtonClickHandler}">
+                                                        <controls:FlyoutMenuButton.Content>
+                                                            <TextBlock
+                                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                                Text="{x:Bind ButtonTitle}"
+                                                                TextAlignment="Center"
+                                                                TextWrapping="Wrap" />
+                                                        </controls:FlyoutMenuButton.Content>
+                                                        <controls:FlyoutMenuButton.Icon>
+                                                            <Image Width="24">
+                                                                <Image.Source>
+                                                                    <BitmapImage UriSource="{x:Bind ButtonGlyph}" />
+                                                                </Image.Source>
+                                                            </Image>
+                                                        </controls:FlyoutMenuButton.Icon>
+                                                        <ToolTipService.ToolTip>
+                                                            <ToolTip Content="{x:Bind ButtonDescription}" />
+                                                        </ToolTipService.ToolTip>
+                                                    </controls:FlyoutMenuButton>
+                                                </DataTemplate>
+                                            </ItemsControl.ItemTemplate>
+
+                                            <ItemsControl.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <StackPanel Spacing="0" />
+                                                </ItemsPanelTemplate>
+                                            </ItemsControl.ItemsPanel>
+                                        </ItemsControl>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+
+                            <TextBlock
+                                x:Uid="NoActionsToShow"
+                                Margin="12"
+                                HorizontalAlignment="Left"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Visibility="{x:Bind ViewModel.ActionModules.Count, Mode=OneWay, Converter={StaticResource DoubleToInvertedVisibilityConverter}}" />
+                        </Grid>
+                    </controls:Card>
+                    <controls:Card
+                        x:Uid="ShortcutsOverview"
+                        Grid.Row="1"
+                        VerticalAlignment="Top">
+                        <Grid>
+                            <ItemsRepeater
+                                Grid.Row="2"
+                                Margin="8,0,0,0"
+                                ItemsSource="{x:Bind ViewModel.ShortcutModules, Mode=OneWay}">
+                                <ItemsRepeater.Layout>
+                                    <StackLayout Orientation="Vertical" Spacing="0" />
+                                </ItemsRepeater.Layout>
+                                <ItemsRepeater.ItemTemplate>
+                                    <DataTemplate x:DataType="viewmodels:DashboardListItem">
+                                        <Grid>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="32" />
+                                                <ColumnDefinition Width="*" />
+                                            </Grid.ColumnDefinitions>
+                                            <Image
+                                                Width="16"
+                                                Margin="0,10,0,0"
+                                                HorizontalAlignment="Left"
+                                                VerticalAlignment="Top"
+                                                AutomationProperties.AccessibilityView="Raw"
+                                                Source="{x:Bind Icon, Mode=OneWay}"
+                                                ToolTipService.ToolTip="{x:Bind Label}" />
+                                            <ItemsControl
+                                                Grid.Column="1"
+                                                IsTabStop="False"
+                                                ItemTemplateSelector="{StaticResource ModuleItemTemplateSelector}"
+                                                ItemsSource="{x:Bind DashboardModuleItems, Mode=OneWay}">
+                                                <ItemsControl.ItemsPanel>
+                                                    <ItemsPanelTemplate>
+                                                        <StackPanel Spacing="0" />
+                                                    </ItemsPanelTemplate>
+                                                </ItemsControl.ItemsPanel>
+                                            </ItemsControl>
+                                        </Grid>
+                                    </DataTemplate>
+                                </ItemsRepeater.ItemTemplate>
+                            </ItemsRepeater>
+                            <TextBlock
+                                x:Uid="NoShortcutsToShow"
+                                Margin="12"
+                                HorizontalAlignment="Left"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Visibility="{x:Bind ViewModel.ShortcutModules.Count, Mode=OneWay, Converter={StaticResource DoubleToInvertedVisibilityConverter}}" />
+                        </Grid>
+                    </controls:Card>
+                    <controls:Card
+                        x:Name="ModulesCard"
+                        Title="Modules"
+                        Grid.RowSpan="2"
+                        Grid.Column="1"
+                        MinWidth="400"
+                        Padding="0"
+                        VerticalAlignment="Top"
+                        DividerVisibility="Collapsed">
+                        <ItemsRepeater
+                            x:Name="DashboardView"
+                            Grid.Row="2"
+                            ItemsSource="{x:Bind ViewModel.AllModules, Mode=OneWay}">
+                            <ItemsRepeater.Layout>
+                                <StackLayout Orientation="Vertical" Spacing="0" />
+                            </ItemsRepeater.Layout>
+                            <ItemsRepeater.ItemTemplate>
+                                <DataTemplate x:DataType="viewmodels:DashboardListItem">
+                                    <tkcontrols:SettingsCard
+                                        MinHeight="0"
+                                        Padding="12,4,12,4"
+                                        AutomationProperties.Name="{x:Bind Label}"
+                                        Background="Transparent"
+                                        BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
+                                        BorderThickness="0,1,0,0"
+                                        Click="DashboardListItemClick"
+                                        CornerRadius="0"
+                                        IsClickEnabled="True"
+                                        Tag="{x:Bind Tag}">
+                                        <tkcontrols:SettingsCard.Resources>
+                                            <x:Double x:Key="SettingsCardWrapThreshold">0</x:Double>
+                                            <x:Double x:Key="SettingsCardHeaderIconMaxSize">16</x:Double>
+                                        </tkcontrols:SettingsCard.Resources>
+                                        <tkcontrols:SettingsCard.Header>
+                                            <StackPanel Orientation="Horizontal">
+                                                <TextBlock Text="{x:Bind Label}" />
+                                                <InfoBadge
+                                                    Margin="4,0,0,0"
+                                                    Style="{StaticResource NewInfoBadge}"
+                                                    Visibility="{x:Bind IsNew, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                                <FontIcon
+                                                    Grid.Column="2"
+                                                    Width="20"
+                                                    Margin="0,0,-12,0"
+                                                    FontSize="16"
+                                                    Glyph="&#xE72E;"
+                                                    Visibility="{x:Bind IsLocked, Converter={StaticResource ReverseBoolToVisibilityConverter}, ConverterParameter=True}">
+                                                    <ToolTipService.ToolTip>
+                                                        <TextBlock x:Uid="GPO_SettingIsManaged_ToolTip" TextWrapping="WrapWholeWords" />
+                                                    </ToolTipService.ToolTip>
+                                                </FontIcon>
+                                            </StackPanel>
+                                        </tkcontrols:SettingsCard.Header>
+                                        <tkcontrols:SettingsCard.HeaderIcon>
+                                            <ImageIcon>
+                                                <ImageIcon.Source>
+                                                    <BitmapImage UriSource="{x:Bind Icon}" />
+                                                </ImageIcon.Source>
+                                            </ImageIcon>
+                                        </tkcontrols:SettingsCard.HeaderIcon>
+                                        <ToggleSwitch
+                                            AutomationProperties.Name="{x:Bind Label}"
+                                            IsEnabled="{x:Bind IsLocked, Converter={StaticResource BoolNegationConverter}, ConverterParameter=True, Mode=OneWay}"
+                                            IsOn="{x:Bind IsEnabled, Mode=TwoWay}"
+                                            OffContent=""
+                                            OnContent="" />
+                                    </tkcontrols:SettingsCard>
+                                </DataTemplate>
+                            </ItemsRepeater.ItemTemplate>
+                        </ItemsRepeater>
+                    </controls:Card>
+                </Grid>
+            </Grid>
        </ScrollViewer>
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup>
+                <VisualState>
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="840" />
+                    </VisualState.StateTriggers>
+                </VisualState>
+                <VisualState>
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="0" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="TopButtonPanel.(Grid.Row)" Value="1" />
+                        <Setter Target="TopButtonPanel.Margin" Value="0,16,0,0" />
+                        <Setter Target="TopButtonPanel.(Grid.Column)" Value="0" />
+                        <Setter Target="ModulesCard.(Grid.Column)" Value="0" />
+                        <Setter Target="ModulesCard.(Grid.Row)" Value="2" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
    </Grid>
-</Page>
+</Page>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml.cs
@@ -5,10 +5,10 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-
 using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.OOBE.Enums;
 using Microsoft.PowerToys.Settings.UI.OOBE.Views;
 using Microsoft.PowerToys.Settings.UI.ViewModels;
 using Microsoft.UI.Xaml;
@@ -46,14 +46,23 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            ViewModel.ModuleEnabledChangedOnSettingsPage();
        }

-        private void SWVersionButtonClicked(object sender, RoutedEventArgs e)
-        {
-            ViewModel.SWVersionButtonClicked();
-        }
-
        private void DashboardListItemClick(object sender, RoutedEventArgs e)
        {
            ViewModel.DashboardListItemClick(sender);
        }
+
+        private void WhatsNewButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (App.GetOobeWindow() == null)
+            {
+                App.SetOobeWindow(new OobeWindow(PowerToysModules.WhatsNew));
+            }
+            else
+            {
+                App.GetOobeWindow().SetAppWindow(PowerToysModules.WhatsNew);
+            }
+
+            App.GetOobeWindow().Activate();
+        }
    }
 }
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
@@ -12,7 +12,6 @@
    mc:Ignorable="d">

    <Page.Resources>
-        <converters:UpdateStateToBoolConverter x:Key="UpdateStateToBoolConverter" />
        <converters:StringToInfoBarSeverityConverter x:Key="StringToInfoBarSeverityConverter" />
    </Page.Resources>

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml
@@ -14,22 +14,23 @@

    <Page.Resources>
        <tkconverters:CollectionVisibilityConverter x:Key="CollectionVisibilityConverter" />
-        <tkconverters:BoolToVisibilityConverter
-            x:Key="BoolToInvertedVisibilityConverter"
-            FalseValue="Visible"
-            TrueValue="Collapsed" />
-        <tkconverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-
        <Style x:Name="KeysListViewContainerStyle" TargetType="ListViewItem">
            <Setter Property="IsTabStop" Value="False" />
        </Style>

        <DataTemplate x:Key="OriginalKeyTemplate" x:DataType="x:String">
-            <controls:KeyVisual Content="{Binding}" VisualType="SmallOutline" />
+            <controls:KeyVisual
+                Padding="8"
+                Content="{Binding}"
+                CornerRadius="{StaticResource ControlCornerRadius}" />
        </DataTemplate>

        <DataTemplate x:Key="RemappedKeyTemplate" x:DataType="x:String">
-            <controls:KeyVisual Content="{Binding}" VisualType="Small" />
+            <controls:KeyVisual
+                Padding="8"
+                Content="{Binding}"
+                CornerRadius="{StaticResource ControlCornerRadius}"
+                Style="{StaticResource AccentKeyVisualStyle}" />
        </DataTemplate>

        <!--<DataTemplate x:Name="KeysListViewTemplate" x:DataType="Lib:KeysDataModel">
@@ -184,7 +185,7 @@
                                                Margin="8,0,8,0"
                                                VerticalAlignment="Center"
                                                Style="{StaticResource SecondaryIsEnabledTextBlockStyle}"
-                                                Visibility="{x:Bind Path=IsOpenUriOrIsRunProgram, Mode=OneWay, Converter={StaticResource BoolToInvertedVisibilityConverter}}" />
+                                                Visibility="{x:Bind Path=IsOpenUriOrIsRunProgram, Mode=OneWay, Converter={StaticResource ReverseBoolToVisibilityConverter}}" />

                                            <controls:IsEnabledTextBlock
                                                x:Uid="Starts"
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
@@ -14,10 +14,6 @@
    mc:Ignorable="d">
    <Page.Resources>
        <converters:IndexBitFieldToVisibilityConverter x:Key="IndexBitFieldToVisibilityConverter" />
-        <tkconverters:BoolToVisibilityConverter
-            x:Key="BoolToInvertedVisibilityConverter"
-            FalseValue="Visible"
-            TrueValue="Collapsed" />
    </Page.Resources>
    <controls:SettingsPageControl x:Uid="MouseUtils" ModuleImageSource="ms-appx:///Assets/Settings/Modules/MouseUtils.png">
        <controls:SettingsPageControl.ModuleContent>
@@ -153,7 +149,7 @@
                        IsClosable="False"
                        IsOpen="True"
                        Severity="Informational"
-                        Visibility="{x:Bind ViewModel.IsAnimationEnabledBySystem, Mode=OneWay, Converter={StaticResource BoolToInvertedVisibilityConverter}}">
+                        Visibility="{x:Bind ViewModel.IsAnimationEnabledBySystem, Mode=OneWay, Converter={StaticResource BoolToReverseVisibilityConverter}}">
                        <InfoBar.ActionButton>
                            <HyperlinkButton x:Uid="OpenSettings" Click="OpenAnimationsSettings_Click" />
                        </InfoBar.ActionButton>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml
@@ -11,7 +11,6 @@
    AutomationProperties.LandmarkType="Main"
    mc:Ignorable="d">
    <Page.Resources>
-        <converters:BoolToVisibilityConverter x:Key="negativeBoolToVisibilityConverter" />
        <converters:BoolToObjectConverter
            x:Key="OneRowMatrixBoolToNumberOfRowsConverter"
            FalseValue="2"
@@ -75,7 +74,7 @@
                                x:Uid="MouseWithoutBorders_Connect"
                                Command="{x:Bind ShowConnectFieldsCommand, Mode=OneTime}"
                                Style="{StaticResource AccentButtonStyle}"
-                                Visibility="{x:Bind Path=ViewModel.ConnectFieldsVisible, Mode=OneWay, Converter={StaticResource negativeBoolToVisibilityConverter}, ConverterParameter=True}" />
+                                Visibility="{x:Bind Path=ViewModel.ConnectFieldsVisible, Mode=OneWay, Converter={StaticResource ReverseBoolToVisibilityConverter}, ConverterParameter=True}" />
                        </StackPanel>
                    </tkcontrols:SettingsExpander>

--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -796,7 +796,7 @@
    <value>Information Symbol</value>
  </data>
  <data name="FancyZones_LaunchEditorButtonControl.Header" xml:space="preserve">
-    <value>Launch layout editor</value>
+    <value>Open layout editor</value>
    <comment>launches the FancyZones layout editor application</comment>
  </data>
  <data name="FancyZones_LaunchEditorButtonControl.Description" xml:space="preserve">
@@ -824,8 +824,11 @@
  <data name="FancyZones_ShiftDragCheckBoxControl_Header.Content" xml:space="preserve">
    <value>Hold Shift key to activate zones while dragging a window</value>
  </data>
+  <data name="FancyZones_ActivationShiftDrag" xml:space="preserve">
+    <value>Hold Shift key</value>
+  </data>
  <data name="FancyZones_ActivationNoShiftDrag" xml:space="preserve">
-    <value>Drag windows to activate zones</value>
+    <value>Drag a window</value>
  </data>
  <data name="FancyZones_ShowZonesOnAllMonitorsCheckBoxControl.Content" xml:space="preserve">
    <value>Show zones on all monitors while dragging a window</value>
@@ -1986,7 +1989,7 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
    <value>Launch</value>
  </data>
  <data name="Launch_ColorPicker.Content" xml:space="preserve">
-    <value>Launch Color Picker</value>
+    <value>Open Color Picker</value>
  </data>
  <data name="Oobe_LearnMore.Text" xml:space="preserve">
    <value>Learn more about</value>
@@ -2133,7 +2136,7 @@ From there, simply click on one of the supported files in the File Explorer and
    <value>Want a custom size? You can add them in the PowerToys Settings!</value>
  </data>
  <data name="Oobe_KBM_HowToCreateMappings.Text" xml:space="preserve">
-    <value>Launch **PowerToys Settings**, navigate to the Keyboard Manager menu, and select either **Remap a key** or **Remap a shortcut**.</value>
+    <value>Open **PowerToys Settings**, navigate to the Keyboard Manager menu, and select either **Remap a key** or **Remap a shortcut**.</value>
  </data>
  <data name="Oobe_KBM_TipsAndTricks.Text" xml:space="preserve">
    <value>Want to only have a shortcut work for a single application? Use the Target App field when creating the shortcut remapping.</value>
@@ -2550,10 +2553,10 @@ From there, simply click on one of the supported files in the File Explorer and
    <comment>Mouse as in the hardware peripheral.</comment>
  </data>
  <data name="Launch_Run.Content" xml:space="preserve">
-    <value>Launch PowerToys Run</value>
+    <value>Open PowerToys Run</value>
  </data>
  <data name="Launch_ShortcutGuide.Content" xml:space="preserve">
-    <value>Launch Shortcut Guide</value>
+    <value>Open Shortcut Guide</value>
  </data>
  <data name="ColorPicker_ColorFormat_ToggleSwitch.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
    <value>Show format in editor</value>
@@ -2848,6 +2851,9 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
  <data name="FancyZones_Zone_Appearance.Header" xml:space="preserve">
    <value>Zone appearance</value>
  </data>
+  <data name="LearnMore.Text" xml:space="preserve">
+    <value>Learn more</value>
+  </data>
  <data name="FileExplorerPreview_ToggleSwitch_Thumbnail_GCODE.Header" xml:space="preserve">
    <value>Geometric Code</value>
    <comment>File type, do not translate</comment>
@@ -3134,7 +3140,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
    <value>Create and manage Workspaces</value>
  </data>
  <data name="Workspaces_LaunchEditorButtonControl.Header" xml:space="preserve">
-    <value>Launch editor</value>
+    <value>Open editor</value>
  </data>
  <data name="LearnMore_Workspaces.Text" xml:space="preserve">
    <value>Learn more about the Workspaces utility</value>
@@ -3159,10 +3165,10 @@ Activate by holding the key for the character you want to add an accent to, then
    <value>Pick a color</value>
  </data>
  <data name="CropAndLock_Thumbnail" xml:space="preserve">
-    <value>Thumbnail</value>
+    <value>Crop and create a thumbnail</value>
  </data>
  <data name="CropAndLock_Reparent" xml:space="preserve">
-    <value>Reparent</value>
+    <value>Crop an app's window into a cropped window</value>
  </data>
  <data name="FancyZones_OpenEditor" xml:space="preserve">
    <value>Open editor</value>
@@ -3174,7 +3180,7 @@ Activate by holding the key for the character you want to add an accent to, then
    <value>Find the mouse</value>
  </data>
  <data name="MouseHighlighter_ShortDescription" xml:space="preserve">
-    <value>Highlight clicks</value>
+    <value>Turn on clicks highlighter</value>
  </data>
  <data name="MouseJump_ShortDescription" xml:space="preserve">
    <value>Quickly move the mouse pointer</value>
@@ -3192,10 +3198,10 @@ Activate by holding the key for the character you want to add an accent to, then
    <value>Learn more</value>
  </data>
  <data name="Peek_ShortDescription" xml:space="preserve">
-    <value>Quick and easy previewer</value>
+    <value>Preview file</value>
  </data>
  <data name="Run_ShortDescription" xml:space="preserve">
-    <value>A quick launcher</value>
+    <value>Open Run</value>
  </data>
  <data name="PowerAccent_ShortDescription" xml:space="preserve">
    <value>An alternative way to type accented characters</value>
@@ -3205,18 +3211,21 @@ Activate by holding the key for the character you want to add an accent to, then
    <comment>{Locked="Windows"}</comment>
  </data>
  <data name="ScreenRuler_ShortDescription" xml:space="preserve">
-    <value>Measure pixels on your screen</value>
+    <value>Start measurement</value>
  </data>
  <data name="ShortcutGuide_ShortDescription" xml:space="preserve">
-    <value>Show a help overlay with Windows shortcuts</value>
+    <value>Open Shortcut Guide</value>
    <comment>{Locked="Windows"}</comment>
  </data>
  <data name="PowerOcr_ShortDescription" xml:space="preserve">
-    <value>A convenient way to copy text from anywhere on screen</value>
+    <value>Start text extraction</value>
  </data>
  <data name="Dashboard_Activation" xml:space="preserve">
    <value>Activation</value>
  </data>
+  <data name="Activate_Zones" xml:space="preserve">
+    <value>Activate zones</value>
+  </data>
  <data name="DashboardKBMShowMappingsButton.Content" xml:space="preserve">
    <value>Show remappings</value>
  </data>
@@ -3395,7 +3404,7 @@ Activate by holding the key for the character you want to add an accent to, then
    <value>Text Extractor</value>
  </data>
  <data name="Launch_TextExtractor.Content" xml:space="preserve">
-    <value>Launch Text Extractor</value>
+    <value>Open Text Extractor</value>
  </data>
  <data name="Oobe_TextExtractor.Title" xml:space="preserve">
    <value>Text Extractor</value>
@@ -3620,11 +3629,11 @@ Activate by holding the key for the character you want to add an accent to, then
    <comment>"Hosts" refers to the system hosts file, do not loc</comment>
  </data>
  <data name="Hosts_LaunchButtonControl.Header" xml:space="preserve">
-    <value>Launch Hosts File Editor</value>
+    <value>Open Hosts File Editor</value>
    <comment>"Hosts File Editor" is a product name</comment>
  </data>
  <data name="Hosts_LaunchButton_Accessible.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Launch Hosts File Editor</value>
+    <value>Open Hosts File Editor</value>
    <comment>"Hosts File Editor" is a product name</comment>
  </data>
  <data name="Hosts_AdditionalLinesPosition.Header" xml:space="preserve">
@@ -3640,7 +3649,7 @@ Activate by holding the key for the character you want to add an accent to, then
    <value>Behavior</value>
  </data>
  <data name="Launch_Hosts.Content" xml:space="preserve">
-    <value>Launch Hosts File Editor</value>
+    <value>Open Hosts File Editor</value>
    <comment>"Hosts File Editor" is the name of the utility</comment>
  </data>
  <data name="LearnMore_Hosts.Text" xml:space="preserve">
@@ -3659,7 +3668,7 @@ Activate by holding the key for the character you want to add an accent to, then
    <value>Required in order to make changes to the hosts file</value>
  </data>
  <data name="Hosts_Toggle_LaunchAdministrator.Header" xml:space="preserve">
-    <value>Launch as administrator</value>
+    <value>Open as administrator</value>
  </data>
  <data name="EnvironmentVariables.ModuleDescription" xml:space="preserve">
    <value>A quick utility for managing environment variables.</value>
@@ -3680,13 +3689,13 @@ Activate by holding the key for the character you want to add an accent to, then
    <value>Manage your environment variables</value>
  </data>
  <data name="EnvironmentVariables_LaunchButtonControl.Header" xml:space="preserve">
-    <value>Launch Environment Variables</value>
+    <value>Open Environment Variables</value>
  </data>
  <data name="EnvironmentVariables_LaunchButton_Accessible.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Launch Environment Variables</value>
+    <value>Open Environment Variables</value>
  </data>
  <data name="Launch_EnvironmentVariables.Content" xml:space="preserve">
-    <value>Launch Environment Variables</value>
+    <value>Open Environment Variables</value>
  </data>
  <data name="LearnMore_EnvironmentVariables.Text" xml:space="preserve">
    <value>Learn more about Environment Variables</value>
@@ -3701,7 +3710,7 @@ Activate by holding the key for the character you want to add an accent to, then
    <value>Required in order to make changes to the system environment variables</value>
  </data>
  <data name="EnvironmentVariables_Toggle_LaunchAdministrator.Header" xml:space="preserve">
-    <value>Launch as administrator</value>
+    <value>Open as administrator</value>
  </data>
  <data name="ShortcutGuide_PressTimeForTaskbarIconShortcuts.Header" xml:space="preserve">
    <value>Press duration before showing taskbar icon shortcuts (ms)</value>
@@ -3955,6 +3964,9 @@ Activate by holding the key for the character you want to add an accent to, then
  <data name="QuickAccessTxt.Text" xml:space="preserve">
    <value>Quick access</value>
  </data>
+  <data name="UpdateAvailable.Text" xml:space="preserve">
+    <value>Update available</value>
+  </data>
  <data name="FileExplorerPreview_Toggle_Monaco_Max_File_Size.Header" xml:space="preserve">
    <value>Maximum file size to preview</value>
    <comment>Size refers to the disk space used by a file</comment>
@@ -3997,7 +4009,7 @@ Activate by holding the key for the character you want to add an accent to, then
    <comment>Registry Preview is a product name, do not loc</comment>
  </data>
  <data name="Launch_RegistryPreview.Content" xml:space="preserve">
-    <value>Launch Registry Preview</value>
+    <value>Open Registry Preview</value>
    <comment>"Registry Preview" is the name of the utility</comment>
  </data>
  <data name="MouseUtils_MouseJump.Header" xml:space="preserve">
@@ -4145,13 +4157,13 @@ Activate by holding the key for the character you want to add an accent to, then
    <value>Consider loopback addresses as duplicates</value>
  </data>
  <data name="RegistryPreview_Launch_GroupSettings.Header" xml:space="preserve">
-    <value>Launch</value>
+    <value>Open</value>
  </data>
  <data name="RegistryPreview_LaunchButton_Accessible.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Launch Registry Preview</value>
+    <value>Open Registry Preview</value>
  </data>
  <data name="RegistryPreview_LaunchButtonControl.Header" xml:space="preserve">
-    <value>Launch Registry Preview</value>
+    <value>Open Registry Preview</value>
  </data>
  <data name="RegistryPreview_DefaultRegApp.Header" xml:space="preserve">
    <value>Make Registry Preview the default app for .reg files</value>
@@ -4227,10 +4239,10 @@ Activate by holding the key for the character you want to add an accent to, then
    <comment>Title of the settings window when running as administrator</comment>
  </data>
  <data name="DashboardTitle.Text" xml:space="preserve">
-    <value>Dashboard</value>
+    <value>Home</value>
  </data>
  <data name="Shell_Dashboard.Content" xml:space="preserve">
-    <value>Dashboard</value>
+    <value>Home</value>
  </data>
  <data name="Peek_Preview_GroupSettings.Header" xml:space="preserve">
    <value>Preview</value>
@@ -4486,7 +4498,7 @@ Activate by holding the key for the character you want to add an accent to, then
    <value>Workspaces</value>
  </data>
  <data name="Workspaces_ShortDescription" xml:space="preserve">
-    <value>Create and launch Workspaces</value>
+    <value>Open editor</value>
  </data>
  <data name="Shell_ZoomIt.Content" xml:space="preserve">
    <value>ZoomIt</value>
@@ -4913,6 +4925,9 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
  <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>
@@ -5030,6 +5045,36 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
  <data name="FileExplorerPreview_ToggleSwitch_Thumbnail_BGCODE.Header" xml:space="preserve">
    <value>Binary Geometric Code</value>
  </data>
+  <data name="YoureUpToDate.Text" xml:space="preserve">
+    <value>You're up to date</value>
+  </data>
+  <data name="UpdateAvailableTextBlock.Text" xml:space="preserve">
+    <value>Update Available</value>
+  </data>
+  <data name="GeneralVersion.Text" xml:space="preserve">
+    <value>Version</value>
+  </data>
+  <data name="LearnWhatsNew.Text" xml:space="preserve">
+    <value>Learn what's new</value>
+  </data>
+  <data name="ConfigureShortcut" xml:space="preserve">
+    <value>Configure shortcut</value>
+  </data>
+  <data name="ConfigureShortcutText.Text" xml:space="preserve">
+    <value>Configure shortcut</value>
+  </data>
+  <data name="QuickAccessTitle.Title" xml:space="preserve">
+    <value>Quick access</value>
+  </data>
+  <data name="ShortcutsOverview.Title" xml:space="preserve">
+    <value>Shortcuts overview</value>
+  </data>
+  <data name="NoActionsToShow.Text" xml:space="preserve">
+    <value>No actions to show..</value>
+  </data>
+  <data name="NoShortcutsToShow.Text" xml:space="preserve">
+    <value>No shortcuts to show..</value>
+  </data>
  <data name="HighlightMode.Description" xml:space="preserve">
    <value>Highlight the cursor or dim the screen to spotlight it</value>
  </data>
@@ -5079,4 +5124,7 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
  <data name="GeneralPage_EnableViewDiagnosticDataText.Text" xml:space="preserve">
    <value>Stores diagnostic data locally in .xml format; folder may include .etl files as well. May use up 1 GB or more of disk space.</value>
  </data>
+  <data name="KeyBack" xml:space="preserve">
+    <value>Back key</value>
+  </data>
 </root>
--- a/src/settings-ui/Settings.UI/ViewModels/DashboardModuleItem.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/DashboardModuleItem.cs
@@ -36,23 +36,9 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
        public List<object> Shortcut { get; set; }
    }

-    public partial class DashboardModuleKBMItem : DashboardModuleItem
+    public partial class DashboardModuleActivationItem : DashboardModuleItem
    {
-        private List<KeysDataModel> _remapKeys = new List<KeysDataModel>();
-
-        public List<KeysDataModel> RemapKeys
-        {
-            get => _remapKeys;
-            set => _remapKeys = value;
-        }
-
-        private List<AppSpecificKeysDataModel> _remapShortcuts = new List<AppSpecificKeysDataModel>();
-
-        public List<AppSpecificKeysDataModel> RemapShortcuts
-        {
-            get => _remapShortcuts;
-            set => _remapShortcuts = value;
-        }
+        public string Activation { get; set; }
    }

    public partial class DashboardModuleItem : INotifyPropertyChanged
--- a/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs
@@ -8,13 +8,14 @@ using System.Collections.ObjectModel;
 using System.IO.Abstractions;
 using System.Linq;
 using System.Windows.Threading;
-
+using CommunityToolkit.WinUI.Controls;
 using global::PowerToys.GPOWrapper;
 using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 using Microsoft.PowerToys.Settings.UI.Services;
 using Microsoft.PowerToys.Settings.UI.Views;
 using Microsoft.UI.Xaml;
@@ -25,19 +26,23 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
    public partial class DashboardViewModel : Observable
    {
        private const string JsonFileType = ".json";
-        private IFileSystemWatcher _watcher;
-        private DashboardModuleKBMItem _kbmItem;
        private Dispatcher dispatcher;

        public Func<string, int> SendConfigMSG { get; }

-        public ObservableCollection<DashboardListItem> ActiveModules { get; set; } = new ObservableCollection<DashboardListItem>();
+        public ObservableCollection<DashboardListItem> AllModules { get; set; } = new ObservableCollection<DashboardListItem>();

-        public ObservableCollection<DashboardListItem> DisabledModules { get; set; } = new ObservableCollection<DashboardListItem>();
+        public ObservableCollection<DashboardListItem> ShortcutModules { get; set; } = new ObservableCollection<DashboardListItem>();

-        public bool UpdateAvailable { get; set; }
+        public ObservableCollection<DashboardListItem> ActionModules { get; set; } = new ObservableCollection<DashboardListItem>();

-        private List<DashboardListItem> _allModules;
+        public string PowerToysVersion
+        {
+            get
+            {
+                return Helper.GetProductVersion();
+            }
+        }

        private ISettingsRepository<GeneralSettings> _settingsRepository;
        private GeneralSettings generalSettingsConfig;
@@ -53,24 +58,18 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
            // set the callback functions value to handle outgoing IPC message.
            SendConfigMSG = ipcMSGCallBackFunc;

-            _allModules = new List<DashboardListItem>();
-
            foreach (ModuleType moduleType in Enum.GetValues<ModuleType>())
            {
                AddDashboardListItem(moduleType);
            }

-            ActiveModules = new ObservableCollection<DashboardListItem>(_allModules.Where(x => x.IsEnabled));
-            DisabledModules = new ObservableCollection<DashboardListItem>(_allModules.Where(x => !x.IsEnabled));
-
-            UpdatingSettings updatingSettingsConfig = UpdatingSettings.LoadSettings();
-            UpdateAvailable = updatingSettingsConfig != null && (updatingSettingsConfig.State == UpdatingSettings.UpdatingState.ReadyToInstall || updatingSettingsConfig.State == UpdatingSettings.UpdatingState.ReadyToDownload);
+            GetShortcutModules();
        }

        private void AddDashboardListItem(ModuleType moduleType)
        {
            GpoRuleConfigured gpo = ModuleHelper.GetModuleGpoConfiguration(moduleType);
-            _allModules.Add(new DashboardListItem()
+            AllModules.Add(new DashboardListItem()
            {
                Tag = moduleType,
                Label = resourceLoader.GetString(ModuleHelper.GetModuleLabelResourceName(moduleType)),
@@ -80,47 +79,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                EnabledChangedCallback = EnabledChangedOnUI,
                DashboardModuleItems = GetModuleItems(moduleType),
            });
-            if (moduleType == ModuleType.KeyboardManager && gpo != GpoRuleConfigured.Disabled)
-            {
-                KeyboardManagerSettings kbmSettings = GetKBMSettings();
-                _watcher = Library.Utilities.Helper.GetFileWatcher(KeyboardManagerSettings.ModuleName, kbmSettings.Properties.ActiveConfiguration.Value + JsonFileType, () => LoadKBMSettingsFromJson());
-            }
-        }
-
-        private void LoadKBMSettingsFromJson()
-        {
-            try
-            {
-                KeyboardManagerProfile kbmProfile = GetKBMProfile();
-                _kbmItem.RemapKeys = kbmProfile?.RemapKeys.InProcessRemapKeys;
-                _kbmItem.RemapShortcuts = KeyboardManagerViewModel.CombineShortcutLists(kbmProfile?.RemapShortcuts.GlobalRemapShortcuts, kbmProfile?.RemapShortcuts.AppSpecificRemapShortcuts);
-                dispatcher.Invoke(new Action(() => UpdateKBMItems()));
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError($"Failed to load KBM settings: {ex.Message}");
-            }
-        }
-
-        private void UpdateKBMItems()
-        {
-            _kbmItem.NotifyPropertyChanged(nameof(_kbmItem.RemapKeys));
-            _kbmItem.NotifyPropertyChanged(nameof(_kbmItem.RemapShortcuts));
-        }
-
-        private KeyboardManagerProfile GetKBMProfile()
-        {
-            KeyboardManagerSettings kbmSettings = GetKBMSettings();
-            const string PowerToyName = KeyboardManagerSettings.ModuleName;
-            string fileName = kbmSettings.Properties.ActiveConfiguration.Value + JsonFileType;
-            return new SettingsUtils().GetSettingsOrDefault<KeyboardManagerProfile>(PowerToyName, fileName);
-        }
-
-        private KeyboardManagerSettings GetKBMSettings()
-        {
-            var settingsUtils = new SettingsUtils();
-            ISettingsRepository<KeyboardManagerSettings> moduleSettingsRepository = SettingsRepository<KeyboardManagerSettings>.GetInstance(settingsUtils);
-            return moduleSettingsRepository.SettingsConfig;
        }

        private void EnabledChangedOnUI(DashboardListItem dashboardListItem)
@@ -139,25 +97,9 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
        {
            try
            {
-                ActiveModules.Clear();
-                DisabledModules.Clear();
+                GetShortcutModules();

-                generalSettingsConfig = _settingsRepository.SettingsConfig;
-                foreach (DashboardListItem item in _allModules)
-                {
-                    item.IsEnabled = ModuleHelper.GetIsModuleEnabled(generalSettingsConfig, item.Tag);
-                    if (item.IsEnabled)
-                    {
-                        ActiveModules.Add(item);
-                    }
-                    else
-                    {
-                        DisabledModules.Add(item);
-                    }
-                }
-
-                OnPropertyChanged(nameof(ActiveModules));
-                OnPropertyChanged(nameof(DisabledModules));
+                OnPropertyChanged(nameof(ShortcutModules));
            }
            catch (Exception ex)
            {
@@ -165,29 +107,71 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
            }
        }

+        private void GetShortcutModules()
+        {
+            ShortcutModules.Clear();
+            ActionModules.Clear();
+
+            foreach (var x in AllModules.Where(x => x.IsEnabled))
+            {
+                var filteredItems = x.DashboardModuleItems
+                    .Where(m => m is DashboardModuleShortcutItem || m is DashboardModuleActivationItem)
+                    .ToList();
+
+                if (filteredItems.Count != 0)
+                {
+                    ShortcutModules.Add(new DashboardListItem
+                    {
+                        EnabledChangedCallback = x.EnabledChangedCallback,
+                        Icon = x.Icon,
+                        IsLocked = x.IsLocked,
+                        Label = x.Label,
+                        Tag = x.Tag,
+                        IsEnabled = x.IsEnabled,
+                        DashboardModuleItems = new ObservableCollection<DashboardModuleItem>(filteredItems),
+                    });
+                }
+            }
+
+            foreach (var x in AllModules.Where(x => x.IsEnabled))
+            {
+                var filteredItems = x.DashboardModuleItems
+                    .Where(m => m is DashboardModuleButtonItem)
+                    .ToList();
+
+                if (filteredItems.Count != 0)
+                {
+                    ActionModules.Add(new DashboardListItem
+                    {
+                        EnabledChangedCallback = x.EnabledChangedCallback,
+                        Icon = x.Icon,
+                        IsLocked = x.IsLocked,
+                        Label = x.Label,
+                        Tag = x.Tag,
+                        IsEnabled = x.IsEnabled,
+                        DashboardModuleItems = new ObservableCollection<DashboardModuleItem>(filteredItems),
+                    });
+                }
+            }
+        }
+
        private ObservableCollection<DashboardModuleItem> GetModuleItems(ModuleType moduleType)
        {
            return moduleType switch
            {
                ModuleType.AdvancedPaste => GetModuleItemsAdvancedPaste(),
                ModuleType.AlwaysOnTop => GetModuleItemsAlwaysOnTop(),
-                ModuleType.Awake => GetModuleItemsAwake(),
                ModuleType.CmdPal => GetModuleItemsCmdPal(),
                ModuleType.ColorPicker => GetModuleItemsColorPicker(),
                ModuleType.CropAndLock => GetModuleItemsCropAndLock(),
                ModuleType.EnvironmentVariables => GetModuleItemsEnvironmentVariables(),
                ModuleType.FancyZones => GetModuleItemsFancyZones(),
-                ModuleType.FileLocksmith => GetModuleItemsFileLocksmith(),
                ModuleType.FindMyMouse => GetModuleItemsFindMyMouse(),
                ModuleType.Hosts => GetModuleItemsHosts(),
-                ModuleType.ImageResizer => GetModuleItemsImageResizer(),
-                ModuleType.KeyboardManager => GetModuleItemsKeyboardManager(),
                ModuleType.MouseHighlighter => GetModuleItemsMouseHighlighter(),
                ModuleType.MouseJump => GetModuleItemsMouseJump(),
                ModuleType.MousePointerCrosshairs => GetModuleItemsMousePointerCrosshairs(),
-                ModuleType.MouseWithoutBorders => GetModuleItemsMouseWithoutBorders(),
                ModuleType.Peek => GetModuleItemsPeek(),
-                ModuleType.PowerRename => GetModuleItemsPowerRename(),
                ModuleType.PowerLauncher => GetModuleItemsPowerLauncher(),
                ModuleType.PowerAccent => GetModuleItemsPowerAccent(),
                ModuleType.Workspaces => GetModuleItemsWorkspaces(),
@@ -195,8 +179,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                ModuleType.MeasureTool => GetModuleItemsMeasureTool(),
                ModuleType.ShortcutGuide => GetModuleItemsShortcutGuide(),
                ModuleType.PowerOCR => GetModuleItemsPowerOCR(),
-                ModuleType.NewPlus => GetModuleItemsNewPlus(),
-                ModuleType.ZoomIt => GetModuleItemsZoomIt(),
                _ => new ObservableCollection<DashboardModuleItem>(), // never called, all values listed above
            };
        }
@@ -211,22 +193,13 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
            return new ObservableCollection<DashboardModuleItem>(list);
        }

-        private ObservableCollection<DashboardModuleItem> GetModuleItemsAwake()
-        {
-            var list = new List<DashboardModuleItem>
-            {
-                new DashboardModuleTextItem() { Label = resourceLoader.GetString("Awake_ShortDescription") },
-            };
-            return new ObservableCollection<DashboardModuleItem>(list);
-        }
-
        private ObservableCollection<DashboardModuleItem> GetModuleItemsCmdPal()
        {
            var hotkey = new CmdPalProperties().Hotkey;

            var list = new List<DashboardModuleItem>
            {
-                new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("CmdPal_ShortDescription"), Shortcut = hotkey.GetKeysList() },
+                new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("CmdPal_ActivationDescription"), Shortcut = hotkey.GetKeysList() },
            };
            return new ObservableCollection<DashboardModuleItem>(list);
        }
@@ -259,7 +232,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
        {
            var list = new List<DashboardModuleItem>
            {
-                new DashboardModuleButtonItem() { ButtonTitle = resourceLoader.GetString("EnvironmentVariables_LaunchButtonControl/Header"), IsButtonDescriptionVisible = true, ButtonDescription = resourceLoader.GetString("EnvironmentVariables_LaunchButtonControl/Description"), ButtonGlyph = "\uEA37", ButtonClickHandler = EnvironmentVariablesLaunchClicked },
+                new DashboardModuleButtonItem() { ButtonTitle = resourceLoader.GetString("EnvironmentVariables_LaunchButtonControl/Header"), IsButtonDescriptionVisible = true, ButtonDescription = resourceLoader.GetString("EnvironmentVariables_LaunchButtonControl/Description"), ButtonGlyph = "ms-appx:///Assets/Settings/Icons/EnvironmentVariables.png", ButtonClickHandler = EnvironmentVariablesLaunchClicked },
            };
            return new ObservableCollection<DashboardModuleItem>(list);
        }
@@ -268,26 +241,13 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
        {
            ISettingsRepository<FancyZonesSettings> moduleSettingsRepository = SettingsRepository<FancyZonesSettings>.GetInstance(new SettingsUtils());
            var settings = moduleSettingsRepository.SettingsConfig;
-            string activationMode = $"{resourceLoader.GetString(settings.Properties.FancyzonesShiftDrag.Value ? "FancyZones_ShiftDragCheckBoxControl_Header/Content" : "FancyZones_ActivationNoShiftDrag")}.";
-            if (settings.Properties.FancyzonesMouseSwitch.Value)
-            {
-                activationMode += $" {resourceLoader.GetString("FancyZones_MouseDragCheckBoxControl_Header/Content")}.";
-            }
+            string activationMode = $"{resourceLoader.GetString(settings.Properties.FancyzonesShiftDrag.Value ? "FancyZones_ActivationShiftDrag" : "FancyZones_ActivationNoShiftDrag")}.";

            var list = new List<DashboardModuleItem>
            {
-                new DashboardModuleTextItem() { Label = activationMode },
+                new DashboardModuleActivationItem() { Label = resourceLoader.GetString("Activate_Zones"), Activation = activationMode },
                new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("FancyZones_OpenEditor"), Shortcut = settings.Properties.FancyzonesEditorHotkey.Value.GetKeysList() },
-                new DashboardModuleButtonItem() { ButtonTitle = resourceLoader.GetString("FancyZones_LaunchEditorButtonControl/Header"), IsButtonDescriptionVisible = true, ButtonDescription = resourceLoader.GetString("FancyZones_LaunchEditorButtonControl/Description"), ButtonGlyph = "\uEB3C", ButtonClickHandler = FancyZoneLaunchClicked },
-            };
-            return new ObservableCollection<DashboardModuleItem>(list);
-        }
-
-        private ObservableCollection<DashboardModuleItem> GetModuleItemsFileLocksmith()
-        {
-            var list = new List<DashboardModuleItem>
-            {
-                new DashboardModuleTextItem() { Label = resourceLoader.GetString("FileLocksmith_ShortDescription") },
+                new DashboardModuleButtonItem() { ButtonTitle = resourceLoader.GetString("FancyZones_LaunchEditorButtonControl/Header"), IsButtonDescriptionVisible = true, ButtonDescription = resourceLoader.GetString("FancyZones_LaunchEditorButtonControl/Description"), ButtonGlyph = "ms-appx:///Assets/Settings/Icons/FancyZones.png", ButtonClickHandler = FancyZoneLaunchClicked },
            };
            return new ObservableCollection<DashboardModuleItem>(list);
        }
@@ -306,15 +266,16 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
            }
            else
            {
+                string activation = string.Empty;
                switch (activationMethod)
                {
-                    case 2: shortDescription += $". {resourceLoader.GetString("Dashboard_Activation")}: {resourceLoader.GetString("MouseUtils_FindMyMouse_ActivationShakeMouse/Content")}"; break;
-                    case 1: shortDescription += $". {resourceLoader.GetString("Dashboard_Activation")}: {resourceLoader.GetString("MouseUtils_FindMyMouse_ActivationDoubleRightControlPress/Content")}"; break;
+                    case 2: activation = resourceLoader.GetString("MouseUtils_FindMyMouse_ActivationShakeMouse/Content"); break;
+                    case 1: activation = resourceLoader.GetString("MouseUtils_FindMyMouse_ActivationDoubleRightControlPress/Content"); break;
                    case 0:
-                    default: shortDescription += $". {resourceLoader.GetString("Dashboard_Activation")}: {resourceLoader.GetString("MouseUtils_FindMyMouse_ActivationDoubleControlPress/Content")}"; break;
+                    default: activation = resourceLoader.GetString("MouseUtils_FindMyMouse_ActivationDoubleControlPress/Content"); break;
                }

-                list.Add(new DashboardModuleTextItem() { Label = shortDescription });
+                list.Add(new DashboardModuleActivationItem() { Label = resourceLoader.GetString("Dashboard_Activation"), Activation = activation });
            }

            return new ObservableCollection<DashboardModuleItem>(list);
@@ -324,36 +285,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
        {
            var list = new List<DashboardModuleItem>
            {
-                new DashboardModuleButtonItem() { ButtonTitle = resourceLoader.GetString("Hosts_LaunchButtonControl/Header"), IsButtonDescriptionVisible = true, ButtonDescription = resourceLoader.GetString("Hosts_LaunchButtonControl/Description"), ButtonGlyph = "\uEA37", ButtonClickHandler = HostLaunchClicked },
-            };
-            return new ObservableCollection<DashboardModuleItem>(list);
-        }
-
-        private ObservableCollection<DashboardModuleItem> GetModuleItemsImageResizer()
-        {
-            var list = new List<DashboardModuleItem>
-            {
-                new DashboardModuleTextItem() { Label = resourceLoader.GetString("ImageResizer_ShortDescription") },
-            };
-            return new ObservableCollection<DashboardModuleItem>(list);
-        }
-
-        private ObservableCollection<DashboardModuleItem> GetModuleItemsKeyboardManager()
-        {
-            KeyboardManagerProfile kbmProfile = GetKBMProfile();
-            _kbmItem = new DashboardModuleKBMItem() { RemapKeys = kbmProfile?.RemapKeys.InProcessRemapKeys, RemapShortcuts = KeyboardManagerViewModel.CombineShortcutLists(kbmProfile?.RemapShortcuts.GlobalRemapShortcuts, kbmProfile?.RemapShortcuts.AppSpecificRemapShortcuts) };
-
-            _kbmItem.RemapKeys = _kbmItem.RemapKeys.Concat(kbmProfile?.RemapKeysToText.InProcessRemapKeys).ToList();
-
-            var shortcutsToTextRemappings = KeyboardManagerViewModel.CombineShortcutLists(kbmProfile?.RemapShortcutsToText.GlobalRemapShortcuts, kbmProfile?.RemapShortcutsToText.AppSpecificRemapShortcuts);
-
-            _kbmItem.RemapShortcuts = _kbmItem.RemapShortcuts.Concat(shortcutsToTextRemappings).ToList();
-
-            var list = new List<DashboardModuleItem>
-            {
-                _kbmItem,
-                new DashboardModuleButtonItem() { ButtonTitle = resourceLoader.GetString("KeyboardManager_RemapKeyboardButton/Header"), IsButtonDescriptionVisible = true, ButtonDescription = resourceLoader.GetString("KeyboardManager_RemapKeyboardButton/Description"), ButtonGlyph = "\uE92E", ButtonClickHandler = KbmKeyLaunchClicked },
-                new DashboardModuleButtonItem() { ButtonTitle = resourceLoader.GetString("KeyboardManager_RemapShortcutsButton/Header"), IsButtonDescriptionVisible = true, ButtonDescription = resourceLoader.GetString("KeyboardManager_RemapShortcutsButton/Description"), ButtonGlyph = "\uE92E", ButtonClickHandler = KbmShortcutLaunchClicked },
+                new DashboardModuleButtonItem() { ButtonTitle = resourceLoader.GetString("Hosts_LaunchButtonControl/Header"), IsButtonDescriptionVisible = true, ButtonDescription = resourceLoader.GetString("Hosts_LaunchButtonControl/Description"), ButtonGlyph = "ms-appx:///Assets/Settings/Icons/Hosts.png", ButtonClickHandler = HostLaunchClicked },
            };
            return new ObservableCollection<DashboardModuleItem>(list);
        }
@@ -388,15 +320,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
            return new ObservableCollection<DashboardModuleItem>(list);
        }

-        private ObservableCollection<DashboardModuleItem> GetModuleItemsMouseWithoutBorders()
-        {
-            var list = new List<DashboardModuleItem>
-            {
-                new DashboardModuleTextItem() { Label = resourceLoader.GetString("MouseWithoutBorders_ShortDescription") },
-            };
-            return new ObservableCollection<DashboardModuleItem>(list);
-        }
-
        private ObservableCollection<DashboardModuleItem> GetModuleItemsAdvancedPaste()
        {
            ISettingsRepository<AdvancedPasteSettings> moduleSettingsRepository = SettingsRepository<AdvancedPasteSettings>.GetInstance(new SettingsUtils());
@@ -429,15 +352,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
            return new ObservableCollection<DashboardModuleItem>(list);
        }

-        private ObservableCollection<DashboardModuleItem> GetModuleItemsPowerRename()
-        {
-            var list = new List<DashboardModuleItem>
-            {
-                new DashboardModuleTextItem() { Label = resourceLoader.GetString("PowerRename_ShortDescription") },
-            };
-            return new ObservableCollection<DashboardModuleItem>(list);
-        }
-
        private ObservableCollection<DashboardModuleItem> GetModuleItemsPowerLauncher()
        {
            ISettingsRepository<PowerLauncherSettings> moduleSettingsRepository = SettingsRepository<PowerLauncherSettings>.GetInstance(new SettingsUtils());
@@ -450,20 +364,20 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels

        private ObservableCollection<DashboardModuleItem> GetModuleItemsPowerAccent()
        {
-            string shortDescription = resourceLoader.GetString("PowerAccent_ShortDescription");
            var settingsUtils = new SettingsUtils();
            PowerAccentSettings moduleSettings = settingsUtils.GetSettingsOrDefault<PowerAccentSettings>(PowerAccentSettings.ModuleName);
            var activationMethod = moduleSettings.Properties.ActivationKey;
+            string activation = string.Empty;
            switch (activationMethod)
            {
-                case Library.Enumerations.PowerAccentActivationKey.LeftRightArrow: shortDescription += $". {resourceLoader.GetString("Dashboard_Activation")}: {resourceLoader.GetString("QuickAccent_Activation_Key_Arrows/Content")}"; break;
-                case Library.Enumerations.PowerAccentActivationKey.Space: shortDescription += $". {resourceLoader.GetString("Dashboard_Activation")}: {resourceLoader.GetString("QuickAccent_Activation_Key_Space/Content")}"; break;
-                case Library.Enumerations.PowerAccentActivationKey.Both: shortDescription += $". {resourceLoader.GetString("Dashboard_Activation")}: {resourceLoader.GetString("QuickAccent_Activation_Key_Either/Content")}"; break;
+                case Library.Enumerations.PowerAccentActivationKey.LeftRightArrow: activation = resourceLoader.GetString("QuickAccent_Activation_Key_Arrows/Content"); break;
+                case Library.Enumerations.PowerAccentActivationKey.Space: activation = resourceLoader.GetString("QuickAccent_Activation_Key_Space/Content"); break;
+                case Library.Enumerations.PowerAccentActivationKey.Both: activation = resourceLoader.GetString("QuickAccent_Activation_Key_Either/Content"); break;
            }

            var list = new List<DashboardModuleItem>
            {
-                new DashboardModuleTextItem() { Label = shortDescription },
+                new DashboardModuleActivationItem() { Label = resourceLoader.GetString("Dashboard_Activation"), Activation = activation },
            };
            return new ObservableCollection<DashboardModuleItem>(list);
        }
@@ -476,7 +390,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
            var list = new List<DashboardModuleItem>
            {
                new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("Workspaces_ShortDescription"), Shortcut = settings.Properties.Hotkey.Value.GetKeysList() },
-                new DashboardModuleButtonItem() { ButtonTitle = resourceLoader.GetString("Workspaces_LaunchEditorButtonControl/Header"), IsButtonDescriptionVisible = true, ButtonDescription = resourceLoader.GetString("FancyZones_LaunchEditorButtonControl/Description"), ButtonGlyph = "\uEB3C", ButtonClickHandler = WorkspacesLaunchClicked },
+                new DashboardModuleButtonItem() { ButtonTitle = resourceLoader.GetString("Workspaces_LaunchEditorButtonControl/Header"), IsButtonDescriptionVisible = true, ButtonDescription = resourceLoader.GetString("FancyZones_LaunchEditorButtonControl/Description"), ButtonGlyph = "ms-appx:///Assets/Settings/Icons/Workspaces.png", ButtonClickHandler = WorkspacesLaunchClicked },
            };
            return new ObservableCollection<DashboardModuleItem>(list);
        }
@@ -485,7 +399,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
        {
            var list = new List<DashboardModuleItem>
            {
-                new DashboardModuleButtonItem() { ButtonTitle = resourceLoader.GetString("RegistryPreview_LaunchButtonControl/Header"), ButtonGlyph = "\uEA37",  ButtonClickHandler = RegistryPreviewLaunchClicked },
+                new DashboardModuleButtonItem() { ButtonTitle = resourceLoader.GetString("RegistryPreview_LaunchButtonControl/Header"), ButtonGlyph = "ms-appx:///Assets/Settings/Icons/RegistryPreview.png",  ButtonClickHandler = RegistryPreviewLaunchClicked },
            };
            return new ObservableCollection<DashboardModuleItem>(list);
        }
@@ -525,24 +439,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
            return new ObservableCollection<DashboardModuleItem>(list);
        }

-        private ObservableCollection<DashboardModuleItem> GetModuleItemsNewPlus()
-        {
-            var list = new List<DashboardModuleItem>
-            {
-                new DashboardModuleTextItem() { Label = resourceLoader.GetString("NewPlus_Product_Description/Description") },
-            };
-            return new ObservableCollection<DashboardModuleItem>(list);
-        }
-
-        private ObservableCollection<DashboardModuleItem> GetModuleItemsZoomIt()
-        {
-            var list = new List<DashboardModuleItem>
-            {
-                new DashboardModuleTextItem() { Label = resourceLoader.GetString("ZoomIt_ShortDescription") },
-            };
-            return new ObservableCollection<DashboardModuleItem>(list);
-        }
-
        internal void SWVersionButtonClicked()
        {
            NavigationService.Navigate(typeof(GeneralPage));
@@ -574,20 +470,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
            SendConfigMSG("{\"action\":{\"Workspaces\":{\"action_name\":\"LaunchEditor\", \"value\":\"\"}}}");
        }

-        private void KbmKeyLaunchClicked(object sender, RoutedEventArgs e)
-        {
-            var settingsUtils = new SettingsUtils();
-            var kbmViewModel = new KeyboardManagerViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage, KeyboardManagerPage.FilterRemapKeysList);
-            kbmViewModel.OnRemapKeyboard();
-        }
-
-        private void KbmShortcutLaunchClicked(object sender, RoutedEventArgs e)
-        {
-            var settingsUtils = new SettingsUtils();
-            var kbmViewModel = new KeyboardManagerViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage, KeyboardManagerPage.FilterRemapKeysList);
-            kbmViewModel.OnEditShortcut();
-        }
-
        private void RegistryPreviewLaunchClicked(object sender, RoutedEventArgs e)
        {
            var actionName = "Launch";
@@ -596,20 +478,10 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels

        internal void DashboardListItemClick(object sender)
        {
-            Button button = sender as Button;
-            if (button == null)
+            if (sender is SettingsCard card && card.Tag is ModuleType moduleType)
            {
-                return;
+                NavigationService.Navigate(ModuleHelper.GetModulePageType(moduleType));
            }
-
-            if (!(button.Tag is ModuleType))
-            {
-                return;
-            }
-
-            ModuleType moduleType = (ModuleType)button.Tag;
-
-            NavigationService.Navigate(ModuleHelper.GetModulePageType(moduleType));
        }
    }
 }
Author	SHA1	Message	Date
Gordon Lam (SH)	6ea196fca9	Resolving comments	2025-08-12 06:16:35 -07:00
Gordon Lam (SH)	4d67d85c05	Add new highlight and fix spelling issue	2025-08-08 01:53:24 -07:00
Gordon Lam (SH)	15361341d1	Reorder, and some text alignment	2025-08-07 19:50:43 -07:00
Gordon Lam (SH)	adda7e58e9	Add all major points, still pending refining	2025-08-07 17:47:47 -07:00
Gordon Lam (SH)	31721c360b	Initial draft	2025-08-07 07:09:16 -07:00
Mike Griese	e93b044f39	CmdPal: Once again, I am asking you to fix form submits (#41010 ) Closes #40979 Usually, you're supposed to try to cast the action to a specific type, and use those objects to get the data you need. However, there's something weird with AdaptiveCards and the way it works when we consume it when built in Release, with AOT (and trimming) enabled. Any sort of `action.As<IAdaptiveSubmitAction>()` or similar will throw a System.InvalidCastException. Instead we have this horror show. The `action.ToJson()` blob ACTUALLY CONTAINS THE `type` field, which we can use to determine what kind of action it is. Then we can parse the JSON manually based on the type.	2025-08-06 19:41:02 -05:00
leileizhang	fed6e523b6	Fix: used wrong preview resize event from another handler (#40995 ) <!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request Bug: Was using GcodePreviewResizeEvent, which will never work — switched to use Bgcode's own event <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [ ] Closes: #xxx - [ ] Communication: I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] Tests: Added/updated and all pass - [ ] Localization: All end-user-facing strings can be localized - [ ] Dev docs: Added/updated - [ ] New binaries: Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] Documentation updated: If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed ## AI Summary This pull request makes a minor update to the event handling in the preview pane module. The change updates the event constant used for resizing the preview from `GcodePreviewResizeEvent` to `BgcodePreviewResizeEvent`, likely to improve naming consistency or to support a new event type.	2025-08-06 14:12:37 +08:00
Jiří Polášek	0997c1a013	CmdPal: Coalesce top-level commands list changes into a single task (#40943 ) ## Summary of the Pull Request Self-refresh of `MainListPage` introduced in #40132 causes unnecessary spawning of tasks by `ReapplySearchInBackground` and pushing the code down the scenic route instead of taking shortcut. This drop-in fix introduces a single-worker coalescing refresh loop to eliminate thread-pool churn and syncs state in early-return paths. ## PR Checklist - [x] Closes: #40916 - [x] Communication: I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] Tests: no change - [ ] Localization: nothing - [ ] Dev docs: nothing - [ ] New binaries: none - [ ] Documentation updated: nothing <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed	2025-08-05 16:26:50 -05:00
Jiří Polášek	fa55cdb67f	CmdPal: properly dispose of the old backdrop controller (#40986 ) ## Summary of the Pull Request Properly disposes the old DesktopAcrylicController when replacing it with a new instance. ## PR Checklist - [ ] Closes: #xxx - [ ] Communication: I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] Tests: Added/updated and all pass - [ ] Localization: All end-user-facing strings can be localized - [ ] Dev docs: Added/updated - [ ] New binaries: Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] Documentation updated: If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx ## Detailed Description of the Pull Request / Additional comments ## Validation Steps Performed	2025-08-05 16:26:22 -05:00
Jiří Polášek	a889f4d4bd	CmdPal: Update a code comment using a wrong member name [nit] (#40987 ) ## Summary of the Pull Request (see title) <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [ ] Closes: #xxx - [ ] Communication: I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] Tests: Added/updated and all pass - [ ] Localization: All end-user-facing strings can be localized - [ ] Dev docs: Added/updated - [ ] New binaries: Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] Documentation updated: If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed	2025-08-05 16:26:05 -05:00
Mike Griese	281c88a620	CmdPal: fix files not having an open command (#40990 ) Yea, it's that dumb. Regressed in #40768	2025-08-05 14:15:52 -05:00
Davide Giacometti	7bcddfeb09	[PowerRename] Fix named pipe detection (#40944 ) <!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist Fix a regression present on master where PowerRename is activated with empty file list where invoked Explorer context menu. Regression was caused by https://github.com/microsoft/PowerToys/pull/40393 - [ ] Closes: #xxx - [ ] Communication: I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] Tests: Added/updated and all pass - [ ] Localization: All end-user-facing strings can be localized - [ ] Dev docs: Added/updated - [ ] New binaries: Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] Documentation updated: If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed Verified that PowerRename shows file list when activated: - From Windows 11 Explorer context menu - From Legacy Explorer context menu - From command line passing some file paths	2025-08-05 15:44:58 +08:00
Michael Jolley	7fb4ac2dcd	Adding additional descriptions for all apps settings (#40911 ) Closes #38351 Adding some descriptions for all apps extension settings. <img width="725" height="470" alt="image" src="https://github.com/user-attachments/assets/9fb06105-80a3-4c78-b10d-241164fead11" />	2025-08-04 18:34:20 -05:00
Niels Laute	c91bef1517	[UX] New dashboard & refactored KeyVisual (#40214 ) ### Updated `KeyVisual` and `Shortcut` control - Refactoring `KeyVisual` to remove redundant properties and UI elements, and using Styles for better customization. - Shortcut control now shows a "Configure shortcut" label when there's no shortcut configured. ### Other changes - Consolidated converters that were used across pages in `App.xaml.cs` with consistent naming. - Renamed templated controls (from `.cs` to `.xaml.cs`) and moving those to the `Controls` root folder vs. individual folders for a better overview. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist Closes #39520 Closes #32944 --------- Co-authored-by: Jay <65828559+Jay-o-Way@users.noreply.github.com> Co-authored-by: Jaylyn Barbee <51131738+Jaylyn-Barbee@users.noreply.github.com>	2025-08-04 18:33:19 -05:00
leileizhang	fdd1f47d85	[UI tests] Fix UI test pipeline to properly handle buildSource parameter conditions (#40899 ) <!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request Fixes a logic issue in the UI test automation pipeline where selecting `latestMainOfficialBuild` would still trigger a full PowerToys build instead of only building UI tests. ### Why The pipeline was using template variables in compilation-time conditions, which doesn't work correctly in pipeline ### fix Replace template variable references with direct parameter comparisons in compilation-time conditions <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [ ] Closes: #xxx - [ ] Communication: I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] Tests: Added/updated and all pass - [ ] Localization: All end-user-facing strings can be localized - [ ] Dev docs: Added/updated - [ ] New binaries: Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] Documentation updated: If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed	2025-08-01 13:57:39 +08:00
leileizhang	9a998b2056	[UI Tests] Enhance UI Test Automation and Pipeline Support for CmdPal Module (#40871 ) <!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request This pull request introduces enhancements to UI test automation, improvements to pipeline configuration, and project structure updates. The goal is to improve flexibility, maintainability, and efficiency in PowerToys’ CI/CD processes. ### UI Test Enhancements: Delayed Text Input Support - UI tests now support character-by-character text input with configurable delays. - This serves as a workaround for a known CmdPal bug where input is swallowed too quickly. The delay mitigates the issue until it is fixed in CmdPal. Centralized Environment Management - Introduced a new class to centralize environment variable access for UI test configuration. CmdPal Launch Handling in Pipelines - Adjusted test logic to handle CmdPal module startup specifically in CI pipelines ### Pipeline Configuration Updates: Build Artifact Customization - Included test-related folders in pipeline build outputs for better traceability. Support for Build ID Targeting - Added support for specifying PowerToys build IDs in test pipelines, with conditional logic for specific or latest build selection. <img width="264" height="44" alt="image" src="https://github.com/user-attachments/assets/0d68a51e-e41a-4868-a1c3-f4233c56b0ee" /> ### Project Structure Updates: Added Peek.UITests back to the solution which removed by https://github.com/microsoft/PowerToys/pull/40754 <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [ ] Closes: #xxx - [ ] Communication: I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] Tests: Added/updated and all pass - [ ] Localization: All end-user-facing strings can be localized - [ ] Dev docs: Added/updated - [ ] New binaries: Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] Documentation updated: If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed	2025-07-31 13:55:23 +08:00
Kai Tao	d26ef36e31	[Doc] Add doc for a script to build installer locally, and doc for testing winget install locally (#40805 ) <!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [ ] Closes: #xxx - [ ] Communication: I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] Tests: Added/updated and all pass - [ ] Localization: All end-user-facing strings can be localized - [ ] Dev docs: Added/updated - [ ] New binaries: Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] Documentation updated: If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments 1. Add instructions to build installer locally with a script 2. Add doc explaining how to install an installer by winget locally. <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed	2025-07-31 09:48:24 +08:00
Jiří Polášek	ee6336c47d	Change filter box placeholder for main list page only (#40799 ) ## Summary of the Pull Request Changes the placeholder in the filter box only on the main list page to "Search for apps, files and commands...": <img width="786" height="473" alt="image" src="https://github.com/user-attachments/assets/844d27ae-61cf-42c9-a7f6-ae78817e928c" /> The default value remains unchanged as "Type here to search..." for all other pages (both built-in and internal), unless the author overrides it: <img width="786" height="473" alt="image" src="https://github.com/user-attachments/assets/aeb3500b-9e36-4e35-8dd7-3bd226336823" /> <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [x] Closes: #40763 - [x] Communication: I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] Tests: Added/updated and all pass - [x] Localization: All end-user-facing strings can be localized - [x] Dev docs: Added/updated - [x] New binaries: none - [x] Documentation updated: ## Detailed Description of the Pull Request / Additional comments ## Validation Steps Performed	2025-07-30 09:27:02 -07:00