fix

2026-01-07 12:57:03 +01:00 · 2025-03-18 16:30:21 +08:00 · 2025-03-13 17:20:34 +08:00 · 2025-03-13 17:14:38 +08:00 · 2025-03-13 14:24:01 +08:00 · 2025-03-13 12:48:59 +08:00
1395 changed files with 7306 additions and 94362 deletions
--- a/.config/configuration.vsEnterprise.winget
+++ b/.config/configuration.vsEnterprise.winget
@@ -6,16 +6,12 @@ properties:
      directives:
        description: Enable Developer Mode
        allowPrerelease: true
-        # Requires elevation for the set operation
-        securityContext: elevated
      settings:
        Ensure: Present
    - resource: Microsoft.WinGet.DSC/WinGetPackage
      id: vsPackage
      directives:
        description: Install Visual Studio 2022 Enterprise (Any edition will work)
-        # Requires elevation for the set operation
-        securityContext: elevated
      settings:
        id: Microsoft.VisualStudio.2022.Enterprise
        source: winget
@@ -25,8 +21,6 @@ properties:
      directives:
        description: Install required VS workloads
        allowPrerelease: true
-        # Requires elevation for the get and set operations
-        securityContext: elevated
      settings:
        productId: Microsoft.VisualStudio.Product.Enterprise
        channelId: VisualStudio.17.Release
--- a/.config/configuration.vsProfessional.winget
+++ b/.config/configuration.vsProfessional.winget
@@ -6,16 +6,12 @@ properties:
      directives:
        description: Enable Developer Mode
        allowPrerelease: true
-        # Requires elevation for the set operation
-        securityContext: elevated
      settings:
        Ensure: Present
    - resource: Microsoft.WinGet.DSC/WinGetPackage
      id: vsPackage
      directives:
        description: Install Visual Studio 2022 Professional (Any edition will work)
-        # Requires elevation for the set operation
-        securityContext: elevated
      settings:
        id: Microsoft.VisualStudio.2022.Professional
        source: winget
@@ -25,8 +21,6 @@ properties:
      directives:
        description: Install required VS workloads
        allowPrerelease: true
-        # Requires elevation for the get and set operations
-        securityContext: elevated
      settings:
        productId: Microsoft.VisualStudio.Product.Professional
        channelId: VisualStudio.17.Release
--- a/.config/configuration.winget
+++ b/.config/configuration.winget
@@ -6,16 +6,12 @@ properties:
      directives:
        description: Enable Developer Mode
        allowPrerelease: true
-        # Requires elevation for the set operation
-        securityContext: elevated
      settings:
        Ensure: Present
    - resource: Microsoft.WinGet.DSC/WinGetPackage
      id: vsPackage
      directives:
        description: Install Visual Studio 2022 Community (Any edition will work)
-        # Requires elevation for the set operation
-        securityContext: elevated
      settings:
        id: Microsoft.VisualStudio.2022.Community
        source: winget
@@ -25,8 +21,6 @@ properties:
      directives:
        description: Install required VS workloads
        allowPrerelease: true
-        # Requires elevation for the get and set operations
-        securityContext: elevated
      settings:
        productId: Microsoft.VisualStudio.Product.Community
        channelId: VisualStudio.17.Release
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,13 +3,13 @@
    "isRoot": true,
    "tools": {
        "dotnet-consolidate": {
-            "version": "4.2.0",
+            "version": "2.0.0",
            "commands": [
                "dotnet-consolidate"
            ]
        },
        "xamlstyler.console": {
-            "version": "3.2501.8",
+            "version": "3.2404.2",
            "commands": [
              "xstyler"
            ]
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,5 +1,6 @@
 name: "🕷️ Bug report"
 description: Report errors or unexpected behavior
+type: Bug
 labels:
 - Issue-Bug
 - Needs-Triage
@@ -7,17 +8,15 @@ body:
 - type: markdown
  attributes:
    value: Please make sure to [search for existing issues](https://github.com/microsoft/PowerToys/issues) before filing a new one!
- id: version
-  type: input
+- type: input
  attributes:
    label: Microsoft PowerToys version
-    placeholder: X.XX.X
+    placeholder: 0.70.0
    description: Hover over system tray icon or look at Settings
  validations:
    required: true

- id: installed
-  type: dropdown
+- type: dropdown
  attributes:
    label: Installation method
    description: How / Where was PowerToys installed from?
@@ -34,6 +33,14 @@ body:
  validations:
    required: true

+- type: dropdown
+  attributes:
+    label: Running as admin
+    description: Are you running PowerToys as Admin?
+    options:
+      - "Yes"
+      - "No"
+
 - type: dropdown
  attributes:
    label: Area(s) with issue?
@@ -46,7 +53,6 @@ body:
      - Awake
      - ColorPicker
      - Command not found
-      - Command Palette
      - Crop and Lock
      - Environment Variables
      - FancyZones
@@ -60,7 +66,7 @@ body:
      - Keyboard Manager
      - Mouse Utilities
      - Mouse Without Borders
-      - New+
+      - New+ 
      - Peek
      - PowerRename
      - PowerToys Run
@@ -99,19 +105,6 @@ body:
  validations:
    required: false

- id: additionalInfo
-  type: textarea
-  attributes:
-    label: Additional Information
-    placeholder: |
-      OS version
-      .Net version
-      System Language
-      User or System Installation
-      Running as admin
-  validations:
-    required: false
-    
 - type: textarea
  attributes:
    label: Other Software
@@ -122,4 +115,3 @@ body:
      My Cool Application v0.3 (include a code snippet if it would help!)
  validations:
    required: false
-  
--- a/.github/actions/spell-check/allow/code.txt
+++ b/.github/actions/spell-check/allow/code.txt
@@ -53,6 +53,8 @@ YVU
 YVYU
 zipfolder
 CODEOWNERS
+VNext
+vnext

 # FONTS

@@ -233,9 +235,6 @@ SWAPBUTTON
 SYSTEMDOCKED
 TABLETPC

-# Units
-nmi
-
 # MATH

 artanh
@@ -273,4 +272,4 @@ mengyuanchen
 testhost

 #Tools
-OIP
+OIP
--- a/.github/actions/spell-check/allow/names.txt
+++ b/.github/actions/spell-check/allow/names.txt
@@ -79,7 +79,6 @@ Gershaft
 Giordani
 Gokce
 gordon
-Griese
 grzhan
 Guo
 hanselman
@@ -110,7 +109,6 @@ Lambson
 Laute
 laviusmotileng
 Leilei
-Loewen
 Luecking
 Mahalingam
 Markovic
@@ -155,7 +153,6 @@ Santossio
 Schoen
 Sekan
 Seraphima
-Shmuelie
 skttl
 somil
 Soref
@@ -188,8 +185,6 @@ zhaoqpcn
 Zoltan
 Zykova
 Sameerjs
-ruslanlap
-vednig

 # OTHERS

@@ -202,7 +197,6 @@ cortana
 dlnilsson
 fancymouse
 firefox
-fudan
 gpt
 Inkscape
 Markdig
@@ -218,7 +212,6 @@ regedit
 roslyn
 Spotify
 Vanara
-wangyi
 WEX
 windowwalker
 winui
@@ -226,9 +219,7 @@ winuiex
 wix
 wordpad
 WWL
-wyhash
 xamlstyler
 Xavalon
 Xbox
 Youdao
-zadjii
--- a/.github/actions/spell-check/excludes.txt
+++ b/.github/actions/spell-check/excludes.txt
@@ -96,11 +96,10 @@
 ^\Qdoc/devdocs/localization.md\E$
 ^\Qsrc/common/ManagedCommon/ColorFormatHelper.cs\E$
 ^\Qsrc/common/notifications/BackgroundActivatorDLL/cpp.hint\E$
-^\Qsrc/modules/cmdpal/doc/initial-sdk-spec/list-elements-mock-002.pdn\E$
 ^\Qsrc/modules/colorPicker/ColorPickerUI/Assets/ColorPicker/colorPicker.cur\E$
 ^\Qsrc/modules/colorPicker/ColorPickerUI/Shaders/GridShader.cso\E$
-^\Qsrc/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.SYSTEM_METRICS_INDEX.cs\E$
 ^\Qsrc/modules/MouseUtils/MouseJumpUI/MainForm.resx\E$
+^\Qsrc/modules/MouseUtils/MouseJump.Common/NativeMethods/User32/UI/WindowsAndMessaging/User32.SYSTEM_METRICS_INDEX.cs\E$
 ^\Qsrc/modules/MouseWithoutBorders/App/Form/frmAbout.cs\E$
 ^\Qsrc/modules/MouseWithoutBorders/App/Form/frmInputCallback.resx\E$
 ^\Qsrc/modules/MouseWithoutBorders/App/Form/frmLogon.resx\E$
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
--- a/.github/actions/spell-check/patterns.txt
+++ b/.github/actions/spell-check/patterns.txt
@@ -232,15 +232,6 @@ _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING
 # ignore long runs of a single character:
 \b([A-Za-z])\g{-1}{3,}\b

-# Amazon
-\bamazon\.com/[-\w]+/(?:dp/[0-9A-Z]+|)
-
-# imgur
-\bimgur\.com/[^.]+
-
-# Process Process (typename varname)
-Process Process
-
 # ZoomIt menu items with accelerator keys
 E&xit
-St&yle
+St&yle
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -1,26 +0,0 @@
-# Dependency Review Action
-#
-# This Action will scan dependency manifest files that change as part of a Pull Request,
-# surfacing known-vulnerable versions of the packages declared or updated in the PR.
-# Once installed, if the workflow run is marked as required,
-# PRs introducing known-vulnerable packages will be blocked from merging.
-#
-# As recommended by Microsoft's security guidelines (https://docs.opensource.microsoft.com/security/tsg/actions/#requirements-for-security-hardening-your-own-github-actions), 
-# 3rd-party actions should be pinned to a specific commit hash to prevent supply chain attacks. 
-# This update aligns with best practices; 1st/2nd-party actions is not required hash pinning.
-#
-# Source repository: https://github.com/actions/dependency-review-action
-name: 'Dependency Review'
-on: [pull_request]
-
-permissions:
-  contents: read
-
-jobs:
-  dependency-review:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Checkout Repository'
-        uses: actions/checkout@v4
-      - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v4
--- a/.github/workflows/msstore-submissions.yml
+++ b/.github/workflows/msstore-submissions.yml
@@ -39,11 +39,6 @@ jobs:
          echo powerToysInstallerX64Url=$(jq -n "$powerToysSetup" | jq -r '[.[]|select(.name | contains("x64"))][0].browser_download_url') >> $GITHUB_OUTPUT
          echo powerToysInstallerArm64Url=$(jq -n "$powerToysSetup" | jq -r '[.[]|select(.name | contains("arm64"))][0].browser_download_url') >> $GITHUB_OUTPUT

-      - name: Setup .NET 9.0
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: '9.0.x'
-
      - uses: microsoft/setup-msstore-cli@v1

      - name: Fetch Store Credential
--- a/.github/workflows/spelling2.yml
+++ b/.github/workflows/spelling2.yml
@@ -93,7 +93,7 @@ jobs:
    steps:
      - name: check-spelling
        id: spelling
-        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
+        uses: check-spelling/check-spelling@v0.0.24
        with:
          config: .github/actions/spell-check
          suppress_push_for_open_pull_request: ${{ github.actor != 'dependabot[bot]' && 1 }}
@@ -156,7 +156,7 @@ jobs:
    if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
    steps:
      - name: comment
-        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
+        uses: check-spelling/check-spelling@v0.0.24
        with:
          config: .github/actions/spell-check
          checkout: true
@@ -175,7 +175,7 @@ jobs:
    if: (success() || failure()) && needs.spelling.outputs.followup && contains(github.event_name, 'pull_request')
    steps:
      - name: comment
-        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
+        uses: check-spelling/check-spelling@v0.0.24
        with:
          config: .github/actions/spell-check
          checkout: true
@@ -202,7 +202,7 @@ jobs:
      cancel-in-progress: false
    steps:
      - name: apply spelling updates
-        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
+        uses: check-spelling/check-spelling@v0.0.24
        with:
          experimental_apply_changes_via_bot: ${{ github.repository_owner != 'microsoft' && 1 }}
          checkout: true
--- a/.gitignore
+++ b/.gitignore
@@ -224,7 +224,7 @@ ClientBin/
 *.publishsettings
 orleans.codegen.cs

-# Including strong name files can present a security risk
+# Including strong name files can present a security risk 
 # (https://github.com/github/gitignore/pull/2483#issue-259490424)
 #*.snk

@@ -322,7 +322,7 @@ ImageResizer/tools/**
 # OpenCover UI analysis results
 OpenCover/

-# Azure Stream Analytics local run output
+# Azure Stream Analytics local run output 
 ASALocalRun/

 # MSBuild Binary and Structured Log
@@ -331,7 +331,7 @@ ASALocalRun/
 # NVidia Nsight GPU debugger configuration file
 *.nvuser

-# MFractors (Xamarin productivity tool) working folder
+# MFractors (Xamarin productivity tool) working folder 
 .mfractor/

 # Temp build files
@@ -350,6 +350,10 @@ src/common/Telemetry/*.etl

 # Generated installer file for Monaco source files.
 /installer/PowerToysSetup/MonacoSRC.wxs
+/installer/PowerToysSetupVNext/MonacoSRC.wxs

 # MSBuildCache
 /MSBuildCacheLogs/
+
+# PowerToysInstaller Build Temp Files
+installer/*/*.wxs.bk
--- a/.pipelines/ESRPSigning_cmdpal_msix_content.json
+++ b/.pipelines/ESRPSigning_cmdpal_msix_content.json
@@ -1,51 +0,0 @@
-{
-    "Version": "1.0.0",
-    "UseMinimatch": false,
-    "SignBatches": [
-        {
-            "MatchedPath": [
-                "*.dll",
-                "*.exe"                
-            ],
-            "SigningInfo": {
-                "Operations": [
-                    {
-                        "KeyCode": "CP-230012",
-                        "OperationSetCode": "SigntoolSign",
-                        "Parameters": [
-                            {
-                                "parameterName": "OpusName",
-                                "parameterValue": "Microsoft"
-                            },
-                            {
-                                "parameterName": "OpusInfo",
-                                "parameterValue": "http://www.microsoft.com"
-                            },
-                            {
-                                "parameterName": "FileDigest",
-                                "parameterValue": "/fd \"SHA256\""
-                            },
-                            {
-                                "parameterName": "PageHash",
-                                "parameterValue": "/NPH"
-                            },
-                            {
-                                "parameterName": "TimeStamp",
-                                "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                            }
-                        ],
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0"
-                    },
-                    {
-                        "KeyCode": "CP-230012",
-                        "OperationSetCode": "SigntoolVerify",
-                        "Parameters": [],
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0"
-                    }
-                ]
-            }
-        }
-    ]
-}
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@@ -127,7 +127,6 @@

                "PowerToys.KeyboardManager.dll",
                "KeyboardManagerEditor\\PowerToys.KeyboardManagerEditor.exe",
-                "KeyboardManagerEditorUI\\PowerToys.KeyboardManagerEditorUI.exe",
                "KeyboardManagerEngine\\PowerToys.KeyboardManagerEngine.exe",
                "PowerToys.KeyboardManagerEditorLibraryWrapper.dll",

@@ -218,11 +217,7 @@
                "PowerToys.ZoomItSettingsInterop.dll",

                "WinUI3Apps\\PowerToys.Settings.dll",
-                "WinUI3Apps\\PowerToys.Settings.exe",
-
-                "PowerToys.CmdPalModuleInterface.dll",
-                "CmdPalKeyboardService.dll",
-                "*Microsoft.CmdPal.UI_*.msix"
+                "WinUI3Apps\\PowerToys.Settings.exe"
            ],
            "SigningInfo": {
                "Operations": [
@@ -332,8 +327,6 @@
                "TestableIO.System.IO.Abstractions.Wrappers.dll",
                "WinUI3Apps\\TestableIO.System.IO.Abstractions.Wrappers.dll",
                "WinUI3Apps\\OpenAI.dll",
-                "Testably.Abstractions.FileSystem.Interface.dll",
-                "WinUI3Apps\\Testably.Abstractions.FileSystem.Interface.dll",
                "ColorCode.Core.dll", 
                "ColorCode.UWP.dll",
                "UnitsNet.dll",
--- a/.pipelines/ESRPSigning_installer.json
+++ b/.pipelines/ESRPSigning_installer.json
@@ -6,7 +6,9 @@
            "MatchedPath": [
                "PowerToysSetupCustomActions.dll",
                "PowerToys*Setup-*.exe",
-                "PowerToys*Setup-*.msi"
+                "PowerToys*Setup-*.msi",
+                "PowerToys*SetupVNext-*.exe",
+                "PowerToys*SetupVNext-*.msi"
            ],
            "SigningInfo": {
                "Operations": [
--- a/.pipelines/ESRPSigning_sdk.json
+++ b/.pipelines/ESRPSigning_sdk.json
@@ -1,51 +0,0 @@
-{
-    "Version": "1.0.0",
-    "UseMinimatch": false,
-    "SignBatches": [
-        {
-            "MatchedPath": [
-                "Microsoft.CommandPalette.Extensions.dll",
-                "Microsoft.CommandPalette.Extensions.Toolkit.dll"
-            ],
-            "SigningInfo": {
-                "Operations": [
-                    {
-                        "KeyCode": "CP-230012",
-                        "OperationSetCode": "SigntoolSign",
-                        "Parameters": [
-                            {
-                                "parameterName": "OpusName",
-                                "parameterValue": "Microsoft"
-                            },
-                            {
-                                "parameterName": "OpusInfo",
-                                "parameterValue": "http://www.microsoft.com"
-                            },
-                            {
-                                "parameterName": "FileDigest",
-                                "parameterValue": "/fd \"SHA256\""
-                            },
-                            {
-                                "parameterName": "PageHash",
-                                "parameterValue": "/NPH"
-                            },
-                            {
-                                "parameterName": "TimeStamp",
-                                "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                            }
-                        ],
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0"
-                    },
-                    {
-                        "KeyCode": "CP-230012",
-                        "OperationSetCode": "SigntoolVerify",
-                        "Parameters": [],
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0"
-                    }
-                ]
-            }
-        }
-    ]
-}
--- a/.pipelines/UpdateVersions.ps1
+++ b/.pipelines/UpdateVersions.ps1
@@ -1,24 +1,16 @@
 Param(
-  # Using the default value of 1.7 for winAppSdkVersionNumber and useExperimentalVersion as false
+  # Using the default value of 1.6 for winAppSdkVersionNumber and useExperimentalVersion as false
  [Parameter(Mandatory=$False,Position=1)]
-  [string]$winAppSdkVersionNumber = "1.7",
+  [string]$winAppSdkVersionNumber = "1.6",

  # When the pipeline calls the PS1 file, the passed parameters are converted to string type
  [Parameter(Mandatory=$False,Position=2)]
-  [boolean]$useExperimentalVersion = $False,
-
-  # Root folder Path for processing
-  [Parameter(Mandatory=$False,Position=3)]
-  [string]$rootPath = $(Split-Path -Parent (Split-Path -Parent $MyInvocation.MyCommand.Path)),
-
-  # Root folder Path for processing
-  [Parameter(Mandatory=$False,Position=4)]
-  [string]$sourceLink = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json"
+  [boolean]$useExperimentalVersion = $False
 )

 function Update-NugetConfig {
    param (
-        [string]$filePath = [System.IO.Path]::Combine($rootPath, "nuget.config")
+        [string]$filePath = "nuget.config"
    )

    Write-Host "Updating nuget.config file"
@@ -43,33 +35,7 @@ function Update-NugetConfig {
    $xml.Save($filePath)
 }

-function Read-FileWithEncoding {
-    param (
-        [string]$Path
-    )
-
-    $reader = New-Object System.IO.StreamReader($Path, $true)  # auto-detect encoding
-    $content = $reader.ReadToEnd()
-    $encoding = $reader.CurrentEncoding
-    $reader.Close()
-
-    return [PSCustomObject]@{
-        Content  = $content
-        Encoding = $encoding
-    }
-}
-
-function Write-FileWithEncoding {
-    param (
-        [string]$Path,
-        [string]$Content,
-        [System.Text.Encoding]$Encoding
-    )
-
-    $writer = New-Object System.IO.StreamWriter($Path, $false, $Encoding)
-    $writer.Write($Content)
-    $writer.Close()
-}
+$sourceLink = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json"

 # Execute nuget list and capture the output
 if ($useExperimentalVersion) {
@@ -113,54 +79,50 @@ if ($latestVersion) {
 }

 # Update packages.config files
-Get-ChildItem -Path $rootPath -Recurse packages.config | ForEach-Object {
-    $file = Read-FileWithEncoding -Path $_.FullName
-    $content = $file.Content
+Get-ChildItem -Recurse packages.config | ForEach-Object {
+    $content = Get-Content $_.FullName -Raw
    if ($content -match 'package id="Microsoft.WindowsAppSDK"') {
        $newVersionString = 'package id="Microsoft.WindowsAppSDK" version="' + $WinAppSDKVersion + '"'
        $oldVersionString = 'package id="Microsoft.WindowsAppSDK" version="[-.0-9a-zA-Z]*"'
        $content = $content -replace $oldVersionString, $newVersionString
-        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
+        Set-Content -Path $_.FullName -Value $content
        Write-Host "Modified " $_.FullName 
    }
 }

 # Update Directory.Packages.props file
-$propsFile = [System.IO.Path]::Combine($rootPath,"Directory.Packages.props")
+$propsFile = "Directory.Packages.props"
 if (Test-Path $propsFile) {
-    $file = Read-FileWithEncoding -Path $propsFile
-    $content = $file.Content
+    $content = Get-Content $propsFile -Raw
    if ($content -match '<PackageVersion Include="Microsoft.WindowsAppSDK"') {
        $newVersionString = '<PackageVersion Include="Microsoft.WindowsAppSDK" Version="' + $WinAppSDKVersion + '" />'
        $oldVersionString = '<PackageVersion Include="Microsoft.WindowsAppSDK" Version="[-.0-9a-zA-Z]*" />'
        $content = $content -replace $oldVersionString, $newVersionString
-        Write-FileWithEncoding -Path $propsFile -Content $content -Encoding $file.encoding
+        Set-Content -Path $propsFile -Value $content
        Write-Host "Modified " $propsFile
    }
 }

 # Update .vcxproj files
-Get-ChildItem -Path $rootPath -Recurse *.vcxproj | ForEach-Object {
-    $file = Read-FileWithEncoding -Path $_.FullName
-    $content = $file.Content
+Get-ChildItem -Recurse *.vcxproj | ForEach-Object {
+    $content = Get-Content $_.FullName -Raw
    if ($content -match '\\Microsoft.WindowsAppSDK.') {
        $newVersionString = '\Microsoft.WindowsAppSDK.' + $WinAppSDKVersion + '\'
        $oldVersionString = '\\Microsoft.WindowsAppSDK.[-.0-9a-zA-Z]*\\'
        $content = $content -replace $oldVersionString, $newVersionString
-        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
+        Set-Content -Path $_.FullName -Value $content
        Write-Host "Modified " $_.FullName
    }
 }

 # Update .csproj files
-Get-ChildItem -Path $rootPath -Recurse *.csproj | ForEach-Object {
-    $file = Read-FileWithEncoding -Path $_.FullName
-    $content = $file.Content
+Get-ChildItem -Recurse *.csproj | ForEach-Object {
+    $content = Get-Content $_.FullName -Raw
    if ($content -match 'PackageReference Include="Microsoft.WindowsAppSDK"') {
        $newVersionString = 'PackageReference Include="Microsoft.WindowsAppSDK" Version="'+ $WinAppSDKVersion + '"'
        $oldVersionString = 'PackageReference Include="Microsoft.WindowsAppSDK" Version="[-.0-9a-zA-Z]*"'
        $content = $content -replace $oldVersionString, $newVersionString
-        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
+        Set-Content -Path $_.FullName -Value $content
        Write-Host "Modified " $_.FullName 
    }
 }
--- a/.pipelines/installWiXVNext.ps1
+++ b/.pipelines/installWiXVNext.ps1
@@ -0,0 +1,26 @@
+$ProgressPreference = 'SilentlyContinue'
+
+$WixDownloadUrl = "https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314.exe"
+$WixBinariesDownloadUrl = "https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314-binaries.zip"
+
+# Download WiX binaries and verify their hash sums
+Invoke-WebRequest -Uri $WixDownloadUrl -OutFile "$($ENV:Temp)\wix314.exe"
+$Hash = (Get-FileHash -Algorithm SHA256 "$($ENV:Temp)\wix314.exe").Hash
+if ($Hash -ne '6BF6D03D6923D9EF827AE1D943B90B42B8EBB1B0F68EF6D55F868FA34C738A29')
+{
+    Write-Error "$WixHash"
+    throw "wix314.exe has unexpected SHA256 hash: $Hash"
+}
+Invoke-WebRequest -Uri $WixBinariesDownloadUrl -OutFile "$($ENV:Temp)\wix314-binaries.zip"
+$Hash = (Get-FileHash -Algorithm SHA256 "$($ENV:Temp)\wix314-binaries.zip").Hash
+if($Hash -ne '6AC824E1642D6F7277D0ED7EA09411A508F6116BA6FAE0AA5F2C7DAA2FF43D31')
+{
+    throw "wix314-binaries.zip has unexpected SHA256 hash: $Hash"
+}
+
+# Install WiX
+Start-Process -Wait -FilePath "$($ENV:Temp)\wix314.exe" -ArgumentList "/install /quiet"
+
+# Extract WiX binaries and copy wix.targets to the installed dir
+Expand-Archive -Path "$($ENV:Temp)\wix314-binaries.zip" -Force -DestinationPath "$($ENV:Temp)"
+Copy-Item -Path "$($ENV:Temp)\wix.targets" -Destination "C:\Program Files (x86)\WiX Toolset v3.14\"
--- a/.pipelines/tsa.json
+++ b/.pipelines/tsa.json
@@ -3,5 +3,5 @@
    "notificationAliases": ["powertoys@microsoft.com"],
    "instanceUrl": "https://microsoft.visualstudio.com",
    "projectName": "OS",
-    "areaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\DIVE\\PowerToys"
+    "areaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys"
 }
--- a/.pipelines/v2/ci-using-the-latest-winappsdk.yml
+++ b/.pipelines/v2/ci-using-the-latest-winappsdk.yml
@@ -33,7 +33,7 @@ parameters:
    default: true
  - name: winAppSDKVersionNumber
    type: string
-    default: 1.7
+    default: 1.6
  - name: useExperimentalVersion
    type: boolean
    default: false
--- a/.pipelines/v2/release.yml
+++ b/.pipelines/v2/release.yml
@@ -20,16 +20,6 @@ parameters:
    type: string
    default: '0.0.1'

-  - name: cmdPalVersionNumber
-    displayName: "Command Palette Version Number"
-    type: string
-    default: '0.0.1'
-
-  - name: cmdPalSdkVersionNumber
-    displayName: "Command Palette SDK Version Number"
-    type: string
-    default: '0.0.1'
-
  - name: buildConfigurations
    displayName: "Build Configurations"
    type: object
@@ -88,7 +78,6 @@ extends:
              buildPlatforms: ${{ parameters.buildPlatforms }}
              buildConfigurations: ${{ parameters.buildConfigurations }}
              versionNumber: ${{ parameters.versionNumber }}
-              cmdPalVersionNumber: ${{ parameters.cmdPalVersionNumber }}
              publishArtifacts: false # 1ES PT handles publication for us.
              codeSign: true
              runTests: false
@@ -106,7 +95,7 @@ extends:
              beforeBuildSteps:
                # Sets versions for all PowerToy created DLLs
                - pwsh: |-
-                    .pipelines/versionSetting.ps1 -versionNumber '${{ parameters.versionNumber }}' -DevEnvironment '' -cmdPalVersionNumber '${{ parameters.cmdPalVersionNumber }}'
+                    .pipelines/versionSetting.ps1 -versionNumber '${{ parameters.versionNumber }}' -DevEnvironment ''
                  displayName: Prepare versioning

                # Prepare the localizations and telemetry config before the release build
@@ -118,28 +107,6 @@ extends:
                    move /Y "Microsoft.PowerToys.Telemetry.2.0.2\build\include\TelemetryBase.cs" "src\common\Telemetry\TelemetryBase.cs" || exit /b 1
                  displayName: Emplace telemetry files

-      - stage: Build_SDK
-        displayName: Build SDK
-        dependsOn: []
-        jobs:
-          - template: .pipelines/v2/templates/job-build-sdk.yml@self
-            parameters:
-              pool:
-                name: SHINE-INT-L
-                image: SHINE-VS17-Latest
-                os: windows
-              codeSign: true
-              sdkVersionNumber: ${{ parameters.cmdPalSdkVersionNumber }}
-              signingIdentity:
-                serviceName: $(SigningServiceName)
-                appId: $(SigningAppId)
-                tenantId: $(SigningTenantId)
-                akvName: $(SigningAKVName)
-                authCertName: $(SigningAuthCertName)
-                signCertName: $(SigningSignCertName)
-                useManagedIdentity: $(SigningUseManagedIdentity)
-                clientId: $(SigningOriginalClientId)
-
      - stage: Publish
        displayName: Publish
        dependsOn: [Build]
@@ -148,7 +115,5 @@ extends:
            parameters:
              versionNumber: ${{ parameters.versionNumber }}
              includePublicSymbolServer: ${{ parameters.publishSymbolsToPublic }}
-              ${{ if ne(parameters.publishSymbolsToPublic, true) }}:
-                symbolExpiryTime: 10 # For private builds, expire symbols within 10 days. The default is 100 years.
              subscription: $(SymbolPublishingServiceConnection)
              symbolProject: $(SymbolPublishingProject)
--- a/.pipelines/v2/templates/job-build-project.yml
+++ b/.pipelines/v2/templates/job-build-project.yml
@@ -56,9 +56,6 @@ parameters:
  - name: versionNumber
    type: string
    default: '0.0.1'
-  - name: cmdPalVersionNumber
-    type: string
-    default: '0.0.1'
  - name: useLatestWinAppSDK
    type: boolean
    default: false
@@ -99,7 +96,6 @@ jobs:
            ${{ else }}:
              OutputBuildPlatform: ${{ platform }}
  variables:
-    MakeAppxPath: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x86\MakeAppx.exe'
    # Azure DevOps abhors a vacuum
    # If these are blank, expansion will fail later on... which will result in direct substitution of the variable *names*
    # later on. We'll just... set them to a single space and if we need to, check IsNullOrWhiteSpace.
@@ -149,7 +145,7 @@ jobs:
  - template: steps-ensure-dotnet-version.yml
    parameters:
      sdk: true
-      version: '6.0' # .NET 6.0 is required in CI for ESRP code signing tasks. Please do not remove.
+      version: '6.0'

  - template: steps-ensure-dotnet-version.yml
    parameters:
@@ -219,6 +215,10 @@ jobs:
      & "$(build.sourcesdirectory)\.pipelines\installWiX.ps1"
    displayName: Download and install WiX 3.14 development build

+  - pwsh: |-
+      & "$(build.sourcesdirectory)\.pipelines\installWiXVNext.ps1"
+    displayName: Download and install WiX 4/5 development build
+
  - ${{ parameters.beforeBuildSteps }}

  - task: VSBuild@1
@@ -246,32 +246,6 @@ jobs:
      env:
        SYSTEM_ACCESSTOKEN: $(System.AccessToken)

-  - task: CopyFiles@2
-    displayName: Stage SDK/build
-    inputs:
-      contents: |-
-        "**/cmdpal/extensionsdk/nuget/Microsoft.CommandPalette.Extensions.SDK.props"
-        "**/cmdpal/extensionsdk/nuget/Microsoft.CommandPalette.Extensions.SDK.targets"
-      flattenFolders: True
-      targetFolder: $(JobOutputDirectory)/sdk/build
-
-  - task: CopyFiles@2
-    displayName: Stage SDK/lib
-    inputs:
-      contents: |-
-        "**/Microsoft.CommandPalette.Extensions.Toolkit/$(BuildPlatform)/release/WinUI3Apps/CmdPal/Microsoft.CommandPalette.Extensions.Toolkit.dll"
-        "**/Microsoft.CommandPalette.Extensions.Toolkit/$(BuildPlatform)/release/WinUI3Apps/CmdPal/Microsoft.CommandPalette.Extensions.Toolkit.deps.json"
-      flattenFolders: True
-      targetFolder: $(JobOutputDirectory)/sdk/lib/net8.0-windows10.0.19041.0
-
-  - task: CopyFiles@2
-    displayName: Stage SDK/winmd
-    inputs:
-      contents: |-
-        "**/Microsoft.CommandPalette.Extensions/$(BuildPlatform)/release/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.winmd"
-      flattenFolders: True
-      targetFolder: $(JobOutputDirectory)/sdk/winmd
-
  - task: VSBuild@1
    displayName: Build BugReportTool
    inputs:
@@ -339,7 +313,7 @@ jobs:
    displayName: HACK Copy core WebView2 ARM64 dll to output directory
    condition: eq(variables['BuildPlatform'],'arm64')
    inputs:
-      contents: packages/Microsoft.Web.WebView2.1.0.2903.40/runtimes/win-ARM64/native_uap/Microsoft.Web.WebView2.Core.dll
+      contents: packages/Microsoft.Web.WebView2.1.0.2739.15/runtimes/win-ARM64/native_uap/Microsoft.Web.WebView2.Core.dll
      targetFolder: $(Build.SourcesDirectory)/ARM64/Release/WinUI3Apps/
      flattenFolders: True
      OverWrite: True
@@ -390,33 +364,6 @@ jobs:
          !**\obj\**

  - ${{ if eq(parameters.codeSign, true) }}:
-    - pwsh: |-
-        $Package = (Get-ChildItem -Recurse -Filter "Microsoft.CmdPal.UI_*.msix" | Select -First 1)
-        $PackageFilename = $Package.FullName
-        Write-Host "##vso[task.setvariable variable=CmdPalPackagePath]${PackageFilename}"
-      displayName: Locate the MSIX
-
-    - pwsh: |-
-        & "$(MakeAppxPath)" unpack /p "$(CmdPalPackagePath)" /d "$(JobOutputDirectory)/CmdPalPackageContents"
-      displayName: Unpack the MSIX for signing
-
-    - template: steps-esrp-signing.yml
-      parameters:
-        displayName: Sign CmdPal MSIX content
-        signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: '$(JobOutputDirectory)/CmdPalPackageContents'
-          signType: batchSigning
-          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_cmdpal_msix_content.json'
-          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-
-    - pwsh: |-
-        $outDir = New-Item -Type Directory "$(JobOutputDirectory)/_appx" -ErrorAction:Ignore
-        $PackageFilename = Join-Path $outDir.FullName (Split-Path -Leaf "$(CmdPalPackagePath)")
-        & "$(MakeAppxPath)" pack /h SHA256 /o /p $PackageFilename /d "$(JobOutputDirectory)/CmdPalPackageContents"
-        Copy-Item -Force $PackageFilename "$(CmdPalPackagePath)"
-      displayName: Re-pack the new CmdPal package after signing
-
    - template: steps-esrp-signing.yml
      parameters:
        displayName: Sign Core PowerToys
@@ -452,6 +399,21 @@ jobs:
      additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
      buildUserInstaller: true # NOTE: This is the distinction between the above and below rules

+  - template: steps-build-installer-vnext.yml
+    parameters:
+      codeSign: ${{ parameters.codeSign }}
+      signingIdentity: ${{ parameters.signingIdentity }}
+      versionNumber: ${{ parameters.versionNumber }}
+      additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
+
+  - template: steps-build-installer-vnext.yml
+    parameters:
+      codeSign: ${{ parameters.codeSign }}
+      signingIdentity: ${{ parameters.signingIdentity }}
+      versionNumber: ${{ parameters.versionNumber }}
+      additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
+      buildUserInstaller: true # NOTE: This is the distinction between the above and below rules
+
  # This saves ~1GiB per architecture. We won't need these later.
  # Removes:
  # - All .pdbs from any static libs .libs (which were only used during linking)
@@ -473,6 +435,13 @@ jobs:
      contents: "**/PowerToys*Setup-*.exe"
      flattenFolders: True
      targetFolder: $(JobOutputDirectory)
+  
+  - task: CopyFiles@2
+    displayName: Stage Installers
+    inputs:
+      contents: "**/PowerToys*SetupVNext-*.exe"
+      flattenFolders: True
+      targetFolder: $(JobOutputDirectory)

  - task: CopyFiles@2
    displayName: Stage Symbols
@@ -492,7 +461,7 @@ jobs:
      $machinePlat = "hash_machine_$(BuildPlatform).txt";
      $combinedUserPath = $p + $userPlat;
      $combinedMachinePath = $p + $machinePlat;
-
+      
      echo $p

      echo $userPlat
@@ -502,7 +471,31 @@ jobs:
      echo $machinePlat
      echo $machineHash
      echo $combinedMachinePath
+      
+      $userHash | out-file -filepath $combinedUserPath
+      $machineHash | out-file -filepath $combinedMachinePath
+    displayName: Calculate file hashes

+# Output config for installer vnext
+  - pwsh: |-
+      $p = "$(JobOutputDirectory)\"
+      $userHash = ((Get-Item $p\PowerToysUserSetupVNext*.exe | Get-FileHash).Hash);
+      $machineHash = ((Get-Item $p\PowerToysSetupVNext*.exe | Get-FileHash).Hash);
+      $userPlat = "hash_user_$(BuildPlatform).txt";
+      $machinePlat = "hash_machine_$(BuildPlatform).txt";
+      $combinedUserPath = $p + $userPlat;
+      $combinedMachinePath = $p + $machinePlat;
+      
+      echo $p
+
+      echo $userPlat
+      echo $userHash
+      echo $combinedUserPath
+
+      echo $machinePlat
+      echo $machineHash
+      echo $combinedMachinePath
+      
      $userHash | out-file -filepath $combinedUserPath
      $machineHash | out-file -filepath $combinedMachinePath
    displayName: Calculate file hashes
--- a/.pipelines/v2/templates/job-build-sdk.yml
+++ b/.pipelines/v2/templates/job-build-sdk.yml
@@ -1,91 +0,0 @@
-parameters:
-  - name: buildConfigurations
-    type: object
-    default:
-      - Release
-  - name: codeSign
-    type: boolean
-    default: false
-  - name: pool
-    type: object
-    default: []
-  - name: signingIdentity
-    type: object
-    default: {}
-  - name: sdkVersionNumber
-    type: string
-    default: '0.0.1'
-
-jobs:
- job: "BuildSDK"
-  ${{ if ne(length(parameters.pool), 0) }}:
-    pool: ${{ parameters.pool }}
-  displayName: Build SDK
-  timeoutInMinutes: 240
-  cancelTimeoutInMinutes: 1
-  templateContext: # Required when this template is hosted in 1ES PT
-    outputs:
-    - output: pipelineArtifact
-      artifactName: SDK
-      targetPath: $(Build.ArtifactStagingDirectory)
-  steps:
-  - checkout: self
-    clean: true
-    submodules: true
-    persistCredentials: True
-    fetchTags: false
-    fetchDepth: 1
-
-  - pwsh: |-
-      & "$(build.sourcesdirectory)\src\modules\cmdpal\extensionsdk\nuget\BuildSDKHelper.ps1" -Configuration "Release" -VersionOfSDK ${{ parameters.sdkVersionNumber }} -BuildStep "build" -IsAzurePipelineBuild
-    displayName: Build SDK
-
-  - ${{ if eq(parameters.codeSign, true) }}:
-    - template: steps-esrp-signing.yml
-      parameters:
-        displayName: Sign SDK
-        signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: 'src/modules'
-          signType: batchSigning
-          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_sdk.json'
-          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-
-  - pwsh: |-
-      & "$(build.sourcesdirectory)\src\modules\cmdpal\extensionsdk\nuget\BuildSDKHelper.ps1" -Configuration "Release" -VersionOfSDK ${{ parameters.sdkVersionNumber }} -BuildStep "pack" -IsAzurePipelineBuild
-    displayName: Pack SDK
-
-  - task: CopyFiles@2
-    displayName: Copy Nuget to Artifact Staging
-    inputs:
-      sourceFolder: "$(build.sourcesdirectory)/src/modules/cmdpal/extensionsdk/_build"
-      contents: '*.nupkg'
-      targetFolder: '$(Build.ArtifactStagingDirectory)'
-
-  - ${{ if eq(parameters.codeSign, true) }}:
-    - template: steps-esrp-signing.yml
-      parameters:
-        displayName: Sign NuGet packages
-        signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: $(Build.ArtifactStagingDirectory)
-          Pattern: '*.nupkg'
-          UseMinimatch: true
-          signConfigType: inlineSignParams
-          inlineOperation: >-
-            [
-                {
-                    "KeyCode": "CP-401405",
-                    "OperationCode": "NuGetSign",
-                    "Parameters": {},
-                    "ToolName": "sign",
-                    "ToolVersion": "1.0"
-                },
-                {
-                    "KeyCode": "CP-401405",
-                    "OperationCode": "NuGetVerify",
-                    "Parameters": {},
-                    "ToolName": "sign",
-                    "ToolVersion": "1.0"
-                }
-            ]
--- a/.pipelines/v2/templates/job-test-project.yml
+++ b/.pipelines/v2/templates/job-test-project.yml
@@ -105,4 +105,4 @@ jobs:
        **\UITests-FancyZones.dll
        **\UITests-FancyZonesEditor.dll
        !**\obj\**
-        !**\ref\**
+        !**\ref\**
--- a/.pipelines/v2/templates/steps-build-installer-vnext.yml
+++ b/.pipelines/v2/templates/steps-build-installer-vnext.yml
@@ -0,0 +1,184 @@
+parameters:
+  - name: versionNumber
+    type: string
+    default: "0.0.1"
+  - name: buildUserInstaller
+    type: boolean
+    default: false
+  - name: codeSign
+    type: boolean
+    default: false
+  - name: signingIdentity
+    type: object
+    default: {}
+  - name: additionalBuildOptions
+    type: string
+    default: ''
+
+steps:
+  - pwsh: |-
+      & git clean -xfd -e *exe -- .\installer\
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Clean installer to reduce cross-contamination
+
+  - pwsh: |-
+      $IsPerUser = $${{ parameters.buildUserInstaller }}
+      $InstallerBuildSlug = "MachineSetup"
+      $InstallerBasename = "PowerToysSetupVNext"
+      If($IsPerUser) {
+        $InstallerBuildSlug = "UserSetup"
+        $InstallerBasename = "PowerToysUserSetupVNext"
+      }
+      $InstallerBasename += "-${{ parameters.versionNumber }}-$(BuildPlatform)"
+      Write-Host "##vso[task.setvariable variable=InstallerBuildSlug]$InstallerBuildSlug"
+      Write-Host "##vso[task.setvariable variable=InstallerRelativePath]$(BuildPlatform)\$(BuildConfiguration)\$InstallerBuildSlug"
+      Write-Host "##vso[task.setvariable variable=InstallerBasename]$InstallerBasename"
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Prepare Installer variables
+
+  # This dll needs to be built and signed before building the MSI.
+  - task: VSBuild@1
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build PowerToysSetupCustomActions
+    inputs:
+      solution: "**/installer/PowerToysSetup.sln"
+      vsVersion: 17.0
+      msbuildArgs: >-
+        /t:PowerToysSetupCustomActions
+        /p:RunBuildEvents=true;PerUser=${{parameters.buildUserInstaller}};RestorePackagesConfig=true;CIBuild=true
+        -restore -graph
+        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-actions.binlog
+        ${{ parameters.additionalBuildOptions }}
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      clean: true
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+
+  - ${{ if eq(parameters.codeSign, true) }}:
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign PowerToysSetupCustomActions
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: 'installer/PowerToysSetupCustomActions/$(InstallerRelativePath)'
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+
+  ## INSTALLER START
+  #### MSI BUILDING AND SIGNING
+  - task: VSBuild@1
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build VNext MSI
+    inputs:
+      solution: "**/installer/PowerToysSetup.sln"
+      vsVersion: 17.0
+      msbuildArgs: >-
+        -restore
+        /t:PowerToysInstallerVNext
+        /p:RunBuildEvents=false;PerUser=${{parameters.buildUserInstaller}};BuildProjectReferences=false;CIBuild=true
+        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-msi.binlog
+        ${{ parameters.additionalBuildOptions }}
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      clean: false # don't undo our hard work above by deleting the CustomActions dll
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+
+  - script: |-
+      "C:\Program Files (x86)\WiX Toolset v3.14\bin\dark.exe" -x $(build.sourcesdirectory)\extractedMsi installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).msi
+      dir $(build.sourcesdirectory)\extractedMsi
+    displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Extract and verify MSI"
+
+  # Check if deps.json files don't reference different dll versions.
+  - pwsh: |-
+      & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Audit deps.json in MSI extracted files
+
+  - ${{ if eq(parameters.codeSign, true) }}:
+    - pwsh: |-
+        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
+        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMsi\Binary'
+        git clean -xfd ./extractedMsi
+      displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Verify all binaries are signed and versioned
+
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign VNext MSI
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: 'installer/PowerToysSetupVNext/$(InstallerRelativePath)'
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+
+  #### END MSI
+  #### BOOTSTRAP BUILDING AND SIGNING
+
+  - task: VSBuild@1
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build Bootstrapper
+    inputs:
+      solution: "**/installer/PowerToysSetup.sln"
+      vsVersion: 17.0
+      msbuildArgs: >-
+        /t:PowerToysBootstrapperVNext
+        /p:PerUser=${{parameters.buildUserInstaller}};CIBuild=true
+        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-bootstrapper.binlog
+        -restore -graph
+        ${{ parameters.additionalBuildOptions }}
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      clean: false # don't undo our hard work above by deleting the MSI
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+
+  # The entirety of bundle unpacking/re-packing is unnecessary if we are not code signing it.
+  - ${{ if eq(parameters.codeSign, true) }}:
+    - script: |-
+        "C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ib installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe -o installer\engine.exe
+      displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Insignia: Extract Engine from Bundle"
+
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign WiX Engine
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: "installer"
+          Pattern: engine.exe
+          signConfigType: inlineSignParams
+          inlineOperation: |
+            [
+                {
+                    "KeyCode": "CP-230012",
+                    "OperationCode": "SigntoolSign",
+                    "Parameters": {
+                        "OpusName": "Microsoft",
+                        "OpusInfo": "http://www.microsoft.com",
+                        "FileDigest": "/fd \"SHA256\"",
+                        "PageHash": "/NPH",
+                        "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+                    },
+                    "ToolName": "sign",
+                    "ToolVersion": "1.0"
+                },
+                {
+                    "KeyCode": "CP-230012",
+                    "OperationCode": "SigntoolVerify",
+                    "Parameters": {},
+                    "ToolName": "sign",
+                    "ToolVersion": "1.0"
+                }
+            ]
+
+    - script: |-
+        "C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ab installer\engine.exe installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe -o installer\PowerToysSetupVNext\$(InstallerRelativePath)\$(InstallerBasename).exe
+      displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Insignia: Merge Engine into Bundle"
+
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign Final Bootstrapper
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: 'installer/PowerToysSetupVNext/$(InstallerRelativePath)'
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+  #### END BOOTSTRAP
+  ## END INSTALLER
--- a/.pipelines/v2/templates/steps-build-installer.yml
+++ b/.pipelines/v2/templates/steps-build-installer.yml
@@ -87,30 +87,6 @@ steps:
      dir $(build.sourcesdirectory)\extractedMsi
    displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Extract and verify MSI"

-  # Extract CmdPal msix package to check if its content is signed
-  - pwsh: |-
-      Write-Host "Extracting CmdPal MSIX package"
-
-      # Define the directory to search
-      $searchDir = "extractedMsi\File"
-
-      # Define the regex pattern for MSIX files
-      $pattern = '^Microsoft.CmdPal.UI.*\.msix$'
-
-      # Get all files in the directory and subdirectories
-      $msixFile = Get-ChildItem -Path $searchDir -Recurse -File | Where-Object {
-          $_.Name -match $pattern
-      }
-
-      Write-Host "MSIX file found: " $msixFile
-
-      $destinationDir = "$(build.sourcesdirectory)\extractedMsi\File\extractedCmdPalMsix"
-
-      Expand-Archive -Path $msixFile -DestinationPath $destinationDir
-      Get-ChildItem -Path $destinationDir -Recurse -File
-
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Extract CmdPal MSIX package
-
  # Check if deps.json files don't reference different dll versions.
  - pwsh: |-
      & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
--- a/.pipelines/v2/templates/steps-update-winappsdk-and-restore-nuget.yml
+++ b/.pipelines/v2/templates/steps-update-winappsdk-and-restore-nuget.yml
@@ -17,7 +17,6 @@ steps:
    arguments: >
      -winAppSdkVersionNumber ${{ parameters.versionNumber }}
      -useExperimentalVersion $${{ parameters.useExperimentalVersion }}
-      -rootPath "$(build.sourcesdirectory)"

 - script: echo $(WinAppSDKVersion)
  displayName: 'Display WinAppSDK Version Found'
--- a/.pipelines/verifyDepsJsonLibraryVersions.ps1
+++ b/.pipelines/verifyDepsJsonLibraryVersions.ps1
@@ -18,11 +18,6 @@ $totalFailures = 0
 Get-ChildItem $targetDir -Recurse -Filter *.deps.json -Exclude *UITest*,MouseJump.Common.UnitTests*,*.FuzzTests* | ForEach-Object {
    # Temporarily exclude All UI-Test, Fuzzer-Test projects because of Appium.WebDriver dependencies
    $depsJsonFullFileName = $_.FullName
-
-    if ($depsJsonFullFileName -like "*CmdPal*") {
-        return
-    }
-
    $depsJsonFileName = $_.Name
    $depsJson = Get-Content $depsJsonFullFileName | ConvertFrom-Json

--- a/.pipelines/versionAndSignCheck.ps1
+++ b/.pipelines/versionAndSignCheck.ps1
@@ -22,11 +22,7 @@ $versionExceptions = @(
    "TraceReloggerLib.dll",
    "Microsoft.WindowsAppRuntime.Release.Net.dll",
    "Microsoft.Windows.Widgets.Projection.dll",
-    "WinRT.Host.Shim.dll",
-    "WyHash.dll",
-    "Microsoft.Recognizers.Text.DataTypes.TimexExpression.dll",
-    "ObjectModelCsProjection.dll",
-    "RendererCsProjection.dll") -join '|';
+    "WinRT.Host.Shim.dll") -join '|';
 $nullVersionExceptions = @(
    "codicon.ttf",
    "e_sqlite3.dll",
@@ -47,14 +43,12 @@ $nullVersionExceptions = @(
    "PushNotificationsLongRunningTask.ProxyStub.dll",
    "WindowsAppSdk.AppxDeploymentExtensions.Desktop.dll",
    "System.Diagnostics.EventLog.Messages.dll",
-    "Microsoft.Windows.Widgets.dll",
-    "AdaptiveCards.ObjectModel.WinUI3.dll",
-    "AdaptiveCards.Rendering.WinUI3.dll") -join '|';
+    "Microsoft.Windows.Widgets.dll") -join '|';
 $totalFailure = 0;

 Write-Host $DirPath;

-if (-not (Test-Path $DirPath)) {
+if (-not (Test-Path $DirPath)) {  
    Write-Error "Folder does not exist!"
 }

@@ -76,7 +70,7 @@ $items | ForEach-Object {
        Write-Host "Version set to 1.0.0.0: " + $_.FullName
        $totalFailure++;
    }
-    elseif ($_.VersionInfo.FileVersion -eq $null -and $_.Name -notmatch $nullVersionExceptions) {
+    elseif ($_.VersionInfo.FileVersion -eq $null -and $_.Name -notmatch $nullVersionExceptions) { 
        # These items are exceptions that actually a version not set.
        Write-Host "Version not set: " + $_.FullName
        $totalFailure++;
--- a/.pipelines/versionSetting.ps1
+++ b/.pipelines/versionSetting.ps1
@@ -5,10 +5,7 @@ Param(

  [Parameter(Mandatory=$True,Position=2)]
  [AllowEmptyString()]
-  [string]$DevEnvironment = "Local",
-
-  [Parameter(Mandatory=$True,Position=3)]
-  [string]$cmdPalVersionNumber = "0.0.1"
+  [string]$DevEnvironment = "Local"
 )

 Write-Host $PSScriptRoot
@@ -41,20 +38,9 @@ $verPropReadFileLocation = $verPropWriteFileLocation;
 $verProps.Project.PropertyGroup.Version = $versionNumber;
 $verProps.Project.PropertyGroup.DevEnvironment = $DevEnvironment;

-Write-Host "xml" $verProps.Project.PropertyGroup.Version
+Write-Host "xml" $verProps.Project.PropertyGroup.Version 
 $verProps.Save($verPropWriteFileLocation);

-
-#### The same thing as above, but for the CmdPal version
-$verPropWriteFileLocation = $PSScriptRoot + '/../src/CmdPalVersion.props';
-$verPropReadFileLocation = $verPropWriteFileLocation;
-[XML]$verProps = Get-Content $verPropReadFileLocation
-$verProps.Project.PropertyGroup.CmdPalVersion = $cmdPalVersionNumber;
-$verProps.Project.PropertyGroup.DevEnvironment = $DevEnvironment;
-Write-Host "xml" $verProps.Project.PropertyGroup.Version
-$verProps.Save($verPropWriteFileLocation);
-#######
-
 # Set PowerRenameContextMenu package version in AppManifest.xml
 $powerRenameContextMenuAppManifestWriteFileLocation = $PSScriptRoot + '/../src/modules/powerrename/PowerRenameContextMenu/AppxManifest.xml';
 $powerRenameContextMenuAppManifestReadFileLocation = $powerRenameContextMenuAppManifestWriteFileLocation;
@@ -90,12 +76,3 @@ $newPlusContextMenuAppManifestReadFileLocation = $newPlusContextMenuAppManifestW
 $newPlusContextMenuAppManifest.Package.Identity.Version = $versionNumber + '.0'
 Write-Host "NewPlusContextMenu version" $newPlusContextMenuAppManifest.Package.Identity.Version
 $newPlusContextMenuAppManifest.Save($newPlusContextMenuAppManifestWriteFileLocation);
-
-# Set package version in Package.appxmanifest
-$cmdPalAppManifestWriteFileLocation = $PSScriptRoot + '/../src/modules/cmdpal/Microsoft.CmdPal.UI/Package.appxmanifest';
-$cmdPalAppManifestReadFileLocation = $cmdPalAppManifestWriteFileLocation;
-
-[XML]$cmdPalAppManifest = Get-Content $cmdPalAppManifestReadFileLocation
-$cmdPalAppManifest.Package.Identity.Version = $cmdPalVersionNumber + '.0'
-Write-Host "CmdPal Package version: " $cmdPalAppManifest.Package.Identity.Version
-$cmdPalAppManifest.Save($cmdPalAppManifestWriteFileLocation);
--- a/.vsconfig
+++ b/.vsconfig
@@ -1,13 +1,12 @@
 {
  "version": "1.0",
-  "components": [
+  "components": [  
    "Microsoft.VisualStudio.Component.CoreEditor",
    "Microsoft.VisualStudio.Workload.CoreEditor",
    "Microsoft.VisualStudio.Workload.NativeDesktop",
    "Microsoft.VisualStudio.Workload.ManagedDesktop",
    "Microsoft.VisualStudio.Workload.Universal",
    "Microsoft.VisualStudio.Component.Windows10SDK.19041",
-    "Microsoft.VisualStudio.Component.Windows10SDK.20348",
    "Microsoft.VisualStudio.Component.Windows10SDK.22621",
    "Microsoft.VisualStudio.ComponentGroup.UWP.VC",
    "Microsoft.VisualStudio.Component.UWP.VC.ARM64",
@@ -19,4 +18,4 @@
    "Microsoft.VisualStudio.Component.VC.ATL.Spectre",
    "Microsoft.VisualStudio.ComponentGroup.WindowsAppSDK.Cs"
  ]
-}
+} 
--- a/COMMUNITY.md
+++ b/COMMUNITY.md
@@ -16,7 +16,7 @@ Christian contributed New+ utility
 CleanCodeDeveloper helped do massive amounts of code stability and image resizer work.

 ### [@plante-msft](https://github.com/plante-msft) - Connor Plante
-Connor was the creator of Workspaces and helped create Command Palette (PowerToys Run v2)
+Connor was the creator of Workspaces and helped create PowerToys Run v2

 ### [@damienleroy](https://github.com/damienleroy) - [Damien Leroy](https://www.linkedin.com/in/Damien-Leroy-b2734416a/)
 Damien has helped out by developing and contributing the Quick Accent utility.
@@ -46,7 +46,7 @@ Jeff added in multiple new features into Keyboard manager, such as key chord sup
 Joe has helped triaging, discussing, issues as well as fixing bugs and building features for Text Extractor.

 ### [@joadoumie](https://github.com/joadoumie) - Jordi Adoumie
-Jordi helped innovate amazing new features into Advanced Paste and helped create Command Palette (PowerToys Run v2)
+Jordi helped innovate amazing new features into Advanced Paste and helped create PowerToys Run v2
  
 ### [@jsoref](https://github.com/jsoref) - [Josh Soref](https://check-spelling.dev/)
 Helping keep our spelling correct :)
@@ -57,9 +57,6 @@ Color Picker is from Martin.
 ### [@mikeclayton](https://github.com/mikeclayton) - [Michael Clayton](https://michael-clayton.com)
 Michael contributed the [initial version](https://github.com/microsoft/PowerToys/issues/23216) of the Mouse Jump tool and [a number of updates](https://github.com/microsoft/PowerToys/pulls?q=is%3Apr+author%3Amikeclayton) based on his FancyMouse utility.

-### [@pedrolamas](https://github.com/pedrolamas/) - Pedro Lamas
-Pedro helped create the thumbnail and File Explorer previewers for 3D files like STL and GCode.  If you like 3D printing, these are very helpful.
-
 ### [@PesBandi](https://github.com/PesBandi/) - PesBandi
 PesBandi has helped do massive amounts of Quick Accent and bug fixes.

@@ -187,11 +184,15 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 - [@crutkas](https://github.com/crutkas/) - Clint Rutkas - Lead
 - [@cinnamon-msft](https://github.com/cinnamon-msft) - Kayla Cinnamon - Lead
 - [@nguyen-dows](https://github.com/nguyen-dows) - Christopher Nguyen - Product Manager
- [@craigloewen-msft](https://github.com/craigloewen-msft) - Craig Loewen - Product Manager
- [@zhiwei-ms](https://github.com/zhiwei-ms) - Zhiwei Yu - Product Manager
+- [@jaimecbernardo](https://github.com/jaimecbernardo) - Jaime Bernardo - Dev lead
 - [@dhowett](https://github.com/dhowett) - Dustin Howett - Dev lead
 - [@yeelam-gordon](https://github.com/yeelam-gordon) - Gordon Lam - Dev lead
 - [@jamrobot](https://github.com/jamrobot) - Jerry Xu - Dev lead
+- [@drawbyperpetual](https://github.com/drawbyperpetual) - Anirudha Shankar - Dev
+- [@mantaionut](https://github.com/mantaionut) - Ionut Manta - Dev
+- [@donlaci](https://github.com/donlaci) - Laszlo Nemeth - Dev
+- [@SeraphimaZykova](https://github.com/SeraphimaZykova) - Seraphima Zykova - Dev
+- [@stefansjfw](https://github.com/stefansjfw) - Stefan Markovic - Dev
 - [@lei9444](https://github.com/lei9444) - Leilei Zhang - Dev
 - [@shuaiyuanxx](https://github.com/shuaiyuanxx) - Shawn Yuan - Dev
 - [@moooyo](https://github.com/moooyo) - Yu Leng - Dev
@@ -205,7 +206,7 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 - [@wang563681252](https://github.com/wang563681252) - Zhaopeng Wang - Dev
 - [@vanzue](https://github.com/vanzue) - Kai Tao - Dev

-## Former PowerToys core team members
+# Former PowerToys core team members

 - [@indierawk2k2](https://github.com/indierawk2k2) - Mike Harsh - Product Manager
 - [@ethanfangg](https://github.com/ethanfangg) - Ethan Fang - Product Manager
@@ -218,9 +219,3 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 - [@taras-janea](https://github.com/taras-janea) - Taras Sich - Dev
 - [@yuyoyuppe](https://github.com/yuyoyuppe) - Andrey Nekrasov - Dev
 - [@gokcekantarci](https://github.com/gokcekantarci) - Gokce Kantarci - Dev
- [@drawbyperpetual](https://github.com/drawbyperpetual) - Anirudha Shankar - Dev
- [@mantaionut](https://github.com/mantaionut) - Ionut Manta - Dev
- [@donlaci](https://github.com/donlaci) - Laszlo Nemeth - Dev
- [@SeraphimaZykova](https://github.com/SeraphimaZykova) - Seraphima Zykova - Dev
- [@stefansjfw](https://github.com/stefansjfw) - Stefan Markovic - Dev
- [@jaimecbernardo](https://github.com/jaimecbernardo) - Jaime Bernardo - Dev lead
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -3,21 +3,17 @@
    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
  </PropertyGroup>
  <ItemGroup>
-    <PackageVersion Include="AdaptiveCards.ObjectModel.WinUI3" Version="2.0.0-beta" />
-    <PackageVersion Include="AdaptiveCards.Rendering.WinUI3" Version="2.1.0-beta" />
-    <PackageVersion Include="AdaptiveCards.Templating" Version="2.0.2" />
    <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
    <PackageVersion Include="Azure.AI.OpenAI" Version="1.0.0-beta.17" />
-    <PackageVersion Include="CommunityToolkit.Common" Version="8.4.0" />
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Collections" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.0.240109" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Collections" Version="8.0.240109" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.0.240109" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.0.240109" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.0.240109" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.0.240109" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.0.240109" />
    <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
    <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
    <PackageVersion Include="ControlzEx" Version="6.0.0" />
@@ -29,24 +25,23 @@
    <PackageVersion Include="Mages" Version="3.0.0" />
    <PackageVersion Include="Markdig.Signed" Version="0.34.0" />
    <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
-    <PackageVersion Include="MessagePack" Version="3.1.3" />
+    <PackageVersion Include="MessagePack" Version="2.5.187" />
    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.4" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.3" />
    <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.4" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces"  Version="9.0.3" />
    <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.4" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.3" />
    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.15.0" />
    <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
-    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2739.15" />
    <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.4" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.3" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.3" />
    <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
    <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
    <!-- 
@@ -55,13 +50,13 @@
 	-->
    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.250205002" />
    <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
    <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
    <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
    <!-- Moq to stay below v4.20 due to behavior change. need to be sure fixed -->
    <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="MSTest" Version="3.8.3" />
+    <PackageVersion Include="MSTest" Version="3.6.3" />
    <PackageVersion Include="NLog" Version="5.0.4" />
    <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.8" />
    <PackageVersion Include="NLog.Schema" Version="5.2.8" />
@@ -69,42 +64,38 @@
    <PackageVersion Include="ReverseMarkdown" Version="4.1.0" />
    <PackageVersion Include="ScipBe.Common.Office.OneNote" Version="3.0.1" />
    <PackageVersion Include="SharpCompress" Version="0.37.2" />
-    <PackageVersion Include="StreamJsonRpc" Version="2.21.69" />
+    <PackageVersion Include="StreamJsonRpc" Version="2.19.27" />
    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
    <!-- Package System.CodeDom added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Management but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.CodeDom" Version="9.0.4" />
+    <PackageVersion Include="System.CodeDom" Version="9.0.3" />
    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.4" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.4" />
-    <PackageVersion Include="System.Data.OleDb" Version="9.0.4" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.3" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.3" />
+    <PackageVersion Include="System.Data.OleDb" Version="9.0.3" />
    <!-- Package System.Data.SqlClient added to force it as a dependency of Microsoft.Windows.Compatibility to the latest version available at this time. -->
    <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
    <!-- Package System.Diagnostics.EventLog added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Data.OleDb but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.4" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.3" />
    <!-- Package System.Diagnostics.PerformanceCounter added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.11. -->
-    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.4" />
-    <PackageVersion Include="System.Drawing.Common" Version="9.0.4" />
-    <PackageVersion Include="System.IO.Abstractions" Version="22.0.13" />
-    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.13" />
-    <PackageVersion Include="System.Management" Version="9.0.4" />
-    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
-    <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.3" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.3" />
+    <PackageVersion Include="System.IO.Abstractions" Version="21.0.29" />
+    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="21.0.29" />
+    <PackageVersion Include="System.Management" Version="9.0.3" />
    <PackageVersion Include="System.Reactive" Version="6.0.1" />
-    <PackageVersion Include="System.Runtime.Caching" Version="9.0.4" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.4" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.4" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.4" />
-    <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
+    <PackageVersion Include="System.Runtime.Caching" Version="9.0.3" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.3" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.3" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.3" />
    <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
    <PackageVersion Include="UnitsNet" Version="5.56.0" />
    <PackageVersion Include="UTF.Unknown" Version="2.5.1" />
    <PackageVersion Include="WinUIEx" Version="2.2.0" />
    <PackageVersion Include="WPF-UI" Version="3.0.5" />
-    <PackageVersion Include="WyHash" Version="1.0.5" />
  </ItemGroup>
  <ItemGroup Condition="'$(IsExperimentationLive)'!=''">
    <!-- Additional dependencies used by experimentation -->
    <PackageVersion Include="Microsoft.VariantAssignment.Client" Version="2.4.17140001" />
    <PackageVersion Include="Microsoft.VariantAssignment.Contract" Version="3.0.16990001" />
  </ItemGroup>
-</Project>
+</Project>
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -3,14 +3,12 @@
 This software incorporates material from third parties.

 - Color Picker
- Command Palette
 - File Explorer Add-ins
 - ImageResizer
 - PowerToys Run
 - Installer/Runner
 - Measure tool
 - Peek
- Registry Preview

 ## Utility: Color Picker

@@ -40,75 +38,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

-## Utility: Command Palette
-
-### wyhash
-
-We use the WyHash NuGet package for calculating stable hashes for strings.
-
-**Source**: [https://github.com/wangyi-fudan/wyhash](https://github.com/wangyi-fudan/wyhash)
-
-```
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org/>
-```
-
-## Utility: Command Palette Built-in Extensions
-
-### Calculator
-
-#### Mages
-
-We use the Mages NuGet package for calculating the result of expression.
-
-**Source**: [https://github.com/FlorianRappl/Mages](https://github.com/FlorianRappl/Mages)
-
-```
-The MIT License (MIT)
-
-Copyright (c) 2016 - 2025 Florian Rappl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-```
-
 ## Utility: File Explorer Add-ins

 ### Monaco Editor
@@ -859,34 +788,6 @@ SOFTWARE.

 ## Utility: Peek

-### Monaco Editor
-
-**Source**: https://github.com/Microsoft/monaco-editor
-
-**Additional third party notifications:** https://github.com/microsoft/monaco-editor/blob/main/ThirdPartyNotices.txt
-
-The MIT License (MIT)
-
-Copyright (c) 2016 - present Microsoft Corporation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
 ### The Quite OK Image Format reference decoder

 **Source**: https://github.com/phoboslab/qoi
@@ -1393,55 +1294,19 @@ EXHIBIT A -Mozilla Public License.
     Original Code Source Code for Your Modifications.]
 ```

-## Utility: Registry Preview
-
-### Monaco Editor
-
-**Source**: https://github.com/Microsoft/monaco-editor
-
-**Additional third party notifications:** https://github.com/microsoft/monaco-editor/blob/main/ThirdPartyNotices.txt
-
-```
-The MIT License (MIT)
-
-Copyright (c) 2016 - present Microsoft Corporation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-```
-
 ## NuGet Packages used by PowerToys

- AdaptiveCards.ObjectModel.WinUI3 2.0.0-beta
- AdaptiveCards.Rendering.WinUI3 2.1.0-beta
- AdaptiveCards.Templating 2.0.2
 - Appium.WebDriver 4.4.5
 - Azure.AI.OpenAI 1.0.0-beta.17
- CommunityToolkit.Common 8.4.0
- CommunityToolkit.Mvvm 8.4.0
- CommunityToolkit.WinUI.Animations 8.2.250402
- CommunityToolkit.WinUI.Collections 8.2.250402
- CommunityToolkit.WinUI.Controls.Primitives 8.2.250402
- CommunityToolkit.WinUI.Controls.Segmented 8.2.250402
- CommunityToolkit.WinUI.Controls.SettingsControls 8.2.250402
- CommunityToolkit.WinUI.Controls.Sizers 8.2.250402
- CommunityToolkit.WinUI.Converters 8.2.250402
- CommunityToolkit.WinUI.Extensions 8.2.250402
+- CommunityToolkit.Mvvm 8.2.2
+- CommunityToolkit.WinUI.Animations 8.0.240109
+- CommunityToolkit.WinUI.Collections 8.0.240109
+- CommunityToolkit.WinUI.Controls.Primitives 8.0.240109
+- CommunityToolkit.WinUI.Controls.Segmented 8.0.240109
+- CommunityToolkit.WinUI.Controls.SettingsControls 8.0.240109
+- CommunityToolkit.WinUI.Controls.Sizers 8.0.240109
+- CommunityToolkit.WinUI.Converters 8.0.240109
+- CommunityToolkit.WinUI.Extensions 8.0.240109
 - CommunityToolkit.WinUI.UI.Controls.DataGrid 7.1.2
 - CommunityToolkit.WinUI.UI.Controls.Markdown 7.1.2
 - ControlzEx 6.0.0
@@ -1452,65 +1317,59 @@ SOFTWARE.
 - LazyCache 2.4.0
 - Mages 3.0.0
 - Markdig.Signed 0.34.0
- MessagePack 3.1.3
- Microsoft.Bcl.AsyncInterfaces 9.0.4
+- MessagePack 2.5.187
+- Microsoft.Bcl.AsyncInterfaces 9.0.3
 - Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
- Microsoft.Data.Sqlite 9.0.4
+- Microsoft.Data.Sqlite 9.0.3
 - Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16
 - Microsoft.DotNet.ILCompiler (A)
- Microsoft.Extensions.DependencyInjection 9.0.4
- Microsoft.Extensions.Hosting 9.0.4
- Microsoft.Extensions.Hosting.WindowsServices 9.0.4
- Microsoft.Extensions.Logging 9.0.4
- Microsoft.Extensions.Logging.Abstractions 9.0.4
+- Microsoft.Extensions.DependencyInjection 9.0.3
+- Microsoft.Extensions.Hosting 9.0.3
+- Microsoft.Extensions.Hosting.WindowsServices 9.0.3
+- Microsoft.Extensions.Logging 9.0.3
+- Microsoft.Extensions.Logging.Abstractions 9.0.3
 - Microsoft.NET.ILLink.Tasks (A)
 - Microsoft.SemanticKernel 1.15.0
 - Microsoft.Toolkit.Uwp.Notifications 7.1.2
- Microsoft.Web.WebView2 1.0.2903.40
- Microsoft.Win32.SystemEvents 9.0.4
- Microsoft.Windows.Compatibility 9.0.4
+- Microsoft.Web.WebView2 1.0.2739.15
+- Microsoft.Win32.SystemEvents 9.0.3
+- Microsoft.Windows.Compatibility 9.0.3
 - Microsoft.Windows.CsWin32 0.2.46-beta
 - Microsoft.Windows.CsWinRT 2.2.0
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
- Microsoft.WindowsAppSDK 1.7.250401001
- Microsoft.WindowsPackageManager.ComInterop 1.10.340
+- Microsoft.WindowsAppSDK 1.6.250205002
 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
 - Microsoft.Xaml.Behaviors.Wpf 1.1.39
 - ModernWpfUI 0.9.4
 - Moq 4.18.4
- MSTest 3.8.3
+- MSTest 3.6.3
 - NLog.Extensions.Logging 5.3.8
 - NLog.Schema 5.2.8
 - OpenAI 2.0.0
 - ReverseMarkdown 4.1.0
 - ScipBe.Common.Office.OneNote 3.0.1
 - SharpCompress 0.37.2
- StreamJsonRpc 2.21.69
+- StreamJsonRpc 2.19.27
 - StyleCop.Analyzers 1.2.0-beta.556
- System.CodeDom 9.0.4
+- System.CodeDom 9.0.3
 - System.CommandLine 2.0.0-beta4.22272.1
- System.ComponentModel.Composition 9.0.4
- System.Configuration.ConfigurationManager 9.0.4
- System.Data.OleDb 9.0.4
+- System.ComponentModel.Composition 9.0.3
+- System.Configuration.ConfigurationManager 9.0.3
+- System.Data.OleDb 9.0.3
 - System.Data.SqlClient 4.8.6
- System.Diagnostics.EventLog 9.0.4
- System.Diagnostics.PerformanceCounter 9.0.4
- System.Drawing.Common 9.0.4
- System.IO.Abstractions 22.0.13
- System.IO.Abstractions.TestingHelpers 22.0.13
- System.Management 9.0.4
- System.Net.Http 4.3.4
- System.Private.Uri 4.3.2
+- System.Diagnostics.EventLog 9.0.3
+- System.Diagnostics.PerformanceCounter 9.0.3
+- System.Drawing.Common 9.0.3
+- System.IO.Abstractions 21.0.29
+- System.IO.Abstractions.TestingHelpers 21.0.29
+- System.Management 9.0.3
 - System.Reactive 6.0.1
- System.Runtime.Caching 9.0.4
- System.ServiceProcess.ServiceController 9.0.4
- System.Text.Encoding.CodePages 9.0.4
- System.Text.Json 9.0.4
- System.Text.RegularExpressions 4.3.1
+- System.Runtime.Caching 9.0.3
+- System.ServiceProcess.ServiceController 9.0.3
+- System.Text.Encoding.CodePages 9.0.3
+- System.Text.Json 9.0.3
 - UnicodeInformation 2.6.0
 - UnitsNet 5.56.0
 - UTF.Unknown 2.5.1
 - WinUIEx 2.2.0
 - WPF-UI 3.0.5
- WyHash 1.0.5
-
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -620,64 +620,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EtwTrace", "src\common\Tele
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MouseWithoutBorders.UnitTests", "src\modules\MouseWithoutBorders\MouseWithoutBorders.UnitTests\MouseWithoutBorders.UnitTests.csproj", "{66614C26-314C-4B91-9071-76133422CFEF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CommandPalette", "CommandPalette", "{3846508C-77EB-4034-A702-F8BB263C4F79}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Built-in Extensions", "Built-in Extensions", "{ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Apps", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Apps\Microsoft.CmdPal.Ext.Apps.csproj", "{6CE438DF-C245-4997-A360-0A0939E4BA34}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Bookmarks", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Bookmark\Microsoft.CmdPal.Ext.Bookmarks.csproj", "{E09AA983-C755-474F-83D6-A5CDF528C070}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Calc", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Calc\Microsoft.CmdPal.Ext.Calc.csproj", "{6D56B64D-FF1F-488F-AFED-9B9854A5D399}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Registry", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Registry\Microsoft.CmdPal.Ext.Registry.csproj", "{92EC89E4-9972-453A-8A1A-3A9E230C146A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsServices", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WindowsServices\Microsoft.CmdPal.Ext.WindowsServices.csproj", "{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsSettings", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WindowsSettings\Microsoft.CmdPal.Ext.WindowsSettings.csproj", "{D1160404-D3D1-497A-883A-4059C07C2273}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsTerminal", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WindowsTerminal\Microsoft.CmdPal.Ext.WindowsTerminal.csproj", "{40F6D69D-E321-400F-A767-5628C7AE453D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extension SDK", "Extension SDK", "{F3D09629-59A2-4924-A4B9-D6BFAA2C1B49}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.CommandPalette.Extensions", "src\modules\cmdpal\extensionsdk\Microsoft.CommandPalette.Extensions\Microsoft.CommandPalette.Extensions.vcxproj", "{305DD37E-C85D-4B08-AAFE-7381FA890463}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CommandPalette.Extensions.Toolkit", "src\modules\cmdpal\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj", "{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Common", "src\modules\cmdpal\Microsoft.CmdPal.Common\Microsoft.CmdPal.Common.csproj", "{14E62033-58D0-4A7D-8990-52F50A08BBBD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.UI", "src\modules\cmdpal\Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj", "{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample Extensions", "Sample Extensions", "{071E18A4-A530-46B8-AB7D-B862EE55E24E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProcessMonitorExtension", "src\modules\cmdpal\ext\ProcessMonitorExtension\ProcessMonitorExtension.csproj", "{C846F7A7-792A-47D9-B0CB-417C900EE03D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SamplePagesExtension", "src\modules\cmdpal\ext\SamplePagesExtension\SamplePagesExtension.csproj", "{C831231F-891C-4572-9694-45062534B42A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{7520A2FE-00A2-49B8-83ED-DB216E874C04}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.UI", "src\modules\cmdpal\Microsoft.CmdPal.UI\Microsoft.CmdPal.UI.csproj", "{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.UI.ViewModels", "src\modules\cmdpal\Microsoft.CmdPal.UI.ViewModels\Microsoft.CmdPal.UI.ViewModels.csproj", "{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.ClipboardHistory", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.ClipboardHistory\Microsoft.CmdPal.Ext.ClipboardHistory.csproj", "{79775343-7A3D-445D-9104-3DD5B2893DF9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdPalModuleInterface", "src\modules\cmdpal\CmdPalModuleInterface\CmdPalModuleInterface.vcxproj", "{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkspacesCsharpLibrary", "src\modules\Workspaces\WorkspacesCsharpLibrary\WorkspacesCsharpLibrary.csproj", "{89D0E199-B17A-418C-B2F8-7375B6708357}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewPlus.ShellExtension.win10", "src\modules\NewPlus\NewShellExtensionContextMenu.win10\NewPlus.ShellExtension.win10.vcxproj", "{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Indexer", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Indexer\Microsoft.CmdPal.Ext.Indexer.csproj", "{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Shell", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Shell\Microsoft.CmdPal.Ext.Shell.csproj", "{C0CE3B5E-16D3-495D-B335-CA791B660162}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowWalker", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WindowWalker\Microsoft.CmdPal.Ext.WindowWalker.csproj", "{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WebSearch", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WebSearch\Microsoft.CmdPal.Ext.WebSearch.csproj", "{605E914B-7232-4789-AF46-BF5D3DDFC14E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WinGet", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WinGet\Microsoft.CmdPal.Ext.WinGet.csproj", "{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.UnitTests", "src\modules\AdvancedPaste\AdvancedPaste.UnitTests\AdvancedPaste.UnitTests.csproj", "{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.FuzzTests", "src\modules\AdvancedPaste\AdvancedPaste.FuzzTests\AdvancedPaste.FuzzTests.csproj", "{7F5B9557-5878-4438-A721-3E28296BA193}"
@@ -690,8 +636,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZoomItModuleInterface", "sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZoomItSettingsInterop", "src\modules\ZoomIt\ZoomItSettingsInterop\ZoomItSettingsInterop.vcxproj", "{CA7D8106-30B9-4AEC-9D05-B69B31B8C461}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.TimeDate", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.TimeDate\Microsoft.CmdPal.Ext.TimeDate.csproj", "{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UITestAutomation", "src\common\UITestAutomation\UITestAutomation.csproj", "{A558C25D-2007-498E-8B6F-43405AFAE9E2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeyboardManagerEditorUI", "src\modules\keyboardmanager\KeyboardManagerEditorUI\KeyboardManagerEditorUI.csproj", "{08F9155D-B6DC-46E5-9C83-AF60B655898B}"
@@ -702,14 +646,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hosts.FuzzTests", "src\modu
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hosts.UITests", "src\modules\Hosts\Hosts.UITests\Hosts.UITests.csproj", "{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegistryPreview.FuzzTests", "src\modules\registrypreview\RegistryPreview.FuzzTests\RegistryPreview.FuzzTests.csproj", "{5702B3CC-8575-48D5-83D8-15BB42269CD3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.System", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.System\Microsoft.CmdPal.Ext.System.csproj", "{64B88F02-CD88-4ED8-9624-989A800230F9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdPalKeyboardService", "src\modules\cmdpal\CmdPalKeyboardService\CmdPalKeyboardService.vcxproj", "{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRename.FuzzingTest", "src\modules\powerrename\PowerRename.FuzzingTest\PowerRename.FuzzingTest.vcxproj", "{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2262,154 +2198,6 @@ Global
 		{66614C26-314C-4B91-9071-76133422CFEF}.Release|ARM64.Build.0 = Release|ARM64
 		{66614C26-314C-4B91-9071-76133422CFEF}.Release|x64.ActiveCfg = Release|x64
 		{66614C26-314C-4B91-9071-76133422CFEF}.Release|x64.Build.0 = Release|x64
-		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Debug|ARM64.Build.0 = Debug|ARM64
-		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Debug|x64.ActiveCfg = Debug|x64
-		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Debug|x64.Build.0 = Debug|x64
-		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Release|ARM64.ActiveCfg = Release|ARM64
-		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Release|ARM64.Build.0 = Release|ARM64
-		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Release|x64.ActiveCfg = Release|x64
-		{6CE438DF-C245-4997-A360-0A0939E4BA34}.Release|x64.Build.0 = Release|x64
-		{E09AA983-C755-474F-83D6-A5CDF528C070}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{E09AA983-C755-474F-83D6-A5CDF528C070}.Debug|ARM64.Build.0 = Debug|ARM64
-		{E09AA983-C755-474F-83D6-A5CDF528C070}.Debug|x64.ActiveCfg = Debug|x64
-		{E09AA983-C755-474F-83D6-A5CDF528C070}.Debug|x64.Build.0 = Debug|x64
-		{E09AA983-C755-474F-83D6-A5CDF528C070}.Release|ARM64.ActiveCfg = Release|ARM64
-		{E09AA983-C755-474F-83D6-A5CDF528C070}.Release|ARM64.Build.0 = Release|ARM64
-		{E09AA983-C755-474F-83D6-A5CDF528C070}.Release|x64.ActiveCfg = Release|x64
-		{E09AA983-C755-474F-83D6-A5CDF528C070}.Release|x64.Build.0 = Release|x64
-		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Debug|ARM64.Build.0 = Debug|ARM64
-		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Debug|x64.ActiveCfg = Debug|x64
-		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Debug|x64.Build.0 = Debug|x64
-		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Release|ARM64.ActiveCfg = Release|ARM64
-		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Release|ARM64.Build.0 = Release|ARM64
-		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Release|x64.ActiveCfg = Release|x64
-		{6D56B64D-FF1F-488F-AFED-9B9854A5D399}.Release|x64.Build.0 = Release|x64
-		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Debug|ARM64.Build.0 = Debug|ARM64
-		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Debug|x64.ActiveCfg = Debug|x64
-		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Debug|x64.Build.0 = Debug|x64
-		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Release|ARM64.ActiveCfg = Release|ARM64
-		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Release|ARM64.Build.0 = Release|ARM64
-		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Release|x64.ActiveCfg = Release|x64
-		{92EC89E4-9972-453A-8A1A-3A9E230C146A}.Release|x64.Build.0 = Release|x64
-		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Debug|ARM64.Build.0 = Debug|ARM64
-		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Debug|x64.ActiveCfg = Debug|x64
-		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Debug|x64.Build.0 = Debug|x64
-		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Release|ARM64.ActiveCfg = Release|ARM64
-		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Release|ARM64.Build.0 = Release|ARM64
-		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Release|x64.ActiveCfg = Release|x64
-		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}.Release|x64.Build.0 = Release|x64
-		{D1160404-D3D1-497A-883A-4059C07C2273}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{D1160404-D3D1-497A-883A-4059C07C2273}.Debug|ARM64.Build.0 = Debug|ARM64
-		{D1160404-D3D1-497A-883A-4059C07C2273}.Debug|x64.ActiveCfg = Debug|x64
-		{D1160404-D3D1-497A-883A-4059C07C2273}.Debug|x64.Build.0 = Debug|x64
-		{D1160404-D3D1-497A-883A-4059C07C2273}.Release|ARM64.ActiveCfg = Release|ARM64
-		{D1160404-D3D1-497A-883A-4059C07C2273}.Release|ARM64.Build.0 = Release|ARM64
-		{D1160404-D3D1-497A-883A-4059C07C2273}.Release|x64.ActiveCfg = Release|x64
-		{D1160404-D3D1-497A-883A-4059C07C2273}.Release|x64.Build.0 = Release|x64
-		{40F6D69D-E321-400F-A767-5628C7AE453D}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{40F6D69D-E321-400F-A767-5628C7AE453D}.Debug|ARM64.Build.0 = Debug|ARM64
-		{40F6D69D-E321-400F-A767-5628C7AE453D}.Debug|x64.ActiveCfg = Debug|x64
-		{40F6D69D-E321-400F-A767-5628C7AE453D}.Debug|x64.Build.0 = Debug|x64
-		{40F6D69D-E321-400F-A767-5628C7AE453D}.Release|ARM64.ActiveCfg = Release|ARM64
-		{40F6D69D-E321-400F-A767-5628C7AE453D}.Release|ARM64.Build.0 = Release|ARM64
-		{40F6D69D-E321-400F-A767-5628C7AE453D}.Release|x64.ActiveCfg = Release|x64
-		{40F6D69D-E321-400F-A767-5628C7AE453D}.Release|x64.Build.0 = Release|x64
-		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Debug|ARM64.Build.0 = Debug|ARM64
-		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Debug|x64.ActiveCfg = Debug|x64
-		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Debug|x64.Build.0 = Debug|x64
-		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Release|ARM64.ActiveCfg = Release|ARM64
-		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Release|ARM64.Build.0 = Release|ARM64
-		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Release|x64.ActiveCfg = Release|x64
-		{305DD37E-C85D-4B08-AAFE-7381FA890463}.Release|x64.Build.0 = Release|x64
-		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24}.Debug|ARM64.Build.0 = Debug|ARM64
-		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24}.Debug|x64.ActiveCfg = Debug|x64
-		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24}.Debug|x64.Build.0 = Debug|x64
-		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24}.Release|ARM64.ActiveCfg = Release|ARM64
-		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24}.Release|ARM64.Build.0 = Release|ARM64
-		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24}.Release|x64.ActiveCfg = Release|x64
-		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24}.Release|x64.Build.0 = Release|x64
-		{14E62033-58D0-4A7D-8990-52F50A08BBBD}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{14E62033-58D0-4A7D-8990-52F50A08BBBD}.Debug|ARM64.Build.0 = Debug|ARM64
-		{14E62033-58D0-4A7D-8990-52F50A08BBBD}.Debug|x64.ActiveCfg = Debug|x64
-		{14E62033-58D0-4A7D-8990-52F50A08BBBD}.Debug|x64.Build.0 = Debug|x64
-		{14E62033-58D0-4A7D-8990-52F50A08BBBD}.Release|ARM64.ActiveCfg = Release|ARM64
-		{14E62033-58D0-4A7D-8990-52F50A08BBBD}.Release|ARM64.Build.0 = Release|ARM64
-		{14E62033-58D0-4A7D-8990-52F50A08BBBD}.Release|x64.ActiveCfg = Release|x64
-		{14E62033-58D0-4A7D-8990-52F50A08BBBD}.Release|x64.Build.0 = Release|x64
-		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Debug|ARM64.Build.0 = Debug|ARM64
-		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Debug|x64.ActiveCfg = Debug|x64
-		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Debug|x64.Build.0 = Debug|x64
-		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Release|ARM64.ActiveCfg = Release|ARM64
-		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Release|ARM64.Build.0 = Release|ARM64
-		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Release|x64.ActiveCfg = Release|x64
-		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Release|x64.Build.0 = Release|x64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Debug|ARM64.Build.0 = Debug|ARM64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Debug|x64.ActiveCfg = Debug|x64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Debug|x64.Build.0 = Debug|x64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Debug|x64.Deploy.0 = Debug|x64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Release|ARM64.ActiveCfg = Release|ARM64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Release|ARM64.Build.0 = Release|ARM64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Release|ARM64.Deploy.0 = Release|ARM64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Release|x64.ActiveCfg = Release|x64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Release|x64.Build.0 = Release|x64
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D}.Release|x64.Deploy.0 = Release|x64
-		{C831231F-891C-4572-9694-45062534B42A}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{C831231F-891C-4572-9694-45062534B42A}.Debug|ARM64.Build.0 = Debug|ARM64
-		{C831231F-891C-4572-9694-45062534B42A}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{C831231F-891C-4572-9694-45062534B42A}.Debug|x64.ActiveCfg = Debug|x64
-		{C831231F-891C-4572-9694-45062534B42A}.Debug|x64.Build.0 = Debug|x64
-		{C831231F-891C-4572-9694-45062534B42A}.Debug|x64.Deploy.0 = Debug|x64
-		{C831231F-891C-4572-9694-45062534B42A}.Release|ARM64.ActiveCfg = Release|ARM64
-		{C831231F-891C-4572-9694-45062534B42A}.Release|ARM64.Build.0 = Release|ARM64
-		{C831231F-891C-4572-9694-45062534B42A}.Release|ARM64.Deploy.0 = Release|ARM64
-		{C831231F-891C-4572-9694-45062534B42A}.Release|x64.ActiveCfg = Release|x64
-		{C831231F-891C-4572-9694-45062534B42A}.Release|x64.Build.0 = Release|x64
-		{C831231F-891C-4572-9694-45062534B42A}.Release|x64.Deploy.0 = Release|x64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Debug|ARM64.Build.0 = Debug|ARM64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Debug|x64.ActiveCfg = Debug|x64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Debug|x64.Build.0 = Debug|x64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Debug|x64.Deploy.0 = Debug|x64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Release|ARM64.ActiveCfg = Release|ARM64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Release|ARM64.Build.0 = Release|ARM64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Release|ARM64.Deploy.0 = Release|ARM64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Release|x64.ActiveCfg = Release|x64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Release|x64.Build.0 = Release|x64
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90}.Release|x64.Deploy.0 = Release|x64
-		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}.Debug|ARM64.Build.0 = Debug|ARM64
-		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}.Debug|x64.ActiveCfg = Debug|x64
-		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}.Debug|x64.Build.0 = Debug|x64
-		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}.Release|ARM64.ActiveCfg = Release|ARM64
-		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}.Release|ARM64.Build.0 = Release|ARM64
-		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}.Release|x64.ActiveCfg = Release|x64
-		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}.Release|x64.Build.0 = Release|x64
-		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Debug|ARM64.Build.0 = Debug|ARM64
-		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Debug|x64.ActiveCfg = Debug|x64
-		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Debug|x64.Build.0 = Debug|x64
-		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Release|ARM64.ActiveCfg = Release|ARM64
-		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Release|ARM64.Build.0 = Release|ARM64
-		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Release|x64.ActiveCfg = Release|x64
-		{79775343-7A3D-445D-9104-3DD5B2893DF9}.Release|x64.Build.0 = Release|x64
-		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}.Debug|ARM64.Build.0 = Debug|ARM64
-		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}.Debug|x64.ActiveCfg = Debug|x64
-		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}.Debug|x64.Build.0 = Debug|x64
-		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}.Release|ARM64.ActiveCfg = Release|ARM64
-		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}.Release|ARM64.Build.0 = Release|ARM64
-		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}.Release|x64.ActiveCfg = Release|x64
-		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}.Release|x64.Build.0 = Release|x64
 		{89D0E199-B17A-418C-B2F8-7375B6708357}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{89D0E199-B17A-418C-B2F8-7375B6708357}.Debug|ARM64.Build.0 = Debug|ARM64
 		{89D0E199-B17A-418C-B2F8-7375B6708357}.Debug|x64.ActiveCfg = Debug|x64
@@ -2426,54 +2214,6 @@ Global
 		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}.Release|ARM64.Build.0 = Release|ARM64
 		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}.Release|x64.ActiveCfg = Release|x64
 		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}.Release|x64.Build.0 = Release|x64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Debug|ARM64.Build.0 = Debug|ARM64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Debug|x64.ActiveCfg = Debug|x64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Debug|x64.Build.0 = Debug|x64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Debug|x64.Deploy.0 = Debug|x64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Release|ARM64.ActiveCfg = Release|ARM64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Release|ARM64.Build.0 = Release|ARM64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Release|ARM64.Deploy.0 = Release|ARM64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Release|x64.ActiveCfg = Release|x64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Release|x64.Build.0 = Release|x64
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}.Release|x64.Deploy.0 = Release|x64
-		{C0CE3B5E-16D3-495D-B335-CA791B660162}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{C0CE3B5E-16D3-495D-B335-CA791B660162}.Debug|ARM64.Build.0 = Debug|ARM64
-		{C0CE3B5E-16D3-495D-B335-CA791B660162}.Debug|x64.ActiveCfg = Debug|x64
-		{C0CE3B5E-16D3-495D-B335-CA791B660162}.Debug|x64.Build.0 = Debug|x64
-		{C0CE3B5E-16D3-495D-B335-CA791B660162}.Release|ARM64.ActiveCfg = Release|ARM64
-		{C0CE3B5E-16D3-495D-B335-CA791B660162}.Release|ARM64.Build.0 = Release|ARM64
-		{C0CE3B5E-16D3-495D-B335-CA791B660162}.Release|x64.ActiveCfg = Release|x64
-		{C0CE3B5E-16D3-495D-B335-CA791B660162}.Release|x64.Build.0 = Release|x64
-		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Debug|ARM64.Build.0 = Debug|ARM64
-		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Debug|x64.ActiveCfg = Debug|x64
-		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Debug|x64.Build.0 = Debug|x64
-		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Release|ARM64.ActiveCfg = Release|ARM64
-		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Release|ARM64.Build.0 = Release|ARM64
-		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Release|x64.ActiveCfg = Release|x64
-		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}.Release|x64.Build.0 = Release|x64
-		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Debug|ARM64.Build.0 = Debug|ARM64
-		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Debug|x64.ActiveCfg = Debug|x64
-		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Debug|x64.Build.0 = Debug|x64
-		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Release|ARM64.ActiveCfg = Release|ARM64
-		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Release|ARM64.Build.0 = Release|ARM64
-		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Release|x64.ActiveCfg = Release|x64
-		{605E914B-7232-4789-AF46-BF5D3DDFC14E}.Release|x64.Build.0 = Release|x64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Debug|ARM64.Build.0 = Debug|ARM64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Debug|x64.ActiveCfg = Debug|x64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Debug|x64.Build.0 = Debug|x64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Debug|x64.Deploy.0 = Debug|x64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|ARM64.ActiveCfg = Release|ARM64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|ARM64.Build.0 = Release|ARM64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|ARM64.Deploy.0 = Release|ARM64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|x64.ActiveCfg = Release|x64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|x64.Build.0 = Release|x64
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}.Release|x64.Deploy.0 = Release|x64
 		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Debug|ARM64.Build.0 = Debug|ARM64
 		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}.Debug|x64.ActiveCfg = Debug|x64
@@ -2514,18 +2254,6 @@ Global
 		{CA7D8106-30B9-4AEC-9D05-B69B31B8C461}.Release|ARM64.Build.0 = Release|ARM64
 		{CA7D8106-30B9-4AEC-9D05-B69B31B8C461}.Release|x64.ActiveCfg = Release|x64
 		{CA7D8106-30B9-4AEC-9D05-B69B31B8C461}.Release|x64.Build.0 = Release|x64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Debug|ARM64.Build.0 = Debug|ARM64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Debug|x64.ActiveCfg = Debug|x64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Debug|x64.Build.0 = Debug|x64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Debug|x64.Deploy.0 = Debug|x64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Release|ARM64.ActiveCfg = Release|ARM64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Release|ARM64.Build.0 = Release|ARM64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Release|ARM64.Deploy.0 = Release|ARM64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Release|x64.ActiveCfg = Release|x64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Release|x64.Build.0 = Release|x64
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}.Release|x64.Deploy.0 = Release|x64
 		{A558C25D-2007-498E-8B6F-43405AFAE9E2}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{A558C25D-2007-498E-8B6F-43405AFAE9E2}.Debug|ARM64.Build.0 = Debug|ARM64
 		{A558C25D-2007-498E-8B6F-43405AFAE9E2}.Debug|x64.ActiveCfg = Debug|x64
@@ -2566,36 +2294,6 @@ Global
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0}.Release|ARM64.Build.0 = Release|ARM64
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0}.Release|x64.ActiveCfg = Release|x64
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0}.Release|x64.Build.0 = Release|x64
-		{5702B3CC-8575-48D5-83D8-15BB42269CD3}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{5702B3CC-8575-48D5-83D8-15BB42269CD3}.Debug|ARM64.Build.0 = Debug|ARM64
-		{5702B3CC-8575-48D5-83D8-15BB42269CD3}.Debug|x64.ActiveCfg = Debug|x64
-		{5702B3CC-8575-48D5-83D8-15BB42269CD3}.Debug|x64.Build.0 = Debug|x64
-		{5702B3CC-8575-48D5-83D8-15BB42269CD3}.Release|ARM64.ActiveCfg = Release|ARM64
-		{5702B3CC-8575-48D5-83D8-15BB42269CD3}.Release|ARM64.Build.0 = Release|ARM64
-		{5702B3CC-8575-48D5-83D8-15BB42269CD3}.Release|x64.ActiveCfg = Release|x64
-		{5702B3CC-8575-48D5-83D8-15BB42269CD3}.Release|x64.Build.0 = Release|x64
-		{64B88F02-CD88-4ED8-9624-989A800230F9}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{64B88F02-CD88-4ED8-9624-989A800230F9}.Debug|ARM64.Build.0 = Debug|ARM64
-		{64B88F02-CD88-4ED8-9624-989A800230F9}.Debug|x64.ActiveCfg = Debug|x64
-		{64B88F02-CD88-4ED8-9624-989A800230F9}.Debug|x64.Build.0 = Debug|x64
-		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|ARM64.ActiveCfg = Release|ARM64
-		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|ARM64.Build.0 = Release|ARM64
-		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.ActiveCfg = Release|x64
-		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.Build.0 = Release|x64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|ARM64.Build.0 = Debug|ARM64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|x64.ActiveCfg = Debug|x64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|x64.Build.0 = Debug|x64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|ARM64.ActiveCfg = Release|ARM64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|ARM64.Build.0 = Release|ARM64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|x64.ActiveCfg = Release|x64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|x64.Build.0 = Release|x64
-		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Debug|x64.ActiveCfg = Debug|x64
-		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Debug|x64.Build.0 = Debug|x64
-		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|ARM64.ActiveCfg = Release|ARM64
-		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.ActiveCfg = Release|x64
-		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2823,51 +2521,19 @@ Global
 		{37D07516-4185-43A4-924F-3C7A5D95ECF6} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{8F021B46-362B-485C-BFBA-CCF83E820CBD} = {8F62026A-294B-41C6-8839-87463613F216}
 		{66614C26-314C-4B91-9071-76133422CFEF} = {B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC}
-		{3846508C-77EB-4034-A702-F8BB263C4F79} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
-		{ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
-		{6CE438DF-C245-4997-A360-0A0939E4BA34} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{E09AA983-C755-474F-83D6-A5CDF528C070} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{6D56B64D-FF1F-488F-AFED-9B9854A5D399} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{92EC89E4-9972-453A-8A1A-3A9E230C146A} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{51939B4F-1F62-4BFF-A6A2-C08646E5BE95} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{D1160404-D3D1-497A-883A-4059C07C2273} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{40F6D69D-E321-400F-A767-5628C7AE453D} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{F3D09629-59A2-4924-A4B9-D6BFAA2C1B49} = {3846508C-77EB-4034-A702-F8BB263C4F79}
-		{305DD37E-C85D-4B08-AAFE-7381FA890463} = {F3D09629-59A2-4924-A4B9-D6BFAA2C1B49}
-		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24} = {F3D09629-59A2-4924-A4B9-D6BFAA2C1B49}
-		{14E62033-58D0-4A7D-8990-52F50A08BBBD} = {7520A2FE-00A2-49B8-83ED-DB216E874C04}
-		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F} = {7520A2FE-00A2-49B8-83ED-DB216E874C04}
-		{071E18A4-A530-46B8-AB7D-B862EE55E24E} = {3846508C-77EB-4034-A702-F8BB263C4F79}
-		{C846F7A7-792A-47D9-B0CB-417C900EE03D} = {071E18A4-A530-46B8-AB7D-B862EE55E24E}
-		{C831231F-891C-4572-9694-45062534B42A} = {071E18A4-A530-46B8-AB7D-B862EE55E24E}
-		{7520A2FE-00A2-49B8-83ED-DB216E874C04} = {3846508C-77EB-4034-A702-F8BB263C4F79}
-		{8FBDABA4-40EE-4C0E-9BC8-2F6444A6EF90} = {7520A2FE-00A2-49B8-83ED-DB216E874C04}
-		{C66020D1-CB10-4CF7-8715-84C97FD5E5E2} = {7520A2FE-00A2-49B8-83ED-DB216E874C04}
-		{79775343-7A3D-445D-9104-3DD5B2893DF9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{89D0E199-B17A-418C-B2F8-7375B6708357} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E} = {CA716AE6-FE5C-40AC-BB8F-2C87912687AC}
-		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{C0CE3B5E-16D3-495D-B335-CA791B660162} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{605E914B-7232-4789-AF46-BF5D3DDFC14E} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE} = {9873BA05-4C41-4819-9283-CF45D795431B}
 		{7F5B9557-5878-4438-A721-3E28296BA193} = {9873BA05-4C41-4819-9283-CF45D795431B}
 		{DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{0A84F764-3A88-44CD-AA96-41BDBD48627B} = {DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C}
 		{E4585179-2AC1-4D5F-A3FF-CFC5392F694C} = {DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C}
 		{CA7D8106-30B9-4AEC-9D05-B69B31B8C461} = {DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C}
-		{DCC6BD67-17BB-47AA-B507-FB0FE43A7449} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{A558C25D-2007-498E-8B6F-43405AFAE9E2} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{08F9155D-B6DC-46E5-9C83-AF60B655898B} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{4382A954-179A-4078-92AF-715187DFFF50} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
 		{EBED240C-8702-452D-B764-6DB9DA9179AF} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
-		{5702B3CC-8575-48D5-83D8-15BB42269CD3} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
-		{64B88F02-CD88-4ED8-9624-989A800230F9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
-		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}
--- a/README.md
+++ b/README.md
@@ -11,15 +11,14 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 |              | Current utilities: |              |
 |--------------|--------------------|--------------|
 | [Advanced Paste](https://aka.ms/PowerToysOverview_AdvancedPaste) | [Always on Top](https://aka.ms/PowerToysOverview_AoT) | [PowerToys Awake](https://aka.ms/PowerToysOverview_Awake) |
-| [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) |
-| [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) |
-| [Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) | [Text Extractor](https://aka.ms/PowerToysOverview_TextExtractor) | [Workspaces](https://aka.ms/PowerToysOverview_Workspaces) |
-| [ZoomIt](https://aka.ms/PowerToysOverview_ZoomIt) |
+| [Command Not Found](https://aka.ms/PowerToysOverview_CmdNotFound) | [Color Picker](https://aka.ms/PowerToysOverview_ColorPicker) | [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) | [Mouse Without Borders](https://aka.ms/PowerToysOverview_MouseWithoutBorders) |
+| [New+](https://aka.ms/PowerToysOverview_NewPlus) | [Peek](https://aka.ms/PowerToysOverview_Peek) | [Paste as Plain Text](https://aka.ms/PowerToysOverview_PastePlain) |
+| [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) | [Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) |
+| [Text Extractor](https://aka.ms/PowerToysOverview_TextExtractor) | [Workspaces](https://aka.ms/PowerToysOverview_Workspaces) | [ZoomIt](https://aka.ms/PowerToysOverview_ZoomIt) |

 ## Installing and running Microsoft PowerToys

@@ -35,19 +34,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.91%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.90%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.90.0/PowerToysUserSetup-0.90.0-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.90.0/PowerToysUserSetup-0.90.0-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.90.0/PowerToysSetup-0.90.0-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.90.0/PowerToysSetup-0.90.0-arm64.exe
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.90%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.89%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.89.0/PowerToysUserSetup-0.89.0-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.89.0/PowerToysUserSetup-0.89.0-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.89.0/PowerToysSetup-0.89.0-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.89.0/PowerToysSetup-0.89.0-arm64.exe
 
 |  Description   | Filename | sha256 hash |
 |----------------|----------|-------------|
-| Per user - x64       | [PowerToysUserSetup-0.90.0-x64.exe][ptUserX64] | 2A6036F5B2D454084E55816C306E1E57EF1D14C916691CBDA42B469797605CE0 |
-| Per user - ARM64     | [PowerToysUserSetup-0.90.0-arm64.exe][ptUserArm64] | AB2E4DC87A9D764BE897C5170E2890E174C89CA912A1916FA3AE1E427536EA4A |
-| Machine wide - x64   | [PowerToysSetup-0.90.0-x64.exe][ptMachineX64] | 12801C44F43D0CC61E90DF1EFDC40E4F3C88341E0199D5B20791042D9B173DCF |
-| Machine wide - ARM64 | [PowerToysSetup-0.90.0-arm64.exe][ptMachineArm64] | 2998007C8FCD7BD2770767C6502AAA2CC75B85EC30DE62986EC7005EB0014EDB |
+| Per user - x64       | [PowerToysUserSetup-0.89.0-x64.exe][ptUserX64] | B4F130CC96F321024A257499247F6FF6DA56612215ED3882E868AAE26C689E33 |
+| Per user - ARM64     | [PowerToysUserSetup-0.89.0-arm64.exe][ptUserArm64] | F69B00F4E520EB09FA0D1D1669E21910C5225FE7A2EEDC0FA7C283B201A5F9C6 |
+| Machine wide - x64   | [PowerToysSetup-0.89.0-x64.exe][ptMachineX64] | E18AC8F9023E341CF7DAD35367FB9DDDB6565D83D8155DBCDDB40AE8A24AE731 |
+| Machine wide - ARM64 | [PowerToysSetup-0.89.0-arm64.exe][ptMachineArm64] | 17DEADEC601D6061D7AF4F487595CC36D9191813003CC2ECE381017F0EC71FBB |

 This is our preferred method.

@@ -93,95 +92,102 @@ 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.90 - March 2025 Update
+### 0.89 - February 2025 Update

-In this release, we focused on new features, stability, and automation.
+In this release, we focused on new features, stability, accessibility and automation.

 **✨Highlights**

-![Gif for Command Palette](doc/images/overview/CmdPal_Hero.gif)
+ - Enhanced Advanced Paste by adding media transcoding support to convert different video and audio file formats! Thanks [@snickler](https://github.com/snickler) for your help!
+ - Fixed crashes when loading thumbnails after the .NET 9 update and resolved PowerLauncher.exe blocking other MSI installers from creating shortcuts!
+ - Fixed accessibility issues across FancyZones, Image Resizer, and Settings to improve screen reader support and clarity!
+ - Enhanced UI automation framework across modules and added new tests to cover manual checks, with more improvements coming!

- New module: Command Palette ("CmdPal") -  Created as the evolution of PowerToys Run with extensibility at the forefront, Command Palette is a quick launcher with a richer display and additional capabilities without sacrificing performance, allowing you to start anything with the shortcut **Win+Alt+Space**! Thanks [@zadjii-msft](https://github.com/zadjii-msft), [@niels9001](https://github.com/niels9001), [@michael-hawker](https://github.com/michael-hawker), [@joadoumie](https://github.com/joadoumie), [@plante-msft](https://github.com/plante-msft), [@ethanfangg](https://github.com/ethanfangg) and [@krschau](https://github.com/krschau)!
- - Enhanced the Color Picker by switching from WPF UI to .NET WPF, resulting in improved themes and visual consistency across different modes. Thanks [@mantaionut](https://github.com/mantaionut)! Thanks [@Jay-o-Way](https://github.com/Jay-o-Way) and [@niels9001](https://github.com/niels9001) for helping with the review!
- - Added the ability to delete files directly from Peek, enhancing file management efficiency. Thanks [@daverayment](https://github.com/daverayment) and thanks [@htcfreek](https://github.com/htcfreek) for the review!
- - Added support for variables in template filenames, enabling dynamic elements like date components and environment variables for enhanced customization in New+. Thanks [@cgaarden](https://github.com/cgaarden)!
+### General

-### Color Picker
+ - Fixed an issue where updating PowerToys on Windows 11 did not properly update context menu entries, impacting New+, PowerRename, Image Resizer, and File Locksmith.
+ - Updated .NET Packages from 9.0.1 to 9.0.2. Thanks [@snickler](https://github.com/snickler) for this.
+ - Enabled compatibility with VS17.3 and later, for C++23. Thanks [@LNKLEO](https://github.com/LNKLEO) for this.

- - Replaced WPF UI with .NET WPF for the Color Picker, enhancing compatibility and improving theme support. Thanks [@mantaionut](https://github.com/mantaionut)! Thanks [@Jay-o-Way](https://github.com/Jay-o-Way) and [@niels9001](https://github.com/niels9001) for helping with the review!
+### Advanced Paste

-### Command Palette
-
- Introduced the Windows Command Palette ("CmdPal"), the next iteration of PowerToys Run, designed with extensibility at its core. CmdPal includes features such as searching for installed apps, shell commands, files and WinGet package installation. This module aims to provide a more powerful and flexible launcher experience. Thanks [@zadjii-msft](https://github.com/zadjii-msft), [@niels9001](https://github.com/niels9001), [@michael-hawker](https://github.com/michael-hawker), [@joadoumie](https://github.com/joadoumie), [@plante-msft](https://github.com/plante-msft), and the whole team!
+ - Added media transcoding support to convert different video and audio file formats, improved UI layouts, refined clipboard handling, and integrated Semantic Kernel for smarter pasting. Thanks [@snickler](https://github.com/snickler) for your help!

 ### FancyZones

- - Fixed a bug where deleting a layout resulted in incorrect data being written to the JSON file.
- - Fixed a bug where layout hotkeys were displayed incorrectly, ensuring the hotkey list does not include invalid entries.
- - Fixed an issue where the "None" option was missing in the editor layout.
+ - Fixed accessibility by improving the text for monitors, ensuring clearer naming and help text for screen readers.

 ### Image Resizer
+ - Fixed issues with Width and Height fields in Image Resizer's Custom preset, ensuring empty values no longer cause errors, settings save correctly, and auto-scaling behaves as expected. Thanks [@daverayment](https://github.com/daverayment)!
+ - Fixed accessibility by ensuring screen readers announce selected image dimensions in the combo-box for better navigation.

- - Fixed warnings in ImageResizer regarding the use of variables "shellItem" and "itemName" without being initialized.
+### Monaco Preview
+
+ - Fixed open link in default browser rather than Microsoft Edge. Thanks [@OldUser101](https://github.com/OldUser101)!
+
+### Mouse Highlighter
+
+ - Fixed a highlight released on an Administrator window will start fading, instead of staying on the screen indefinitely until the mouse button is pressed again on an unelevated window.

 ### Mouse Without Borders
+ - Fixed an issue in service mode where copy-paste and drag-drop file transfers didn’t work, ensuring seamless file operations.
+ - Enabled GPO for enable/disable for Mouse Without Borders in Service Mode. Thanks [@htcfreek](https://github.com/htcfreek) for review and comments!
+ - Fixed code maintainability by refactoring the oversized 'Common' class in Mouse Without Borders into smaller, focused classes for better structure and clarity. Thanks [@mikeclayton](https://github.com/mikeclayton) and thanks [@htcfreek](https://github.com/htcfreek) for review!

- - Enhanced the logger to properly track the file path for easier debugging.
- - Refactored the "Common" class into distinct individual classes to enhance maintainability, and updated all references and unit tests to reflect these changes. Thanks [@mikeclayton](https://github.com/mikeclayton) for this!
-
-### New+
-
- - Added support for variables in template filenames, including date/time components, parent folder name, and environment variables. Thanks [@cgaarden](https://github.com/cgaarden)!
-
-### Peek
-
- - Added the ability to delete the file currently being previewed in Peek, including navigation updates and handling for deleted items. Thanks [@daverayment](https://github.com/daverayment) and thanks [@htcfreek](https://github.com/htcfreek) for your help reviewing this!
+### PowerRename
+ - Supported negative value as Start value in regular expression, e.g. ${start=-1314}
+ - Enhanced RegEx help by adding $, ^, quantifiers, and common patterns for better usability. Thanks [@PesBandi](https://github.com/PesBandi) and thanks [@htcfreek](https://github.com/htcfreek) for review.

 ### PowerToys Run
+ - Fixed crashes when loading thumbnails after the .NET 9 update by disabling CETCompat.
+ - Fixed PowerLauncher.exe blocking other MSI installers creating shortcuts. Thanks [@OneBlue](https://github.com/OneBlue)!
+ - Fixed Run’s dark mode detection to work reliably, preventing issues with incorrect theme detection and ensuring a smoother user experience. Thanks [@daverayment](https://github.com/daverayment)!
+ - Fixed list separator handling in Calculator, allowing functions with multiple arguments to work correctly across different locales. For example pow(2;3) would be replaced with pow(2,3). Thanks [@PesBandi](https://github.com/PesBandi) and thanks [@htcfreek](https://github.com/htcfreek) for review!
+ - Fixed angle unit conversions in the PowerToys Run calculator, allowing quick conversions between radians, degrees, and gradians. Thanks [@OldUser101](https://github.com/OldUser101)!

- - Fixed an issue where duplicated applications were shown by ensuring the shell link helper opens .ink files non-exclusively and correctly retrieves the "FullPath". Thanks [@htcfreek](https://github.com/htcfreek) and [@davidegiacometti](https://github.com/davidegiacometti) for review!
- - Fixed an issue where applying round corners on Windows 11 build 22000 caused crashes.
- - Async the OnRename method to unblock the thread. Thanks [@davidegiacometti](https://github.com/davidegiacometti) for review!
- - Added support for using `sq` instead of `^2` in the Unit Converter. Thanks [@PesBandi](https://github.com/PesBandi)!
+### Quick Accent
+
+ - Added ǎ, ǒ and ǔ to the IPA character set. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Added ` (backtick) and ~ (tilde) to the VK_OEM_5 character set. Thanks [@xanatos](https://github.com/xanatos)!
+ - Added ς (final sigma) to the Greek character set. Thanks [@IamSmeagol](https://github.com/IamSmeagol)!

 ### Settings

- - Disabled the spell check feature in the text boxes of plugin settings for PowerToys Run. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Fixed an issue where InfoBars for release notes errors were not displayed properly, and added a retry button. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Enabled GPO for the "run at startup" setting. Thanks [@htcfreek](https://github.com/htcfreek) for review and comments!
+ - Fixed accessibility issue by allowing screen readers to announce the group name for secondary links in Settings pages, instead of reading link descriptions without context.
+ - Fixed an issue where the Color Picker shortcut was not displaying correctly in the Dashboard.

 ### Workspaces

- - Fixed an issue where some minimized packaged apps (e.g., Microsoft ToDo, Settings) were not snapshotted.
+ - Fixed if a window was last placed on a disconnected monitor, it launches minimized and repositions within the main monitor's visible area when restored, instead of remaining off-screen and invisible.
+ - Fixed on ARM64 to correctly display icons for packaged apps by resolving path mismatches.
+
+### ZoomIt
+
+ - Fixed warning C4706 and related error C2220 during build. Thanks [@xanatos](https://github.com/xanatos)!

 ### Documentation

- - Added the FirefoxBookmark plugin to the list of Third-Party plugins for PowerToys Run. Thanks [@8LWXpg](https://github.com/8LWXpg)!
- - Added the SVGL third-party plugin to PowerToys Run, enabling users to search, browse, and copy SVG logos. Thanks [@SameerJS6](https://github.com/SameerJS6)!
- - Added Monaco usage for the Registry Preview.
+ - Fixed runner-ipc.md doc on the broken link. Thanks [@daverayment](https://github.com/daverayment)!
+ - Fixed the new plugin checklist by updating the target framework, removing duplicates, and improving statement organization. Thanks [@hlaueriksson](https://github.com/hlaueriksson)!
+ - Updated runner documentation to align with the latest code structure.

 ### Development

- - Updated WinGet configuration file location and extension. Thanks [@mdanish-kh](https://github.com/mdanish-kh)!
- - Removed the Markdown file bypass to ensure CI runs for commits that only update Markdown files.
- - Fixed an issue where the default generated file path exceeded the length limit of 260 characters for EnvironmentVariablesUILib.csproj, causing build failures.
- - Upgraded WindowsAppSDK to 1.6.250205002 and CsWinRT to 2.2.0. Thanks [@htcfreek](https://github.com/htcfreek) for review!
- - Upgraded XamlStyler to 3.2501.8 and dotnet-consolidate to 4.2.0. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Updated .NET Packages from 9.0.2 to 9.0.3.
- - Optimized the UI Test Automation Framework and added UI test cases for the Hosts File Editor module.
- - Added fuzz testing for RegistryPreview.
- - Added new UI tests for the FancyZones editor, including tests for creating, duplicating, editing, and deleting layouts.
- - Added telemetry code to measure the module editor open time and evaluate the benefits of applying AOT.
-
-
+ - Stabilized pipeline on ARM64 and forked build.
+ - Added fuzz testing for HostUILib, added as part of pipeline for OneFuzz.
+ - Fixed and improved UI-Test automation framework, and added new test cases for the FancyZones and Hosts module.
+ - Optimized Logger function as AOT compatible, improving performance by 18%.
+ - Made Common.UI and Setting.UI to be AOT compatible.
 
-### What is being planned for version 0.91
+### What is being planned for version 0.90

-For [v0.91][github-next-release-work], we'll work on the items below:
+For [v0.90][github-next-release-work], we'll work on the items below:

+ - New module: PowerToys Run v2
 - New module: File Actions Menu
- - New UI Automation tests
 - Working on installer upgrades
- - Upgrading Keyboard Manager's editor UI
+ - Upgrading keyboard manager's editor UI
 - Stability / bug fixes

 ## PowerToys Community
--- a/doc/Fuzzing/CppFuzzingGuide.md
+++ b/doc/Fuzzing/CppFuzzingGuide.md
@@ -1,117 +0,0 @@
-# 🧪 C++ Project Fuzzing Test Guide
-
-This guide walks you through setting up a **fuzzing test** project for a C++ module using [libFuzzer](https://llvm.org/docs/LibFuzzer.html).
-.
-
---
-
-## 🏗️ Step-by-Step Setup
-
-### 1. Create a New C++ Project
-
- Use **Empty Project** template.
- Name it `<ModuleName>.FuzzingTest`.
-
---
-
-### 2. Update Build Configuration
-
- In **Configuration Manager**, Uncheck Build for both Release|ARM64, Debug|ARM64 and Debug|x64 configurations.
- Note: ARM64 is not supported in this case, so leave ARM64 configurations build disabled.
---
-
-### 3. Enable ASan and libFuzzer in `.vcxproj`
-
-Edit the project file to enable fuzzing:
-
-```xml
-<PropertyGroup>
-  <EnableASAN>true</EnableASAN>
-  <EnableFuzzer>true</EnableFuzzer>
-</PropertyGroup>
-```
-
---
-
-### 4. Add Fuzzing Compiler Flags
-
-Add this to `AdditionalOptions` under the `Fuzzing` configuration:
-
-```xml
-/fsanitize=address
-/fsanitize-coverage=inline-8bit-counters
-/fsanitize-coverage=edge
-/fsanitize-coverage=trace-cmp
-/fsanitize-coverage=trace-div
-%(AdditionalOptions)
-```
-
---
-
-### 5. Link the Sanitizer Coverage Runtime
-
-In `Linker → Input → Additional Dependencies`, add:
-
-```text
-$(VCToolsInstallDir)lib\$(Platform)\libsancov.lib
-```
-
---
-
-### 6. Copy Required Runtime DLL
-
-Add a `PostBuildEvent` to copy the ASAN DLL:
-
-```xml
-<Command>
-  xcopy /y "$(VCToolsInstallDir)bin\Hostx64\x64\clang_rt.asan_dynamic-x86_64.dll" "$(OutDir)"
-</Command>
-```
-
---
-
-### 7. Add Preprocessor Definitions
-
-To avoid annotation issues, add these to the `Preprocessor Definitions`:
-
-```text
-_DISABLE_VECTOR_ANNOTATION;_DISABLE_STRING_ANNOTATION
-```
-
---
-
-## 🧬 Required Code
-
-### `LLVMFuzzerTestOneInput` Entry Point
-
-Every fuzzing project must expose this function:
-
-```cpp
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
-{
-    std::string input(reinterpret_cast<const char*>(data), size);
-
-    try
-    {
-        // Call your module with the input here.
-    }
-    catch (...) {}
-
-    return 0;
-}
-```
-
---
-
-## ⚙️ [Test run in the cloud](https://eng.ms/docs/cloud-ai-platform/azure-edge-platform-aep/aep-security/epsf-edge-and-platform-security-fundamentals/the-onefuzz-service/onefuzz/faq/notwindows/walkthrough)
-
-To submit a job to the cloud you can run with this command:
-
-```
-oip submit --config .\OneFuzzConfig.json --drop-path <your_submission_directory> --platform windows --do-not-file-bugs --duration 1
-```
-You want to run with --do-not-file-bugs because if there is an issue with running the parser in the cloud (which is very possible), you don't want bugs to be created if there is an issue. The --duration task is the number of hours you want the task to run. I recommend just running for 1 hour to make sure things work initially. If you don't specify this parameter, it will default to 48 hours. You can find more about submitting a test job here. 
-
-OneFuzz will send you an email when the job has started.
-
---
--- a/doc/devdocs/UITests.md
+++ b/doc/devdocs/UITests.md
@@ -88,4 +88,4 @@ namespace UITests_KeyboardManager
 ## Extra tools and information

 **Accessibility Tools**:
-While working on tests, you may need a tool that helps you to view the element's accessibility data, e.g. for finding the button to click. For this purpose, you could use [AccessibilityInsights](https://accessibilityinsights.io/docs/windows/overview).
+While working on tests, you may need a tool that helps you to view the element's accessibility data, e.g. for finding the button to click. For this purpose, you could use [AccessibilityInsights](https://accessibilityinsights.io/docs/windows/overview) 
--- a/doc/devdocs/modules/launcher/plugins/timedate.md
+++ b/doc/devdocs/modules/launcher/plugins/timedate.md
@@ -16,70 +16,49 @@ The 'Time and Date' plugin shows the date and time in different formats. For the
 ### Available formats

 **Remarks**
- The following formats requires a prefix in the query when using them as date input:
+- The following formats requires a prefix in the query:
   - Unix Timestamp: `u`
   - Unix Timestamp in milliseconds: `ums`
   - Windows file time: `ft`
-   - OLE Automation date: `oa`
-   - Excel 1900 date value: `exc`
-   - Excel 1904 date value: `exf`
 - On invalid number inputs we show a warning that tells the user which prefixes are allowed/required.

 **List of available formats**

 The following formats are currently available:

-| Format | Example (Based on default settings) | As result | As input | Result as custom format only
+| Format | Example (Based on default settings) | As result | As input |
 |--------------|-----------|------------|------------|
-| Time | 5:10 PM | x | x | |
-| Date | 3/5/2022 | x | x | |
-| Now | 3/5/2022 5:10 PM | x | x | |
-| Time UTC | 4:10 PM | x | x | |
-| Now UTC | 3/5/2022 4:10 PM | x | x | |
-| Unix Timestamp | 1646496622 | x | x | |
-| Unix Timestamp in milliseconds | 1646496622500 | x | x | |
-| Hour | 10 | x | | |
-| Minute | 30 | x | | |
-| Second | 45 | x | | |
-| Millisecond | 678 | x | | |
-| Day (Week day) | Saturday | x | | |
-| Day of the week | 6 | x | | |
-| Day of the month | 5 | x | | |
-| Day of the year | 64 | x | | |
-| Week of the month | 1 | x | | |
-| Week of the year (Calendar week, Week number) | 10 | x | | |
-| Month | March | x | | |
-| Month of the year | 3 | x | | |
-| Month and day | March 7 | x | x | |
-| Year | 2022 | x | | |
-| Era | AD | x | | |
-| Era abbreviation | A | x | | |
-| Month and year | March 2022 | x | x | |
-| Windows file time (Int64 number) | 637820976123938199 | x | x | |
-| Universal time format: YYYY-MM-DD hh:mm:ss| 2022-03-05 16:20:12Z | x | x | |
-| ISO 8601 | 2022-03-05T17:23:04 | x | x | |
-| ISO 8601 UTC | 2022-03-05T16:23:04 | x | x | |
-| ISO 8601 with time zone | 2022-03-05T17:23:04+01:00 | x | x | |
-| ISO 8601 UTC with time zone | 2022-03-05T16:23:04Z | x | x | |
-| RFC1123 | Sat, 05 Mar 2022 16:23:04 GMT | x | x | |
-| OLE Automation date | 45723.44143763889 | | x | x |
-| Excel's 1900 date value | 45723.44143763889 | | x | x |
-| Excel's 1904 date value | 44261.44143763889 | | x | x |
-
-**Custom format definition**
-The user can create its own formats. One per line in the settings text box. The format of each line is `<name>=<syntax pattern>`.
-If the syntax pattern starting with `UTC:` then we use the UTC time instead of the local time.
-As syntax pattern the pattern from `DateTime.ToString()` and the following custom pattern are available:
- DOW: Number of the day in the week.
- WOM: Number of week in the month.
- WOY: Number of the week in the year.
- EAB: Era abbreviation.
- WFT: Windows file time.
- UXT: Unix time stamp.
- UMS: Unix time stamp in milliseconds.
- OAD: OLE Automation date.
- EXC: Excel's 1900 based date value.
- EXF: Excel's 1904 based date value.
+| Time | 5:10 PM | x | x |
+| Date | 3/5/2022 | x | x |
+| Now | 3/5/2022 5:10 PM | x | x |
+| Time UTC | 4:10 PM | x | x |
+| Now UTC | 3/5/2022 4:10 PM | x | x |
+| Unix Timestamp | 1646496622 | x | x |
+| Unix Timestamp in milliseconds | 1646496622500 | x | x |
+| Hour | 10 | x | |
+| Minute | 30 | x | |
+| Second | 45 | x | |
+| Millisecond | 678 | x | |
+| Day (Week day) | Saturday | x | |
+| Day of the week | 6 | x | |
+| Day of the month | 5 | x | |
+| Day of the year | 64 | x | |
+| Week of the month | 1 | x | |
+| Week of the year (Calendar week, Week number) | 10 | x | |
+| Month | March | x | |
+| Month of the year | 3 | x | |
+| Month and day | March 7 | x | x |
+| Year | 2022 | x | |
+| Era | AD | x | |
+| Era abbreviation | A | x | |
+| Month and year | March 2022 | x | x |
+| Windows file time (Int64 number) | 637820976123938199 | x | x |
+| Universal time format: YYYY-MM-DD hh:mm:ss| 2022-03-05 16:20:12Z | x | x |
+| ISO 8601 | 2022-03-05T17:23:04 | x | x |
+| ISO 8601 UTC | 2022-03-05T16:23:04 | x | x |
+| ISO 8601 with time zone | 2022-03-05T17:23:04+01:00 | x | x |
+| ISO 8601 UTC with time zone | 2022-03-05T16:23:04Z | x | x |
+| RFC1123 | Sat, 05 Mar 2022 16:23:04 GMT | x | x |

 ### Add new formats
 - To add a new formats you have to add them to the method `GetList()` of the [`AvailableResultsList`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Components/AvailableResultsList.cs) class.
@@ -94,13 +73,13 @@ As syntax pattern the pattern from `DateTime.ToString()` and the following custo

 	| Key | Type | Default value | Name | Description |
 	|--------------|--------------|-----------|------------|------------|
+	| `CalendarFirstWeekRule` | Combo box | `-1` (Use system settings) | First week of the year | Configure the calendar rule for the first week of the year. |
+	| `FirstDayOfWeek` | Combo box | `-1` (Use system settings) | First day of the week | |
 	| `OnlyDateTimeNowGlobal` | Checkbox | `true` | Show only 'Time', 'Date', and 'Now' result for system time on global queries | Regardless of this setting, for global queries the first word of the query has to be a complete match. |
 	| `TimeWithSeconds` | Checkbox | `false` | Show time with seconds | This setting applies to the 'Time' and 'Now' result. |
 	| `DateWithWeekday` | Checkbox | `false` | Show date with weekday and name of month | This setting applies to the 'Date' and 'Now' result. |
 	| `HideNumberMessageOnGlobalQuery` | Checkbox | `false` | Hide 'Invalid number input' error message on global queries | |
-	| `CalendarFirstWeekRule` | Combo box | `-1` (Use system settings) | First week of the year | Configure the calendar rule for the first week of the year. |
-	| `FirstDayOfWeek` | Combo box | `-1` (Use system settings) | First day of the week | |
-	| `CustomFormats` | Multiline text box | `string.Empty` | Custom formats | Use date and time string format syntax and DOW (Day of Week), WOM (Week of Month), WOY (Week of the year), EAB (Era abbreviation), WFT (Windows File Time), UXT (Unix Time), UMS (Unix Time in milliseconds), OAD (OLE Automation date), EXC (Excel's 1900 based date value), EXF (Excel's 1904 based date value). If the format starts with UTC:, then Universal Time (UTC) is used. (Use a backslash to escape format sequences and the backslash character as text.) |
+	

 ## Classes

--- a/doc/images/overview/CmdPal_Hero.gif
+++ b/doc/images/overview/CmdPal_Hero.gif
--- a/doc/thirdPartyRunPlugins.md
+++ b/doc/thirdPartyRunPlugins.md
@@ -43,9 +43,6 @@ Contact the developers of a plugin directly for assistance with a specific plugi
 | [TailwindCSS](https://github.com/skttl/ptrun-tailwindcss) | [skttl](https://github.com/skttl) | Search the documentation of TailwindCSS |
 | [HttpStatusCodes](https://github.com/grzhan/HttpStatusCodePowerToys) | [grzhan](https://github.com/grzhan) | Search for http status codes |
 | [SVGL](https://github.com/Sameerjs6/powertoys-svgl) | [SameerJS6](https://github.com/SameerJS6) | Search, Browse and copy SVG logos from SVGL. |
-| [QuickNotes](https://github.com/ruslanlap/CommunityPowerToysRunPlugin-QuickNotes) | [ruslanlap](https://github.com/ruslanlap) | Create, manage, and search notes directly from PowerToys Run. |
-| [Weather](https://github.com/ruslanlap/PowerToysRun-Weather) | [ruslanlap](https://github.com/ruslanlap) | Get real-time weather information directly from PowerToys Run. |
-| [Pomodoro](https://github.com/ruslanlap/PowerToysRun-Pomodoro) | [ruslanlap](https://github.com/ruslanlap) | Manage Pomodoro productivity sessions directly from PowerToys Run. |

 ## Extending software plugins

@@ -68,4 +65,3 @@ Below are community created plugins that target a website or software.  They are
 | [Bilibili](https://github.com/Whuihuan/PowerToysRun-Bilibili) | [Whuihuan](https://github.com/Whuihuan) | Use AVID or BVID to parse and jump to Bilibili |
 | [YubicoOauthOTP](https://github.com/dlnilsson/Community.PowerToys.Run.Plugin.YubicoOauthOTP) | [dlnilsson](https://github.com/dlnilsson) | Display generated codes from OATH accounts stored on the YubiKey in powerToys Run  |
 | [Firefox Bookmark](https://github.com/8LWXpg/PowerToysRun-FirefoxBookmark) | [8LWXpg](https://github.com/8LWXpg) | Open bookmarks in Firefox based browser |
-[Linear](https://github.com/vednig/powertoys-linear) | [vednig](https://github.com/vednig) | Create Linear Issues directly from Powertoys Run |
--- a/installer/PowerToysSetup.sln
+++ b/installer/PowerToysSetup.sln
@@ -17,6 +17,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Version", "..\src\common\ve
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EtwTrace", "..\src\common\Telemetry\EtwTrace\EtwTrace.vcxproj", "{8F021B46-362B-485C-BFBA-CCF83E820CBD}"
 EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "PowerToysInstallerVNext", "PowerToysSetupVNext\PowerToysInstallerVNext.wixproj", "{B6E94700-DF38-41F6-A3FD-18B69674AB1E}"
+EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "PowerToysBootstrapperVNext", "PowerToysSetupVNext\PowerToysBootstrapperVNext.wixproj", "{DA4E9744-80BE-424C-B0F5-AFD8757DB575}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -78,6 +82,22 @@ Global
 		{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Release|ARM64.Build.0 = Release|ARM64
 		{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Release|x64.ActiveCfg = Release|x64
 		{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Release|x64.Build.0 = Release|x64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Debug|ARM64.Build.0 = Debug|ARM64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Debug|x64.ActiveCfg = Debug|x64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Debug|x64.Build.0 = Debug|x64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Release|ARM64.ActiveCfg = Release|ARM64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Release|ARM64.Build.0 = Release|ARM64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Release|x64.ActiveCfg = Release|x64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Release|x64.Build.0 = Release|x64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Debug|ARM64.Build.0 = Debug|ARM64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Debug|x64.ActiveCfg = Debug|x64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Debug|x64.Build.0 = Debug|x64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Release|ARM64.ActiveCfg = Release|ARM64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Release|ARM64.Build.0 = Release|ARM64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Release|x64.ActiveCfg = Release|x64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/installer/PowerToysSetup/CmdPal.wxs
+++ b/installer/PowerToysSetup/CmdPal.wxs
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-  xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define CmdPalBuildDir="$(var.BinDir)\WinUI3Apps\CmdPal\"?>
-
-  <Fragment>
-    <DirectoryRef Id="WinUI3AppsInstallFolder">
-      <Directory Id="CmdPalInstallFolder" Name="CmdPal">
-        <Directory Id="CmdPalDepsInstallFolder" Name="Dependencies">
-        <?if $(sys.BUILDARCH) = x64 ?>
-          <Directory Id="CmdPalDepsX64InstallFolder" Name="x64" />
-        <?else ?>
-          <Directory Id="CmdPalDepsArm64InstallFolder" Name="arm64" />
-        <?endif ?>
-        </Directory>
-      </Directory>
-    </DirectoryRef>
-
-    <DirectoryRef Id="CmdPalInstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test">
-      <Component Id="Module_CmdPal" Win64="yes" Guid="3A4942B2-1A86-4182-B3B4-65157365A980">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Module_CmdPal" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <?if $(sys.BUILDARCH) = x64 ?>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_x64.msix" />
-        <?else ?>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_arm64.msix" />
-        <?endif ?>
-
-      </Component>
-    </DirectoryRef>
-
-    <?if $(sys.BUILDARCH) = x64 ?>
-    <DirectoryRef Id="CmdPalDepsX64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test\Dependencies\x64">
-      <Component Id="Module_CmdPal_Deps" Win64="yes" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test\Dependencies\x64\Microsoft.VCLibs.x64.14.00.Desktop.appx" />
-      </Component>
-    </DirectoryRef>
-    <?else ?>
-    <DirectoryRef Id="CmdPalDepsArm64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test\Dependencies\arm64">
-      <Component Id="Module_CmdPal_Deps" Win64="yes" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test\Dependencies\arm64\Microsoft.VCLibs.ARM64.14.00.Desktop.appx" />
-      </Component>
-    </DirectoryRef>
-    <?endif ?>
-
-    <ComponentGroup Id="CmdPalComponentGroup">
-      <Component Id="RemoveCmdPalFolder" Guid="2DF90C08-CC75-4245-A14E-B82904636C53" Directory="INSTALLFOLDER">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveCmdPalFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveCmdPalInstallDirFolder" Directory="CmdPalInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveCmdPalDepsInstallDirFolder" Directory="CmdPalDepsInstallFolder" On="uninstall"/>
-    <?if $(sys.BUILDARCH) = x64 ?>
-        <RemoveFolder Id="RemoveCmdPalDepsX64InstallDirFolder" Directory="CmdPalDepsX64InstallFolder" On="uninstall"/>
-    <?else ?>
-        <RemoveFolder Id="RemoveCmdPalDepsArm64InstallDirFolder" Directory="CmdPalDepsArm64InstallFolder" On="uninstall"/>
-    <?endif ?>
-      </Component>
-      <ComponentRef Id="Module_CmdPal" />
-      <ComponentRef Id="Module_CmdPal_Deps" />
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>
--- a/installer/PowerToysSetup/PowerToysBootstrapper.wixproj
+++ b/installer/PowerToysSetup/PowerToysBootstrapper.wixproj
@@ -17,12 +17,6 @@
  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' != 'true' ">
    <DefineConstants>$(DefineConstants);PerUser=false</DefineConstants>
  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(CIBuild)' == 'true' ">
-    <DefineConstants>$(DefineConstants);CIBuild=true</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(CIBuild)' != 'true' ">
-    <DefineConstants>$(DefineConstants);CIBuild=false</DefineConstants>
-  </PropertyGroup>
  <PropertyGroup>
    <Configuration>Release</Configuration>
    <Platform Condition="'$(Platform)'=='x64'">x64</Platform>
--- a/installer/PowerToysSetup/PowerToysInstaller.wixproj
+++ b/installer/PowerToysSetup/PowerToysInstaller.wixproj
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureNuGetPackageBuildImports"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureNuGetPackageBuildImports" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
-  <Import Project="..\..\src\CmdPalVersion.props" Condition="Exists('..\..\src\CmdPalVersion.props')" />
  <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />
  <PropertyGroup Condition="'$(Platform)' == 'x64'">
-    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion)</DefineConstants>
+    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC</DefineConstants>
    <!-- THIS IS AN INNER LOOP OPTIMIZATION
    The build pipeline builds the Settings and Launcher projects for Publication
    using a specific profile. If you're doing local installer builds, this will
@@ -19,7 +17,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
    </PreBuildEvent>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Platform)' != 'x64'">
-    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion);</DefineConstants>
+    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\Assets\Monaco\monacoSRC</DefineConstants>
    <PreBuildEvent>IF NOT DEFINED IsPipeline (
 call "$([MSBuild]::GetVsInstallRoot())\Common7\Tools\VsDevCmd.bat" -arch=arm64 -host_arch=amd64 -winsdk=10.0.19041.0 -vcvars_ver=$(VCToolsVersion)
 SET PTRoot=$(SolutionDir)\..
@@ -34,7 +32,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
      call move /Y ..\..\..\AdvancedPaste.wxs.bk ..\..\..\AdvancedPaste.wxs
      call move /Y ..\..\..\Awake.wxs.bk ..\..\..\Awake.wxs
      call move /Y ..\..\..\BaseApplications.wxs.bk ..\..\..\BaseApplications.wxs
-      call move /Y ..\..\..\CmdPal.wxs.bk ..\..\..\CmdPal.wxs
      call move /Y ..\..\..\ColorPicker.wxs.bk ..\..\..\ColorPicker.wxs
      call move /Y ..\..\..\Core.wxs.bk ..\..\..\Core.wxs
      call move /Y ..\..\..\EnvironmentVariables.wxs.bk ..\..\..\EnvironmentVariables.wxs
@@ -57,7 +54,32 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
      call move /Y ..\..\..\WinAppSDK.wxs.bk ..\..\..\WinAppSDK.wxs
      call move /Y ..\..\..\WinUI3Applications.wxs.bk ..\..\..\WinUI3Applications.wxs
      call move /Y ..\..\..\Workspaces.wxs.bk ..\..\..\Workspaces.wxs
-    </PostBuildEvent>
+      call move /Y ..\..\..\..\PowerToysSetupVNext\AdvancedPaste.wxs.bk ..\..\..\..\PowerToysSetupVNext\AdvancedPaste.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\Awake.wxs.bk ..\..\..\..\PowerToysSetupVNext\Awake.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\BaseApplications.wxs.bk ..\..\..\..\PowerToysSetupVNext\BaseApplications.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\ColorPicker.wxs.bk ..\..\..\..\PowerToysSetupVNext\ColorPicker.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\Core.wxs.bk ..\..\..\..\PowerToysSetupVNext\Core.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\EnvironmentVariables.wxs.bk ..\..\..\..\PowerToysSetupVNext\EnvironmentVariables.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\FileExplorerPreview.wxs.bk ..\..\..\..\PowerToysSetupVNext\FileExplorerPreview.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\FileLocksmith.wxs.bk ..\..\..\..\PowerToysSetupVNext\FileLocksmith.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\Hosts.wxs.bk ..\..\..\..\PowerToysSetupVNext\Hosts.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\ImageResizer.wxs.bk ..\..\..\..\PowerToysSetupVNext\ImageResizer.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\KeyboardManager.wxs.bk ..\..\..\..\PowerToysSetupVNext\KeyboardManager.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\MouseWithoutBorders.wxs.bk ..\..\..\..\PowerToysSetupVNext\MouseWithoutBorders.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\NewPlus.wxs.bk ..\..\..\..\PowerToysSetupVNext\NewPlus.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\Peek.wxs.bk ..\..\..\..\PowerToysSetupVNext\Peek.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\PowerRename.wxs.bk ..\..\..\..\PowerToysSetupVNext\PowerRename.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\Product.wxs.bk ..\..\..\..\PowerToysSetupVNext\Product.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\RegistryPreview.wxs.bk ..\..\..\..\PowerToysSetupVNext\RegistryPreview.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\Resources.wxs.bk ..\..\..\..\PowerToysSetupVNext\Resources.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\Run.wxs.bk ..\..\..\..\PowerToysSetupVNext\Run.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\Settings.wxs.bk ..\..\..\..\PowerToysSetupVNext\Settings.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\ShortcutGuide.wxs.bk ..\..\..\..\PowerToysSetupVNext\ShortcutGuide.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\Tools.wxs.bk ..\..\..\..\PowerToysSetupVNext\Tools.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\WinAppSDK.wxs.bk ..\..\..\..\PowerToysSetupVNext\WinAppSDK.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\WinUI3Applications.wxs.bk ..\..\..\..\PowerToysSetupVNext\WinUI3Applications.wxs
+      call move /Y ..\..\..\..\PowerToysSetupVNext\Workspaces.wxs.bk ..\..\..\..\PowerToysSetupVNext\Workspaces.wxs
+      </PostBuildEvent>
  </PropertyGroup>
  <PropertyGroup>
    <Name>PowerToysInstaller</Name>
@@ -68,12 +90,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' != 'true' ">
    <DefineConstants>$(DefineConstants);PerUser=false</DefineConstants>
  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(CIBuild)' == 'true' ">
-    <DefineConstants>$(DefineConstants);CIBuild=true</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(CIBuild)' != 'true' ">
-    <DefineConstants>$(DefineConstants);CIBuild=false</DefineConstants>
-  </PropertyGroup>
  <PropertyGroup>
    <!-- We do not support debug installer builds -->
    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
@@ -113,7 +129,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
    <Compile Include="AdvancedPaste.wxs" />
    <Compile Include="Awake.wxs" />
    <Compile Include="BaseApplications.wxs" />
-    <Compile Include="CmdPal.wxs" />
    <Compile Include="ColorPicker.wxs" />
    <Compile Include="EnvironmentVariables.wxs" />
    <Compile Include="FileExplorerPreview.wxs" />
@@ -198,4 +213,4 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
    </ItemGroup>
  </Target>
  <Target Name="Restore" />
-</Project>
+</Project>
--- a/installer/PowerToysSetup/Product.wxs
+++ b/installer/PowerToysSetup/Product.wxs
@@ -79,7 +79,6 @@
      <ComponentGroupRef Id="ToolComponentGroup" />
      <ComponentGroupRef Id="MonacoSRCHeatGenerated" />
      <ComponentGroupRef Id="WorkspacesComponentGroup" />
-      <ComponentGroupRef Id="CmdPalComponentGroup" />
    </Feature>

    <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" />
@@ -136,7 +135,6 @@
    <InstallExecuteSequence>
      <Custom Action="DetectPrevInstallPath" After="AppSearch" />
      <Custom Action="SetLaunchPowerToysParam" Before="LaunchPowerToys" />
-      <Custom Action="SetInstallCmdPalPackageParam" Before="InstallCmdPalPackage" />
      <Custom Action="SetUninstallCommandNotFoundParam" Before="UninstallCommandNotFound" />
      <Custom Action="SetUpgradeCommandNotFoundParam" Before="UpgradeCommandNotFound" />
      <Custom Action="SetApplyModulesRegistryChangeSetsParam" Before="ApplyModulesRegistryChangeSets" />
@@ -152,9 +150,6 @@
      <Custom Action="ApplyModulesRegistryChangeSets" After="InstallFiles">
        NOT Installed
      </Custom>
-      <Custom Action="InstallCmdPalPackage" After="InstallFiles">
-        NOT Installed
-      </Custom>
      <Custom Action="WixCloseApplications" Before="RemoveFiles" />
      <Custom Action="RemovePowerToysSchTasks" After="RemoveFiles" />
      <!-- TODO: Use to activate embedded MSIX -->
@@ -176,9 +171,6 @@
      <Custom Action="UnRegisterContextMenuPackages" Before="RemoveFiles">
        Installed AND (REMOVE="ALL")
      </Custom>
-      <Custom Action="UnRegisterCmdPalPackage" Before="RemoveFiles">
-        Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
-      </Custom>
      <Custom Action="UnsetAdvancedPasteAPIKey" Before="RemoveFiles">
        Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
      </Custom>
@@ -212,10 +204,6 @@
                    Property="LaunchPowerToys"
                    Value="[INSTALLFOLDER]" />

-    <CustomAction Id="SetInstallCmdPalPackageParam"
-                    Property="InstallCmdPalPackage"
-                    Value="[INSTALLFOLDER]" />
-
    <CustomAction
      Id="LaunchPowerToys"
      Return="ignore"
@@ -439,14 +427,6 @@
                DllEntry="UnRegisterContextMenuPackagesCA"
                  />

-    <CustomAction Id="UnRegisterCmdPalPackage"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="UnRegisterCmdPalPackageCA"
-                  />
-
    <CustomAction Id="CheckGPO"
                  Return="check"
                  Impersonate="yes"
@@ -454,14 +434,6 @@
                  DllEntry="CheckGPOCA"
                  />

-    <CustomAction Id="InstallCmdPalPackage"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="InstallCmdPalPackageCA"
-                  />
-
    <!-- Close 'PowerToys.exe' before uninstall-->
    <Property Id="MSIRESTARTMANAGERCONTROL" Value="DisableShutdown" />
    <Property Id="MSIFASTINSTALL" Value="DisableShutdown" />
--- a/installer/PowerToysSetupCustomActions/CustomAction.cpp
+++ b/installer/PowerToysSetupCustomActions/CustomAction.cpp
@@ -11,7 +11,6 @@
 #include "../../src/common/updating/installer.h"
 #include "../../src/common/version/version.h"
 #include "../../src/common/Telemetry/EtwTrace/EtwTrace.h"
-#include "../../src/common/utils/package.h"
 #include "../../src/common/utils/clean_video_conference.h"

 #include <winrt/Windows.ApplicationModel.h>
@@ -36,13 +35,13 @@ TRACELOGGING_DEFINE_PROVIDER(
    TraceLoggingOptionProjectTelemetry());

 const DWORD USERNAME_DOMAIN_LEN = DNLEN + UNLEN + 2; // Domain Name + '\' + User Name + '\0'
-const DWORD USERNAME_LEN = UNLEN + 1;                // User Name + '\0'
+const DWORD USERNAME_LEN = UNLEN + 1; // User Name + '\0'

-static const wchar_t *POWERTOYS_EXE_COMPONENT = L"{A2C66D91-3485-4D00-B04D-91844E6B345B}";
-static const wchar_t *POWERTOYS_UPGRADE_CODE = L"{42B84BF7-5FBF-473B-9C8B-049DC16F7708}";
+static const wchar_t* POWERTOYS_EXE_COMPONENT = L"{A2C66D91-3485-4D00-B04D-91844E6B345B}";
+static const wchar_t* POWERTOYS_UPGRADE_CODE = L"{42B84BF7-5FBF-473B-9C8B-049DC16F7708}";

-constexpr inline const wchar_t *DataDiagnosticsRegKey = L"Software\\Classes\\PowerToys";
-constexpr inline const wchar_t *DataDiagnosticsRegValueName = L"AllowDataDiagnostics";
+constexpr inline const wchar_t* DataDiagnosticsRegKey = L"Software\\Classes\\PowerToys";
+constexpr inline const wchar_t* DataDiagnosticsRegValueName = L"AllowDataDiagnostics";

 #define TraceLoggingWriteWrapper(provider, eventName, ...)   \
    if (isDataDiagnosticEnabled())                           \
@@ -53,16 +52,16 @@ constexpr inline const wchar_t *DataDiagnosticsRegValueName = L"AllowDataDiagnos
        trace.UpdateState(false);                            \
    }

-static Shared::Trace::ETWTrace trace{L"PowerToys_Installer"};
+static Shared::Trace::ETWTrace trace{ L"PowerToys_Installer" };

 inline bool isDataDiagnosticEnabled()
 {
    HKEY key{};
    if (RegOpenKeyExW(HKEY_CURRENT_USER,
-                      DataDiagnosticsRegKey,
-                      0,
-                      KEY_READ,
-                      &key) != ERROR_SUCCESS)
+                        DataDiagnosticsRegKey,
+                        0,
+                        KEY_READ,
+                        &key) != ERROR_SUCCESS)
    {
        return false;
    }
@@ -87,7 +86,8 @@ inline bool isDataDiagnosticEnabled()
    return isDataDiagnosticsEnabled == 1;
 }

-HRESULT getInstallFolder(MSIHANDLE hInstall, std::wstring &installationDir)
+
+HRESULT getInstallFolder(MSIHANDLE hInstall, std::wstring& installationDir)
 {
    DWORD len = 0;
    wchar_t _[1];
@@ -116,13 +116,13 @@ BOOL IsLocalSystem()

    // open process token
    if (!OpenProcessToken(GetCurrentProcess(),
-                          TOKEN_QUERY,
-                          &hToken))
+        TOKEN_QUERY,
+        &hToken))
        return FALSE;

    // retrieve user SID
    if (!GetTokenInformation(hToken, TokenUser, pTokenUser,
-                             sizeof(bTokenUser), &cbTokenUser))
+        sizeof(bTokenUser), &cbTokenUser))
    {
        CloseHandle(hToken);
        return FALSE;
@@ -132,7 +132,7 @@ BOOL IsLocalSystem()

    // allocate LocalSystem well-known SID
    if (!AllocateAndInitializeSid(&siaNT, 1, SECURITY_LOCAL_SYSTEM_RID,
-                                  0, 0, 0, 0, 0, 0, 0, &pSystemSid))
+        0, 0, 0, 0, 0, 0, 0, &pSystemSid))
        return FALSE;

    // compare the user SID from the token with the LocalSystem SID
@@ -194,7 +194,7 @@ static std::filesystem::path GetUserPowerShellModulesPath()

    if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_Documents, 0, NULL, &myDocumentsBlockPtr)))
    {
-        const std::wstring myDocuments{myDocumentsBlockPtr};
+        const std::wstring myDocuments{ myDocumentsBlockPtr };
        CoTaskMemFree(myDocumentsBlockPtr);
        return std::filesystem::path(myDocuments) / "PowerShell" / "Modules";
    }
@@ -227,12 +227,10 @@ UINT __stdcall LaunchPowerToysCA(MSIHANDLE hInstall)

    BOOL isSystemUser = IsLocalSystem();

-    if (isSystemUser)
-    {
+    if (isSystemUser) {

-        auto action = [&commandLine](HANDLE userToken)
-        {
-            STARTUPINFO startupInfo{.cb = sizeof(STARTUPINFO), .wShowWindow = SW_SHOWNORMAL};
+        auto action = [&commandLine](HANDLE userToken) {
+            STARTUPINFO startupInfo{ .cb = sizeof(STARTUPINFO),  .wShowWindow = SW_SHOWNORMAL };
            PROCESS_INFORMATION processInformation;

            PVOID lpEnvironment = NULL;
@@ -271,7 +269,7 @@ UINT __stdcall LaunchPowerToysCA(MSIHANDLE hInstall)
    }
    else
    {
-        STARTUPINFO startupInfo{.cb = sizeof(STARTUPINFO), .wShowWindow = SW_SHOWNORMAL};
+        STARTUPINFO startupInfo{ .cb = sizeof(STARTUPINFO),  .wShowWindow = SW_SHOWNORMAL };

        PROCESS_INFORMATION processInformation;

@@ -315,7 +313,7 @@ UINT __stdcall CheckGPOCA(MSIHANDLE hInstall)
    LPWSTR currentScope = nullptr;
    hr = WcaGetProperty(L"InstallScope", &currentScope);

-    if (std::wstring{currentScope} == L"perUser")
+    if (std::wstring{ currentScope } == L"perUser")
    {
        if (powertoys_gpo::getDisablePerUserInstallationValue() == powertoys_gpo::gpo_rule_configured_enabled)
        {
@@ -356,7 +354,7 @@ UINT __stdcall ApplyModulesRegistryChangeSetsCA(MSIHANDLE hInstall)
    hr = getInstallFolder(hInstall, installationFolder);
    ExitOnFailure(hr, "Failed to get installFolder.");

-    for (const auto &changeSet : getAllOnByDefaultModulesChangeSets(installationFolder))
+    for (const auto& changeSet : getAllOnByDefaultModulesChangeSets(installationFolder))
    {
        if (!changeSet.apply())
        {
@@ -384,7 +382,7 @@ UINT __stdcall UnApplyModulesRegistryChangeSetsCA(MSIHANDLE hInstall)
    ExitOnFailure(hr, "Failed to initialize");
    hr = getInstallFolder(hInstall, installationFolder);
    ExitOnFailure(hr, "Failed to get installFolder.");
-    for (const auto &changeSet : getAllModulesChangeSets(installationFolder))
+    for (const auto& changeSet : getAllModulesChangeSets(installationFolder))
    {
        changeSet.unApply();
    }
@@ -398,8 +396,8 @@ LExit:
    return WcaFinalize(er);
 }

-const wchar_t *DSC_CONFIGURE_PSD1_NAME = L"Microsoft.PowerToys.Configure.psd1";
-const wchar_t *DSC_CONFIGURE_PSM1_NAME = L"Microsoft.PowerToys.Configure.psm1";
+const wchar_t* DSC_CONFIGURE_PSD1_NAME = L"Microsoft.PowerToys.Configure.psd1";
+const wchar_t* DSC_CONFIGURE_PSM1_NAME = L"Microsoft.PowerToys.Configure.psm1";

 UINT __stdcall InstallDSCModuleCA(MSIHANDLE hInstall)
 {
@@ -431,7 +429,7 @@ UINT __stdcall InstallDSCModuleCA(MSIHANDLE hInstall)
            ExitOnFailure(hr, "Unable to create Powershell modules folder");
        }

-        for (const auto *filename : {DSC_CONFIGURE_PSD1_NAME, DSC_CONFIGURE_PSM1_NAME})
+        for (const auto* filename : { DSC_CONFIGURE_PSD1_NAME, DSC_CONFIGURE_PSM1_NAME })
        {
            fs::copy_file(fs::path(installationFolder) / "DSCModules" / filename, modulesPath / filename, fs::copy_options::overwrite_existing, errorCode);

@@ -479,7 +477,7 @@ UINT __stdcall UninstallDSCModuleCA(MSIHANDLE hInstall)

        std::error_code errorCode;

-        for (const auto *filename : {DSC_CONFIGURE_PSD1_NAME, DSC_CONFIGURE_PSM1_NAME})
+        for (const auto* filename : { DSC_CONFIGURE_PSD1_NAME, DSC_CONFIGURE_PSM1_NAME })
        {
            fs::remove(versionedModulePath / filename, errorCode);

@@ -490,7 +488,7 @@ UINT __stdcall UninstallDSCModuleCA(MSIHANDLE hInstall)
            }
        }

-        for (const auto *modulePath : {&versionedModulePath, &powerToysModulePath})
+        for (const auto* modulePath : { &versionedModulePath, &powerToysModulePath })
        {
            fs::remove(*modulePath, errorCode);

@@ -537,7 +535,7 @@ UINT __stdcall InstallEmbeddedMSIXCA(MSIHANDLE hInstall)
        using namespace winrt::Windows::Management::Deployment;
        using namespace winrt::Windows::Foundation;

-        Uri msix_uri{msix_path.wstring()};
+        Uri msix_uri{ msix_path.wstring() };
        PackageManager pm;
        auto result = pm.AddPackageAsync(msix_uri, nullptr, DeploymentOptions::None).get();
        if (!result)
@@ -571,7 +569,7 @@ UINT __stdcall UninstallEmbeddedMSIXCA(MSIHANDLE hInstall)
    hr = WcaInitialize(hInstall, "UninstallEmbeddedMSIXCA");
    ExitOnFailure(hr, "Failed to initialize");

-    for (const auto &p : pm.FindPackagesForUser({}, package_name, publisher))
+    for (const auto& p : pm.FindPackagesForUser({}, package_name, publisher))
    {
        auto result = pm.RemovePackageAsync(p.Id().FullName()).get();
        if (result)
@@ -685,6 +683,7 @@ UINT __stdcall UninstallCommandNotFoundModuleCA(MSIHANDLE hInstall)
    command += "-NoProfile -NonInteractive -NoLogo -WindowStyle Hidden -ExecutionPolicy Unrestricted -File \"" + winrt::to_string(installationFolder) + "\\WinUI3Apps\\Assets\\Settings\\Scripts\\DisableModule.ps1" + "\"";
 #endif

+
    system(command.c_str());

 LExit:
@@ -739,10 +738,10 @@ UINT __stdcall RemoveScheduledTasksCA(MSIHANDLE hInstall)
    HRESULT hr = S_OK;
    UINT er = ERROR_SUCCESS;

-    ITaskService *pService = nullptr;
-    ITaskFolder *pTaskFolder = nullptr;
-    IRegisteredTaskCollection *pTaskCollection = nullptr;
-    ITaskFolder *pRootFolder = nullptr;
+    ITaskService* pService = nullptr;
+    ITaskFolder* pTaskFolder = nullptr;
+    IRegisteredTaskCollection* pTaskCollection = nullptr;
+    ITaskFolder* pRootFolder = nullptr;
    LONG numTasks = 0;

    hr = WcaInitialize(hInstall, "RemoveScheduledTasksCA");
@@ -755,10 +754,10 @@ UINT __stdcall RemoveScheduledTasksCA(MSIHANDLE hInstall)
    // ------------------------------------------------------
    // Create an instance of the Task Service.
    hr = CoCreateInstance(CLSID_TaskScheduler,
-                          nullptr,
-                          CLSCTX_INPROC_SERVER,
-                          IID_ITaskService,
-                          reinterpret_cast<void **>(&pService));
+        nullptr,
+        CLSCTX_INPROC_SERVER,
+        IID_ITaskService,
+        reinterpret_cast<void**>(&pService));
    ExitOnFailure(hr, "Failed to create an instance of ITaskService: %x", hr);

    // Connect to the task service.
@@ -786,7 +785,7 @@ UINT __stdcall RemoveScheduledTasksCA(MSIHANDLE hInstall)
    {
        // Delete all the tasks found.
        // If some tasks can't be deleted, the folder won't be deleted later and the user will still be notified.
-        IRegisteredTask *pRegisteredTask = nullptr;
+        IRegisteredTask* pRegisteredTask = nullptr;
        hr = pTaskCollection->get_Item(_variant_t(i + 1), &pRegisteredTask);
        if (SUCCEEDED(hr))
        {
@@ -862,7 +861,8 @@ UINT __stdcall TelemetryLogInstallSuccessCA(MSIHANDLE hInstall)
        TraceLoggingWideString(get_product_version().c_str(), "Version"),
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE)
+        );

 LExit:
    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
@@ -1028,7 +1028,7 @@ UINT __stdcall DetectPrevInstallPathCA(MSIHANDLE hInstall)

    try
    {
-        if (auto install_path = GetMsiPackageInstalledPath(std::wstring{currentScope} == L"perUser"))
+        if (auto install_path = GetMsiPackageInstalledPath(std::wstring{ currentScope } == L"perUser"))
        {
            MsiSetPropertyW(hInstall, L"PREVIOUSINSTALLFOLDER", install_path->data());
        }
@@ -1040,82 +1040,6 @@ UINT __stdcall DetectPrevInstallPathCA(MSIHANDLE hInstall)
    return WcaFinalize(er);
 }

-UINT __stdcall InstallCmdPalPackageCA(MSIHANDLE hInstall)
-{
-    using namespace winrt::Windows::Foundation;
-    using namespace winrt::Windows::Management::Deployment;
-
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    std::wstring installationFolder;
-
-    hr = WcaInitialize(hInstall, "InstallCmdPalPackage");
-    hr = getInstallFolder(hInstall, installationFolder);
-
-    try
-    {
-        auto msix = package::FindMsixFile(installationFolder + L"\\WinUI3Apps\\CmdPal\\", false);
-        auto dependencies = package::FindMsixFile(installationFolder + L"\\WinUI3Apps\\CmdPal\\Dependencies\\", true);
-
-        if (!msix.empty())
-        {
-            auto msixPath = msix[0];
-
-            if (!package::RegisterPackage(msixPath, dependencies))
-            {
-                Logger::error(L"Failed to install CmdPal package");
-                er = ERROR_INSTALL_FAILURE;
-            }
-        }
-    }
-    catch (std::exception &e)
-    {
-        std::string errorMessage{"Exception thrown while trying to install CmdPal package: "};
-        errorMessage += e.what();
-        Logger::error(errorMessage);
-
-        er = ERROR_INSTALL_FAILURE;
-    }
-
-    er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall UnRegisterCmdPalPackageCA(MSIHANDLE hInstall)
-{
-    using namespace winrt::Windows::Foundation;
-    using namespace winrt::Windows::Management::Deployment;
-
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-
-    hr = WcaInitialize(hInstall, "UnRegisterCmdPalPackageCA");
-
-    try
-    {
-        // Packages to unregister
-        std::wstring packageToRemoveDisplayName {L"Microsoft.CommandPalette"};
-
-        if (!package::UnRegisterPackage(packageToRemoveDisplayName))
-        {
-            Logger::error(L"Failed to unregister package: " + packageToRemoveDisplayName);
-            er = ERROR_INSTALL_FAILURE;
-        }
-    }
-    catch (std::exception &e)
-    {
-        std::string errorMessage{"Exception thrown while trying to unregister the CmdPal package: "};
-        errorMessage += e.what();
-        Logger::error(errorMessage);
-
-        er = ERROR_INSTALL_FAILURE;
-    }
-
-    er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er;
-    return WcaFinalize(er);
-}
-
-
 UINT __stdcall UnRegisterContextMenuPackagesCA(MSIHANDLE hInstall)
 {
    using namespace winrt::Windows::Foundation;
@@ -1129,20 +1053,54 @@ UINT __stdcall UnRegisterContextMenuPackagesCA(MSIHANDLE hInstall)
    try
    {
        // Packages to unregister
-        const std::vector<std::wstring> packagesToRemoveDisplayName{{L"PowerRenameContextMenu"}, {L"ImageResizerContextMenu"}, {L"FileLocksmithContextMenu"}, {L"NewPlusContextMenu"}};
+        const std::vector<std::wstring> packagesToRemoveDisplayName{ { L"PowerRenameContextMenu" }, { L"ImageResizerContextMenu" }, { L"FileLocksmithContextMenu" }, { L"NewPlusContextMenu" } };

-        for (auto const &package : packagesToRemoveDisplayName)
+        PackageManager packageManager;
+
+        for (auto const& package : packageManager.FindPackages())
        {
-            if (!package::UnRegisterPackage(package))
+            const auto& packageFullName = std::wstring{ package.Id().FullName() };
+
+            for (const auto& packageToRemove : packagesToRemoveDisplayName)
            {
-                Logger::error(L"Failed to unregister package: " + package);
-                er = ERROR_INSTALL_FAILURE;
+                if (packageFullName.contains(packageToRemove))
+                {
+                    auto deploymentOperation{ packageManager.RemovePackageAsync(packageFullName) };
+                    deploymentOperation.get();
+
+                    // Check the status of the operation
+                    if (deploymentOperation.Status() == AsyncStatus::Error)
+                    {
+                        auto deploymentResult{ deploymentOperation.GetResults() };
+                        auto errorCode = deploymentOperation.ErrorCode();
+                        auto errorText = deploymentResult.ErrorText();
+
+                        Logger::error(L"Unregister {} package failed. ErrorCode: {}, ErrorText: {}", packageFullName, std::to_wstring(errorCode), errorText);
+
+                        er = ERROR_INSTALL_FAILURE;
+                    }
+                    else if (deploymentOperation.Status() == AsyncStatus::Canceled)
+                    {
+                        Logger::error(L"Unregister {} package canceled.", packageFullName);
+
+                        er = ERROR_INSTALL_FAILURE;
+                    }
+                    else if (deploymentOperation.Status() == AsyncStatus::Completed)
+                    {
+                        Logger::info(L"Unregister {} package completed.", packageFullName);
+                    }
+                    else
+                    {
+                        Logger::debug(L"Unregister {} package started.", packageFullName);
+                    }
+                }
+
            }
        }
    }
-    catch (std::exception &e)
+    catch (std::exception& e)
    {
-        std::string errorMessage{"Exception thrown while trying to unregister sparse packages: "};
+        std::string errorMessage{ "Exception thrown while trying to unregister sparse packages: " };
        errorMessage += e.what();
        Logger::error(errorMessage);

@@ -1170,7 +1128,7 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
    }
    processes.resize(bytes / sizeof(processes[0]));

-    std::array<std::wstring_view, 39> processesToTerminate = {
+    std::array<std::wstring_view, 38> processesToTerminate = {
        L"PowerToys.PowerLauncher.exe",
        L"PowerToys.Settings.exe",
        L"PowerToys.AdvancedPaste.exe",
@@ -1207,7 +1165,6 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
        L"PowerToys.WorkspacesLauncherUI.exe",
        L"PowerToys.WorkspacesEditor.exe",
        L"PowerToys.WorkspacesWindowArranger.exe",
-        L"Microsoft.CmdPal.UI.exe",
        L"PowerToys.ZoomIt.exe",
        L"PowerToys.exe",
    };
@@ -1220,7 +1177,7 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
        }
        wchar_t processName[MAX_PATH] = L"<unknown>";

-        HANDLE hProcess{OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ | PROCESS_TERMINATE, FALSE, procID)};
+        HANDLE hProcess{ OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ | PROCESS_TERMINATE, FALSE, procID) };
        if (!hProcess)
        {
            continue;
@@ -1240,9 +1197,8 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
            if (processName == processToTerminate)
            {
                const DWORD timeout = 500;
-                auto windowEnumerator = [](HWND hwnd, LPARAM procIDPtr) -> BOOL
-                {
-                    auto targetProcID = *reinterpret_cast<const DWORD *>(procIDPtr);
+                auto windowEnumerator = [](HWND hwnd, LPARAM procIDPtr) -> BOOL {
+                    auto targetProcID = *reinterpret_cast<const DWORD*>(procIDPtr);
                    DWORD windowProcID = 0;
                    GetWindowThreadProcessId(hwnd, &windowProcID);
                    if (windowProcID == targetProcID)
@@ -1268,15 +1224,15 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
 void initSystemLogger()
 {
    static std::once_flag initLoggerFlag;
-    std::call_once(initLoggerFlag, []()
-                   {
-            WCHAR temp_path[MAX_PATH];
-            auto ret = GetTempPath(MAX_PATH, temp_path);
+    std::call_once(initLoggerFlag, []() {
+        WCHAR temp_path[MAX_PATH];
+        auto ret = GetTempPath(MAX_PATH, temp_path);

-            if (ret)
-            {
-                Logger::init("PowerToysMSI", std::wstring{ temp_path } + L"\\PowerToysMSIInstaller", L"");
-            } });
+        if (ret)
+        {
+            Logger::init("PowerToysMSI", std::wstring{ temp_path } + L"\\PowerToysMSIInstaller", L"");
+        }
+        });
 }

 // DllMain - Initialize and cleanup WiX custom action utils.
--- a/installer/PowerToysSetupCustomActions/CustomAction.def
+++ b/installer/PowerToysSetupCustomActions/CustomAction.def
@@ -18,9 +18,7 @@ EXPORTS
 	TerminateProcessesCA
 	InstallEmbeddedMSIXCA
 	InstallDSCModuleCA
-	InstallCmdPalPackageCA
 	UnApplyModulesRegistryChangeSetsCA
-	UnRegisterCmdPalPackageCA
 	UnRegisterContextMenuPackagesCA
 	UninstallEmbeddedMSIXCA
 	UninstallDSCModuleCA
--- a/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj
+++ b/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
  <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />
  <PropertyGroup Label="Globals">
@@ -55,7 +54,6 @@
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\AdvancedPaste.wxs"" ""$(ProjectDir)..\PowerToysSetup\AdvancedPaste.wxs.bk""""
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Awake.wxs"" ""$(ProjectDir)..\PowerToysSetup\Awake.wxs.bk""""
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\BaseApplications.wxs"" ""$(ProjectDir)..\PowerToysSetup\BaseApplications.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\CmdPal.wxs"" ""$(ProjectDir)..\PowerToysSetup\CmdPal.wxs.bk""""
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\ColorPicker.wxs"" ""$(ProjectDir)..\PowerToysSetup\ColorPicker.wxs.bk""""
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Core.wxs"" ""$(ProjectDir)..\PowerToysSetup\Core.wxs.bk""""
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\EnvironmentVariables.wxs"" ""$(ProjectDir)..\PowerToysSetup\EnvironmentVariables.wxs.bk""""
@@ -80,8 +78,35 @@
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Workspaces.wxs"" ""$(ProjectDir)..\PowerToysSetup\Workspaces.wxs.bk""""
      if not "$(NormalizedPerUserValue)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetup\generateAllFileComponents.ps1 -platform $(Platform)
      if "$(NormalizedPerUserValue)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetup\generateAllFileComponents.ps1 -platform $(Platform) -installscopeperuser $(NormalizedPerUserValue)
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\AdvancedPaste.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\AdvancedPaste.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Awake.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Awake.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\BaseApplications.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\BaseApplications.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\ColorPicker.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\ColorPicker.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Core.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Core.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\EnvironmentVariables.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\EnvironmentVariables.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\FileExplorerPreview.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\FileExplorerPreview.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\FileLocksmith.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\FileLocksmith.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Hosts.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Hosts.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\ImageResizer.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\ImageResizer.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\KeyboardManager.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\KeyboardManager.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\MouseWithoutBorders.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\MouseWithoutBorders.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\NewPlus.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\NewPlus.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Peek.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Peek.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\PowerRename.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\PowerRename.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Product.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Product.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\RegistryPreview.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\RegistryPreview.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Resources.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Resources.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Run.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Run.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Settings.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Settings.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\ShortcutGuide.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\ShortcutGuide.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Tools.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Tools.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\WinAppSDK.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\WinAppSDK.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\WinUI3Applications.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\WinUI3Applications.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Workspaces.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Workspaces.wxs.bk""""
+      if not "$(NormalizedPerUserValue)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetupVNext\generateAllFileComponents.ps1 -platform $(Platform)
+      if "$(NormalizedPerUserValue)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetupVNext\generateAllFileComponents.ps1 -platform $(Platform) -installscopeperuser $(NormalizedPerUserValue)
      </Command>
-      <Message>Backing up original files and populating .NET and WPF Runtime dependencies </Message>
+      <Message>Backing up original files and populating .NET and WPF Runtime dependencies for WiX3 based installer</Message>
    </PreBuildEvent>
  </ItemDefinitionGroup>
  <PropertyGroup Condition="'$(RunBuildEvents)'=='false'">
--- a/installer/PowerToysSetupVNext/AdvancedPaste.wxs
+++ b/installer/PowerToysSetupVNext/AdvancedPaste.wxs
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define AdvancedPasteAssetsFiles=?>
+  <?define AdvancedPasteAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\AdvancedPaste\?>
+
+  <Fragment>
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="AdvancedPasteAssetsFolder" Name="AdvancedPaste" />
+    </DirectoryRef>
+    <DirectoryRef Id="AdvancedPasteAssetsFolder" FileSource="$(var.AdvancedPasteAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--AdvancedPasteAssetsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="AdvancedPasteComponentGroup">
+      <Component Id="RemoveAdvancedPasteFolder" Guid="55AFE81D-F6BD-439A-A229-66AF5C360AB0" Directory="AdvancedPasteAssetsFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveAdvancedPasteFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderAdvancedPasteAssetsFolder" Directory="AdvancedPasteAssetsFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/Awake.wxs
+++ b/installer/PowerToysSetupVNext/Awake.wxs
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define AwakeImagesFiles=?>
+  <?define AwakeImagesFilesPath=$(var.BinDir)\Assets\Awake\?>
+
+  <Fragment>
+    <!-- Awake images -->
+
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="AwakeImagesFolder" Name="Awake" />
+    </DirectoryRef>
+
+    <DirectoryRef Id="AwakeImagesFolder" FileSource="$(var.AwakeImagesFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--AwakeImagesFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="AwakeComponentGroup">
+      <Component Id="RemoveAwakeFolder" Guid="95D7774C-69A3-48A3-B417-1BD9664BE974" Directory="INSTALLFOLDER" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveAwakeFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderAwakeImagesFolder" Directory="AwakeImagesFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/BaseApplications.wxs
+++ b/installer/PowerToysSetupVNext/BaseApplications.wxs
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define BaseApplicationsFiles=?>
+  <?define BaseApplicationsFilesPath=$(var.BinDir)\?>
+
+  <Fragment>
+    <DirectoryRef Id="INSTALLFOLDER">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--BaseApplicationsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="BaseApplicationsComponentGroup">
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/ColorPicker.wxs
+++ b/installer/PowerToysSetupVNext/ColorPicker.wxs
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define ColorPickerAssetsFiles=?>
+  <?define ColorPickerAssetsFilesPath=$(var.BinDir)Assets\ColorPicker\?>
+
+  <Fragment>
+  <!-- Color Picker -->
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="ColorPickerAssetsFolder" Name="ColorPicker" />
+    </DirectoryRef>
+    <!-- Color Picker Resources -->
+    <DirectoryRef Id="ColorPickerAssetsFolder" FileSource="$(var.ColorPickerAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ColorPickerAssetsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="ColorPickerComponentGroup">
+      <Component Id="RemoveColorPickerFolder" Guid="18C0C18C-F38A-4C88-B22C-9222F3A5B2EB" Directory="INSTALLFOLDER" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveColorPickerFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderColorPickerAssetsFolder" Directory="ColorPickerAssetsFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/Common.wxi
+++ b/installer/PowerToysSetupVNext/Common.wxi
@@ -0,0 +1,58 @@
+<Include>
+  <!-- Names of folders and projects -->
+  <?define FancyZonesProjectName="FancyZones"?>
+  <?define ImageResizerProjectName="ImageResizer"?>
+  <?define KeyboardManagerProjectName="KeyboardManager"?>
+  <?define PowerAccentProjectName="PowerAccent"?>
+  <?define PowerRenameProjectName="PowerRename"?>
+  <?define FileLocksmithProjectName="FileLocksmith"?>
+  <?define ColorPickerProjectName="ColorPicker"?>
+  <?define PowerOCRProjectName="PowerOCR"?>
+  <?define AwakeProjectName="Awake"?>
+  <?define MouseUtilsProjectName="MouseUtils"?>
+  <?define AlwaysOnTopProjectName="AlwaysOnTop"?>
+  <?define MeasureToolProjectName="MeasureTool"?>
+  <?define HostsProjectName="Hosts"?>
+  <?define MouseWithoutBordersProjectName="MouseWithoutBorders"?>
+  <?define AdvancedPasteProjectName="AdvancedPaste"?>
+  <?define RegistryPreviewProjectName="RegistryPreview"?>
+  <?define PeekProjectName="Peek"?>
+  <?define WorkspacesProjectName="Workspaces"?>
+  
+  <?define RepoDir="$(var.ProjectDir)..\..\" ?>
+  <?if $(var.Platform) = x64?>
+        <?define PowerToysPlatform="x64"?>
+        <?define PlatformProgramFiles="[ProgramFiles64Folder]"?>
+        <?define PlatformLK="x64" ?>
+        <?define BinDir="$(var.RepoDir)x64\$(var.Configuration)\" ?>
+  <?else?>
+        <!-- stable WIX 3 doesn't support ARM64, so we build installers as x86 -->
+        <?define PowerToysPlatform="ARM64"?>
+        <!--TODO: define to ARM64 Program files once it's available-->
+        <?define PlatformProgramFiles="[ProgramFiles6432Folder]"?> 
+        <?define PlatformLK="arm64" ?>
+        <?define BinDir="$(var.RepoDir)ARM64\$(var.Configuration)\" ?>
+  <?endif?>
+
+  <?if $(var.PerUser) = "true"?>
+        <?define PerMachineYesNo="no"?>
+        <?define MSIPath="UserSetup"?>
+        <?define MSIName="PowerToysUserSetupVNext-$(var.Version)-$(var.PowerToysPlatform).msi"?>
+        <?define DefaultInstallDir="LocalAppDataFolder" ?>
+        <?define RegistryScope="HKCU" ?>
+        <?define InstallScope="perUser" ?>
+        <?define InstallPrivileges="limited" ?>
+        <?define UpgradeCodeGUID="D8B559DB-4C98-487A-A33F-50A8EEE42726" ?>
+   <?else?>
+        <?define PerMachineYesNo="yes"?>
+        <?define MSIPath="MachineSetup"?>
+        <?define MSIName="PowerToysSetupVNext-$(var.Version)-$(var.PowerToysPlatform).msi"?>
+        <?define DefaultInstallDir="ProgramFiles64Folder" ?>
+        <?define RegistryScope="HKLM" ?>
+        <?define InstallScope="perMachine" ?>
+        <?define InstallPrivileges="elevated" ?>
+        <?define UpgradeCodeGUID="42B84BF7-5FBF-473B-9C8B-049DC16F7708" ?>
+  <?endif?>
+
+  <?define BinX32Dir="$(var.RepoDir)x86\$(var.Configuration)\" ?>
+</Include>
--- a/installer/PowerToysSetupVNext/Core.wxs
+++ b/installer/PowerToysSetupVNext/Core.wxs
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <Fragment>
+    <DirectoryRef Id="INSTALLFOLDER" FileSource="$(var.BinDir)">
+      <Component Id="powertoys_per_machine_comp" Win64="yes">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys">
+          <RegistryValue Type="string" Name="InstallScope" Value="$(var.InstallScope)" />
+        </RegistryKey>
+      </Component>
+      <Component Id="powertoys_toast_clsid" Win64="yes">
+        <RemoveFolder Id='Remove_powertoys_toast_clsid' On='uninstall' />
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{DD5CACDA-7C2E-4997-A62A-04A597B58F76}">
+          <RegistryValue Type="string" Value="PowerToys Toast Notifications Background Activator" />
+          <RegistryValue Type="string" Key="LocalServer32" Value="[INSTALLFOLDER]PowerToys.exe -ToastActivated" />
+          <RegistryValue Type="string" Key="LocalServer32" Name="ThreadingModel" Value="Apartment" />
+        </RegistryKey>
+      </Component>
+      <Component Id="powertoys_exe" Win64="yes" Guid="30261594-41A6-4509-AD09-FBC4E692F441">
+        <File Id="PowerToys.exe" Checksum="yes" />
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys">
+          <RegistryValue Type="string" Name="URL Protocol" Value="" KeyPath="yes"/>
+          <RegistryValue Type="string" Value="URL:PowerToys custom internal URI protocol"/>
+          <RegistryKey Key="DefaultIcon">
+            <RegistryValue Type="string" Value="PowerToys.exe" />
+          </RegistryKey>
+          <RegistryKey Key="shell\open\command">
+            <RegistryValue Type="string" Value="&quot;[INSTALLFOLDER]PowerToys.exe&quot; &quot;%1&quot;" />
+          </RegistryKey>
+        </RegistryKey>
+      </Component>
+      <Component Id="License_rtf" Win64="yes" Guid="632C60DF-0DDC-4F14-8F2B-A28136CD9E63">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="License_rtf" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.RepoDir)\installer\License.rtf" Id="License.rtf" />
+      </Component>
+      <Component Id="Notice_md" Win64="yes" Guid="1671B5F5-1260-42CF-83A8-9B3430DFF8C5">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Notice_md" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.RepoDir)\Notice.md" Id="Notice.md" />
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="DSCModulesReferenceFolder">
+      <Component Id="PowerToysDSCReference" Win64="yes" Guid="40869ACB-0BEB-4911-AE41-5E73BC1586A9">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="DSCModulesReference" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psd1" Id="PTConfReference.psd1" />
+        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psm1" Id="PTConfReference.psm1" />
+      </Component>
+    </DirectoryRef>
+
+    <?if $(var.PerUser) = "true" ?>
+    <!-- DSC module files for PerUser handled in InstallDSCModule custom action. -->
+    <?else?>
+    <DirectoryRef Id="ProgramFiles64Folder">
+      <Directory Id="WindowsPowerShellFolder" Name="WindowsPowerShell">
+        <Directory Id="PowerShellModulesFolder" Name="Modules">
+          <Directory Id="PowerToysDscFolder" Name="Microsoft.PowerToys.Configure">
+            <Directory Id="PowerToysDscVerFolder" Name="$(var.Version).0">
+              <Component Id="PowerToysDSC" Win64="yes" Guid="C52AECA0-DA73-49B8-BB49-31EF6640FF1F">
+                <!-- Don't fail installation because of DSC. Files are marked as not vital. -->
+                <File Vital="no" Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psd1" Id="PTConf.psd1" />
+                <File Vital="no" Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psm1" Id="PTConf.psm1" />
+              </Component>
+            </Directory>
+          </Directory>
+        </Directory>
+      </Directory>
+    </DirectoryRef>
+    <?endif?>
+
+    <DirectoryRef Id="ApplicationProgramsFolder">
+      <Component Id="PowerToysStartMenuShortcut" >
+        <Shortcut Id="ApplicationStartMenuShortcut"
+        Name="PowerToys (Preview)"
+        Description="PowerToys - Windows system utilities to maximize productivity"
+        Icon="powertoys.exe"
+        IconIndex="0"
+        Target="[!PowerToys.exe]"
+        WorkingDirectory="INSTALLFOLDER">
+          <ShortcutProperty Key="System.AppUserModel.ID" Value="Microsoft.PowerToysWin32"/>
+        </Shortcut>
+        <RemoveFolder Id="CleanUpStartMenuShortCut" Directory="ApplicationProgramsFolder" On="uninstall"/>
+        <!-- ApplicationStartMenuShortcut is implicitly installed in HKCU, so WIX won't allow changing this reg value to HKLM. -->
+        <RegistryValue Root="HKCU" Key="Software\Microsoft\PowerToys" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="DesktopFolder">
+      <Component Id="DesktopShortcut" >
+        <Condition>INSTALLDESKTOPSHORTCUT</Condition>
+        <!-- DesktopShortcutId is implicitly installed in HKCU, so WIX won't allow changing this reg value to HKLM. -->
+        <RegistryValue Root="HKCU"
+                        Key="Software\[Manufacturer]\[ProductName]"
+                        Name="desktopshorcutinstalled"
+                        Type="integer"
+                        Value="1"
+                        KeyPath="yes"/>
+        <Shortcut Id="DesktopShortcutId"
+                  Name="PowerToys (Preview)"
+                  Description="PowerToys - Windows system utilities to maximize productivity"
+                  Target="[!PowerToys.exe]"
+                  WorkingDirectory="INSTALLFOLDER"
+                  Icon="powertoys.exe"
+                  Directory="DesktopFolder"/>
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="CoreComponents">
+      <Component Id="RemoveCoreFolder" Guid="9330BD69-2D12-4D98-B0C7-66C99564D619" Directory="INSTALLFOLDER" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveCoreFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveBaseApplicationsAssetsFolder" Directory="BaseApplicationsAssetsFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveDSCModulesReferenceFolder" Directory="DSCModulesReferenceFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveWinUI3AppsInstallFolder" Directory="WinUI3AppsInstallFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveWinUI3AppsAssetsFolder" Directory="WinUI3AppsAssetsFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveINSTALLFOLDER" Directory="INSTALLFOLDER" On="uninstall"/>
+      </Component>
+      <ComponentRef Id="powertoys_exe" />
+      <ComponentRef Id="PowerToysStartMenuShortcut"/>
+      <ComponentRef Id="powertoys_per_machine_comp" />
+      <ComponentRef Id="powertoys_toast_clsid" />
+      <ComponentRef Id="License_rtf" />
+      <ComponentRef Id="Notice_md" />
+      <ComponentRef Id="DesktopShortcut" />
+      <ComponentRef Id="PowerToysDSCReference" />
+      <?if $(var.PerUser) = "false" ?>
+      <ComponentRef Id="PowerToysDSC" />
+      <?endif?>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/CustomDialogs/PTInstallDirDlg.wxs
+++ b/installer/PowerToysSetupVNext/CustomDialogs/PTInstallDirDlg.wxs
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI>
+            <Dialog Id="PTInstallDirDlg" Width="370" Height="270" Title="!(loc.InstallDirDlg_Title)">
+                <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
+                <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
+                <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+                    <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+                </Control>
+
+                <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgDescription)" />
+                <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgTitle)" />
+                <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.InstallDirDlgBannerBitmap)" />
+                <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+
+                <Control Id="FolderLabel" Type="Text" X="20" Y="60" Width="290" Height="30" NoPrefix="yes" Text="!(loc.InstallDirDlgFolderLabel)" />
+                <Control Id="Folder" Type="PathEdit" X="20" Y="100" Width="320" Height="18" Property="WIXUI_INSTALLDIR" Indirect="yes" />
+                <Control Id="ChangeFolder" Type="PushButton" X="20" Y="120" Width="56" Height="17" Text="!(loc.InstallDirDlgChange)" />
+                <Control Id="DesktopShortcutCheckBox" Type="CheckBox" X="20" Y="160" Width="290" Height="17" Property="INSTALLDESKTOPSHORTCUT" CheckBoxValue="1" Text="Create a shortcut for [ProductName] on the desktop." />
+                <Control Id="ScheduledTaskCheckBox" Type="CheckBox" X="20" Y="180" Width="330" Height="17" Property="CREATESCHEDULEDTASK" CheckBoxValue="1" Text="Automatically start [ProductName] at logon." />
+            </Dialog>
+        </UI>
+    </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/CustomDialogs/PTLicenseDlg.wxs
+++ b/installer/PowerToysSetupVNext/CustomDialogs/PTLicenseDlg.wxs
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <UI>
+      <Dialog Id="PTLicenseDlg" Width="370" Height="270" Title="!(loc.LicenseAgreementDlg_Title)">
+        <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.LicenseAgreementDlgBannerBitmap)" />
+        <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+        <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+        <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}[ProductName] License" />
+        <Control Id="Print" Type="PushButton" X="112" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)">
+          <Publish Event="DoAction" Value="WixUIPrintEula">1</Publish>
+        </Control>
+        <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
+        <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">
+          <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish>
+        </Control>
+        <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+          <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+        </Control>
+        <Control Id="LicenseText" Type="ScrollableText" X="20" Y="60" Width="330" Height="140" Sunken="yes" TabSkip="no">
+          <Text SourceFile="!(wix.WixUILicenseRtf)" />
+        </Control>
+      </Dialog>
+    </UI>
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/CustomDialogs/WixUI_PTInstallDir.wxs
+++ b/installer/PowerToysSetupVNext/CustomDialogs/WixUI_PTInstallDir.wxs
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+
+<!--
+First-time install dialog sequence:
+ - WixUI_WelcomeDlg
+ - WixUI_LicenseAgreementDlg
+ - WixUI_PTInstallDirDlg
+ - WixUI_VerifyReadyDlg
+ - WixUI_DiskCostDlg
+
+Maintenance dialog sequence:
+ - WixUI_MaintenanceWelcomeDlg
+ - WixUI_MaintenanceTypeDlg
+ - WixUI_PTInstallDirDlg
+ - WixUI_VerifyReadyDlg
+
+Patch dialog sequence:
+ - WixUI_WelcomeDlg
+ - WixUI_VerifyReadyDlg
+
+-->
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <UI Id="WixUI_PTInstallDir">
+            <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
+            <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
+            <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
+
+            <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
+            <Property Id="WixUI_Mode" Value="InstallDir" />
+
+            <DialogRef Id="BrowseDlg" />
+            <DialogRef Id="DiskCostDlg" />
+            <DialogRef Id="ErrorDlg" />
+            <DialogRef Id="FatalError" />
+            <DialogRef Id="FilesInUse" />
+            <DialogRef Id="MsiRMFilesInUse" />
+            <DialogRef Id="PrepareDlg" />
+            <DialogRef Id="ProgressDlg" />
+            <DialogRef Id="ResumeDlg" />
+            <DialogRef Id="UserExit" />
+            
+            <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
+            <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+
+            <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+            <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="PTLicenseDlg">NOT Installed</Publish>
+            <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
+
+            <Publish Dialog="PTLicenseDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
+            <Publish Dialog="PTLicenseDlg" Control="Next" Event="NewDialog" Value="PTInstallDirDlg">1</Publish>
+
+            <Publish Dialog="PTInstallDirDlg" Control="Back" Event="NewDialog" Value="PTLicenseDlg">1</Publish>
+            <Publish Dialog="PTInstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+            <Publish Dialog="PTInstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
+            <Publish Dialog="PTInstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+            <Publish Dialog="PTInstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
+            <Publish Dialog="PTInstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+            <Publish Dialog="PTInstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
+            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="PTInstallDirDlg" Order="1">NOT Installed</Publish>
+            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
+            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>
+
+            <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+
+            <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+            <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+            <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+        </UI>
+
+        <UIRef Id="WixUI_Common" />
+    </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/EnvironmentVariables.wxs
+++ b/installer/PowerToysSetupVNext/EnvironmentVariables.wxs
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define EnvironmentVariablesAssetsFiles=?>
+  <?define EnvironmentVariablesAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\EnvironmentVariables\?>
+
+  <Fragment>
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="EnvironmentVariablesAssetsFolder" Name="EnvironmentVariables" />
+    </DirectoryRef>
+    <DirectoryRef Id="EnvironmentVariablesAssetsFolder" FileSource="$(var.EnvironmentVariablesAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--EnvironmentVariablesAssetsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="EnvironmentVariablesComponentGroup">
+      <Component Id="RemoveEnvironmentVariablesFolder" Guid="B62A779D-38BA-46B2-859D-9D242D9B0CC1" Directory="EnvironmentVariablesAssetsFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveEnvironmentVariablesFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderEnvironmentVariablesAssetsFolder" Directory="EnvironmentVariablesAssetsFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/FileExplorerPreview.wxs
+++ b/installer/PowerToysSetupVNext/FileExplorerPreview.wxs
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define MonacoPreviewHandlerMonacoAssetsFiles=?>
+  <?define MonacoPreviewHandlerMonacoAssetsFilesPath=$(var.BinDir)Assets\Monaco\?>
+  <?define MonacoPreviewHandlerCustomLanguagesFiles=?>
+  <?define MonacoPreviewHandlerCustomLanguagesFilesPath=$(var.BinDir)Assets\Monaco\customLanguages\?>
+
+  <Fragment>
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="MonacoAssetsFolder" Name="Monaco">
+        <Directory Id="MonacoPreviewHandlerMonacoCustomLanguagesFolder" Name="customLanguages" />
+        <Directory Id="MonacoPreviewHandlerMonacoSRCFolder" Name="monacoSRC" />
+      </Directory>
+    </DirectoryRef>
+
+    <DirectoryRef Id="MonacoAssetsFolder" FileSource="$(var.MonacoPreviewHandlerMonacoAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--MonacoPreviewHandlerMonacoAssetsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="MonacoPreviewHandlerMonacoCustomLanguagesFolder" FileSource="$(var.MonacoPreviewHandlerCustomLanguagesFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--MonacoPreviewHandlerCustomLanguagesFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="FileExplorerPreviewComponentGroup">
+      <Component Id="RemoveFileExplorerPreviewFolder" Guid="4AB83E58-17F1-41AF-B67F-F6C36EFED28D" Directory="MonacoAssetsFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveFileExplorerPreviewFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveMonacoAssetsFolder" Directory="MonacoAssetsFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderMonacoPreviewHandlerCustomLanguagesFolder" Directory="MonacoPreviewHandlerMonacoCustomLanguagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderMonacoPreviewHandlerMonacoSRCFolder" Directory="MonacoPreviewHandlerMonacoSRCFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/FileLocksmith.wxs
+++ b/installer/PowerToysSetupVNext/FileLocksmith.wxs
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define FileLocksmithAssetsFiles=?>
+  <?define FileLocksmithAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\FileLocksmith\?>
+
+  <Fragment>
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="FileLocksmithAssetsInstallFolder" Name="FileLocksmith" />
+    </DirectoryRef>
+    <DirectoryRef Id="FileLocksmithAssetsInstallFolder" FileSource="$(var.FileLocksmithAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--FileLocksmithAssetsFiles_Component_Def-->
+      <!-- !Warning! Make sure to change Component Guid if you update something here -->
+      <Component Id="Module_FileLocksmith" Guid="108D3EC1-E6E0-4E81-88EF-25966133CB41" Win64="yes">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{84D68575-E186-46AD-B0CB-BAEB45EE29C0}">
+          <RegistryValue Type="string" Value="File Locksmith Shell Extension" />
+          <RegistryValue Type="string" Name="ContextMenuOptIn" Value="" />
+          <RegistryValue Type="string" Key="InprocServer32" Value="[WinUI3AppsInstallFolder]PowerToys.FileLocksmithExt.dll" />
+          <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Apartment" />
+        </RegistryKey>
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\AllFileSystemObjects\ShellEx\ContextMenuHandlers\FileLocksmithExt">
+          <RegistryValue Type="string" Value="{84D68575-E186-46AD-B0CB-BAEB45EE29C0}"/>
+        </RegistryKey>
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\Drive\ShellEx\ContextMenuHandlers\FileLocksmithExt">
+          <RegistryValue Type="string" Value="{84D68575-E186-46AD-B0CB-BAEB45EE29C0}"/>
+        </RegistryKey>
+      </Component>
+    </DirectoryRef>
+
+    <ComponentGroup Id="FileLocksmithComponentGroup">
+      <Component Id="RemoveFileLocksmithFolder" Guid="1DAC9A3F-D89C-4730-BF57-1778E011709B" Directory="FileLocksmithAssetsInstallFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveFileLocksmithFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderFileLocksmithAssetsFolder" Directory="FileLocksmithAssetsInstallFolder" On="uninstall"/>
+      </Component>
+      <ComponentRef Id="Module_FileLocksmith" />
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/Hosts.wxs
+++ b/installer/PowerToysSetupVNext/Hosts.wxs
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define HostsAssetsFiles=?>
+  <?define HostsAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Hosts\?>
+
+  <Fragment>
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="HostsAssetsFolder" Name="Hosts" />
+    </DirectoryRef>
+    <DirectoryRef Id="HostsAssetsFolder" FileSource="$(var.HostsAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--HostsAssetsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="HostsComponentGroup">
+      <Component Id="RemoveHostsFolder" Guid="7FF19EBB-041D-4498-9826-C9AECEBE86E1" Directory="HostsAssetsFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveHostsFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderHostsAssetsFolder" Directory="HostsAssetsFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/ImageResizer.wxs
+++ b/installer/PowerToysSetupVNext/ImageResizer.wxs
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define ImageResizerAssetsFiles=?>
+  <?define ImageResizerAssetsFilesPath=$(var.BinDir)Assets\ImageResizer\?>
+
+  <Fragment>
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="ImageResizerAssetsFolder" Name="ImageResizer" />
+    </DirectoryRef>
+
+    <DirectoryRef Id="ImageResizerAssetsFolder" FileSource="$(var.ImageResizerAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ImageResizerAssetsFiles_Component_Def-->
+
+      <Component Id="Module_ImageResizer_Registry" Win64="yes">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{51B4D7E5-7568-4234-B4BB-47FB3C016A69}\InprocServer32">
+          <RegistryValue Value="[INSTALLFOLDER]PowerToys.ImageResizerExt.dll" Type="string" />
+          <RegistryValue Name="ThreadingModel" Value="Apartment" Type="string" />
+        </RegistryKey>
+
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\Directory\ShellEx\DragDropHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <!-- Registry Keys for the context menu handler for each of the following image formats: bmp, dib, gif, jfif, jpe, jpeg, jpg, jxr, png, rle, tif, tiff, wdp  -->
+        <RegistryValue Root="$(var.RegistryScope)"
+                          Key="SOFTWARE\Classes\SystemFileAssociations\.bmp\ShellEx\ContextMenuHandlers\ImageResizer"
+                          Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                          Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.dib\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.gif\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.jfif\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.jpe\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.jpeg\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.jpg\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.jxr\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.png\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.rle\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.tif\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.tiff\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+        <RegistryValue Root="$(var.RegistryScope)"
+                        Key="SOFTWARE\Classes\SystemFileAssociations\.wdp\ShellEx\ContextMenuHandlers\ImageResizer"
+                        Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
+                        Type="string" />
+      </Component>
+
+    </DirectoryRef>
+
+    <ComponentGroup Id="ImageResizerComponentGroup">
+      <Component Id="RemoveImageResizerFolder" Guid="8E5DE86A-8618-4590-9584-51BCD3A14280" Directory="ImageResizerAssetsFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveImageResizerFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderImageResizerAssetsFolder" Directory="ImageResizerAssetsFolder" On="uninstall"/>
+      </Component>
+      <ComponentRef Id="Module_ImageResizer_Registry" />
+    </ComponentGroup>
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/Images/banner.png
+++ b/installer/PowerToysSetupVNext/Images/banner.png
--- a/installer/PowerToysSetupVNext/Images/dialog.png
+++ b/installer/PowerToysSetupVNext/Images/dialog.png
--- a/installer/PowerToysSetupVNext/Images/logo.png
+++ b/installer/PowerToysSetupVNext/Images/logo.png
--- a/installer/PowerToysSetupVNext/Images/logo150.png
+++ b/installer/PowerToysSetupVNext/Images/logo150.png
--- a/installer/PowerToysSetupVNext/Images/logo44.png
+++ b/installer/PowerToysSetupVNext/Images/logo44.png
--- a/installer/PowerToysSetupVNext/KeyboardManager.wxs
+++ b/installer/PowerToysSetupVNext/KeyboardManager.wxs
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <Fragment>
+    <DirectoryRef Id="INSTALLFOLDER">
+      <Directory Id="KeyboardManagerEditorInstallFolder" Name="KeyboardManagerEditor" />
+      <Directory Id="KeyboardManagerEngineInstallFolder" Name="KeyboardManagerEngine" />
+    </DirectoryRef>
+
+    <!-- KBM Editor -->
+    <DirectoryRef Id="KeyboardManagerEditorInstallFolder" FileSource="$(var.BinDir)KeyboardManagerEditor">
+      <Component Id="Module_KeyboardManager_Editor" Win64="yes" Guid="E9C74E78-970F-4DF5-9CC0-FFD3CCF285B4">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Module_KeyboardManager_Editor" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.BinDir)KeyboardManagerEditor\PowerToys.KeyboardManagerEditor.exe" />
+        <File Source="$(var.BinDir)KeyboardManagerEditor\Microsoft.Toolkit.Win32.UI.XamlHost.dll" />
+        <File Source="$(var.BinDir)KeyboardManagerEditor\Microsoft.UI.Xaml.dll" />
+        <File Source="$(var.BinDir)KeyboardManagerEditor\msvcp140_app.dll" />
+        <File Source="$(var.BinDir)KeyboardManagerEditor\resources.pri" />
+        <File Source="$(var.BinDir)KeyboardManagerEditor\vcruntime140_app.dll" />
+        <?if $(sys.BUILDARCH) = x64 ?>
+          <File Source="$(var.BinDir)KeyboardManagerEditor\vcruntime140_1_app.dll" />
+        <?endif ?>
+        <File Source="$(var.BinDir)KeyboardManagerEditor\vcruntime140.dll" />
+        <File Source="$(var.BinDir)KeyboardManagerEditor\vcruntime140_1.dll" />
+        <File Source="$(var.BinDir)KeyboardManagerEditor\msvcp140.dll" />
+      </Component>
+    </DirectoryRef>
+
+    <!-- KBM Engine -->
+    <DirectoryRef Id="KeyboardManagerEngineInstallFolder" FileSource="$(var.BinDir)KeyboardManagerEngine">
+      <Component Id="Module_KeyboardManager_Engine" Win64="yes" Guid="3F58FCE3-B44D-4676-94E9-C59F1FE42FFD">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Module_KeyboardManager_Engine" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.BinDir)KeyboardManagerEngine\PowerToys.KeyboardManagerEngine.exe" />
+      </Component>
+    </DirectoryRef>
+
+    <ComponentGroup Id="KeyboardManagerComponentGroup">
+      <Component Id="RemoveKeyboardManagerFolder" Guid="C411CB11-4617-40A4-B6DA-1823B49FB9FF" Directory="INSTALLFOLDER" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveKeyboardManagerFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderKeyboardManagerEditorFolder" Directory="KeyboardManagerEditorInstallFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderKeyboardManagerEngineFolder" Directory="KeyboardManagerEngineInstallFolder" On="uninstall"/>
+      </Component>
+      <ComponentRef Id="Module_KeyboardManager_Editor" />
+      <ComponentRef Id="Module_KeyboardManager_Engine" />
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/MouseWithoutBorders.wxs
+++ b/installer/PowerToysSetupVNext/MouseWithoutBorders.wxs
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+  xmlns:Fire="http://schemas.microsoft.com/wix/FirewallExtension"
+  xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <Fragment>
+    <ComponentGroup Id="MouseWithoutBordersComponentGroup">
+      <Component Id="MouseWithoutBordersFirewallComponent" Directory="INSTALLFOLDER" Guid="FEA59459-EC0E-4636-8E76-4C168235982B">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="MouseWithoutBordersFirewall_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <!-- The program name used here will be generated by generateFileComponents.ps1 -->
+        <Fire:FirewallException Id="MouseWithoutBordersFirewallException1" Name="PowerToys.MouseWithoutBorders" Scope="localSubnet" IgnoreFailure="yes" Program="[#BaseApplicationsFiles_File_PowerToys.MouseWithoutBorders.exe]" />
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/NewPlus.wxs
+++ b/installer/PowerToysSetupVNext/NewPlus.wxs
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+   xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+   <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+   <?define NewPlusAssetsFiles=?>
+   <?define NewPlusAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\?>
+   <?define NewPlusTemplateFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\Templates\?>
+   <?define NewPlusTemplateSubFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\Templates\Example folder\?>
+
+   <Fragment>
+
+      <!-- Assets -->
+      <DirectoryRef Id="WinUI3AppsAssetsFolder">
+         <Directory Id="NewPlusAssetsInstallFolder" Name="NewPlus" />
+      </DirectoryRef>
+      <DirectoryRef Id="NewPlusAssetsInstallFolder" FileSource="$(var.NewPlusAssetsFilesPath)">
+         <!-- Generated by generateFileComponents.ps1 -->
+         <!--NewPlusAssetsFiles_Component_Def-->
+         
+         <!-- NewPlus Shell Extension for Win10 registration -->
+         <Component Id="NewPlus_ShellExtension_win10" Guid="D5456D4A-6EEC-4B85-944D-6A6A4A74FFA6" Win64="yes">
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{FF90D477-E32A-4BE8-8CC5-A502A97F5401}">
+               <RegistryValue Type="string" Value="NewPlus Shell Extension Win10" />
+               <RegistryValue Type="string" Name="ContextMenuOptIn" Value="" />
+               <RegistryValue Type="string" Key="InprocServer32" Value="[WinUI3AppsInstallFolder]PowerToys.NewPlus.ShellExtension.win10.dll" />
+               <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Apartment" />
+            </RegistryKey>
+            <RegistryKey Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\Directory\background\ShellEx\ContextMenuHandlers\NewPlusShellExtensionWin10">
+               <RegistryValue Type="string" Value="{FF90D477-E32A-4BE8-8CC5-A502A97F5401}"/>
+            </RegistryKey>
+         </Component>
+      </DirectoryRef>
+
+      <ComponentGroup Id="NewPlusComponentGroup">
+         <Component Id="RemoveNewPlusFolder" Guid="4189C789-56EB-409D-912E-3F4F3F4F1FFA" Directory="NewPlusAssetsInstallFolder" >
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+               <RegistryValue Type="string" Name="RemoveNewPlusFolder" Value="" KeyPath="yes"/>
+            </RegistryKey>
+            <RemoveFolder Id="RemoveFolderNewPlusAssetsFolder" Directory="NewPlusAssetsInstallFolder" On="uninstall"/>
+         </Component>
+         <ComponentRef Id="NewPlus_ShellExtension_win10" />
+      </ComponentGroup>
+
+      
+      <!-- Example templates -->
+      <DirectoryRef Id="WinUI3AppsAssetsFolder">
+         <Directory Id="NewPlusInstallFolder" Name="NewPlus">
+            <Directory Id="NewPlusTemplatesInstallFolder" Name="Templates">
+               <Directory Id="NewPlusTemplatesSubInstallFolder" Name="Example folder"/>
+            </Directory>
+         </Directory>
+      </DirectoryRef>
+      <DirectoryRef Id="NewPlusTemplatesInstallFolder" FileSource="$(var.NewPlusTemplateFilesPath)">
+         <Component Id="NewPlusTemplateFiles_Component" Win64="yes" Guid="39264075-4B7F-40E3-A76F-21E68576D43E">
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+               <RegistryValue Type="string" Name="NewPlusTemplateFiles_Component" Value="" KeyPath="yes"/>
+            </RegistryKey>
+            <File Id="NewPlusTemplateFiles_File_1.md" Source="$(var.NewPlusTemplateFilesPath)Any files or folders placed in the template folder are available via New+.txt" />
+         </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="NewPlusTemplatesSubInstallFolder" FileSource="$(var.NewPlusTemplateSubFilesPath)">
+         <Component Id="NewPlusTemplateSubFiles_Component" Win64="yes" Guid="7618E61C-CCB8-492F-B284-E1AE2954AF0B">
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+               <RegistryValue Type="string" Name="NewPlusTemplateSubFiles_Component" Value="" KeyPath="yes"/>
+            </RegistryKey>
+            <File Id="NewPlusTemplateSubFiles_File_1.md" Source="$(var.NewPlusTemplateSubFilesPath)Example txt file.txt" />
+            <File Id="NewPlusTemplateSubFiles_File_2.md" Source="$(var.NewPlusTemplateSubFilesPath)Another example txt file.txt" />
+         </Component>
+      </DirectoryRef>
+
+      <ComponentGroup Id="NewPlusTemplatesComponentGroup">
+         <Component Id="RemoveNewPlusTemplateFolder" Guid="3E9B15CA-A50C-42DA-977F-5E9914562FE7" Directory="NewPlusInstallFolder" >
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+               <RegistryValue Type="string" Name="RemoveNewPlusTemplateFolder" Value="" KeyPath="yes"/>
+            </RegistryKey>
+            <RemoveFolder Id="RemoveFolderNewPlusInstallFolder" Directory="NewPlusInstallFolder" On="uninstall"/>
+            <RemoveFolder Id="RemoveFolderNewPlusTemplatesInstallFolder" Directory="NewPlusTemplatesInstallFolder" On="uninstall"/>
+            <RemoveFolder Id="RemoveFolderNewPlusTemplatesSubInstallFolder" Directory="NewPlusTemplatesSubInstallFolder" On="uninstall"/>
+         </Component>
+         <ComponentRef Id="NewPlusTemplateFiles_Component" />
+         <ComponentRef Id="NewPlusTemplateSubFiles_Component" />
+      </ComponentGroup>
+
+   </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/Peek.wxs
+++ b/installer/PowerToysSetupVNext/Peek.wxs
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define PeekAssetsFiles=?>
+  <?define PeekAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Peek\?>
+
+  <Fragment>
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="PeekAssetsFolder" Name="Peek" />
+    </DirectoryRef>
+    <DirectoryRef Id="PeekAssetsFolder" FileSource="$(var.PeekAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--PeekAssetsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="PeekComponentGroup">
+      <Component Id="RemovePeekFolder" Guid="EF9422D7-FF0A-4887-968A-E61B53ACD23A" Directory="PeekAssetsFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemovePeekFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderPeekAssetsFolder" Directory="PeekAssetsFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/PowerRename.wxs
+++ b/installer/PowerToysSetupVNext/PowerRename.wxs
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define PowerRenameAssetsFiles=?>
+  <?define PowerRenameAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\PowerRename\?>
+
+  <Fragment>
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="PowerRenameAssetsFolder" Name="PowerRename" />
+    </DirectoryRef>
+    <DirectoryRef Id="PowerRenameAssetsFolder" FileSource="$(var.PowerRenameAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--PowerRenameAssetsFiles_Component_Def-->
+      <!-- !Warning! Make sure to change Component Guid if you update something here -->
+      <Component Id="Module_PowerRename" Guid="40D43079-240E-402D-8CE8-571BFFA71175" Win64="yes">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{0440049F-D1DC-4E46-B27B-98393D79486B}">
+          <RegistryValue Type="string" Value="PowerRename Shell Extension" />
+          <RegistryValue Type="string" Name="ContextMenuOptIn" Value="" />
+          <RegistryValue Type="string" Key="InprocServer32" Value="[WinUI3AppsInstallFolder]PowerToys.PowerRenameExt.dll" />
+          <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Apartment" />
+        </RegistryKey>
+        <RegistryKey Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\AllFileSystemObjects\ShellEx\ContextMenuHandlers\PowerRenameExt">
+          <RegistryValue Type="string" Value="{0440049F-D1DC-4E46-B27B-98393D79486B}"/>
+        </RegistryKey>
+        <RegistryKey Root="$(var.RegistryScope)" Key="SOFTWARE\Classes\Directory\background\ShellEx\ContextMenuHandlers\PowerRenameExt">
+          <RegistryValue Type="string" Value="{0440049F-D1DC-4E46-B27B-98393D79486B}"/>
+        </RegistryKey>
+
+      </Component>
+    </DirectoryRef>
+
+    <ComponentGroup Id="PowerRenameComponentGroup">
+      <Component Id="RemovePowerRenameFolder" Guid="2028549B-02E3-4D80-BC3F-59AEA37AC73D" Directory="PowerRenameAssetsFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemovePowerRenameFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderPowerRenameAssetsFolder" Directory="PowerRenameAssetsFolder" On="uninstall"/>
+      </Component>
+      <ComponentRef Id="Module_PowerRename" />
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/PowerToys.wxs
+++ b/installer/PowerToysSetupVNext/PowerToys.wxs
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?define UpgradeCode="6341382d-c0a9-4238-9188-be9607e3fab2"?>
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+    xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
+    xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
+
+    <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+    <Bundle Name="PowerToys (Preview) $(var.PowerToysPlatform)"
+            Version="$(var.Version)"
+            Manufacturer="Microsoft Corporation"
+            IconSourceFile="$(var.BinDir)svgs\icon.ico"
+            UpgradeCode="$(var.UpgradeCode)">
+        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
+            <bal:WixStandardBootstrapperApplication 
+              LicenseFile="$(var.RepoDir)\installer\License.rtf"
+              LogoFile="$(var.RepoDir)\installer\PowerToysSetupVNext\Images\logo44.png"
+              SuppressOptionsUI="no"
+              SuppressRepair="yes" />
+        </BootstrapperApplicationRef>
+
+        <util:RegistrySearch Variable="HasWebView2PerMachine" Root="HKLM" Key="SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Result="exists" />
+        <util:RegistrySearch Variable="HasWebView2PerUser" Root="HKCU" Key="Software\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Result="exists" />
+
+        <?if $(var.PerUser) = "true" ?>
+            <Variable Name="InstallFolder" Type="string" Value="[LocalAppDataFolder]PowerToys" bal:Overridable="yes"/>
+        <?else?>
+            <Variable Name="InstallFolder" Type="string" Value="$(var.PlatformProgramFiles)PowerToys" bal:Overridable="yes"/>
+        <?endif?>
+
+        <Variable Name="MsiLogFolder" Type="string" Value="[LocalAppDataFolder]\Microsoft\PowerToys\" /> 
+        <Log Disable="no" Prefix='powertoys-bootstrapper-msi-$(var.Version)' Extension=".log" />
+
+      <!-- Only install/upgrade if the version is greater or equal than the currently installed version of PowerToys, to handle the case in which PowerToys was installed from old MSI (before WiX bootstrapper was used) -->
+      <!-- If the previous installation is a bundle installation, just let WiX run its logic. -->
+      <Variable Name="MinimumVersion" Type="version" Value="0.0.0.0"/>
+      <Variable Name="TargetPowerToysVersion" Type="version" Value="$(var.Version)"/>
+      <Variable  Name="DetectedPowerToysVersion" Type="version" Value="0.0.0.0"/>
+      <Variable  Name="DetectedPowerToysUserVersion" Type="version" Value="0.0.0.0"/>
+
+      <util:ProductSearch Id="SearchInstalledPowerToysVersion" Variable="DetectedPowerToysVersion" UpgradeCode="42B84BF7-5FBF-473B-9C8B-049DC16F7708" Result="version" />
+      <util:ProductSearch Id="SearchInstalledPowerToysUserVersion" Variable="DetectedPowerToysUserVersion" UpgradeCode="D8B559DB-4C98-487A-A33F-50A8EEE42726" Result="version" />
+
+      <?if $(var.PerUser) = "true" ?>
+        <bal:Condition Message="PowerToys is already installed on this system for all users. We recommend first uninstalling that version before installing this one." >MinimumVersion &gt;= DetectedPowerToysVersion</bal:Condition>
+        <bal:Condition Message="The same or later version of PowerToys is already installed." >TargetPowerToysVersion &gt;= DetectedPowerToysUserVersion OR WixBundleInstalled</bal:Condition>
+      <?else?>
+        <bal:Condition Message="PowerToys is already installed on this system for current user. We recommend first uninstalling that version before installing this one." >MinimumVersion &gt;= DetectedPowerToysUserVersion</bal:Condition>
+        <bal:Condition Message="A later version of PowerToys is already installed." >TargetPowerToysVersion &gt;= DetectedPowerToysVersion OR WixBundleInstalled</bal:Condition>
+      <?endif?>
+
+      <Variable Name="DetectedWindowsBuildNumber" Type="version" Value="0"/>
+      <util:RegistrySearch Id="SearchWindowsBuildNumber" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Value="CurrentBuildNumber" Result="value" Format="raw" Variable="DetectedWindowsBuildNumber" />
+      <bal:Condition Message="This application is only supported on Windows 10 version v2004 (build 19041) or higher.">DetectedWindowsBuildNumber &gt;= 19041 OR WixBundleInstalled</bal:Condition>
+    
+        <Chain>
+            <ExePackage
+                DisplayName="Closing PowerToys application"
+                Name="terminate_powertoys.cmd"
+                Cache="no"
+                Compressed="yes"
+                Id="TerminatePowerToys"
+                SourceFile="terminate_powertoys.cmd"
+                Permanent="yes"
+                PerMachine="$(var.PerMachineYesNo)"
+                Vital="no">
+            </ExePackage>
+            <ExePackage
+                DisplayName="Microsoft Edge WebView2"
+                Name="MicrosoftEdgeWebview2Setup.exe"
+                Compressed="yes"
+                Id="WebView2"
+                DetectCondition="HasWebView2PerMachine OR HasWebView2PerUser"
+                SourceFile="WebView2\MicrosoftEdgeWebview2Setup.exe"
+                InstallCommand="/silent /install"
+                RepairCommand="/repair /passive"
+                Permanent="yes"
+                PerMachine="$(var.PerMachineYesNo)"
+                UninstallCommand="/silent /uninstall">
+            </ExePackage>
+            <MsiPackage
+                DisplayName="PowerToys MSI"
+                SourceFile="$(var.PowerToysPlatform)\Release\$(var.MSIPath)\$(var.MSIName)"
+                Compressed="yes"
+                DisplayInternalUI="no">
+                <MsiProperty Name="BOOTSTRAPPERINSTALLFOLDER" Value="[InstallFolder]" />
+            </MsiPackage>
+        </Chain>
+    </Bundle>
+</Wix>
--- a/installer/PowerToysSetupVNext/PowerToysBootstrapperVNext.wixproj
+++ b/installer/PowerToysSetupVNext/PowerToysBootstrapperVNext.wixproj
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0"
+  DefaultTargets="Build"
+  InitialTargets="EnsureNuGetPackageBuildImports"
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
+  <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />
+
+  <PropertyGroup>
+    <DefineConstants>Version=$(Version)</DefineConstants>
+    <Name>PowerToysVNextBootstrapper</Name>
+    <ProjectGuid>{da4e9744-80be-424c-b0f5-afd8757db575}</ProjectGuid>
+  </PropertyGroup>
+  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' == 'true' ">
+    <DefineConstants>$(DefineConstants);PerUser=true</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' != 'true' ">
+    <DefineConstants>$(DefineConstants);PerUser=false</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform Condition="'$(Platform)'=='x64'">x64</Platform>
+    <Platform Condition="'$(Platform)'!='x64'">arm64</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>PowerToysSetupVNext-$(Version)-$(Platform)</OutputName>
+    <OutputType>Bundle</OutputType>
+    <SuppressAclReset>True</SuppressAclReset>
+    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetupVNext-$(Version)-$(Platform)</OutputName>
+    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetupVNext-$(Version)-$(Platform)</OutputName>
+    <OutputPath Condition=" '$(PerUser)' != 'true' ">$(Platform)\$(Configuration)\MachineSetup</OutputPath>
+    <OutputPath Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+    <NuGetPackageImportStamp />
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="PowerToys.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixNetFxExtension">
+      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+      <Name>WixNetFxExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixNetFxExtension">
+      <HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
+      <Name>WixBalExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="CustomDialogs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)"
+    Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets"
+    Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled"
+    Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="The WiX Toolset v3 build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+  </Target>
+  <Target Name="EnsureNuGetPackageBuildImports"
+    BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\wix.props')"
+      Text="$([System.String]::Format('$(ErrorText)', '..\wixVNext.props'))" />
+  </Target>
+
+  <!-- Prevents NU1503 -->
+  <Target Name="_IsProjectRestoreSupported" Returns="@(_ValidProjectsForRestore)">
+    <ItemGroup>
+      <_ValidProjectsForRestore Include="$(MSBuildProjectFullPath)" />
+    </ItemGroup>
+  </Target>
+  <Target Name="Restore" />
+</Project>
--- a/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj
+++ b/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureNuGetPackageBuildImports" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
+  <Import Project="..\wixVNext.props" Condition="Exists('..\wixVNext.props')" />
+  <PropertyGroup Condition="'$(Platform)' == 'x64'">
+    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC</DefineConstants>
+    <!-- THIS IS AN INNER LOOP OPTIMIZATION
+    The build pipeline builds the Settings and Launcher projects for Publication
+    using a specific profile. If you're doing local installer builds, this will
+    simulate the build pipeline doing that for you. -->
+    <PreBuildEvent>IF NOT DEFINED IsPipeline (
+call "$([MSBuild]::GetVsInstallRoot())\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.19041.0 -vcvars_ver=$(VCToolsVersion)
+SET PTRoot=$(SolutionDir)\..
+call "..\..\..\publish.cmd" x64
+)
+call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs"
+    </PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Platform)' != 'x64'">
+    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\Assets\Monaco\monacoSRC</DefineConstants>
+    <PreBuildEvent>IF NOT DEFINED IsPipeline (
+call "$([MSBuild]::GetVsInstallRoot())\Common7\Tools\VsDevCmd.bat" -arch=arm64 -host_arch=amd64 -winsdk=10.0.19041.0 -vcvars_ver=$(VCToolsVersion)
+SET PTRoot=$(SolutionDir)\..
+call "..\..\..\publish.cmd" arm64
+)
+call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs"
+    </PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
+    <PostBuildEvent>
+      call move /Y ..\..\..\AdvancedPaste.wxs.bk ..\..\..\AdvancedPaste.wxs
+      call move /Y ..\..\..\Awake.wxs.bk ..\..\..\Awake.wxs
+      call move /Y ..\..\..\BaseApplications.wxs.bk ..\..\..\BaseApplications.wxs
+      call move /Y ..\..\..\ColorPicker.wxs.bk ..\..\..\ColorPicker.wxs
+      call move /Y ..\..\..\Core.wxs.bk ..\..\..\Core.wxs
+      call move /Y ..\..\..\EnvironmentVariables.wxs.bk ..\..\..\EnvironmentVariables.wxs
+      call move /Y ..\..\..\FileExplorerPreview.wxs.bk ..\..\..\FileExplorerPreview.wxs
+      call move /Y ..\..\..\FileLocksmith.wxs.bk ..\..\..\FileLocksmith.wxs
+      call move /Y ..\..\..\Hosts.wxs.bk ..\..\..\Hosts.wxs
+      call move /Y ..\..\..\ImageResizer.wxs.bk ..\..\..\ImageResizer.wxs
+      call move /Y ..\..\..\KeyboardManager.wxs.bk ..\..\..\KeyboardManager.wxs
+      call move /Y ..\..\..\MouseWithoutBorders.wxs.bk ..\..\..\MouseWithoutBorders.wxs
+      call move /Y ..\..\..\NewPlus.wxs.bk ..\..\..\NewPlus.wxs
+      call move /Y ..\..\..\Peek.wxs.bk ..\..\..\Peek.wxs
+      call move /Y ..\..\..\PowerRename.wxs.bk ..\..\..\PowerRename.wxs
+      call move /Y ..\..\..\Product.wxs.bk ..\..\..\Product.wxs
+      call move /Y ..\..\..\RegistryPreview.wxs.bk ..\..\..\RegistryPreview.wxs
+      call move /Y ..\..\..\Resources.wxs.bk ..\..\..\Resources.wxs
+      call move /Y ..\..\..\Run.wxs.bk ..\..\..\Run.wxs
+      call move /Y ..\..\..\Settings.wxs.bk ..\..\..\Settings.wxs
+      call move /Y ..\..\..\ShortcutGuide.wxs.bk ..\..\..\ShortcutGuide.wxs
+      call move /Y ..\..\..\Tools.wxs.bk ..\..\..\Tools.wxs
+      call move /Y ..\..\..\WinAppSDK.wxs.bk ..\..\..\WinAppSDK.wxs
+      call move /Y ..\..\..\WinUI3Applications.wxs.bk ..\..\..\WinUI3Applications.wxs
+      call move /Y ..\..\..\Workspaces.wxs.bk ..\..\..\Workspaces.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\AdvancedPaste.wxs.bk ..\..\..\..\PowerToysSetup\AdvancedPaste.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\Awake.wxs.bk ..\..\..\..\PowerToysSetup\Awake.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\BaseApplications.wxs.bk ..\..\..\..\PowerToysSetup\BaseApplications.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\ColorPicker.wxs.bk ..\..\..\..\PowerToysSetup\ColorPicker.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\Core.wxs.bk ..\..\..\..\PowerToysSetup\Core.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\EnvironmentVariables.wxs.bk ..\..\..\..\PowerToysSetup\EnvironmentVariables.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\FileExplorerPreview.wxs.bk ..\..\..\..\PowerToysSetup\FileExplorerPreview.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\FileLocksmith.wxs.bk ..\..\..\..\PowerToysSetup\FileLocksmith.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\Hosts.wxs.bk ..\..\..\..\PowerToysSetup\Hosts.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\ImageResizer.wxs.bk ..\..\..\..\PowerToysSetup\ImageResizer.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\KeyboardManager.wxs.bk ..\..\..\..\PowerToysSetup\KeyboardManager.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\MouseWithoutBorders.wxs.bk ..\..\..\..\PowerToysSetup\MouseWithoutBorders.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\NewPlus.wxs.bk ..\..\..\..\PowerToysSetup\NewPlus.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\Peek.wxs.bk ..\..\..\..\PowerToysSetup\Peek.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\PowerRename.wxs.bk ..\..\..\..\PowerToysSetup\PowerRename.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\Product.wxs.bk ..\..\..\..\PowerToysSetup\Product.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\RegistryPreview.wxs.bk ..\..\..\..\PowerToysSetup\RegistryPreview.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\Resources.wxs.bk ..\..\..\..\PowerToysSetup\Resources.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\Run.wxs.bk ..\..\..\..\PowerToysSetup\Run.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\Settings.wxs.bk ..\..\..\..\PowerToysSetup\Settings.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\ShortcutGuide.wxs.bk ..\..\..\..\PowerToysSetup\ShortcutGuide.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\Tools.wxs.bk ..\..\..\..\PowerToysSetup\Tools.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\WinAppSDK.wxs.bk ..\..\..\..\PowerToysSetup\WinAppSDK.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\WinUI3Applications.wxs.bk ..\..\..\..\PowerToysSetup\WinUI3Applications.wxs
+      call move /Y ..\..\..\..\PowerToysSetup\Workspaces.wxs.bk ..\..\..\..\PowerToysSetup\Workspaces.wxs
+    </PostBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' == 'true' ">
+    <DefineConstants>$(DefineConstants);PerUser=true</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' != 'true' ">
+    <DefineConstants>$(DefineConstants);PerUser=false</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup>
+    <Name>PowerToysVNextInstaller</Name>
+    <!-- We do not support debug installer builds -->
+    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+    <Platform>$(Platform)</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <ProjectGuid>{b6e94700-df38-41f6-a3fd-18b69674ab1e}</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetupVNext-$(Version)-$(Platform)</OutputName>
+    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetupVNext-$(Version)-$(Platform)</OutputName>
+    <OutputType>Package</OutputType>
+    <SuppressAclReset>True</SuppressAclReset>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <!-- 1076 and ICE91 - warning: using this configuration for perMachine install could cause problems. -->
+    <!-- 1026 - warning: file ID is too long -->
+    <SuppressIces>ICE91</SuppressIces>
+    <SuppressSpecificWarnings>1026;1076</SuppressSpecificWarnings>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OutputPath Condition=" '$(PerUser)' != 'true' ">$(Platform)\$(Configuration)\MachineSetup</OutputPath>
+    <OutputPath Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup</OutputPath>
+    <IntermediateOutputPath Condition=" '$(PerUser)' != 'true' ">obj\$(Platform)\$(Configuration)\MachineSetup</IntermediateOutputPath>
+    <IntermediateOutputPath Condition=" '$(PerUser)' == 'true' ">obj\$(Platform)\$(Configuration)\UserSetup</IntermediateOutputPath>
+    <SuppressIces>ICE40</SuppressIces>
+  </PropertyGroup>
+  <PropertyGroup>
+    <!-- suppress warning 1108 regarding -sh being deprecated -->
+    <!-- -sh suppresses file information which was causing wix build to hang in CI -->
+    <LinkerAdditionalOptions>-v -sh -sw1108</LinkerAdditionalOptions>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="CustomDialogs\PTInstallDirDlg.wxs" />
+    <Compile Include="CustomDialogs\PTLicenseDlg.wxs" />
+    <Compile Include="CustomDialogs\WixUI_PTInstallDir.wxs" />
+    <Compile Include="NewPlus.wxs" />
+    <Compile Include="Product.wxs" />
+    <Compile Include="AdvancedPaste.wxs" />
+    <Compile Include="Awake.wxs" />
+    <Compile Include="BaseApplications.wxs" />
+    <Compile Include="ColorPicker.wxs" />
+    <Compile Include="EnvironmentVariables.wxs" />
+    <Compile Include="FileExplorerPreview.wxs" />
+    <Compile Include="FileLocksmith.wxs" />
+    <Compile Include="Hosts.wxs" />
+    <Compile Include="ImageResizer.wxs" />
+    <Compile Include="KeyboardManager.wxs" />
+    <Compile Include="Peek.wxs" />
+    <Compile Include="PowerRename.wxs" />
+    <Compile Include="RegistryPreview.wxs" />
+    <Compile Include="Run.wxs" />
+    <Compile Include="Settings.wxs" />
+    <Compile Include="ShortcutGuide.wxs" />
+    <Compile Include="Tools.wxs" />
+    <Compile Include="MouseWithoutBorders.wxs" />
+    <Compile Include="WinUI3Applications.wxs" />
+    <Compile Include="MonacoSRC.wxs" />
+    <Compile Include="Core.wxs" />
+    <Compile Include="Resources.wxs" />
+    <Compile Include="WinAppSDK.wxs" />
+    <Compile Include="Workspaces.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixFirewallExtension">
+      <HintPath>$(WixExtDir)\WixFirewallExtension.dll</HintPath>
+      <Name>WixFirewallExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixNetFxExtension">
+      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+      <Name>WixNetFxExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="CustomDialogs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PowerToysSetupCustomActions\PowerToysSetupCustomActions.vcxproj">
+      <Name>PowerToysSetupCustomActions</Name>
+      <Project>{32f3882b-f2d6-4586-b5ed-11e39e522bd3}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="The WiX Toolset v3 build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+  </Target>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\wixVNext.props')" Text="$([System.String]::Format('$(ErrorText)', '..\wixVNext.props'))" />
+  </Target>
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target> -->
+  <Target Name="BeforeBuild">
+    <HeatDirectory Directory="..\..\src\Monaco\monacoSRC" PreprocessorVariable="var.MonacoSRCHarvestPath" OutputFile="MonacoSRC.wxs" ComponentGroupName="MonacoSRCHeatGenerated" DirectoryRefId="MonacoPreviewHandlerMonacoSRCFolder" AutogenerateGuids="false" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" RunAsSeparateProcess="true" SuppressFragments="false" SuppressRegistry="false" SuppressRootDirectory="true" />
+  </Target>
+  <!-- Prevents NU1503 -->
+  <Target Name="_IsProjectRestoreSupported" Returns="@(_ValidProjectsForRestore)">
+    <ItemGroup>
+      <_ValidProjectsForRestore Include="$(MSBuildProjectFullPath)" />
+    </ItemGroup>
+  </Target>
+  <Target Name="Restore" />
+</Project>
--- a/installer/PowerToysSetupVNext/Product.wxs
+++ b/installer/PowerToysSetupVNext/Product.wxs
@@ -0,0 +1,471 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <!-- WiX Components with multiple files cause issues due to the way Windows installs them. 
+         Windows decides whether to install a component by checking the existence of KeyPath file and its version.
+         Thus, if some files were updated but KeyPath file was not, the component wouldn't be updated.
+         Some resource files, e.g. images, do not have version, so even if Component has only a single image and a static GUID, it won't be updated.
+         
+         Considering all of the above, it's much simpler to just have one file per Component with an implicit Guid.
+
+         More info:
+         - https://stackoverflow.com/a/1604348/657390
+         - https://stackoverflow.com/a/1422121/657390
+         - https://robmensching.com/blog/posts/2003/10/18/component-rules-101/
+         - https://robmensching.com/blog/posts/2003/10/4/windows-installer-components-introduction/
+           -->
+
+  <Product Id="*"
+       Name="PowerToys (Preview)"
+       Language="1033"
+       Version="$(var.Version)"
+       Manufacturer="Microsoft Corporation"
+       UpgradeCode="$(var.UpgradeCodeGUID)">
+
+
+      <Package InstallerVersion="500" Compressed="yes" InstallScope="$(var.InstallScope)" InstallPrivileges="$(var.InstallPrivileges)" Platform="$(var.PlatformLK)" />
+
+    <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed." />
+
+    <Upgrade Id="$(var.UpgradeCodeGUID)">
+      <UpgradeVersion
+         Minimum="0.0.0" Maximum="$(var.Version)"
+         Property="PREVIOUSVERSIONSINSTALLED" 
+         IncludeMinimum="yes" IncludeMaximum="no" />
+    </Upgrade>
+
+    <MediaTemplate EmbedCab="yes" />
+
+    <Property Id="REINSTALLMODE" Value="amus" />
+    <Property Id="WINDOWSBUILDNUMBER" Secure="yes">
+      <RegistrySearch Id="BuildNumberSearch" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="CurrentBuildNumber" Type="raw" />
+    </Property>
+    <Condition Message="This application is only supported on Windows 10 version v2004 (build 19041) or higher.">
+      <![CDATA[(WINDOWSBUILDNUMBER >= 19041)]]>
+    </Condition>
+
+    <Icon Id="powertoys.exe" SourceFile="$(var.BinDir)svgs\icon.ico"/>
+
+    <Property Id="ARPPRODUCTICON" Value="powertoys.exe" />
+
+    <Feature Id="CoreFeature" Title="PowerToys" AllowAdvertise="no" Absent="disallow" TypicalDefault="install"
+             Description="Contains all PowerToys features.">
+      <ComponentGroupRef Id="CoreComponents" />
+      <ComponentGroupRef Id="BaseApplicationsComponentGroup" />
+      <ComponentGroupRef Id="WinUI3ApplicationsComponentGroup" />
+      <ComponentGroupRef Id="AwakeComponentGroup" />
+      <ComponentGroupRef Id="ColorPickerComponentGroup" />
+      <ComponentGroupRef Id="FileExplorerPreviewComponentGroup" />
+      <ComponentGroupRef Id="FileLocksmithComponentGroup" />
+      <ComponentGroupRef Id="HostsComponentGroup" />
+      <ComponentGroupRef Id="ImageResizerComponentGroup" />
+      <ComponentGroupRef Id="KeyboardManagerComponentGroup" />
+      <ComponentGroupRef Id="PeekComponentGroup" />
+      <ComponentGroupRef Id="PowerRenameComponentGroup" />
+      <ComponentGroupRef Id="RegistryPreviewComponentGroup" />
+      <ComponentGroupRef Id="RunComponentGroup" />
+      <ComponentGroupRef Id="SettingsComponentGroup" />
+      <ComponentGroupRef Id="ShortcutGuideComponentGroup" />
+      <ComponentGroupRef Id="MouseWithoutBordersComponentGroup" />
+      <ComponentGroupRef Id="EnvironmentVariablesComponentGroup" />
+      <ComponentGroupRef Id="AdvancedPasteComponentGroup" />
+      <ComponentGroupRef Id="NewPlusComponentGroup" />
+      <ComponentGroupRef Id="NewPlusTemplatesComponentGroup" />
+      <ComponentGroupRef Id="ResourcesComponentGroup" />
+      <ComponentGroupRef Id="WindowsAppSDKComponentGroup" />
+      <ComponentGroupRef Id="ToolComponentGroup" />
+      <ComponentGroupRef Id="MonacoSRCHeatGenerated" />
+      <ComponentGroupRef Id="WorkspacesComponentGroup" />
+    </Feature>
+
+    <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" />
+
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
+
+    <UI>
+      <UIRef Id="WixUI_InstallDir"/>
+      <Publish Dialog="WelcomeDlg"
+                Control="Next"
+                Event="NewDialog"
+                Value="InstallDirDlg"
+                Order="99">1</Publish>
+      <Publish Dialog="InstallDirDlg"
+                Control="Back"
+                Event="NewDialog"
+                Value="WelcomeDlg"
+                Order="99">1</Publish>
+
+      <Publish Dialog="ExitDialog"
+            Control="Finish"
+            Event="EndDialog"
+            Value="Return">NOT Installed</Publish>
+      <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Property="_REMOVE_ALL" Value="Yes">1</Publish>
+      <Publish Dialog="UserExit" Control="Finish" Event="DoAction" Value="TelemetryLogInstallCancel">NOT Installed</Publish>
+      <Publish Dialog="FatalError" Control="Finish" Event="DoAction" Value="TelemetryLogInstallFail">NOT Installed</Publish>
+      <Publish Dialog="UserExit" Control="Finish" Event="DoAction" Value="TelemetryLogUninstallCancel">Installed AND _REMOVE_ALL="Yes"</Publish>
+      <Publish Dialog="FatalError" Control="Finish" Event="DoAction" Value="TelemetryLogUninstallFail">Installed AND _REMOVE_ALL="Yes"</Publish>
+      <Publish Dialog="UserExit" Control="Finish" Event="DoAction" Value="TelemetryLogRepairCancel">Installed AND NOT (_REMOVE_ALL="Yes")</Publish>
+      <Publish Dialog="FatalError" Control="Finish" Event="DoAction" Value="TelemetryLogRepairFail">Installed AND NOT (_REMOVE_ALL="Yes")</Publish>
+    </UI>
+
+    <WixVariable Id="WixUIBannerBmp" Value="$(var.ProjectDir)\Images\banner.png" />
+    <WixVariable Id="WixUIDialogBmp" Value="$(var.ProjectDir)\Images\dialog.png" />
+    <WixVariable Id="WixUILicenseRtf" Value="$(var.RepoDir)\installer\License.rtf" />
+    <Property Id="INSTALLSTARTMENUSHORTCUT" Value="1"/>
+    <Property Id="WixShellExecTarget" Value="[#PowerToys_ActionRunner.exe]" />
+
+    <SetProperty Action="SetDEFAULTBOOTSTRAPPERINSTALLFOLDER" Id="DEFAULTBOOTSTRAPPERINSTALLFOLDER" Value="[$(var.DefaultInstallDir)]PowerToys" Before="SetBOOTSTRAPPERINSTALLFOLDER" Sequence="execute"></SetProperty>
+
+    <!-- In case we didn't receive a value from the bootstrapper. -->
+    <SetProperty Action="SetBOOTSTRAPPERINSTALLFOLDER" Id="BOOTSTRAPPERINSTALLFOLDER" Value="[DEFAULTBOOTSTRAPPERINSTALLFOLDER]" Before="DetectPrevInstallPath" Sequence="execute">
+      <![CDATA[BOOTSTRAPPERINSTALLFOLDER = ""]]>
+    </SetProperty>
+    <!-- Have to compare value sent by bootstrapper to default to avoid using it, as a check to verify it's not default. This hack can be removed if it's possible to set the bootstrapper option to the previous install folder--> 
+    <SetProperty Action="SetINSTALLFOLDERTOPREVIOUSINSTALLFOLDER" Id="INSTALLFOLDER" Value="[PREVIOUSINSTALLFOLDER]" After="DetectPrevInstallPath" Sequence="execute">
+      <![CDATA[BOOTSTRAPPERINSTALLFOLDER = DEFAULTBOOTSTRAPPERINSTALLFOLDER AND PREVIOUSINSTALLFOLDER <> ""]]>
+    </SetProperty>
+    <SetProperty Action="SetINSTALLFOLDERTOBOOTSTRAPPERINSTALLFOLDER" Id="INSTALLFOLDER" Value="[BOOTSTRAPPERINSTALLFOLDER]" After="DetectPrevInstallPath" Sequence="execute">
+      <![CDATA[BOOTSTRAPPERINSTALLFOLDER <> DEFAULTBOOTSTRAPPERINSTALLFOLDER OR PREVIOUSINSTALLFOLDER = ""]]>
+    </SetProperty>
+
+    <SetProperty Id="InstallScope" Value="$(var.InstallScope)" Before="DetectPrevInstallPath" Sequence="execute"></SetProperty>
+    <InstallExecuteSequence>
+      <Custom Action="DetectPrevInstallPath" After="AppSearch" />
+      <Custom Action="SetLaunchPowerToysParam" Before="LaunchPowerToys" />
+      <Custom Action="SetUninstallCommandNotFoundParam" Before="UninstallCommandNotFound" />
+      <Custom Action="SetUpgradeCommandNotFoundParam" Before="UpgradeCommandNotFound" />
+      <Custom Action="SetApplyModulesRegistryChangeSetsParam" Before="ApplyModulesRegistryChangeSets" />
+
+      <?if $(var.PerUser) = "true" ?>
+      <Custom Action="SetInstallDSCModuleParam" Before="InstallDSCModule" />
+      <?endif?>
+
+      <Custom Action="SetUnApplyModulesRegistryChangeSetsParam" Before="UnApplyModulesRegistryChangeSets" />
+      <Custom Action="CheckGPO" After="InstallInitialize">
+        NOT Installed
+      </Custom>
+      <Custom Action="ApplyModulesRegistryChangeSets" After="InstallFiles">
+        NOT Installed
+      </Custom>
+      <Custom Action="WixCloseApplications" Before="RemoveFiles" />
+      <Custom Action="RemovePowerToysSchTasks" After="RemoveFiles" />
+      <!-- TODO: Use to activate embedded MSIX -->
+      <!--<Custom Action="InstallEmbeddedMSIXTask" After="InstallFinalize">
+        NOT Installed
+      </Custom>-->
+        <?if $(var.PerUser) = "true" ?>
+        <Custom Action="InstallDSCModule" After="InstallFiles"/>
+        <?endif?>
+        <Custom Action="TelemetryLogInstallSuccess" After="InstallFinalize">
+        NOT Installed
+      </Custom>
+      <Custom Action="TelemetryLogUninstallSuccess" After="InstallFinalize">
+        Installed and (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
+      </Custom>
+      <Custom Action="UnApplyModulesRegistryChangeSets" Before="RemoveFiles">
+        Installed AND (REMOVE="ALL")
+      </Custom>
+      <Custom Action="UnRegisterContextMenuPackages" Before="RemoveFiles">
+        Installed AND (REMOVE="ALL")
+      </Custom>
+      <Custom Action="UnsetAdvancedPasteAPIKey" Before="RemoveFiles">
+        Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
+      </Custom>
+      <Custom Action="UninstallCommandNotFound" Before="RemoveFiles">
+        Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
+      </Custom>
+      <Custom Action="UpgradeCommandNotFound" After="InstallFiles">
+        WIX_UPGRADE_DETECTED
+      </Custom>
+      <Custom Action="UninstallServicesTask" After="InstallFinalize">
+          Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
+      </Custom>
+        <!-- TODO: Use to activate embedded MSIX -->
+      <!--<Custom Action="UninstallEmbeddedMSIXTask" After="InstallFinalize">
+        Installed AND (REMOVE="ALL")
+      </Custom>-->
+      <?if $(var.PerUser) = "true" ?>
+      <Custom Action="UninstallDSCModule" After="InstallFinalize">
+          Installed AND (REMOVE="ALL")
+      </Custom>
+      <?endif?>
+      <Custom Action="TerminateProcesses" Before="InstallValidate" />
+      <Custom Action="LaunchPowerToys" Before="InstallFinalize">NOT Installed</Custom>
+
+      <!-- Clean Video Conference Mute registry keys that might be around from previous installations. We've deprecated this utility since then. -->
+      <Custom Action="CleanVideoConferenceRegistry" Before="InstallFinalize">NOT Installed</Custom>
+
+    </InstallExecuteSequence>
+
+    <CustomAction Id="SetLaunchPowerToysParam"
+                    Property="LaunchPowerToys"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction
+      Id="LaunchPowerToys"
+      Return="ignore"
+      Impersonate="yes"
+      Execute="deferred"
+      BinaryKey="PTCustomActions"
+      DllEntry="LaunchPowerToysCA"
+      />
+
+    <CustomAction
+      Id="TerminateProcesses"
+      Return="ignore"
+      Execute="immediate"
+      BinaryKey="PTCustomActions"
+      DllEntry="TerminateProcessesCA" />
+
+    <CustomAction Id="SetApplyModulesRegistryChangeSetsParam"
+                    Property="ApplyModulesRegistryChangeSets"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="SetUnApplyModulesRegistryChangeSetsParam"
+                    Property="UnApplyModulesRegistryChangeSets"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="SetInstallDSCModuleParam"
+                    Property="InstallDSCModule"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="SetUninstallCommandNotFoundParam"
+                    Property="UninstallCommandNotFound"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="SetUpgradeCommandNotFoundParam"
+                    Property="UpgradeCommandNotFound"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="SetCreateWinAppSDKHardlinksParam"
+                    Property="CreateWinAppSDKHardlinks"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="SetDeleteWinAppSDKHardlinksParam"
+                    Property="DeleteWinAppSDKHardlinks"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="SetCreatePTInteropHardlinksParam"
+                    Property="CreatePTInteropHardlinks"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="SetDeletePTInteropHardlinksParam"
+                    Property="DeletePTInteropHardlinks"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="SetCreateDotnetRuntimeHardlinksParam"
+                    Property="CreateDotnetRuntimeHardlinks"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="SetDeleteDotnetRuntimeHardlinksParam"
+                    Property="DeleteDotnetRuntimeHardlinks"
+                    Value="[INSTALLFOLDER]" />
+
+    <CustomAction Id="RemovePowerToysSchTasks"
+                  Return="ignore"
+                  Impersonate="no"
+                  Execute="deferred"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="RemoveScheduledTasksCA"
+                   />
+
+    <CustomAction Id="InstallEmbeddedMSIXTask"
+                  Return="ignore"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="InstallEmbeddedMSIXCA"
+                   />
+
+    <CustomAction Id="UninstallEmbeddedMSIXTask"
+                  Return="ignore"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="UninstallEmbeddedMSIXCA"
+                   />
+
+    <CustomAction Id="InstallDSCModule"
+                  Return="ignore"
+                  Impersonate="yes"
+                  Execute="deferred"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="InstallDSCModuleCA"
+                   />
+
+    <CustomAction Id="UninstallDSCModule"
+                  Return="ignore"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="UninstallDSCModuleCA"
+                   />
+
+      <CustomAction Id="UninstallServicesTask"
+                    Return="ignore"
+                    Impersonate="yes"
+                    BinaryKey="PTCustomActions"
+                    DllEntry="UninstallServicesCA"
+                   />
+
+      <CustomAction Id="UninstallCommandNotFound"
+                    Return="ignore"
+                    Impersonate="yes"
+                    Execute="deferred"
+                    BinaryKey="PTCustomActions"
+                    DllEntry="UninstallCommandNotFoundModuleCA"
+                   />
+      
+      <CustomAction Id="UpgradeCommandNotFound"
+                    Return="ignore"
+                    Impersonate="yes"
+                    Execute="deferred"
+                    BinaryKey="PTCustomActions"
+                    DllEntry="UpgradeCommandNotFoundModuleCA"
+                   />
+
+      <CustomAction Id="UnsetAdvancedPasteAPIKey"
+                    Return="ignore"
+                    Impersonate="yes"
+                    Execute="deferred"
+                    BinaryKey="PTCustomActions"
+                    DllEntry="UnsetAdvancedPasteAPIKeyCA"
+                   />
+
+      <CustomAction Id="TelemetryLogInstallSuccess"
+              Return="ignore"
+              Impersonate="yes"
+              BinaryKey="PTCustomActions"
+              DllEntry="TelemetryLogInstallSuccessCA"
+                   />
+
+    <CustomAction Id="TelemetryLogInstallCancel"
+                  Return="ignore"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="TelemetryLogInstallCancelCA"
+                   />
+
+    <CustomAction Id="TelemetryLogInstallFail"
+                  Return="ignore"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="TelemetryLogInstallFailCA"
+                   />
+
+    <CustomAction Id="TelemetryLogUninstallSuccess"
+                  Return="ignore"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="TelemetryLogUninstallSuccessCA"
+                   />
+
+    <CustomAction Id="TelemetryLogUninstallCancel"
+                  Return="ignore"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="TelemetryLogUninstallCancelCA"
+                   />
+
+    <CustomAction Id="TelemetryLogUninstallFail"
+                  Return="ignore"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="TelemetryLogUninstallFailCA"
+                   />
+
+    <CustomAction Id="TelemetryLogRepairCancel"
+                  Return="ignore"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="TelemetryLogRepairCancelCA"
+                   />
+
+    <CustomAction Id="TelemetryLogRepairFail"
+                  Return="ignore"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="TelemetryLogRepairFailCA"
+                   />
+
+    <CustomAction Id="DetectPrevInstallPath"
+                  Return="check"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="DetectPrevInstallPathCA"
+                  />
+
+    <CustomAction Id="CleanVideoConferenceRegistry"
+                  Return="ignore"
+                  Impersonate="yes"
+                  Execute="deferred"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="CleanVideoConferenceRegistryCA"
+                  />
+
+    <CustomAction Id="ApplyModulesRegistryChangeSets"
+                  Return="check"
+                  Impersonate="yes"
+                  Execute="deferred"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="ApplyModulesRegistryChangeSetsCA"
+                  />
+
+    <CustomAction Id="UnApplyModulesRegistryChangeSets"
+                  Return="check"
+                  Impersonate="yes"
+                  Execute="deferred"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="UnApplyModulesRegistryChangeSetsCA"
+                  />
+
+    <CustomAction Id="UnRegisterContextMenuPackages"
+                      Return="ignore"
+                Impersonate="yes"
+                Execute="deferred"
+                BinaryKey="PTCustomActions"
+                DllEntry="UnRegisterContextMenuPackagesCA"
+                  />
+
+    <CustomAction Id="CheckGPO"
+                  Return="check"
+                  Impersonate="yes"
+                  BinaryKey="PTCustomActions"
+                  DllEntry="CheckGPOCA"
+                  />
+
+    <!-- Close 'PowerToys.exe' before uninstall-->
+    <Property Id="MSIRESTARTMANAGERCONTROL" Value="DisableShutdown" />
+    <Property Id="MSIFASTINSTALL" Value="DisableShutdown" />
+    <util:CloseApplication CloseMessage="yes" Target="PowerToys.exe" ElevatedCloseMessage="yes" RebootPrompt="no" TerminateProcess="0" />
+  </Product>
+
+  <Fragment>
+    <Binary Id="PTCustomActions" SourceFile="$(var.PowerToysSetupCustomActions.TargetPath)" />
+  </Fragment>
+
+  <!-- Installation directory structure -->
+  <Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="$(var.DefaultInstallDir)">
+        <Directory Id="INSTALLFOLDER" Name="PowerToys">
+          <Directory Id="BaseApplicationsAssetsFolder" Name="Assets">
+          </Directory>
+          <Directory Id="DSCModulesReferenceFolder" Name="DSCModules" />
+          <Directory Id="WinUI3AppsInstallFolder" Name="WinUI3Apps">
+              <Directory Id="WinUI3AppsMicrosoftUIXamlInstallFolder" Name="Microsoft.UI.Xaml">
+                <Directory Id="WinUI3AppsMicrosoftUIXamlAssetsInstallFolder" Name="Assets" />
+              </Directory>
+            <Directory Id="WinUI3AppsAssetsFolder" Name="Assets">
+            </Directory>
+          </Directory>
+          <Directory Id="ToolsFolder" Name="Tools"/>
+        </Directory>
+      </Directory>
+      <Directory Id="ProgramMenuFolder">
+        <Directory Id="ApplicationProgramsFolder" Name="PowerToys (Preview)"/>
+      </Directory>
+      <Directory Id="DesktopFolder" Name="Desktop" />
+    </Directory>
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/RegistryPreview.wxs
+++ b/installer/PowerToysSetupVNext/RegistryPreview.wxs
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define RegistryPreviewAssetsFiles=?>
+  <?define RegistryPreviewAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\RegistryPreview?>
+
+  <Fragment>
+    <!-- Registry Preview -->
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="RegistryPreviewAssetsInstallFolder" Name="RegistryPreview" />
+    </DirectoryRef>
+    <DirectoryRef Id="RegistryPreviewAssetsInstallFolder" FileSource="$(var.RegistryPreviewAssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--RegistryPreviewAssetsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="RegistryPreviewComponentGroup">
+      <Component Id="RemoveRegistryPreviewFolder" Guid="D3DBC395-FAC5-44B1-BE44-3FE2B6E0F391" Directory="RegistryPreviewAssetsInstallFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveRegistryPreviewFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderRegistryPreviewAssetsFolder" Directory="RegistryPreviewAssetsInstallFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/Resources.wxs
+++ b/installer/PowerToysSetupVNext/Resources.wxs
@@ -0,0 +1,554 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <!-- Languages for localization on build farm -->
+  <!-- qps-ploc;qps-ploca;qps-plocm; -->
+  <?define LocLanguageList = ar-SA;cs-CZ;de-DE;es-ES;fa-IR;fr-FR;he-IL;hu-HU;it-IT;ja-JP;ko-KR;nl-NL;pl-PL;pt-BR;pt-PT;ru-RU;sv-SE;tr-TR;uk-UA;zh-CN;zh-TW?>
+
+  <Fragment>
+    <!-- Resource directories should be added only if the installer is built on the build farm -->
+    <?ifdef env.IsPipeline?>
+      <?foreach ParentDirectory in INSTALLFOLDER;HistoryPluginFolder;CalculatorPluginFolder;FolderPluginFolder;ProgramPluginFolder;ShellPluginFolder;IndexerPluginFolder;UnitConverterPluginFolder;ValueGeneratorPluginFolder;UriPluginFolder;WindowWalkerPluginFolder;OneNotePluginFolder;RegistryPluginFolder;VSCodeWorkspacesPluginFolder;ServicePluginFolder;SystemPluginFolder;TimeDatePluginFolder;WindowsSettingsPluginFolder;WindowsTerminalPluginFolder;WebSearchPluginFolder;PowerToysPluginFolder?>
+        <DirectoryRef Id="$(var.ParentDirectory)">
+          <!-- Resource file directories -->
+          <?foreach Language in $(var.LocLanguageList)?>
+          <!--NB: Ids can't contain hyphens-->
+          <?if $(var.Language) = ar-SA?>
+          <?define IdSafeLanguage = ar_SA?>
+          <?elseif $(var.Language) = cs-CZ?>
+          <?define IdSafeLanguage = cs_CZ?>
+          <?elseif $(var.Language) = de-DE?>
+          <?define IdSafeLanguage = de_DE?>
+          <?elseif $(var.Language) = es-ES?>
+          <?define IdSafeLanguage = es_ES?>
+          <?elseif $(var.Language) = fa-IR?>
+          <?define IdSafeLanguage = fa_IR?>
+          <?elseif $(var.Language) = fr-FR?>
+          <?define IdSafeLanguage = fr_FR?>
+          <?elseif $(var.Language) = he-IL?>
+          <?define IdSafeLanguage = he_IL?>
+          <?elseif $(var.Language) = hu-HU?>
+          <?define IdSafeLanguage = hu_HU?>
+          <?elseif $(var.Language) = it-IT?>
+          <?define IdSafeLanguage = it_IT?>
+          <?elseif $(var.Language) = ja-JP?>
+          <?define IdSafeLanguage = ja_JP?>
+          <?elseif $(var.Language) = ko-KR?>
+          <?define IdSafeLanguage = ko_KR?>
+          <?elseif $(var.Language) = nl-NL?>
+          <?define IdSafeLanguage = nl_NL?>
+          <?elseif $(var.Language) = pl-PL?>
+          <?define IdSafeLanguage = pl_PL?>
+          <?elseif $(var.Language) = pt-BR?>
+          <?define IdSafeLanguage = pt_BR?>
+          <?elseif $(var.Language) = pt-PT?>
+          <?define IdSafeLanguage = pt_PT?>
+          <!--
+          <?elseif $(var.Language) = qps-ploc?>
+          <?define IdSafeLanguage = qps_ploc?>
+          <?elseif $(var.Language) = qps-ploca?>
+          <?define IdSafeLanguage = qps_ploca?>
+          <?elseif $(var.Language) = qps-plocm?>
+          <?define IdSafeLanguage = qps_plocm?>
+          -->
+          <?elseif $(var.Language) = ru-RU?>
+          <?define IdSafeLanguage = ru_RU?>
+          <?elseif $(var.Language) = sv-SE?>
+          <?define IdSafeLanguage = sv_SE?>
+          <?elseif $(var.Language) = tr-TR?>
+          <?define IdSafeLanguage = tr_TR?>
+          <?elseif $(var.Language) = uk-UA?>
+          <?define IdSafeLanguage = uk_UA?>
+          <?elseif $(var.Language) = zh-CN?>
+          <?define IdSafeLanguage = zh_CN?>
+          <?elseif $(var.Language) = zh-TW?>
+          <?define IdSafeLanguage = zh_TW?>
+          <?else?>
+          <?define IdSafeLanguage = $(var.Language)?>
+          <?endif?>
+          <Directory Id="Resource$(var.IdSafeLanguage)$(var.ParentDirectory)" Name="$(var.Language)" />
+          <?undef IdSafeLanguage?>
+          <?endforeach?>
+        </DirectoryRef>
+      <?endforeach?>
+    <?endif?>
+
+    <ComponentGroup Id="ResourcesComponentGroup">
+      <!-- Resource components should be added only if the installer is built on the build farm -->
+      <?ifdef env.IsPipeline?>
+      <!-- Components for adding resource files -->
+      <?foreach Language in $(var.LocLanguageList)?>
+      <!--NB: Ids can't contain hyphens-->
+      <?if $(var.Language) = ar-SA?>
+      <!-- CompGUIDPrefix is language-dependent guid prefix missing the last 2 digits. -->
+      <?define CompGUIDPrefix = 4CF0A1CD-CA13-408B-AAC1-6E024B86A9?>
+      <?define IdSafeLanguage = ar_SA?>
+      <?elseif $(var.Language) = cs-CZ?>
+      <?define CompGUIDPrefix = 3E93405A-B91B-4E04-BAEC-26BEEE60F9?>
+      <?define IdSafeLanguage = cs_CZ?>
+      <?elseif $(var.Language) = de-DE?>
+      <?define CompGUIDPrefix = AF28C057-7ED9-474C-8E7E-D583BE8ECF?>
+      <?define IdSafeLanguage = de_DE?>
+      <?elseif $(var.Language) = es-ES?>
+      <?define CompGUIDPrefix = DD1FEEBD-55F0-44BA-A0FF-62C5C1C952?>
+      <?define IdSafeLanguage = es_ES?>
+      <?elseif $(var.Language) = fa-IR?>
+      <?define CompGUIDPrefix = 157411C9-CAB8-4CC5-AEA4-5ABEB91E59?>
+      <?define IdSafeLanguage = fa_IR?>
+      <?elseif $(var.Language) = fr-FR?>
+      <?define CompGUIDPrefix = F9F86D61-C747-43FC-8509-F3D1F198E1?>
+      <?define IdSafeLanguage = fr_FR?>
+      <?elseif $(var.Language) = he-IL?>
+      <?define CompGUIDPrefix = AFEA6E19-5B93-4CBB-B0CB-AFB2565C7D?>
+      <?define IdSafeLanguage = he_IL?>
+      <?elseif $(var.Language) = hu-HU?>
+      <?define CompGUIDPrefix = 9A919A40-E457-47F5-97C8-E886F06DDE?>
+      <?define IdSafeLanguage = hu_HU?>
+      <?elseif $(var.Language) = it-IT?>
+      <?define CompGUIDPrefix = 48FBF6D9-32DB-46FF-A64C-225269E738?>
+      <?define IdSafeLanguage = it_IT?>
+      <?elseif $(var.Language) = ja-JP?>
+      <?define CompGUIDPrefix = FB8E04AB-C8E8-43C0-8883-19F73E4EBA?>
+      <?define IdSafeLanguage = ja_JP?>
+      <?elseif $(var.Language) = ko-KR?>
+      <?define CompGUIDPrefix = 86C8F07C-80CA-420A-B6E7-86933D640C?>
+      <?define IdSafeLanguage = ko_KR?>
+      <?elseif $(var.Language) = nl-NL?>
+      <?define CompGUIDPrefix = C68F115F-28DD-4B45-9512-405C432458?>
+      <?define IdSafeLanguage = nl_NL?>
+      <?elseif $(var.Language) = pl-PL?>
+      <?define CompGUIDPrefix = 97494A31-5F57-4EC1-A6A9-994DF0813B?>
+      <?define IdSafeLanguage = pl_PL?>
+      <?elseif $(var.Language) = pt-BR?>
+      <?define CompGUIDPrefix = F4985235-2AB9-446B-BF8E-B14929A160?>
+      <?define IdSafeLanguage = pt_BR?>
+      <?elseif $(var.Language) = pt-PT?>
+      <?define CompGUIDPrefix = 58155841-D53A-4330-89D3-5C0338B928?>
+      <?define IdSafeLanguage = pt_PT?>
+      <!-- 
+      <?elseif $(var.Language) = qps-ploc?>
+      <?define CompGUIDPrefix = 75710CB2-DBDA-420B-9676-34D5F9D4A2?>
+      <?define IdSafeLanguage = qps_ploc?>
+      <?elseif $(var.Language) = qps-ploca?>
+      <?define CompGUIDPrefix = 55AF2A35-F959-49AB-B9EF-DFC9964A4F?>
+      <?define IdSafeLanguage = qps_ploca?>
+      <?elseif $(var.Language) = qps-plocm?>
+      <?define CompGUIDPrefix = D8CE2F7B-B0A1-4687-BFB7-1792B2FCCD?>
+      <?define IdSafeLanguage = qps_plocm?> 
+      -->
+      <?elseif $(var.Language) = ru-RU?>
+      <?define CompGUIDPrefix = 157BAF33-8D3F-46B7-9CF9-2C18E601CC?>
+      <?define IdSafeLanguage = ru_RU?>
+      <?elseif $(var.Language) = sv-SE?>
+      <?define CompGUIDPrefix = 85B4199F-5F89-42C3-B7C2-DBCD3E5267?>
+      <?define IdSafeLanguage = sv_SE?>
+      <?elseif $(var.Language) = tr-TR?>
+      <?define CompGUIDPrefix = EA375345-F52A-499B-A45E-108CE67EAF?>
+      <?define IdSafeLanguage = tr_TR?>
+      <?elseif $(var.Language) = uk-UA?>
+      <?define CompGUIDPrefix = 17BA6BA7-8CB6-47CA-BEB1-2FE87A0724?>
+      <?define IdSafeLanguage = uk_UA?>
+      <?elseif $(var.Language) = zh-CN?>
+      <?define CompGUIDPrefix = F8EE7CE9-58EA-4850-B76F-C22362DC0E?>
+      <?define IdSafeLanguage = zh_CN?>
+      <?elseif $(var.Language) = zh-TW?>
+      <?define CompGUIDPrefix = F07F3210-79E2-4C38-AEF7-D8EBE06621?>
+      <?define IdSafeLanguage = zh_TW?>
+      <?else?>
+      <?define IdSafeLanguage = $(var.Language)?>
+      <?define CompGUIDPrefix = 94D9A417-56FC-435D-8167-A45F5D7A75?>
+      <?endif?>
+      <Component
+          Id="Launcher_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)00">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.PowerLauncher.resources.dll" />
+      </Component>
+      <Component
+          Id="FancyZonesEditor_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)01">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="FancyZonesEditor_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="FancyZonesEditor_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.FancyZonesEditor.resources.dll" />
+      </Component>
+      <Component
+          Id="ImageResizer_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)02">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="ImageResizer_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="ImageResizer_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.ImageResizer.resources.dll" />
+      </Component>
+      <Component
+          Id="ColorPicker_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)03">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="ColorPicker_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="ColorPicker_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.ColorPickerUI.resources.dll" />
+      </Component>
+      <Component
+          Id="MarkdownPreviewHandler_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)04">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="MarkdownPreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="MarkdownPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)$(var.Language)\PowerToys.MarkdownPreviewHandler.resources.dll" />
+      </Component>
+      <Component
+          Id="SVGPreviewHandler_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)05">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="SVGPreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="SVGPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.SvgPreviewHandler.resources.dll" />
+      </Component>
+      <Component
+          Id="PDFPreviewHandler_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)06">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="PDFPreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="PDFPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.PdfPreviewHandler.resources.dll" />
+      </Component>
+      <Component
+          Id="GcodePreviewHandler_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)07">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="GcodePreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="GcodePreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.GcodePreviewHandler.resources.dll" />
+      </Component>
+      <!-- PowerToys Run aka Launcher plugin resources -->
+      <Component
+          Id="Launcher_Calculator_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)CalculatorPluginFolder"
+          Guid="$(var.CompGUIDPrefix)08">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_Calculator_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_Calculator_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Calculator\$(var.Language)\Microsoft.PowerToys.Run.Plugin.Calculator.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_Folder_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)FolderPluginFolder"
+          Guid="$(var.CompGUIDPrefix)09">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_Folder_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_Folder_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Folder\$(var.Language)\Microsoft.Plugin.Folder.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_Program_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)0A"
+          Directory="Resource$(var.IdSafeLanguage)ProgramPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_Program_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_Program_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Program\$(var.Language)\Microsoft.Plugin.Program.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_Shell_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)0B"
+          Directory="Resource$(var.IdSafeLanguage)ShellPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_Shell_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_Shell_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Shell\$(var.Language)\Microsoft.Plugin.Shell.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_Indexer_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)0C"
+          Directory="Resource$(var.IdSafeLanguage)IndexerPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_Indexer_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_Indexer_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Indexer\$(var.Language)\Microsoft.Plugin.Indexer.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_Uri_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)0D"
+          Directory="Resource$(var.IdSafeLanguage)UriPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_Uri_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_Uri_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Uri\$(var.Language)\Microsoft.Plugin.Uri.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_VSCodeWorkspaces_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)0E"
+          Directory="Resource$(var.IdSafeLanguage)VSCodeWorkspacesPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_VSCodeWorkspaces_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_VSCodeWorkspaces_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\VSCodeWorkspaces\$(var.Language)\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.resources.dll" />
+      </Component>
+      <Component Id="Launcher_WindowWalker_$(var.IdSafeLanguage)_Component"
+                 Guid="$(var.CompGUIDPrefix)0F"
+                 Directory="Resource$(var.IdSafeLanguage)WindowWalkerPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_WindowWalker_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_WindowWalker_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\WindowWalker\$(var.Language)\Microsoft.Plugin.WindowWalker.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_Registry_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)10"
+          Directory="Resource$(var.IdSafeLanguage)RegistryPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_Registry_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_Registry_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Registry\$(var.Language)\Microsoft.PowerToys.Run.Plugin.Registry.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_Service_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)11"
+          Directory="Resource$(var.IdSafeLanguage)ServicePluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_Service_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_Service_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Service\$(var.Language)\Microsoft.PowerToys.Run.Plugin.Service.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_System_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)12"
+          Directory="Resource$(var.IdSafeLanguage)SystemPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_System_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_System_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\System\$(var.Language)\Microsoft.PowerToys.Run.Plugin.System.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_WindowsSettings_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)13"
+          Directory="Resource$(var.IdSafeLanguage)WindowsSettingsPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_WindowsSettings_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_WindowsSettings_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\WindowsSettings\$(var.Language)\Microsoft.PowerToys.Run.Plugin.WindowsSettings.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_WindowsTerminal_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)15"
+          Directory="Resource$(var.IdSafeLanguage)WindowsTerminalPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_WindowsTerminal_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_WindowsTerminal_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\WindowsTerminal\$(var.Language)\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_WebSearch_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)16"
+          Directory="Resource$(var.IdSafeLanguage)WebSearchPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_WebSearch_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_WebSearch_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\WebSearch\$(var.Language)\Community.PowerToys.Run.Plugin.WebSearch.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_UnitConverter_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)17"
+          Directory="Resource$(var.IdSafeLanguage)UnitConverterPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_UnitConverter_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_UnitConverter_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\UnitConverter\$(var.Language)\Community.PowerToys.Run.Plugin.UnitConverter.resources.dll" />
+      </Component>
+      <Component
+                Id="Launcher_TimeDate_$(var.IdSafeLanguage)_Component"
+                Guid="$(var.CompGUIDPrefix)18"
+                Directory="Resource$(var.IdSafeLanguage)TimeDatePluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_TimeDate_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_TimeDate_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\TimeDate\$(var.Language)\Microsoft.PowerToys.Run.Plugin.TimeDate.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_OneNote_$(var.IdSafeLanguage)_Component"
+          Guid="$(var.CompGUIDPrefix)19"
+          Directory="Resource$(var.IdSafeLanguage)OneNotePluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Resource$(var.IdSafeLanguage)OneNotePluginFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_OneNote_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\OneNote\$(var.Language)\Microsoft.PowerToys.Run.Plugin.OneNote.resources.dll" />
+      </Component>
+      <Component
+          Id="MonacoPreviewHandler_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)1A">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="MonacoPreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="MonacoPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.MonacoPreviewHandler.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_History_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)HistoryPluginFolder"
+          Guid="$(var.CompGUIDPrefix)1B">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_History_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_History_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\History\$(var.Language)\Microsoft.PowerToys.Run.Plugin.History.resources.dll" />
+      </Component>
+      <Component
+          Id="Launcher_PowerToys_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)PowerToysPluginFolder"
+          Guid="$(var.CompGUIDPrefix)1C">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_PowerToys_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_PowerToys_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\PowerToys\$(var.Language)\Microsoft.PowerToys.Run.Plugin.PowerToys.resources.dll" />
+      </Component>
+      <Component
+         Id="Launcher_ValueGenerator_$(var.IdSafeLanguage)_Component"
+         Guid="$(var.CompGUIDPrefix)1D"
+         Directory="Resource$(var.IdSafeLanguage)ValueGeneratorPluginFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Launcher_ValueGenerator_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Launcher_ValueGenerator_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\ValueGenerator\$(var.Language)\Community.PowerToys.Run.Plugin.ValueGenerator.resources.dll" />
+      </Component>
+      <Component
+          Id="QoiPreviewHandler_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)1E">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="QoiPreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="QoiPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.QoiPreviewHandler.resources.dll" />
+      </Component>
+      <Component
+          Id="Awake_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)1F">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="Awake_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="Awake_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.Awake.resources.dll" />
+      </Component>
+      <Component
+          Id="PowerOCR_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)20">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="PowerOCR_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="PowerOCR_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.PowerOCR.resources.dll" />
+      </Component>
+      <Component
+          Id="WorkspacesEditor_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)21">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="WorkspacesEditor_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="WorkspacesEditor_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.WorkspacesEditor.resources.dll" />
+      </Component>
+      <?undef IdSafeLanguage?>
+      <?undef CompGUIDPrefix?>
+      <?endforeach?>
+      <?endif?>
+
+    <?ifdef env.IsPipeline?>
+      <Component Id="RemoveResourcesFolder" Guid="9BC0A5A1-CBC5-47C8-8544-3F8A8C0D45F5" Directory="INSTALLFOLDER" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveResourcesFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+      <?foreach Language in $(var.LocLanguageList)?>
+      <!--NB: Ids can't contain hyphens-->
+      <?if $(var.Language) = ar-SA?>
+      <?define IdSafeLanguage = ar_SA?>
+      <?elseif $(var.Language) = cs-CZ?>
+      <?define IdSafeLanguage = cs_CZ?>
+      <?elseif $(var.Language) = de-DE?>
+      <?define IdSafeLanguage = de_DE?>
+      <?elseif $(var.Language) = es-ES?>
+      <?define IdSafeLanguage = es_ES?>
+      <?elseif $(var.Language) = fa-IR?>
+      <?define IdSafeLanguage = fa_IR?>
+      <?elseif $(var.Language) = fr-FR?>
+      <?define IdSafeLanguage = fr_FR?>
+      <?elseif $(var.Language) = he-IL?>
+      <?define IdSafeLanguage = he_IL?>
+      <?elseif $(var.Language) = hu-HU?>
+      <?define IdSafeLanguage = hu_HU?>
+      <?elseif $(var.Language) = it-IT?>
+      <?define IdSafeLanguage = it_IT?>
+      <?elseif $(var.Language) = ja-JP?>
+      <?define IdSafeLanguage = ja_JP?>
+      <?elseif $(var.Language) = ko-KR?>
+      <?define IdSafeLanguage = ko_KR?>
+      <?elseif $(var.Language) = nl-NL?>
+      <?define IdSafeLanguage = nl_NL?>
+      <?elseif $(var.Language) = pl-PL?>
+      <?define IdSafeLanguage = pl_PL?>
+      <?elseif $(var.Language) = pt-BR?>
+      <?define IdSafeLanguage = pt_BR?>
+      <?elseif $(var.Language) = pt-PT?>
+      <?define IdSafeLanguage = pt_PT?>
+      <!-- 
+      <?elseif $(var.Language) = qps-ploc?>
+      <?define IdSafeLanguage = qps_ploc?>
+      <?elseif $(var.Language) = qps-ploca?>
+      <?define IdSafeLanguage = qps_ploca?>
+      <?elseif $(var.Language) = qps-plocm?>
+      <?define IdSafeLanguage = qps_plocm?> 
+      -->
+      <?elseif $(var.Language) = ru-RU?>
+      <?define IdSafeLanguage = ru_RU?>
+      <?elseif $(var.Language) = sv-SE?>
+      <?define IdSafeLanguage = sv_SE?>
+      <?elseif $(var.Language) = tr-TR?>
+      <?define IdSafeLanguage = tr_TR?>
+      <?elseif $(var.Language) = uk-UA?>
+      <?define IdSafeLanguage = uk_UA?>
+      <?elseif $(var.Language) = zh-CN?>
+      <?define IdSafeLanguage = zh_CN?>
+      <?elseif $(var.Language) = zh-TW?>
+      <?define IdSafeLanguage = zh_TW?>
+      <?else?>
+      <?define IdSafeLanguage = $(var.Language)?>
+      <?endif?>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)INSTALLFOLDER" Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)CalculatorPluginFolder" Directory="Resource$(var.IdSafeLanguage)CalculatorPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)FolderPluginFolder" Directory="Resource$(var.IdSafeLanguage)FolderPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ProgramPluginFolder" Directory="Resource$(var.IdSafeLanguage)ProgramPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ShellPluginFolder" Directory="Resource$(var.IdSafeLanguage)ShellPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)IndexerPluginFolder" Directory="Resource$(var.IdSafeLanguage)IndexerPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)UriPluginFolder" Directory="Resource$(var.IdSafeLanguage)UriPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)VSCodeWorkspacesPluginFolder" Directory="Resource$(var.IdSafeLanguage)VSCodeWorkspacesPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WindowWalkerPluginFolder" Directory="Resource$(var.IdSafeLanguage)WindowWalkerPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)RegistryPluginFolder" Directory="Resource$(var.IdSafeLanguage)RegistryPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ServicePluginFolder" Directory="Resource$(var.IdSafeLanguage)ServicePluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)SystemPluginFolder" Directory="Resource$(var.IdSafeLanguage)SystemPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WindowsSettingsPluginFolder" Directory="Resource$(var.IdSafeLanguage)WindowsSettingsPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WindowsTerminalPluginFolder" Directory="Resource$(var.IdSafeLanguage)WindowsTerminalPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WebSearchPluginFolder" Directory="Resource$(var.IdSafeLanguage)WebSearchPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)UnitConverterPluginFolder" Directory="Resource$(var.IdSafeLanguage)UnitConverterPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)TimeDatePluginFolder" Directory="Resource$(var.IdSafeLanguage)TimeDatePluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)OneNotePluginFolder" Directory="Resource$(var.IdSafeLanguage)OneNotePluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)HistoryPluginFolder" Directory="Resource$(var.IdSafeLanguage)HistoryPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)PowerToysPluginFolder" Directory="Resource$(var.IdSafeLanguage)PowerToysPluginFolder" On="uninstall"/>
+          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ValueGeneratorPluginFolder" Directory="Resource$(var.IdSafeLanguage)ValueGeneratorPluginFolder" On="uninstall"/>
+      <?undef IdSafeLanguage?>
+        <?endforeach?>
+      </Component>
+    <?endif?>
+
+    </ComponentGroup>
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/Run.wxs
+++ b/installer/PowerToysSetupVNext/Run.wxs
@@ -0,0 +1,448 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define launcherImagesComponentFiles=?>
+  <?define launcherImagesComponentFilesPath=$(var.BinDir)Assets\PowerLauncher\?>
+
+  <?define calcComponentFiles=?>
+  <?define calcComponentFilesPath=$(var.BinDir)RunPlugins\Calculator\?>
+  <?define calcImagesComponentFiles=?>
+  <?define calcImagesComponentFilesPath=$(var.BinDir)RunPlugins\Calculator\Images\?>
+
+  <?define FolderComponentFiles=?>
+  <?define FolderComponentFilesPath=$(var.BinDir)RunPlugins\Folder\?>
+  <?define FolderImagesComponentFiles=?>
+  <?define FolderImagesComponentFilesPath=$(var.BinDir)RunPlugins\Folder\Images?>
+
+  <?define ProgramComponentFiles=?>
+  <?define ProgramComponentFilesPath=$(var.BinDir)RunPlugins\Program\?>
+  <?define ProgramImagesComponentFiles=?>
+  <?define ProgramImagesComponentFilesPath=$(var.BinDir)RunPlugins\Program\Images\?>
+
+  <?define ShellComponentFiles=?>
+  <?define ShellComponentFilesPath=$(var.BinDir)RunPlugins\Shell\?>
+  <?define ShellImagesComponentFiles=?>
+  <?define ShellImagesComponentFilesPath=$(var.BinDir)RunPlugins\Shell\Images\?>
+
+  <?define IndexerComponentFiles=?>
+  <?define IndexerComponentFilesPath=$(var.BinDir)RunPlugins\Indexer\?>
+  <?define IndexerImagesComponentFiles=?>
+  <?define IndexerImagesComponentFilesPath=$(var.BinDir)RunPlugins\Indexer\Images\?>
+
+  <?define UnitConvCompFiles=?>
+  <?define UnitConvCompFilesPath=$(var.BinDir)RunPlugins\UnitConverter\?>
+  <?define UnitConvImagesCompFiles=?>
+  <?define UnitConvImagesCompFilesPath=$(var.BinDir)RunPlugins\UnitConverter\Images\?>
+
+  <?define WebSrchCompFiles=?>
+  <?define WebSrchCompFilesPath=$(var.BinDir)RunPlugins\WebSearch\?>
+  <?define WebSrchImagesCompFiles=?>
+  <?define WebSrchImagesCompFilesPath=$(var.BinDir)RunPlugins\WebSearch\Images\?>
+
+  <?define HistoryPluginComponentFiles=?>
+  <?define HistoryPluginComponentFilesPath=$(var.BinDir)RunPlugins\History\?>
+  <?define HistoryPluginImagesComponentFiles=?>
+  <?define HistoryPluginImagesComponentFilesPath=$(var.BinDir)RunPlugins\History\Images\?>
+
+  <?define UriComponentFiles=?>
+  <?define UriComponentFilesPath=$(var.BinDir)RunPlugins\Uri\?>
+  <?define UriImagesComponentFiles=?>
+  <?define UriImagesComponentFilesPath=$(var.BinDir)RunPlugins\Uri\Images\?>
+
+  <?define VSCWrkCompFiles=?>
+  <?define VSCWrkCompFilesPath=$(var.BinDir)RunPlugins\VSCodeWorkspaces\?>
+  <?define VSCWrkImagesCompFiles=?>
+  <?define VSCWrkImagesCompFilesPath=$(var.BinDir)RunPlugins\VSCodeWorkspaces\Images\?>
+
+  <?define WindowWlkrCompFiles=?>
+  <?define WindowWlkrCompFilesPath=$(var.BinDir)RunPlugins\WindowWalker\?>
+  <?define WindowWlkrImagesCompFiles=?>
+  <?define WindowWlkrImagesCompFilesPath=$(var.BinDir)RunPlugins\WindowWalker\Images\?>
+
+  <?define OneNoteComponentFiles=?>
+  <?define OneNoteComponentFilesPath=$(var.BinDir)RunPlugins\OneNote\?>
+  <?define OneNoteImagesComponentFiles=?>
+  <?define OneNoteImagesComponentFilesPath=$(var.BinDir)RunPlugins\OneNote\Images\?>
+
+  <?define RegistryComponentFiles=?>
+  <?define RegistryComponentFilesPath=$(var.BinDir)RunPlugins\Registry\?>
+  <?define RegistryImagesComponentFiles=?>
+  <?define RegistryImagesComponentFilesPath=$(var.BinDir)RunPlugins\Registry\Images\?>
+
+  <?define ServiceComponentFiles=?>
+  <?define ServiceComponentFilesPath=$(var.BinDir)RunPlugins\Service\?>
+  <?define ServiceImagesComponentFiles=?>
+  <?define ServiceImagesComponentFilesPath=$(var.BinDir)RunPlugins\Service\Images\?>
+
+  <?define SystemComponentFiles=?>
+  <?define SystemComponentFilesPath=$(var.BinDir)RunPlugins\System\?>
+  <?define SystemImagesComponentFiles=?>
+  <?define SystemImagesComponentFilesPath=$(var.BinDir)RunPlugins\System\Images\?>
+
+  <?define TimeDateComponentFiles=?>
+  <?define TimeDateComponentFilesPath=$(var.BinDir)RunPlugins\TimeDate\?>
+  <?define TimeDateImagesComponentFiles=?>
+  <?define TimeDateImagesComponentFilesPath=$(var.BinDir)RunPlugins\TimeDate\Images\?>
+
+  <?define WinSetCmpFiles=?>
+  <?define WinSetCmpFilesPath=$(var.BinDir)RunPlugins\WindowsSettings\?>
+  <?define WinSetImagesCmpFiles=?>
+  <?define WinSetImagesCmpFilesPath=$(var.BinDir)RunPlugins\WindowsSettings\Images\?>
+
+  <?define WinTermCmpFiles=?>
+  <?define WinTermCmpFilesPath=$(var.BinDir)RunPlugins\WindowsTerminal\?>
+  <?define WinTermImagesCmpFiles=?>
+  <?define WinTermImagesCmpFilesPath=$(var.BinDir)RunPlugins\WindowsTerminal\Images\?>
+
+  <?define PowerToysCmpFiles=?>
+  <?define PowerToysCmpFilesPath=$(var.BinDir)RunPlugins\PowerToys\?>
+  <?define PowerToysImagesCmpFiles=?>
+  <?define PowerToysImagesCmpFilesPath=$(var.BinDir)RunPlugins\PowerToys\Images\?>
+
+  <?define ValueGeneratorCmpFiles=?>
+  <?define ValueGeneratorCmpFilesPath=$(var.BinDir)RunPlugins\ValueGenerator\?>
+  <?define ValueGeneratorImagesCmpFiles=?>
+  <?define ValueGeneratorImagesCmpFilesPath=$(var.BinDir)RunPlugins\ValueGenerator\Images\?>
+
+  <Fragment>
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="LauncherImagesFolder" Name="PowerLauncher" />
+    </DirectoryRef>
+
+    <DirectoryRef Id="INSTALLFOLDER">
+      <!-- Plugins -->
+      <Directory Id="LauncherPluginsFolder" Name="RunPlugins">
+        <Directory Id="WebSearchPluginFolder" Name="WebSearch">
+          <Directory Id="WebSearchImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="CalculatorPluginFolder" Name="Calculator">
+          <Directory Id="CalculatorImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="FolderPluginFolder" Name="Folder">
+          <Directory Id="FolderPluginImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="ProgramPluginFolder" Name="Program">
+          <Directory Id="ProgramImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="ShellPluginFolder" Name="Shell">
+          <Directory Id="ShellImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="IndexerPluginFolder" Name="Indexer">
+          <Directory Id="IndexerImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="UriPluginFolder" Name="Uri">
+          <Directory Id="UriImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="HistoryPluginFolder" Name="History">
+          <Directory Id="HistoryImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="UnitConverterPluginFolder" Name="UnitConverter">
+          <Directory Id="UnitConverterImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="VSCodeWorkspacesPluginFolder" Name="VSCodeWorkspaces">
+          <Directory Id="VSCodeWorkspaceImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="WindowWalkerPluginFolder" Name="WindowWalker">
+          <Directory Id="WindowWalkerImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="OneNotePluginFolder" Name="OneNote">
+          <Directory Id="OneNoteImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="PowerToysPluginFolder" Name="PowerToys">
+          <Directory Id="PowerToysImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="RegistryPluginFolder" Name="Registry">
+          <Directory Id="RegistryImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="ServicePluginFolder" Name="Service">
+          <Directory Id="ServiceImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="WindowsTerminalPluginFolder" Name="WindowsTerminal">
+          <Directory Id="WindowsTerminalImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="SystemPluginFolder" Name="System">
+          <Directory Id="SystemImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="TimeDatePluginFolder" Name="TimeDate">
+          <Directory Id="TimeDateImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="WindowsSettingsPluginFolder" Name="WindowsSettings">
+          <Directory Id="WindowsSettingsImagesFolder" Name="Images" />
+        </Directory>
+        <Directory Id="ValueGeneratorPluginFolder" Name="ValueGenerator">
+          <Directory Id="ValueGeneratorImagesFolder" Name="Images" />
+        </Directory>
+      </Directory>
+    </DirectoryRef>
+
+    <DirectoryRef Id="LauncherImagesFolder" FileSource="$(var.launcherImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--launcherImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Calculator Plugin -->
+    <DirectoryRef Id="CalculatorPluginFolder" FileSource="$(var.calcComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--calcComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="CalculatorImagesFolder" FileSource="$(var.calcImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--calcImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Folder Plugin -->
+    <DirectoryRef Id="FolderPluginFolder" FileSource="$(var.FolderComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--FolderComponentFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="FolderPluginImagesFolder" FileSource="$(var.FolderImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--FolderImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Program Plugin -->
+    <DirectoryRef Id="ProgramPluginFolder" FileSource="$(var.ProgramComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ProgramComponentFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="ProgramImagesFolder" FileSource="$(var.ProgramImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ProgramImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Shell Plugin -->
+    <DirectoryRef Id="ShellPluginFolder" FileSource="$(var.ShellComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ShellComponentFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="ShellImagesFolder" FileSource="$(var.ShellImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ShellImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Indexer Plugin -->
+    <DirectoryRef Id="IndexerPluginFolder" FileSource="$(var.IndexerComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--IndexerComponentFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="IndexerImagesFolder" FileSource="$(var.IndexerImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--IndexerImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- UnitConverter Plugin -->
+    <DirectoryRef Id="UnitConverterPluginFolder" FileSource="$(var.UnitConvCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--UnitConvCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="UnitConverterImagesFolder" FileSource="$(var.UnitConvImagesCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--UnitConvImagesCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- WebSearch Plugin -->
+    <DirectoryRef Id="WebSearchPluginFolder" FileSource="$(var.WebSrchCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WebSrchCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="WebSearchImagesFolder" FileSource="$(var.WebSrchImagesCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WebSrchImagesCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- History Plugin -->
+    <DirectoryRef Id="HistoryPluginFolder" FileSource="$(var.HistoryPluginComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--HistoryPluginComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="HistoryImagesFolder" FileSource="$(var.HistoryPluginImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--HistoryPluginImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Uri Plugin -->
+    <DirectoryRef Id="UriPluginFolder" FileSource="$(var.UriComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--UriComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="UriImagesFolder" FileSource="$(var.UriImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--UriImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- VSCodeWorkspaces Plugin -->
+    <DirectoryRef Id="VSCodeWorkspacesPluginFolder" FileSource="$(var.VSCWrkCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--VSCWrkCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="VSCodeWorkspaceImagesFolder" FileSource="$(var.VSCWrkImagesCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--VSCWrkImagesCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- WindowWalker Plugin -->
+    <DirectoryRef Id="WindowWalkerPluginFolder" FileSource="$(var.WindowWlkrCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WindowWlkrCompFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="WindowWalkerImagesFolder" FileSource="$(var.WindowWlkrImagesCompFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WindowWlkrImagesCompFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- OneNote Plugin -->
+    <DirectoryRef Id="OneNotePluginFolder" FileSource="$(var.OneNoteComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--OneNoteComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="OneNoteImagesFolder" FileSource="$(var.OneNoteImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--OneNoteImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Registry Plugin -->
+    <DirectoryRef Id="RegistryPluginFolder" FileSource="$(var.RegistryComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--RegistryComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="RegistryImagesFolder" FileSource="$(var.RegistryImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--RegistryImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Service Plugin -->
+    <DirectoryRef Id="ServicePluginFolder" FileSource="$(var.ServiceComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ServiceComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="ServiceImagesFolder" FileSource="$(var.ServiceImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ServiceImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- System Plugin -->
+    <DirectoryRef Id="SystemPluginFolder" FileSource="$(var.SystemComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--SystemComponentFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="SystemImagesFolder" FileSource="$(var.SystemImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--SystemImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- TimeDate Plugin -->
+    <DirectoryRef Id="TimeDatePluginFolder" FileSource="$(var.TimeDateComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--TimeDateComponentFiles_Component_Def-->
+    </DirectoryRef>
+    <DirectoryRef Id="TimeDateImagesFolder" FileSource="$(var.TimeDateImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--TimeDateImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- WindowsSettings Plugin -->
+    <DirectoryRef Id="WindowsSettingsPluginFolder" FileSource="$(var.WinSetCmpFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WinSetCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="WindowsSettingsImagesFolder" FileSource="$(var.WinSetImagesCmpFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WinSetImagesCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- WindowsTerminal Plugin -->
+    <DirectoryRef Id="WindowsTerminalPluginFolder" FileSource="$(var.WinTermCmpFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WinTermCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="WindowsTerminalImagesFolder" FileSource="$(var.WinTermImagesCmpFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WinTermImagesCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- PowerToys Plugin -->
+    <DirectoryRef Id="PowerToysPluginFolder" FileSource="$(var.PowerToysCmpFilesPath)">
+      <!-- Generated by generateFileComponents.ps1 -->
+      <!--PowerToysCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="PowerToysImagesFolder" FileSource="$(var.PowerToysImagesCmpFilesPath)">
+      <!-- Generated by generateFileComponents.ps1 -->
+      <!--PowerToysImagesCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="ValueGeneratorPluginFolder" FileSource="$(var.ValueGeneratorCmpFilesPath)">
+      <!-- Generated by generateFileComponents.ps1 -->
+      <!--ValueGeneratorCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="ValueGeneratorImagesFolder" FileSource="$(var.ValueGeneratorImagesCmpFilesPath)">
+      <!-- Generated by generateFileComponents.ps1 -->
+      <!--ValueGeneratorImagesCmpFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="RunComponentGroup">
+      <Component Id="RemoveLauncherFolder" Guid="3FFDC0B6-82BC-4C57-AEB1-C710DB108C23" Directory="INSTALLFOLDER" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveLauncherFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderLauncherImagesFolder" Directory="LauncherImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderLauncherPluginsFolder" Directory="LauncherPluginsFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderCalculatorPluginFolder" Directory="CalculatorPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderCalculatorImagesFolder" Directory="CalculatorImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderFolderPluginFolder" Directory="FolderPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderFolderPluginImagesFolder" Directory="FolderPluginImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderProgramPluginFolder" Directory="ProgramPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderProgramImagesFolder" Directory="ProgramImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderShellPluginFolder" Directory="ShellPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderShellImagesFolder" Directory="ShellImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderIndexerPluginFolder" Directory="IndexerPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderIndexerImagesFolder" Directory="IndexerImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderUnitConverterPluginFolder" Directory="UnitConverterPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderUnitConverterImagesFolder" Directory="UnitConverterImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWebSearchPluginFolder" Directory="WebSearchPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWebSearchImagesFolder" Directory="WebSearchImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderHistoryPluginFolder" Directory="HistoryPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderHistoryImagesFolder" Directory="HistoryImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderUriPluginFolder" Directory="UriPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderUriImagesFolder" Directory="UriImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderVSCodeWorkspacesPluginFolder" Directory="VSCodeWorkspacesPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderVSCodeWorkspaceImagesFolder" Directory="VSCodeWorkspaceImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWindowWalkerPluginFolder" Directory="WindowWalkerPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWindowWalkerImagesFolder" Directory="WindowWalkerImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderOneNotePluginFolder" Directory="OneNotePluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderOneNoteImagesFolder" Directory="OneNoteImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderRegistryPluginFolder" Directory="RegistryPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderRegistryImagesFolder" Directory="RegistryImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderServicePluginFolder" Directory="ServicePluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderServiceImagesFolder" Directory="ServiceImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderSystemPluginFolder" Directory="SystemPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderSystemImagesFolder" Directory="SystemImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderTimeDatePluginFolder" Directory="TimeDatePluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderTimeDateImagesFolder" Directory="TimeDateImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWindowsSettingsPluginFolder" Directory="WindowsSettingsPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWindowsSettingsImagesFolder" Directory="WindowsSettingsImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWindowsTerminalPluginFolder" Directory="WindowsTerminalPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWindowsTerminalImagesFolder" Directory="WindowsTerminalImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderPowerToysPluginFolder" Directory="PowerToysPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderPowerToysImagesFolder" Directory="PowerToysImagesFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderValueGeneratorPluginFolder" Directory="ValueGeneratorPluginFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderValueGeneratorImagesFolder" Directory="ValueGeneratorImagesFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/Settings.wxs
+++ b/installer/PowerToysSetupVNext/Settings.wxs
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define SettingsV2AssetsFiles=?>
+  <?define SettingsV2AssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\?>
+
+  <?define SettingsV2AssetsModulesFiles=?>
+  <?define SettingsV2AssetsModulesFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\Modules\?>
+
+  <?define SettingsV2OOBEAssetsModulesFiles=?>
+  <?define SettingsV2OOBEAssetsModulesFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\Modules\OOBE\?>
+
+  <?define SettingsV2OOBEAssetsFluentIconsFiles=?>
+  <?define SettingsV2OOBEAssetsFluentIconsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\Icons\?>
+
+  <Fragment>
+    <DirectoryRef Id="WinUI3AppsAssetsFolder">
+      <Directory Id="SettingsV2AssetsInstallFolder" Name="Settings">
+        <Directory Id="SettingsAppAssetsScriptsFolder" Name="Scripts"/>
+        <Directory Id="SettingsV2OOBEAssetsFluentIconsInstallFolder" Name="Icons" />
+        <Directory Id="SettingsV2AssetsModulesInstallFolder" Name="Modules" >
+          <Directory Id="SettingsV2OOBEAssetsModulesInstallFolder" Name="OOBE" />
+        </Directory>
+      </Directory>
+    </DirectoryRef>
+
+    <DirectoryRef Id="SettingsV2AssetsInstallFolder" FileSource="$(var.SettingsV2AssetsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--SettingsV2AssetsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="SettingsV2AssetsModulesInstallFolder" FileSource="$(var.SettingsV2AssetsModulesFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--SettingsV2AssetsModulesFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="SettingsV2OOBEAssetsModulesInstallFolder" FileSource="$(var.SettingsV2OOBEAssetsModulesFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--SettingsV2OOBEAssetsModulesFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="SettingsV2OOBEAssetsFluentIconsInstallFolder" FileSource="$(var.SettingsV2OOBEAssetsFluentIconsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--SettingsV2OOBEAssetsFluentIconsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <DirectoryRef Id="SettingsAppAssetsScriptsFolder" FileSource="$(var.SettingsV2AssetsFilesPath)\Scripts\">
+      <Component Id="CommandNotFound_Scripts" Win64="yes" Guid="898EFA1E-EDD3-4F4B-8C7F-4A14B0D05B02">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="CommandNotFound_Scripts" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="CommandNotFound_Scripts_EnableModule.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\EnableModule.ps1" />
+        <File Id="CommandNotFound_Scripts_UpgradeModule.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\UpgradeModule.ps1" />
+        <File Id="CommandNotFound_Scripts_DisableModule.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\DisableModule.ps1" />
+        <File Id="CommandNotFound_Scripts_CheckCmdNotFoundRequirements.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\CheckCmdNotFoundRequirements.ps1" />
+        <File Id="CommandNotFound_Scripts_InstallWinGetClientModule.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\InstallWinGetClientModule.ps1" />
+        <File Id="CommandNotFound_Scripts_InstallPowerShell7.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\InstallPowerShell7.ps1" />
+      </Component>
+    </DirectoryRef>
+
+    <ComponentGroup Id="SettingsComponentGroup">
+
+      <Component Id="RemoveSettingsFolder" Guid="2D3AEF68-4E5A-4FF9-A5C0-9E53391AC754" Directory="SettingsV2AssetsInstallFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveSettingsFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderSettingsV2AssetsInstallFolder" Directory="SettingsV2AssetsInstallFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderSettingsV2OOBEAssetsFluentIconsInstallFolder" Directory="SettingsV2OOBEAssetsFluentIconsInstallFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderSettingsV2AssetsModulesInstallFolder" Directory="SettingsV2AssetsModulesInstallFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderSettingsV2OOBEAssetsModulesInstallFolder" Directory="SettingsV2OOBEAssetsModulesInstallFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderSettingsAppAssetsScriptsFolder" Directory="SettingsAppAssetsScriptsFolder" On="uninstall"/>
+      </Component>
+      <ComponentRef Id="CommandNotFound_Scripts"/>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/ShortcutGuide.wxs
+++ b/installer/PowerToysSetupVNext/ShortcutGuide.wxs
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define ShortcutGuideSvgFiles=?>
+  <?define ShortcutGuideSvgFilesPath=$(var.BinDir)\Assets\ShortcutGuide\?>
+
+  <Fragment>
+    <!-- Shortcut guide files -->
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="ShortcutGuideSvgsInstallFolder" Name="ShortcutGuide" />
+    </DirectoryRef>
+    <DirectoryRef Id="ShortcutGuideSvgsInstallFolder" FileSource="$(var.ShortcutGuideSvgFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--ShortcutGuideSvgFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Shortcut guide -->
+    <ComponentGroup Id="ShortcutGuideComponentGroup" >
+      <Component Id="RemoveShortcutGuideFolder" Guid="AD1ABC55-B593-4A60-A86A-BA8C0ED493A5" Directory="ShortcutGuideSvgsInstallFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveShortcutGuideFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderShortcutGuideSvgsInstallFolder" Directory="ShortcutGuideSvgsInstallFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/Tools.wxs
+++ b/installer/PowerToysSetupVNext/Tools.wxs
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <Fragment>
+    <DirectoryRef Id="ToolsFolder">
+      <Component Id="BugReportTool_exe" Win64="yes" Guid="370D0C28-F423-4A12-9A64-6BAB57C7E5C3">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="BugReportTool_exe" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.BinDir)Tools\PowerToys.BugReportTool.exe" Id="BugReportTool.exe" Checksum="yes" />
+      </Component>
+      <Component Id="StylesReportTool_exe" Win64="yes" Guid="9D348A78-38A0-4FDC-8D16-BDB0178E5F1E">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="StylesReportTool_exe" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Source="$(var.BinDir)StylesReportTool\PowerToys.StylesReportTool.exe" Id="StylesReportTool.exe" Checksum="yes" />
+      </Component>
+    </DirectoryRef>
+
+    <ComponentGroup Id="ToolComponentGroup">
+      <Component Id="RemoveToolsFolder" Guid="0402A3E8-1B4F-4762-9CCF-2267BCF8B6EE" Directory="ToolsFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveToolsFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderToolsFolder" Directory="ToolsFolder" On="uninstall"/>
+      </Component>
+      <ComponentRef Id="BugReportTool_exe" />
+      <ComponentRef Id="StylesReportTool_exe" />
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/WebView2/MicrosoftEdgeWebview2Setup.exe
+++ b/installer/PowerToysSetupVNext/WebView2/MicrosoftEdgeWebview2Setup.exe
--- a/installer/PowerToysSetupVNext/WinAppSDK.wxs
+++ b/installer/PowerToysSetupVNext/WinAppSDK.wxs
@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <!-- Localization languages shipped with WinAppSDK. We should ship these as well. -->
+  <?define WinAppSDKLocLanguageList = af-ZA;ar-SA;az-Latn-AZ;bg-BG;bs-Latn-BA;ca-ES;cs-CZ;cy-GB;da-DK;de-DE;el-GR;en-GB;en-us;es-ES;es-MX;et-EE;eu-ES;fa-IR;fi-FI;fr-CA;fr-FR;gl-ES;he-IL;hi-IN;hr-HR;hu-HU;id-ID;is-IS;it-IT;ja-JP;ka-GE;kk-KZ;ko-KR;lt-LT;lv-LV;ms-MY;nb-NO;nl-NL;nn-NO;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sl-SI;sq-AL;sr-Cyrl-RS;sr-Latn-RS;sv-SE;th-TH;tr-TR;uk-UA;vi-VN;zh-CN;zh-TW?>
+
+  <Fragment>
+    <DirectoryRef Id="WinUI3AppsMicrosoftUIXamlAssetsInstallFolder" FileSource="$(var.BinDir)WinUI3Apps\Microsoft.UI.Xaml\Assets">
+      <Component Id="WinUI3AppsMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG.png" Win64="yes" Guid="39889494-838A-4B9A-BD0A-105A1F0161BF">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="WinUI3AppsMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="WinUI3AppsMicrosoftUIXamlAssetsFile_NoiseAsset_256x256_PNG.png" Source="$(var.BinDir)WinUI3Apps\Microsoft.UI.Xaml\Assets\NoiseAsset_256x256_PNG.png" />
+      </Component>
+      <Component Id="WinUI3AppsMicrosoftUIXamlAssets_map.html" Win64="yes" Guid="A970464C-A5BC-43DB-ACB3-7D83CF3047B3">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="WinUI3AppsMicrosoftUIXamlAssets_map" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="WinUI3AppsMicrosoftUIXamlAssetsFile_map.html" Source="$(var.BinDir)WinUI3Apps\Microsoft.UI.Xaml\Assets\map.html" />
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="WinUI3AppsInstallFolder">
+      <?foreach Language in $(var.WinAppSDKLocLanguageList)?>
+      <?if $(var.Language) = af-ZA?>
+      <?define IdSafeLanguage = af_ZA?>
+      <?elseif $(var.Language) = ar-SA?>
+      <?define IdSafeLanguage = ar_SA?>
+      <?elseif $(var.Language) = az-Latn-AZ?>
+      <?define IdSafeLanguage = az_Latn_AZ?>
+      <?elseif $(var.Language) = bg-BG?>
+      <?define IdSafeLanguage = bg_BG?>
+      <?elseif $(var.Language) = bs-Latn-BA?>
+      <?define IdSafeLanguage = bs_Latn_BA?>
+      <?elseif $(var.Language) = ca-ES?>
+      <?define IdSafeLanguage = ca_ES?>
+      <?elseif $(var.Language) = cs-CZ?>
+      <?define IdSafeLanguage = cs_CZ?>
+      <?elseif $(var.Language) = cy-GB?>
+      <?define IdSafeLanguage = cy_GB?>
+      <?elseif $(var.Language) = da-DK?>
+      <?define IdSafeLanguage = da_DK?>
+      <?elseif $(var.Language) = de-DE?>
+      <?define IdSafeLanguage = de_DE?>
+      <?elseif $(var.Language) = el-GR?>
+      <?define IdSafeLanguage = el_GR?>
+      <?elseif $(var.Language) = en-GB?>
+      <?define IdSafeLanguage = en_GB?>
+      <?elseif $(var.Language) = en-us?>
+      <?define IdSafeLanguage = en_us?>
+      <?elseif $(var.Language) = es-ES?>
+      <?define IdSafeLanguage = es_ES?>
+      <?elseif $(var.Language) = es-MX?>
+      <?define IdSafeLanguage = es_MX?>
+      <?elseif $(var.Language) = et-EE?>
+      <?define IdSafeLanguage = et_EE?>
+      <?elseif $(var.Language) = eu-ES?>
+      <?define IdSafeLanguage = eu_ES?>
+      <?elseif $(var.Language) = fa-IR?>
+      <?define IdSafeLanguage = fa_IR?>
+      <?elseif $(var.Language) = fi-FI?>
+      <?define IdSafeLanguage = fi_FI?>
+      <?elseif $(var.Language) = fr-CA?>
+      <?define IdSafeLanguage = fr_CA?>
+      <?elseif $(var.Language) = fr-FR?>
+      <?define IdSafeLanguage = fr_FR?>
+      <?elseif $(var.Language) = gl-ES?>
+      <?define IdSafeLanguage = gl_ES?>
+      <?elseif $(var.Language) = he-IL?>
+      <?define IdSafeLanguage = he_IL?>
+      <?elseif $(var.Language) = hi-IN?>
+      <?define IdSafeLanguage = hi_IN?>
+      <?elseif $(var.Language) = hr-HR?>
+      <?define IdSafeLanguage = hr_HR?>
+      <?elseif $(var.Language) = hu-HU?>
+      <?define IdSafeLanguage = hu_HU?>
+      <?elseif $(var.Language) = id-ID?>
+      <?define IdSafeLanguage = id_ID?>
+      <?elseif $(var.Language) = is-IS?>
+      <?define IdSafeLanguage = is_IS?>
+      <?elseif $(var.Language) = it-IT?>
+      <?define IdSafeLanguage = it_IT?>
+      <?elseif $(var.Language) = ja-JP?>
+      <?define IdSafeLanguage = ja_JP?>
+      <?elseif $(var.Language) = ka-GE?>
+      <?define IdSafeLanguage = ka_GE?>
+      <?elseif $(var.Language) = kk-KZ?>
+      <?define IdSafeLanguage = kk_KZ?>
+      <?elseif $(var.Language) = ko-KR?>
+      <?define IdSafeLanguage = ko_KR?>
+      <?elseif $(var.Language) = lt-LT?>
+      <?define IdSafeLanguage = lt_LT?>
+      <?elseif $(var.Language) = lv-LV?>
+      <?define IdSafeLanguage = lv_LV?>
+      <?elseif $(var.Language) = ms-MY?>
+      <?define IdSafeLanguage = ms_MY?>
+      <?elseif $(var.Language) = nb-NO?>
+      <?define IdSafeLanguage = nb_NO?>
+      <?elseif $(var.Language) = nl-NL?>
+      <?define IdSafeLanguage = nl_NL?>
+      <?elseif $(var.Language) = nn-NO?>
+      <?define IdSafeLanguage = nn_NO?>
+      <?elseif $(var.Language) = pl-PL?>
+      <?define IdSafeLanguage = pl_PL?>
+      <?elseif $(var.Language) = pt-BR?>
+      <?define IdSafeLanguage = pt_BR?>
+      <?elseif $(var.Language) = pt-PT?>
+      <?define IdSafeLanguage = pt_PT?>
+      <?elseif $(var.Language) = ro-RO?>
+      <?define IdSafeLanguage = ro_RO?>
+      <?elseif $(var.Language) = ru-RU?>
+      <?define IdSafeLanguage = ru_RU?>
+      <?elseif $(var.Language) = sk-SK?>
+      <?define IdSafeLanguage = sk_SK?>
+      <?elseif $(var.Language) = sl-SI?>
+      <?define IdSafeLanguage = sl_SI?>
+      <?elseif $(var.Language) = sq-AL?>
+      <?define IdSafeLanguage = sq_AL?>
+      <?elseif $(var.Language) = sr-Cyrl-RS?>
+      <?define IdSafeLanguage = sr_Cyrl_RS?>
+      <?elseif $(var.Language) = sr-Latn-RS?>
+      <?define IdSafeLanguage = sr_Latn_RS?>
+      <?elseif $(var.Language) = sv-SE?>
+      <?define IdSafeLanguage = sv_SE?>
+      <?elseif $(var.Language) = th-TH?>
+      <?define IdSafeLanguage = th_TH?>
+      <?elseif $(var.Language) = tr-TR?>
+      <?define IdSafeLanguage = tr_TR?>
+      <?elseif $(var.Language) = uk-UA?>
+      <?define IdSafeLanguage = uk_UA?>
+      <?elseif $(var.Language) = vi-VN?>
+      <?define IdSafeLanguage = vi_VN?>
+      <?elseif $(var.Language) = zh-CN?>
+      <?define IdSafeLanguage = zh_CN?>
+      <?elseif $(var.Language) = zh-TW?>
+      <?define IdSafeLanguage = zh_TW?>
+      <?else?>
+      <?define IdSafeLanguage = $(var.Language)?>
+      <?endif?>
+      <Directory Id="WinAppSDKLoc$(var.IdSafeLanguage)WinUI3AppsInstallFolder" Name="$(var.Language)" />
+      <?undef IdSafeLanguage?>
+      <?endforeach?>
+    </DirectoryRef>
+
+    <ComponentGroup Id="WindowsAppSDKComponentGroup">
+      <?foreach Language in $(var.WinAppSDKLocLanguageList)?>
+      <?if $(var.Language) = af-ZA?>
+      <?define CompGUIDPrefix = 3C8E6C25-772A-4686-8FE3-8BE63F8D19?>
+      <?define IdSafeLanguage = af_ZA?>
+      <?elseif $(var.Language) = ar-SA?>
+      <?define CompGUIDPrefix = E2E65A7F-48CA-49E1-847B-5B1116D32E?>
+      <?define IdSafeLanguage = ar_SA?>
+      <?elseif $(var.Language) = az-Latn-AZ?>
+      <?define CompGUIDPrefix = 601F5B70-D386-4F68-B958-9D3F07167C?>
+      <?define IdSafeLanguage = az_Latn_AZ?>
+      <?elseif $(var.Language) = bg-BG?>
+      <?define CompGUIDPrefix = 9DD6C8F9-8599-46E4-B9B6-8B8CB095F9?>
+      <?define IdSafeLanguage = bg_BG?>
+      <?elseif $(var.Language) = bs-Latn-BA?>
+      <?define CompGUIDPrefix = CF68A082-D286-4556-BDF1-FBD9C7FE37?>
+      <?define IdSafeLanguage = bs_Latn_BA?>
+      <?elseif $(var.Language) = ca-ES?>
+      <?define CompGUIDPrefix = 298A66A5-9683-4ABF-A1C5-D97DA031B3?>
+      <?define IdSafeLanguage = ca_ES?>
+      <?elseif $(var.Language) = cs-CZ?>
+      <?define CompGUIDPrefix = EDEC8BF7-6602-47E5-AC04-3D392BDD83?>
+      <?define IdSafeLanguage = cs_CZ?>
+      <?elseif $(var.Language) = cy-GB?>
+      <?define CompGUIDPrefix = 6E328AD9-58D4-4615-8A64-9710D5EA81?>
+      <?define IdSafeLanguage = cy_GB?>
+      <?elseif $(var.Language) = da-DK?>
+      <?define CompGUIDPrefix = BC5D9E5C-D4B8-4CEB-A944-1A34FD46E5?>
+      <?define IdSafeLanguage = da_DK?>
+      <?elseif $(var.Language) = de-DE?>
+      <?define CompGUIDPrefix = 4E1F60E3-6257-4492-AD9E-22124393F7?>
+      <?define IdSafeLanguage = de_DE?>
+      <?elseif $(var.Language) = el-GR?>
+      <?define CompGUIDPrefix = 0A340858-D5DF-44D1-90F9-E5435128D5?>
+      <?define IdSafeLanguage = el_GR?>
+      <?elseif $(var.Language) = en-GB?>
+      <?define CompGUIDPrefix = 2F06617A-9700-4223-A309-58F2C1DA88?>
+      <?define IdSafeLanguage = en_GB?>
+      <?elseif $(var.Language) = en-us?>
+      <?define CompGUIDPrefix = A817585B-4AD2-4030-844B-1B2975DE6C?>
+      <?define IdSafeLanguage = en_us?>
+      <?elseif $(var.Language) = es-ES?>
+      <?define CompGUIDPrefix = 987CE029-212B-40AF-956E-D0D76F5EE8?>
+      <?define IdSafeLanguage = es_ES?>
+      <?elseif $(var.Language) = es-MX?>
+      <?define CompGUIDPrefix = 9E806BDC-CB61-43C5-A314-6CB3C7CE17?>
+      <?define IdSafeLanguage = es_MX?>
+      <?elseif $(var.Language) = et-EE?>
+      <?define CompGUIDPrefix = 07C20887-C0FD-4686-8D6C-CD70D4099E?>
+      <?define IdSafeLanguage = et_EE?>
+      <?elseif $(var.Language) = eu-ES?>
+      <?define CompGUIDPrefix = 43FDBB2A-DCF0-4E5C-98B2-DF5F8A7ABC?>
+      <?define IdSafeLanguage = eu_ES?>
+      <?elseif $(var.Language) = fa-IR?>
+      <?define CompGUIDPrefix = 9A709AF1-A967-4188-9A6E-0EE1A01091?>
+      <?define IdSafeLanguage = fa_IR?>
+      <?elseif $(var.Language) = fi-FI?>
+      <?define CompGUIDPrefix = 7C933CD2-E937-4BEF-835D-7D27660BF1?>
+      <?define IdSafeLanguage = fi_FI?>
+      <?elseif $(var.Language) = fr-CA?>
+      <?define CompGUIDPrefix = 547742D0-6025-43A1-B37A-D7FE1C7AB7?>
+      <?define IdSafeLanguage = fr_CA?>
+      <?elseif $(var.Language) = fr-FR?>
+      <?define CompGUIDPrefix = 5C208D3F-0A62-4DD3-9A3C-D5F5931BC0?>
+      <?define IdSafeLanguage = fr_FR?>
+      <?elseif $(var.Language) = gl-ES?>
+      <?define CompGUIDPrefix = CC8360F1-B761-485F-AE34-D5E76C2133?>
+      <?define IdSafeLanguage = gl_ES?>
+      <?elseif $(var.Language) = he-IL?>
+      <?define CompGUIDPrefix = 5D3703BA-B7F8-45E6-8727-E184890524?>
+      <?define IdSafeLanguage = he_IL?>
+      <?elseif $(var.Language) = hi-IN?>
+      <?define CompGUIDPrefix = 85D55059-CFE3-47CD-A000-D795DCD0FF?>
+      <?define IdSafeLanguage = hi_IN?>
+      <?elseif $(var.Language) = hr-HR?>
+      <?define CompGUIDPrefix = 2BD6767A-A7C5-440B-BDC7-EA505F6B69?>
+      <?define IdSafeLanguage = hr_HR?>
+      <?elseif $(var.Language) = hu-HU?>
+      <?define CompGUIDPrefix = FB99F97C-A1C3-407E-AA4A-264621D1C4?>
+      <?define IdSafeLanguage = hu_HU?>
+      <?elseif $(var.Language) = id-ID?>
+      <?define CompGUIDPrefix = CBBA3A3A-B336-4CB0-ACB1-4BB666855D?>
+      <?define IdSafeLanguage = id_ID?>
+      <?elseif $(var.Language) = is-IS?>
+      <?define CompGUIDPrefix = 57E8C11E-6D1F-4F29-A440-9F6175C607?>
+      <?define IdSafeLanguage = is_IS?>
+      <?elseif $(var.Language) = it-IT?>
+      <?define CompGUIDPrefix = 1C4F8911-96E4-4903-A92B-CD48BF09DE?>
+      <?define IdSafeLanguage = it_IT?>
+      <?elseif $(var.Language) = ja-JP?>
+      <?define CompGUIDPrefix = EF51BC22-3D3E-4767-8558-BE43F729FD?>
+      <?define IdSafeLanguage = ja_JP?>
+      <?elseif $(var.Language) = ka-GE?>
+      <?define CompGUIDPrefix = 7F625700-74B5-4F55-8F80-E86B4DC784?>
+      <?define IdSafeLanguage = ka_GE?>
+      <?elseif $(var.Language) = kk-KZ?>
+      <?define CompGUIDPrefix = 3F4019C3-2FA3-48BA-9096-C02E6679B5?>
+      <?define IdSafeLanguage = kk_KZ?>
+      <?elseif $(var.Language) = ko-KR?>
+      <?define CompGUIDPrefix = F6C1AAAD-1917-48AC-B89A-3953D01C20?>
+      <?define IdSafeLanguage = ko_KR?>
+      <?elseif $(var.Language) = lt-LT?>
+      <?define CompGUIDPrefix = 6E48287B-937D-43D0-A7FB-161717D5E2?>
+      <?define IdSafeLanguage = lt_LT?>
+      <?elseif $(var.Language) = lv-LV?>
+      <?define CompGUIDPrefix = F2E02A03-361C-43FA-ACFA-53369774A6?>
+      <?define IdSafeLanguage = lv_LV?>
+      <?elseif $(var.Language) = ms-MY?>
+      <?define CompGUIDPrefix = 4D141E3C-7F30-4689-9D8D-36C1245845?>
+      <?define IdSafeLanguage = ms_MY?>
+      <?elseif $(var.Language) = nb-NO?>
+      <?define CompGUIDPrefix = 939F5123-0700-4C0C-891F-04E331FC5E?>
+      <?define IdSafeLanguage = nb_NO?>
+      <?elseif $(var.Language) = nl-NL?>
+      <?define CompGUIDPrefix = 5E97EAE0-F207-47F1-B4BD-12113D983C?>
+      <?define IdSafeLanguage = nl_NL?>
+      <?elseif $(var.Language) = nn-NO?>
+      <?define CompGUIDPrefix = A1E74004-671D-46DC-AECD-826D068B26?>
+      <?define IdSafeLanguage = nn_NO?>
+      <?elseif $(var.Language) = pl-PL?>
+      <?define CompGUIDPrefix = E1D983A8-D406-4C60-AE61-9F362CBEF2?>
+      <?define IdSafeLanguage = pl_PL?>
+      <?elseif $(var.Language) = pt-BR?>
+      <?define CompGUIDPrefix = E6E4AF39-7758-4F52-B6CA-CD6D4513B7?>
+      <?define IdSafeLanguage = pt_BR?>
+      <?elseif $(var.Language) = pt-PT?>
+      <?define CompGUIDPrefix = 8F4BB964-3EB7-4D91-816D-D0E25D69D0?>
+      <?define IdSafeLanguage = pt_PT?>
+      <?elseif $(var.Language) = ro-RO?>
+      <?define CompGUIDPrefix = 8324BA46-F54F-4696-B348-3193856660?>
+      <?define IdSafeLanguage = ro_RO?>
+      <?elseif $(var.Language) = ru-RU?>
+      <?define CompGUIDPrefix = 13BB6E4C-A928-4FD5-A0CA-CE45B8B857?>
+      <?define IdSafeLanguage = ru_RU?>
+      <?elseif $(var.Language) = sk-SK?>
+      <?define CompGUIDPrefix = 63D22C1D-D00A-4194-B64F-9CA2DF93D5?>
+      <?define IdSafeLanguage = sk_SK?>
+      <?elseif $(var.Language) = sl-SI?>
+      <?define CompGUIDPrefix = C007A438-5EBD-4E2A-9E03-8C9521762B?>
+      <?define IdSafeLanguage = sl_SI?>
+      <?elseif $(var.Language) = sq-AL?>
+      <?define CompGUIDPrefix = 9058E23A-A9DD-45A2-A85C-5DE97D0F2A?>
+      <?define IdSafeLanguage = sq_AL?>
+      <?elseif $(var.Language) = sr-Cyrl-RS?>
+      <?define CompGUIDPrefix = 7D21E8FC-368D-4393-A055-44D742C7A0?>
+      <?define IdSafeLanguage = sr_Cyrl_RS?>
+      <?elseif $(var.Language) = sr-Latn-RS?>
+      <?define CompGUIDPrefix = F8B974A0-4BEA-44F7-8603-7D9BE3003F?>
+      <?define IdSafeLanguage = sr_Latn_RS?>
+      <?elseif $(var.Language) = sv-SE?>
+      <?define CompGUIDPrefix = A56ECD85-B52C-421D-8C8A-CBADE0A92F?>
+      <?define IdSafeLanguage = sv_SE?>
+      <?elseif $(var.Language) = th-TH?>
+      <?define CompGUIDPrefix = C71B1361-A45E-42AB-8A20-95ED3AF74E?>
+      <?define IdSafeLanguage = th_TH?>
+      <?elseif $(var.Language) = tr-TR?>
+      <?define CompGUIDPrefix = 025B5CE3-6470-4C01-A606-DFC74A47E0?>
+      <?define IdSafeLanguage = tr_TR?>
+      <?elseif $(var.Language) = uk-UA?>
+      <?define CompGUIDPrefix = AD78BE3F-6A3B-414D-AAEC-BC4C801B64?>
+      <?define IdSafeLanguage = uk_UA?>
+      <?elseif $(var.Language) = vi-VN?>
+      <?define CompGUIDPrefix = 9F21001A-87DA-4D9E-A298-FEDC375D0C?>
+      <?define IdSafeLanguage = vi_VN?>
+      <?elseif $(var.Language) = zh-CN?>
+      <?define CompGUIDPrefix = C8BB7DD7-EB7B-478E-925D-6F64107590?>
+      <?define IdSafeLanguage = zh_CN?>
+      <?elseif $(var.Language) = zh-TW?>
+      <?define CompGUIDPrefix = E472BBC5-604D-44A2-8B95-3A456CFF56?>
+      <?define IdSafeLanguage = zh_TW?>
+      <?else?>
+      <?define IdSafeLanguage = $(var.Language)?>
+      <?define CompGUIDPrefix = 51B656B3-2D45-49D8-9871-F0A1C8BEEE?>
+      <?endif?>
+      <Component
+          Id="WinUI3Apps_WinAppSDKLoc_$(var.IdSafeLanguage)_Component"
+          Directory="WinAppSDKLoc$(var.IdSafeLanguage)WinUI3AppsInstallFolder"
+          Guid="$(var.CompGUIDPrefix)01">
+          <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+            <RegistryValue Type="string" Name="WinUI3Apps_WinAppSDKLoc_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+          </RegistryKey>
+          <File Id="WinUI3Apps_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlMui_File" Source="$(var.BinDir)WinUI3Apps\$(var.Language)\Microsoft.ui.xaml.dll.mui" />
+          <File Id="WinUI3Apps_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlPhoneMui_File" Source="$(var.BinDir)WinUI3Apps\$(var.Language)\Microsoft.UI.Xaml.Phone.dll.mui" />
+      </Component>
+      <?undef IdSafeLanguage?>
+      <?undef CompGUIDPrefix?>
+      <?endforeach?>
+      <Component Id="RemoveWinAppSDKFolder" Guid="1BBAA49F-3B2E-455C-A615-EEB079CB9A8B" Directory="WinUI3AppsInstallFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveWinAppSDKFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+      <?foreach Language in $(var.WinAppSDKLocLanguageList)?>
+      <?if $(var.Language) = af-ZA?>
+      <?define IdSafeLanguage = af_ZA?>
+      <?elseif $(var.Language) = ar-SA?>
+      <?define IdSafeLanguage = ar_SA?>
+      <?elseif $(var.Language) = az-Latn-AZ?>
+      <?define IdSafeLanguage = az_Latn_AZ?>
+      <?elseif $(var.Language) = bg-BG?>
+      <?define IdSafeLanguage = bg_BG?>
+      <?elseif $(var.Language) = bs-Latn-BA?>
+      <?define IdSafeLanguage = bs_Latn_BA?>
+      <?elseif $(var.Language) = ca-ES?>
+      <?define IdSafeLanguage = ca_ES?>
+      <?elseif $(var.Language) = cs-CZ?>
+      <?define IdSafeLanguage = cs_CZ?>
+      <?elseif $(var.Language) = cy-GB?>
+      <?define IdSafeLanguage = cy_GB?>
+      <?elseif $(var.Language) = da-DK?>
+      <?define IdSafeLanguage = da_DK?>
+      <?elseif $(var.Language) = de-DE?>
+      <?define IdSafeLanguage = de_DE?>
+      <?elseif $(var.Language) = el-GR?>
+      <?define IdSafeLanguage = el_GR?>
+      <?elseif $(var.Language) = en-GB?>
+      <?define IdSafeLanguage = en_GB?>
+      <?elseif $(var.Language) = en-us?>
+      <?define IdSafeLanguage = en_us?>
+      <?elseif $(var.Language) = es-ES?>
+      <?define IdSafeLanguage = es_ES?>
+      <?elseif $(var.Language) = es-MX?>
+      <?define IdSafeLanguage = es_MX?>
+      <?elseif $(var.Language) = et-EE?>
+      <?define IdSafeLanguage = et_EE?>
+      <?elseif $(var.Language) = eu-ES?>
+      <?define IdSafeLanguage = eu_ES?>
+      <?elseif $(var.Language) = fa-IR?>
+      <?define IdSafeLanguage = fa_IR?>
+      <?elseif $(var.Language) = fi-FI?>
+      <?define IdSafeLanguage = fi_FI?>
+      <?elseif $(var.Language) = fr-CA?>
+      <?define IdSafeLanguage = fr_CA?>
+      <?elseif $(var.Language) = fr-FR?>
+      <?define IdSafeLanguage = fr_FR?>
+      <?elseif $(var.Language) = gl-ES?>
+      <?define IdSafeLanguage = gl_ES?>
+      <?elseif $(var.Language) = he-IL?>
+      <?define IdSafeLanguage = he_IL?>
+      <?elseif $(var.Language) = hi-IN?>
+      <?define IdSafeLanguage = hi_IN?>
+      <?elseif $(var.Language) = hr-HR?>
+      <?define IdSafeLanguage = hr_HR?>
+      <?elseif $(var.Language) = hu-HU?>
+      <?define IdSafeLanguage = hu_HU?>
+      <?elseif $(var.Language) = id-ID?>
+      <?define IdSafeLanguage = id_ID?>
+      <?elseif $(var.Language) = is-IS?>
+      <?define IdSafeLanguage = is_IS?>
+      <?elseif $(var.Language) = it-IT?>
+      <?define IdSafeLanguage = it_IT?>
+      <?elseif $(var.Language) = ja-JP?>
+      <?define IdSafeLanguage = ja_JP?>
+      <?elseif $(var.Language) = ka-GE?>
+      <?define IdSafeLanguage = ka_GE?>
+      <?elseif $(var.Language) = kk-KZ?>
+      <?define IdSafeLanguage = kk_KZ?>
+      <?elseif $(var.Language) = ko-KR?>
+      <?define IdSafeLanguage = ko_KR?>
+      <?elseif $(var.Language) = lt-LT?>
+      <?define IdSafeLanguage = lt_LT?>
+      <?elseif $(var.Language) = lv-LV?>
+      <?define IdSafeLanguage = lv_LV?>
+      <?elseif $(var.Language) = ms-MY?>
+      <?define IdSafeLanguage = ms_MY?>
+      <?elseif $(var.Language) = nb-NO?>
+      <?define IdSafeLanguage = nb_NO?>
+      <?elseif $(var.Language) = nl-NL?>
+      <?define IdSafeLanguage = nl_NL?>
+      <?elseif $(var.Language) = nn-NO?>
+      <?define IdSafeLanguage = nn_NO?>
+      <?elseif $(var.Language) = pl-PL?>
+      <?define IdSafeLanguage = pl_PL?>
+      <?elseif $(var.Language) = pt-BR?>
+      <?define IdSafeLanguage = pt_BR?>
+      <?elseif $(var.Language) = pt-PT?>
+      <?define IdSafeLanguage = pt_PT?>
+      <?elseif $(var.Language) = ro-RO?>
+      <?define IdSafeLanguage = ro_RO?>
+      <?elseif $(var.Language) = ru-RU?>
+      <?define IdSafeLanguage = ru_RU?>
+      <?elseif $(var.Language) = sk-SK?>
+      <?define IdSafeLanguage = sk_SK?>
+      <?elseif $(var.Language) = sl-SI?>
+      <?define IdSafeLanguage = sl_SI?>
+      <?elseif $(var.Language) = sq-AL?>
+      <?define IdSafeLanguage = sq_AL?>
+      <?elseif $(var.Language) = sr-Cyrl-RS?>
+      <?define IdSafeLanguage = sr_Cyrl_RS?>
+      <?elseif $(var.Language) = sr-Latn-RS?>
+      <?define IdSafeLanguage = sr_Latn_RS?>
+      <?elseif $(var.Language) = sv-SE?>
+      <?define IdSafeLanguage = sv_SE?>
+      <?elseif $(var.Language) = th-TH?>
+      <?define IdSafeLanguage = th_TH?>
+      <?elseif $(var.Language) = tr-TR?>
+      <?define IdSafeLanguage = tr_TR?>
+      <?elseif $(var.Language) = uk-UA?>
+      <?define IdSafeLanguage = uk_UA?>
+      <?elseif $(var.Language) = vi-VN?>
+      <?define IdSafeLanguage = vi_VN?>
+      <?elseif $(var.Language) = zh-CN?>
+      <?define IdSafeLanguage = zh_CN?>
+      <?elseif $(var.Language) = zh-TW?>
+      <?define IdSafeLanguage = zh_TW?>
+      <?else?>
+      <?define IdSafeLanguage = $(var.Language)?>
+      <?endif?>
+        <RemoveFolder Id="RemoveFolderWinAppSDKLoc$(var.IdSafeLanguage)WinUI3AppsInstallFolder" Directory="WinAppSDKLoc$(var.IdSafeLanguage)WinUI3AppsInstallFolder" On="uninstall"/>
+      <?undef IdSafeLanguage?>
+      <?endforeach?>
+        <RemoveFolder Id="RemoveFolderWinUI3AppsMicrosoftUIXamlInstallFolder" Directory="WinUI3AppsMicrosoftUIXamlInstallFolder" On="uninstall"/>
+        <RemoveFolder Id="RemoveFolderWinUI3AppsMicrosoftUIXamlAssetsInstallFolder" Directory="WinUI3AppsMicrosoftUIXamlAssetsInstallFolder" On="uninstall"/>
+      </Component>
+      <ComponentRef Id="WinUI3AppsMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG.png" />
+      <ComponentRef Id="WinUI3AppsMicrosoftUIXamlAssets_map.html" />
+    </ComponentGroup>
+  </Fragment>
+</Wix>
+
--- a/installer/PowerToysSetupVNext/WinUI3Applications.wxs
+++ b/installer/PowerToysSetupVNext/WinUI3Applications.wxs
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define WinUI3ApplicationsFiles=?>
+  <?define WinUI3ApplicationsFilesPath=$(var.BinDir)\WinUI3Apps\?>
+
+  <Fragment>
+    <DirectoryRef Id="WinUI3AppsInstallFolder">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WinUI3ApplicationsFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="WinUI3ApplicationsComponentGroup">
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/Workspaces.wxs
+++ b/installer/PowerToysSetupVNext/Workspaces.wxs
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define WorkspacesImagesComponentFiles=?>
+  <?define WorkspacesImagesComponentFilesPath=$(var.BinDir)Assets\Workspaces\?>
+
+  <Fragment>
+    <!-- Shortcut guide files -->
+    <DirectoryRef Id="BaseApplicationsAssetsFolder">
+      <Directory Id="WorkspacesAssetsInstallFolder" Name="Workspaces" />
+    </DirectoryRef>
+    <DirectoryRef Id="WorkspacesAssetsInstallFolder" FileSource="$(var.WorkspacesImagesComponentFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--WorkspacesImagesComponentFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Workspaces -->
+    <ComponentGroup Id="WorkspacesComponentGroup" >
+      <Component Id="RemoveWorkspacesAssetsFolder" Guid="34FC1245-1197-4025-9CF1-A298D509C2CC" Directory="WorkspacesAssetsInstallFolder" >
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveWorkspacesAssetsFolder" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderWorkspacesAssetsFolder" Directory="WorkspacesAssetsInstallFolder" On="uninstall"/>
+      </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>
--- a/installer/PowerToysSetupVNext/generateAllFileComponents.ps1
+++ b/installer/PowerToysSetupVNext/generateAllFileComponents.ps1
@@ -0,0 +1,323 @@
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory = $True, Position = 1)]
+    [string]$platform,
+    [Parameter(Mandatory = $False, Position = 2)]
+    [string]$installscopeperuser = "false"
+)
+
+Function Generate-FileList() {
+    [CmdletBinding()]
+    Param(
+        # Can be multiple files separated by ; as long as they're on the same directory
+        [Parameter(Mandatory = $True, Position = 1)]
+        [AllowEmptyString()]
+        [string]$fileDepsJson,
+        [Parameter(Mandatory = $True, Position = 2)]
+        [string]$fileListName,
+        [Parameter(Mandatory = $True, Position = 3)]
+        [string]$wxsFilePath,
+        # If there is no deps.json file, just pass path to files
+        [Parameter(Mandatory = $False, Position = 4)]
+        [string]$depsPath,
+        # launcher plugins are being loaded into launcher process,
+        # so there are some additional dependencies to skip
+        [Parameter(Mandatory = $False, Position = 5)]
+        [bool]$isLauncherPlugin
+    )
+
+    $fileWxs = Get-Content $wxsFilePath;
+
+    $fileExclusionList = @("*.pdb", "*.lastcodeanalysissucceeded", "createdump.exe", "powertoys.exe")
+
+    $fileInclusionList = @("*.dll", "*.exe", "*.json", "*.msix", "*.png", "*.gif", "*.ico", "*.cur", "*.svg", "index.html", "reg.js", "gitignore.js", "srt.js", "monacoSpecialLanguages.js", "customTokenThemeRules.js", "*.pri")
+
+    $dllsToIgnore = @("System.CodeDom.dll", "WindowsBase.dll")
+
+    if ($fileDepsJson -eq [string]::Empty) {
+        $fileDepsRoot = $depsPath
+    } else {
+        $multipleDepsJson = $fileDepsJson.Split(";")
+
+        foreach ( $singleDepsJson in $multipleDepsJson )
+        {
+
+            $fileDepsRoot = (Get-ChildItem $singleDepsJson).Directory.FullName
+            $depsJson = Get-Content $singleDepsJson | ConvertFrom-Json
+
+            $runtimeList = ([array]$depsJson.targets.PSObject.Properties)[-1].Value.PSObject.Properties | Where-Object {
+                $_.Name -match "runtimepack.*Runtime"
+            };
+
+            $runtimeList | ForEach-Object {
+                $_.Value.PSObject.Properties.Value | ForEach-Object {
+                    $fileExclusionList += $_.PSObject.Properties.Name
+                }
+            }
+        }
+    }
+
+    $fileExclusionList = $fileExclusionList | Where-Object {$_ -notin $dllsToIgnore}
+
+    if ($isLauncherPlugin -eq $True) {
+        $fileInclusionList += @("*.deps.json")
+        $fileExclusionList += @("Ijwhost.dll", "PowerToys.Common.UI.dll", "PowerToys.GPOWrapper.dll", "PowerToys.GPOWrapperProjection.dll", "PowerToys.PowerLauncher.Telemetry.dll", "PowerToys.ManagedCommon.dll", "PowerToys.Settings.UI.Lib.dll", "Wox.Infrastructure.dll", "Wox.Plugin.dll")
+    }
+
+    $fileList = Get-ChildItem $fileDepsRoot -Include $fileInclusionList -Exclude $fileExclusionList -File -Name
+
+    $fileWxs = $fileWxs -replace "(<\?define $($fileListName)=)", "<?define $fileListName=$($fileList -join ';')"
+
+    Set-Content -Path $wxsFilePath -Value $fileWxs
+}
+
+Function Generate-FileComponents() {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $True, Position = 1)]
+        [string]$fileListName,
+        [Parameter(Mandatory = $True, Position = 2)]
+        [string]$wxsFilePath,
+        [Parameter(Mandatory = $True, Position = 3)]
+        [string]$regroot
+    )
+
+    $wxsFile = Get-Content $wxsFilePath;
+
+    $wxsFile | ForEach-Object {
+        if ($_ -match "(<?define $fileListName=)(.*)\?>") {
+            [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssignments', 'fileList',
+            Justification = 'variable is used in another scope')]
+
+            $fileList = $matches[2] -split ';'
+            return
+        }
+    }
+
+    $componentId = "$($fileListName)_Component"
+
+    $componentDefs = "`r`n"
+    $componentDefs +=
+    @"
+            <Component Id="$($componentId)" Win64="yes" Guid="$((New-Guid).ToString().ToUpper())">
+              <RegistryKey Root="$($regroot)" Key="Software\Classes\powertoys\components">
+                <RegistryValue Type="string" Name="$($componentId)" Value="" KeyPath="yes"/>
+              </RegistryKey>`r`n
+"@
+
+    foreach ($file in $fileList) {
+        $fileTmp = $file -replace "-", "_"
+        $componentDefs +=
+    @"
+              <File Id="$($fileListName)_File_$($fileTmp)" Source="`$(var.$($fileListName)Path)\$($file)" />`r`n
+"@
+    }
+
+    $componentDefs +=
+    @"
+            </Component>`r`n
+"@
+
+    $wxsFile = $wxsFile -replace "\s+(<!--$($fileListName)_Component_Def-->)", $componentDefs
+
+    $componentRef =
+    @"
+            <ComponentRef Id="$($componentId)" />
+"@
+
+    $wxsFile = $wxsFile -replace "\s+(</ComponentGroup>)", "$componentRef`r`n    </ComponentGroup>"
+
+    Set-Content -Path $wxsFilePath -Value $wxsFile
+}
+
+if ($platform -ceq "arm64") {
+    $platform = "ARM64"
+}
+
+if ($installscopeperuser -eq "true") {
+    $registryroot = "HKCU"
+} else {
+    $registryroot = "HKLM"
+}
+
+#BaseApplications
+Generate-FileList -fileDepsJson "" -fileListName BaseApplicationsFiles -wxsFilePath $PSScriptRoot\BaseApplications.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release"
+Generate-FileComponents -fileListName "BaseApplicationsFiles" -wxsFilePath $PSScriptRoot\BaseApplications.wxs -regroot $registryroot
+
+#WinUI3Applications
+Generate-FileList -fileDepsJson "" -fileListName WinUI3ApplicationsFiles -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps"
+Generate-FileComponents -fileListName "WinUI3ApplicationsFiles" -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -regroot $registryroot
+
+#AdvancedPaste
+Generate-FileList -fileDepsJson "" -fileListName AdvancedPasteAssetsFiles -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\AdvancedPaste"
+Generate-FileComponents -fileListName "AdvancedPasteAssetsFiles" -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs -regroot $registryroot
+
+#AwakeFiles
+Generate-FileList -fileDepsJson "" -fileListName AwakeImagesFiles -wxsFilePath $PSScriptRoot\Awake.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Awake"
+Generate-FileComponents -fileListName "AwakeImagesFiles" -wxsFilePath $PSScriptRoot\Awake.wxs -regroot $registryroot
+
+#ColorPicker
+Generate-FileList -fileDepsJson "" -fileListName ColorPickerAssetsFiles -wxsFilePath $PSScriptRoot\ColorPicker.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ColorPicker"
+Generate-FileComponents -fileListName "ColorPickerAssetsFiles" -wxsFilePath $PSScriptRoot\ColorPicker.wxs -regroot $registryroot
+
+#Environment Variables
+Generate-FileList -fileDepsJson "" -fileListName EnvironmentVariablesAssetsFiles -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\EnvironmentVariables"
+Generate-FileComponents -fileListName "EnvironmentVariablesAssetsFiles" -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs -regroot $registryroot
+
+#FileExplorerAdd-ons
+Generate-FileList -fileDepsJson "" -fileListName MonacoPreviewHandlerMonacoAssetsFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco"
+Generate-FileList -fileDepsJson "" -fileListName MonacoPreviewHandlerCustomLanguagesFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco\customLanguages"
+Generate-FileComponents -fileListName "MonacoPreviewHandlerMonacoAssetsFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "MonacoPreviewHandlerCustomLanguagesFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot
+
+#FileLocksmith
+Generate-FileList -fileDepsJson "" -fileListName FileLocksmithAssetsFiles -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\FileLocksmith"
+Generate-FileComponents -fileListName "FileLocksmithAssetsFiles" -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -regroot $registryroot
+
+#Hosts
+Generate-FileList -fileDepsJson "" -fileListName HostsAssetsFiles -wxsFilePath $PSScriptRoot\Hosts.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Hosts"
+Generate-FileComponents -fileListName "HostsAssetsFiles" -wxsFilePath $PSScriptRoot\Hosts.wxs -regroot $registryroot
+
+#ImageResizer
+Generate-FileList -fileDepsJson "" -fileListName ImageResizerAssetsFiles -wxsFilePath $PSScriptRoot\ImageResizer.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ImageResizer"
+Generate-FileComponents -fileListName "ImageResizerAssetsFiles" -wxsFilePath $PSScriptRoot\ImageResizer.wxs -regroot $registryroot
+
+#New+
+Generate-FileList -fileDepsJson "" -fileListName NewPlusAssetsFiles -wxsFilePath $PSScriptRoot\NewPlus.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\NewPlus"
+Generate-FileComponents -fileListName "NewPlusAssetsFiles" -wxsFilePath $PSScriptRoot\NewPlus.wxs -regroot $registryroot
+
+#Peek
+Generate-FileList -fileDepsJson "" -fileListName PeekAssetsFiles -wxsFilePath $PSScriptRoot\Peek.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Peek\"
+Generate-FileComponents -fileListName "PeekAssetsFiles" -wxsFilePath $PSScriptRoot\Peek.wxs -regroot $registryroot
+
+#PowerRename
+Generate-FileList -fileDepsJson "" -fileListName PowerRenameAssetsFiles -wxsFilePath $PSScriptRoot\PowerRename.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\PowerRename\"
+Generate-FileComponents -fileListName "PowerRenameAssetsFiles" -wxsFilePath $PSScriptRoot\PowerRename.wxs -regroot $registryroot
+
+#RegistryPreview
+Generate-FileList -fileDepsJson "" -fileListName RegistryPreviewAssetsFiles -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\RegistryPreview\"
+Generate-FileComponents -fileListName "RegistryPreviewAssetsFiles" -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -regroot $registryroot
+
+#Run
+Generate-FileList -fileDepsJson "" -fileListName launcherImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\PowerLauncher"
+Generate-FileComponents -fileListName "launcherImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+## Plugins
+###Calculator
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Microsoft.PowerToys.Run.Plugin.Calculator.deps.json" -fileListName calcComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName calcImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Images"
+Generate-FileComponents -fileListName "calcComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "calcImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###Folder
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Microsoft.Plugin.Folder.deps.json" -fileListName FolderComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName FolderImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Images"
+Generate-FileComponents -fileListName "FolderComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "FolderImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###Program
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Microsoft.Plugin.Program.deps.json" -fileListName ProgramComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName ProgramImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Images"
+Generate-FileComponents -fileListName "ProgramComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ProgramImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###Shell
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Microsoft.Plugin.Shell.deps.json" -fileListName ShellComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName ShellImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Images"
+Generate-FileComponents -fileListName "ShellComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ShellImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###Indexer
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Microsoft.Plugin.Indexer.deps.json" -fileListName IndexerComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName IndexerImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Images"
+Generate-FileComponents -fileListName "IndexerComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "IndexerImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###UnitConverter
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Community.PowerToys.Run.Plugin.UnitConverter.deps.json" -fileListName UnitConvCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName UnitConvImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Images"
+Generate-FileComponents -fileListName "UnitConvCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "UnitConvImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###WebSearch
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Community.PowerToys.Run.Plugin.WebSearch.deps.json" -fileListName WebSrchCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName WebSrchImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Images"
+Generate-FileComponents -fileListName "WebSrchCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WebSrchImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###History
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Microsoft.PowerToys.Run.Plugin.History.deps.json" -fileListName HistoryPluginComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName HistoryPluginImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Images"
+Generate-FileComponents -fileListName "HistoryPluginComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "HistoryPluginImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###Uri
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Microsoft.Plugin.Uri.deps.json" -fileListName UriComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName UriImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Images"
+Generate-FileComponents -fileListName "UriComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "UriImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###VSCodeWorkspaces
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.deps.json" -fileListName VSCWrkCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName VSCWrkImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Images"
+Generate-FileComponents -fileListName "VSCWrkCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "VSCWrkImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###WindowWalker
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Microsoft.Plugin.WindowWalker.deps.json" -fileListName WindowWlkrCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName WindowWlkrImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Images"
+Generate-FileComponents -fileListName "WindowWlkrCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WindowWlkrImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###OneNote
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Microsoft.PowerToys.Run.Plugin.OneNote.deps.json" -fileListName OneNoteComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName OneNoteImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Images"
+Generate-FileComponents -fileListName "OneNoteComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "OneNoteImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###Registry
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Microsoft.PowerToys.Run.Plugin.Registry.deps.json" -fileListName RegistryComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName RegistryImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Images"
+Generate-FileComponents -fileListName "RegistryComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "RegistryImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###Service
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Microsoft.PowerToys.Run.Plugin.Service.deps.json" -fileListName ServiceComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName ServiceImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Images"
+Generate-FileComponents -fileListName "ServiceComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ServiceImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###System
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Microsoft.PowerToys.Run.Plugin.System.deps.json" -fileListName SystemComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName SystemImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Images"
+Generate-FileComponents -fileListName "SystemComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SystemImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###TimeDate
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Microsoft.PowerToys.Run.Plugin.TimeDate.deps.json" -fileListName TimeDateComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName TimeDateImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Images"
+Generate-FileComponents -fileListName "TimeDateComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "TimeDateImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###WindowsSettings
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Microsoft.PowerToys.Run.Plugin.WindowsSettings.deps.json" -fileListName WinSetCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName WinSetImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Images"
+Generate-FileComponents -fileListName "WinSetCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WinSetImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###WindowsTerminal
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.deps.json" -fileListName WinTermCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName WinTermImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Images"
+Generate-FileComponents -fileListName "WinTermCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WinTermImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###PowerToys
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Microsoft.PowerToys.Run.Plugin.PowerToys.deps.json" -fileListName PowerToysCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName PowerToysImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Images"
+Generate-FileComponents -fileListName "PowerToysCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "PowerToysImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+###ValueGenerator
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Community.PowerToys.Run.Plugin.ValueGenerator.deps.json" -fileListName ValueGeneratorCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName ValueGeneratorImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Images"
+Generate-FileComponents -fileListName "ValueGeneratorCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ValueGeneratorImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+## Plugins
+
+#ShortcutGuide
+Generate-FileList -fileDepsJson "" -fileListName ShortcutGuideSvgFiles -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ShortcutGuide\"
+Generate-FileComponents -fileListName "ShortcutGuideSvgFiles" -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -regroot $registryroot
+
+#Settings
+Generate-FileList -fileDepsJson "" -fileListName SettingsV2AssetsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\"
+Generate-FileList -fileDepsJson "" -fileListName SettingsV2AssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\"
+Generate-FileList -fileDepsJson "" -fileListName SettingsV2OOBEAssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\OOBE\"
+Generate-FileList -fileDepsJson "" -fileListName SettingsV2OOBEAssetsFluentIconsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Icons\"
+Generate-FileComponents -fileListName "SettingsV2AssetsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SettingsV2AssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SettingsV2OOBEAssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SettingsV2OOBEAssetsFluentIconsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
+
+#Workspaces
+Generate-FileList -fileDepsJson "" -fileListName WorkspacesImagesComponentFiles -wxsFilePath $PSScriptRoot\Workspaces.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Workspaces\"
+Generate-FileComponents -fileListName "WorkspacesImagesComponentFiles" -wxsFilePath $PSScriptRoot\Workspaces.wxs -regroot $registryroot
--- a/installer/PowerToysSetupVNext/generateMonacoWxs.ps1
+++ b/installer/PowerToysSetupVNext/generateMonacoWxs.ps1
@@ -0,0 +1,70 @@
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory = $True, Position = 1)]
+    [string]$monacoWxsFile
+)
+
+$fileWxs = Get-Content $monacoWxsFile;
+
+$fileWxs = $fileWxs -replace " KeyPath=`"yes`" ", " "
+
+$newFileContent = ""
+
+$componentId = "error"
+$directories = @()
+
+$fileWxs | ForEach-Object {
+    $line = $_;
+    if ($line -match "<Wix xmlns=`".*`">") {
+        $line +=
+@"
+`r`n
+    <?include `$(sys.CURRENTDIR)\Common.wxi?>`r`n
+"@
+    }
+    if ($line -match "<Component Id=`"(.*)`" Directory") {
+        $componentId = $matches[1]
+    }
+    if ($line -match "<Directory Id=`"(.*)`" Name=`".*`" />") {
+        $directories += $matches[1]
+    }
+    if ($line -match "</Component>") {
+        $line =
+@"
+                <RegistryKey Root="`$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+                    <RegistryValue Type="string" Name="$($componentId)" Value="" KeyPath="yes"/>
+                </RegistryKey>
+            </Component>
+"@
+    }
+
+    $newFileContent += $line + "`r`n";
+}
+
+$removeFolderEntries =
+@"
+`r`n            <Component Id="RemoveMonacoSRCFolders" Guid="$((New-Guid).ToString().ToUpper())" Directory="MonacoPreviewHandlerMonacoSRCFolder" >
+                <RegistryKey Root="`$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+                    <RegistryValue Type="string" Name="RemoveMonacoSRCFolders" Value="" KeyPath="yes"/>
+                </RegistryKey>`r`n
+"@
+
+$directories | ForEach-Object {
+
+    $removeFolderEntries +=
+@"
+                <RemoveFolder Id="Remove$($_)" Directory="$($_)" On="uninstall"/>
+
+"@
+}
+
+$removeFolderEntries +=
+@"
+            </Component>
+"@
+
+
+
+$newFileContent = $newFileContent -replace "\s+(</ComponentGroup>)", "$removeFolderEntries`r`n        </ComponentGroup>"
+
+Set-Content -Path $monacoWxsFile -Value $newFileContent
--- a/installer/PowerToysSetupVNext/packages.config
+++ b/installer/PowerToysSetupVNext/packages.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+</packages>
--- a/installer/PowerToysSetupVNext/publish.cmd
+++ b/installer/PowerToysSetupVNext/publish.cmd
@@ -0,0 +1,17 @@
+setlocal enableDelayedExpansion
+
+IF NOT DEFINED PTRoot (SET PTRoot=..\..)
+
+SET PlatformArg=%1
+IF NOT DEFINED PlatformArg (SET PlatformArg=x64)
+SET VCToolsVersion=!VCToolsVersion!
+SET ClearDevCommandPromptEnvVars=false
+
+rem In case of Release we should not use Debug CRT in VCRT forwarders
+msbuild !PTRoot!\src\modules\previewpane\MonacoPreviewHandler\MonacoPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml
+
+msbuild !PTRoot!\src\modules\previewpane\MarkdownPreviewHandler\MarkdownPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml
+
+msbuild !PTRoot!\src\modules\previewpane\SvgPreviewHandler\SvgPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml
+
+msbuild !PTRoot!\src\modules\previewpane\SvgThumbnailProvider\SvgThumbnailProvider.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml
--- a/installer/PowerToysSetupVNext/terminate_powertoys.cmd
+++ b/installer/PowerToysSetupVNext/terminate_powertoys.cmd
@@ -0,0 +1,12 @@
+@echo off
+setlocal ENABLEDELAYEDEXPANSION
+
+@REM We loop here until taskkill cannot find a PowerToys process. We can't use /F flag, because it
+@REM doesn't give application an opportunity to cleanup. Thus we send WM_CLOSE which is being caught
+@REM by multiple windows running a msg loop in PowerToys.exe process, which we close one by one.
+for /l %%x in (1, 1, 100) do (
+    taskkill /IM PowerToys.exe 1>NUL 2>NUL
+    if !ERRORLEVEL! NEQ 0 goto quit
+)
+
+:quit
--- a/installer/wixVNext.props
+++ b/installer/wixVNext.props
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WixInstallPath>C:\Program Files (x86)\WiX Toolset v3.14\bin\</WixInstallPath>
+    <WixExtDir>$(WixInstallPath)\</WixExtDir>
+
+    <WixTargetsPath>$(WixInstallPath)\..\wix.targets</WixTargetsPath>
+    <LuxTargetsPath>$(WixInstallPath)\..\lux.targets</LuxTargetsPath>
+
+    <WixTasksPath>$(WixInstallPath)\WixTasks.dll</WixTasksPath>
+    <WixSdkPath>$(WixInstallPath)\..\sdk\</WixSdkPath>
+    <WixCATargetsPath>$(WixSdkPath)\..\wix.ca.targets</WixCATargetsPath>
+  </PropertyGroup>
+</Project>
--- a/src/CmdPalVersion.props
+++ b/src/CmdPalVersion.props
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <CmdPalVersion>0.0.1</CmdPalVersion>
-    <DevEnvironment>Local</DevEnvironment>
-
-    <!-- Forcing for every DLL on by default -->
-    <ChecksumAlgorithm>SHA256</ChecksumAlgorithm>
-  </PropertyGroup>
-</Project>
--- a/src/Common.Dotnet.AotCompatibility.props
+++ b/src/Common.Dotnet.AotCompatibility.props
@@ -5,8 +5,5 @@
    <IsAotCompatible>true</IsAotCompatible>
    <CsWinRTAotOptimizerEnabled>true</CsWinRTAotOptimizerEnabled>
    <CsWinRTAotWarningLevel>2</CsWinRTAotWarningLevel>
-
-    <!-- Suppress DynamicallyAccessedMemberTypes.PublicParameterlessConstructor in fallback code path of Windows SDK projection -->
-    <WarningsNotAsErrors>IL2081</WarningsNotAsErrors>
  </PropertyGroup>
 </Project>
--- a/src/Common.Dotnet.CsWinRT.props
+++ b/src/Common.Dotnet.CsWinRT.props
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Some items may be set in Directory.Build.props in root -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project=".\Common.Dotnet.PrepareGeneratedFolder.targets" />
-
  <PropertyGroup>
    <WindowsSdkPackageVersion>10.0.22621.57</WindowsSdkPackageVersion>
    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
@@ -16,7 +14,7 @@
    <WarningLevel>4</WarningLevel>
    <NoWarn></NoWarn>
    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-    <WarningsNotAsErrors>CA1720;CA1859;CA2263;CA2022;MVVMTK0045;MVVMTK0049</WarningsNotAsErrors>
+    <WarningsNotAsErrors>CA1720;CA1859;CA2263;CA2022</WarningsNotAsErrors>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
--- a/src/Common.Dotnet.PrepareGeneratedFolder.targets
+++ b/src/Common.Dotnet.PrepareGeneratedFolder.targets
@@ -1,16 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <Target Name="EnsureGeneratedBaseFolder" BeforeTargets="XamlPreCompile">
-    <PropertyGroup>
-      <!-- Only create the base 'generated' folder -->
-      <CompilerGeneratedFilesOutputPath>$(ProjectDir)obj\g</CompilerGeneratedFilesOutputPath>
-    </PropertyGroup>
-
-    <!-- Create 'generated' folder if missing -->
-    <MakeDir Directories="$(CompilerGeneratedFilesOutputPath)" />
-
-    <!-- Optional logging for debugging -->
-    <Message Text="Ensured: $(GeneratedBasePath)" Importance="Low" />
-  </Target>
-
-</Project>
--- a/src/codeAnalysis/GlobalSuppressions.cs
+++ b/src/codeAnalysis/GlobalSuppressions.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

@@ -12,10 +12,10 @@ using System.Diagnostics.CodeAnalysis;

 [assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1101:PrefixLocalCallsWithThis", Justification = "We follow the C# Core Coding Style which avoids using `this` unless absolutely necessary.")]

-[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:ElementsMustAppearInTheCorrectOrder", Justification = "It is not a priority and has high impact in code changes.")]
-[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1202:ElementsMustBeOrderedByAccess", Justification = "It is not a priority and has high impact in code changes.")]
-[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1203:ConstantsMustAppearBeforeFields", Justification = "It is not a priority and has high impact in code changes.")]
-[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1204:StaticElementsMustAppearBeforeInstanceElements", Justification = "It is not a priority and has high impact in code changes.")]
+[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:ElementsMustAppearInTheCorrectOrder", Justification = "It is not a priority and have hight impact in code changes.")]
+[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1202:ElementsMustBeOrderedByAccess", Justification = "It is not a priority and have hight impact in code changes.")]
+[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1203:ConstantsMustAppearBeforeFields", Justification = "It is not a priority and have hight impact in code changes.")]
+[assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1204:StaticElementsMustAppearBeforeInstanceElements", Justification = "It is not a priority and have hight impact in code changes.")]

 [assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1309:FieldNamesMustNotBeginWithUnderscore", Justification = "We follow the C# Core Coding Style which uses underscores as prefixes rather than using `this.`.")]

@@ -62,17 +62,3 @@ using System.Diagnostics.CodeAnalysis;
 [assembly: SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "<Dotnet port with style preservation>", Scope = "namespaceanddescendants", Target = "MouseWithoutBorders")]
 [assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "<Dotnet port with style preservation>", Scope = "namespaceanddescendants", Target = "MouseWithoutBorders")]
 [assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649:File name should match first type name", Justification = "<Dotnet port with style preservation>", Scope = "namespaceanddescendants", Target = "MouseWithoutBorders")]
-
-// AOT MVVMTK0045
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "AdvancedPaste.ViewModels")]
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "HostsUILib")]
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "EnvironmentVariablesUILib")]
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "Peek.FilePreviewer")]
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "Peek.UI")]
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "Peek.UI.Views")]
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib")]
-
-// AOT MVVMTK0049
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0049:Using [INotifyPropertyChanged] is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "Peek.FilePreviewer")]
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.INotifyPropertyChangedGenerator", "MVVMTK0049:Using [INotifyPropertyChanged] is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "type", Target = "~T:Peek.UI.Views.TitleBar")]
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0049:Using [INotifyPropertyChanged] is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib")]
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Peiyao Zhao (from Dev Box)	ab40a7baf2	fix	2025-03-18 16:30:21 +08:00
Peiyao Zhao (from Dev Box)	11d18a3205	fix	2025-03-13 17:20:34 +08:00
Peiyao Zhao (from Dev Box)	fa8ddca1c3	fix	2025-03-13 17:14:38 +08:00
Peiyao Zhao (from Dev Box)	3d220fa82c	fix	2025-03-13 14:24:01 +08:00
Peiyao Zhao (from Dev Box)	6d25bed5c4	fix	2025-03-13 12:48:59 +08:00
Peiyao Zhao (from Dev Box)	cba3425d4e	update	2025-03-13 10:57:25 +08:00
Peiyao Zhao (from Dev Box)	d322c35b31	update	2025-03-13 10:44:47 +08:00
Peiyao Zhao (from Dev Box)	b47a07395c	fix pipelien build error	2025-03-12 15:34:13 +08:00
Peiyao Zhao (from Dev Box)	7e8a461b89	Merge remote-tracking branch 'origin/main' into peiyaozhao/init-migration-project	2025-03-12 14:49:48 +08:00
Peiyao Zhao (from Dev Box)	29c3523b0f	fix spell-check	2025-03-11 23:36:30 +08:00
Peiyao Zhao (from Dev Box)	8f62088903	fix pipeline build error	2025-03-11 23:14:52 +08:00
Peiyao Zhao (from Dev Box)	839f4fbcf2	update pipeline	2025-03-11 18:24:37 +08:00
Peiyao Zhao (from Dev Box)	a21d4af25f	test	2025-03-03 22:59:07 +08:00
Peiyao Zhao (from Dev Box)	5cd93293e6	fix build error	2025-03-03 22:32:45 +08:00
Peiyao Zhao (from Dev Box)	4966968e9e	update	2025-02-28 09:48:49 +08:00
Peiyao Zhao (from Dev Box)	694d23fd8c	update	2025-02-27 01:10:58 +08:00
Peiyao Zhao (from Dev Box)	37dee4e9e1	update	2025-02-25 14:37:20 +08:00
Peiyao Zhao (from Dev Box)	9c931951de	update expect.txt	2025-02-25 14:01:59 +08:00
Peiyao Zhao (from Dev Box)	3ccf99324c	add .gitignore	2025-02-25 11:27:57 +08:00
Jerry Xu	b9534c126d	fix conflict	2025-02-25 10:44:45 +08:00