allow partially succeeded build

Signed-off-by: Shawn Yuan <shuai.yuan.zju@gmail.com>
update
2025-12-31 17:36:49 +01:00 · 2025-04-24 15:58:26 +08:00 · 2025-04-24 15:17:19 +08:00 · 2025-04-24 15:13:58 +08:00 · 2025-04-24 15:13:35 +08:00 · 2025-04-23 17:39:58 +08:00
1163 changed files with 2540 additions and 81644 deletions
--- 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
@@ -53,7 +53,6 @@ body:
      - Awake
      - ColorPicker
      - Command not found
-      - Command Palette
      - Crop and Lock
      - Environment Variables
      - FancyZones
--- a/.github/actions/spell-check/allow/code.txt
+++ b/.github/actions/spell-check/allow/code.txt
@@ -89,7 +89,6 @@ onefuzzingestionpreparationtool
 OTP
 Yubi
 Yubico
-svgl

 # KEYS

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

-# Units
-nmi
-
 # MATH

 artanh
--- 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
@@ -154,7 +153,6 @@ Santossio
 Schoen
 Sekan
 Seraphima
-Shmuelie
 skttl
 somil
 Soref
@@ -186,7 +184,6 @@ zhaopy
 zhaoqpcn
 Zoltan
 Zykova
-Sameerjs

 # OTHERS

@@ -199,7 +196,6 @@ cortana
 dlnilsson
 fancymouse
 firefox
-fudan
 gpt
 Inkscape
 Markdig
@@ -215,7 +211,6 @@ regedit
 roslyn
 Spotify
 Vanara
-wangyi
 WEX
 windowwalker
 winui
@@ -223,9 +218,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/.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
--- 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
@@ -217,10 +217,7 @@
                "PowerToys.ZoomItSettingsInterop.dll",

                "WinUI3Apps\\PowerToys.Settings.dll",
-                "WinUI3Apps\\PowerToys.Settings.exe",
-
-                "PowerToys.CmdPalModuleInterface.dll",
-                "*Microsoft.CmdPal.UI_*.msix"
+                "WinUI3Apps\\PowerToys.Settings.exe"
            ],
            "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/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.6
+    default: 1.7
  - name: useExperimentalVersion
    type: boolean
    default: false
@@ -47,4 +47,4 @@ extends:
    useVSPreview: ${{ parameters.useVSPreview }}
    useLatestWinAppSDK: ${{ parameters.useLatestWinAppSDK }}
    winAppSDKVersionNumber: ${{ parameters.winAppSDKVersionNumber }}
-    useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
+    useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
--- 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]
--- 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:
@@ -246,32 +242,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 +309,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 +360,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
@@ -492,7 +435,7 @@ jobs:
      $machinePlat = "hash_machine_$(BuildPlatform).txt";
      $combinedUserPath = $p + $userPlat;
      $combinedMachinePath = $p + $machinePlat;
-
+      
      echo $p

      echo $userPlat
@@ -502,7 +445,7 @@ jobs:
      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-ci-precheck.yml
+++ b/.pipelines/v2/templates/job-ci-precheck.yml
@@ -0,0 +1,30 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/microsoft/azure-pipelines-vscode/master/service-schema.json
+jobs:
+- job: Precheck
+  pool:
+    vmImage: windows-2022
+  steps:
+  - checkout: none
+
+  - pwsh: |-
+      try {
+        # Try based on pull request first
+        $pullRequestNumber = "$(system.pullRequest.pullRequestNumber)";
+        $gitHubPullRequest = Invoke-RestMethod -Method Get "https://api.github.com/repos/microsoft/PowerToys/pulls/$pullRequestNumber/files"
+        # If there are no files updated in the commit that are .md, set skipBuild variable
+        if(([array]($gitHubPullRequest.filename) -notmatch ".md|.txt").Length -eq 0) {
+            Write-Host '##vso[task.setvariable variable=skipBuild;isOutput=true]Yes'
+            Write-Host 'Skipping Build'
+        }
+      }
+      catch {
+        # Fall back to the latest commit otherwise.
+        $commit = "$(build.sourceVersion)";
+        $gitHubCommit = Invoke-RestMethod -Method Get "https://api.github.com/repos/microsoft/PowerToys/commits/$commit"
+        if(([array]($githubCommit.files.filename) -notmatch ".md|.txt").Length -eq 0) {
+          Write-Host '##vso[task.setvariable variable=skipBuild;isOutput=true]Yes'
+          Write-Host 'Skipping Build'
+        }
+      }
+    displayName: Verify whether we need to build at all
+    name: verifyBuildRequest
--- 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/pipeline-ci-build.yml
+++ b/.pipelines/v2/templates/pipeline-ci-build.yml
@@ -36,10 +36,20 @@ parameters:
    default: false

 stages:
+  # Allow manual builds to skip pre-check
+  - ${{ if ne(variables['Build.Reason'], 'Manual') }}:
+    - stage: Precheck
+      jobs:
+        - template: job-ci-precheck.yml
+
  - ${{ each platform in parameters.buildPlatforms }}:
    - stage: Build_${{ platform }}
      displayName: Build ${{ platform }}
-      dependsOn: []
+      ${{ if ne(variables['Build.Reason'], 'Manual') }}:
+        dependsOn: [Precheck]
+        condition: and(succeeded(), ne(dependencies.Precheck.outputs['Precheck.verifyBuildRequest.skipBuild'], 'Yes'))
+      ${{ else }}:
+        dependsOn: []
      jobs:
        - template: job-build-project.yml
          parameters:
--- 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
@@ -27,6 +27,9 @@ steps:
    buildType: 'specific'
    project: '55e8140e-57ac-4e5f-8f9c-c7c15b51929d'
    definition: '104083'
+    specificBuildWithTriggering: false
+    allowPartiallySucceededBuilds: true
+    allowFailedBuilds: true
    buildVersionToDownload: 'latestFromBranch'
    branchName: 'refs/heads/release/${{ parameters.versionNumber }}-stable'
    artifactName: 'WindowsAppSDK_Nuget_And_MSIX'
--- 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/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.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Collections" Version="8.2.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.2.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.2.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250129-preview2" />
+    <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" />
@@ -31,31 +27,30 @@
    <!-- 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="2.5.187" />
    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.3" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.2" />
    <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces"  Version="9.0.3" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces"  Version="9.0.2" />
    <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
-    <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.Extensions.DependencyInjection" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.2" />
    <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.3" />
-    <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.120-preview" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.3" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.2" />
    <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. -->
    <!-- 
      TODO: in Common.Dotnet.CsWinRT.props, on upgrade, verify RemoveCsWinRTPackageAnalyzer is no longer needed.  
      This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail.
 	-->
-    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
+    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.1.5" />
    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.250205002" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
    <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" />
@@ -72,36 +67,35 @@
    <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.3" />
+    <PackageVersion Include="System.CodeDom" Version="9.0.2" />
    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <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" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.2" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.2" />
+    <PackageVersion Include="System.Data.OleDb" Version="9.0.2" />
    <!-- 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.3" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.2" />
    <!-- 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.3" />
-    <PackageVersion Include="System.Drawing.Common" Version="9.0.3" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.2" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.2" />
    <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.Management" Version="9.0.2" />
    <PackageVersion Include="System.Reactive" Version="6.0.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="System.Runtime.Caching" Version="9.0.2" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.2" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.2" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.2" />
    <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,41 +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: File Explorer Add-ins

 ### Monaco Editor
@@ -825,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
@@ -1359,56 +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.250129-preview2
- CommunityToolkit.WinUI.Collections 8.2.250129-preview2
- CommunityToolkit.WinUI.Controls.Primitives 8.2.250129-preview2
- CommunityToolkit.WinUI.Controls.Segmented 8.2.250129-preview2
- CommunityToolkit.WinUI.Controls.SettingsControls 8.2.250129-preview2
- CommunityToolkit.WinUI.Controls.Sizers 8.2.250129-preview2
- CommunityToolkit.WinUI.Converters 8.2.250129-preview2
- CommunityToolkit.WinUI.Extensions 8.2.250129-preview2
+- 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
@@ -1420,27 +1318,26 @@ SOFTWARE.
 - Mages 3.0.0
 - Markdig.Signed 0.34.0
 - MessagePack 2.5.187
- Microsoft.Bcl.AsyncInterfaces 9.0.3
+- Microsoft.Bcl.AsyncInterfaces 9.0.2
 - Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
- Microsoft.Data.Sqlite 9.0.3
+- Microsoft.Data.Sqlite 9.0.2
 - Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16
 - Microsoft.DotNet.ILCompiler (A)
- 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.Extensions.DependencyInjection 9.0.2
+- Microsoft.Extensions.Hosting 9.0.2
+- Microsoft.Extensions.Hosting.WindowsServices 9.0.2
+- Microsoft.Extensions.Logging 9.0.2
+- Microsoft.Extensions.Logging.Abstractions 9.0.2
 - 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.3
- Microsoft.Windows.Compatibility 9.0.3
+- Microsoft.Web.WebView2 1.0.2739.15
+- Microsoft.Win32.SystemEvents 9.0.2
+- Microsoft.Windows.Compatibility 9.0.2
 - Microsoft.Windows.CsWin32 0.2.46-beta
- Microsoft.Windows.CsWinRT 2.2.0
+- Microsoft.Windows.CsWinRT 2.1.5
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
- Microsoft.WindowsAppSDK 1.6.250205002
- Microsoft.WindowsPackageManager.ComInterop 1.10.120-preview
+- Microsoft.WindowsAppSDK 1.6.241114003
 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
 - Microsoft.Xaml.Behaviors.Wpf 1.1.39
 - ModernWpfUI 0.9.4
@@ -1454,26 +1351,25 @@ SOFTWARE.
 - SharpCompress 0.37.2
 - StreamJsonRpc 2.19.27
 - StyleCop.Analyzers 1.2.0-beta.556
- System.CodeDom 9.0.3
+- System.CodeDom 9.0.2
 - System.CommandLine 2.0.0-beta4.22272.1
- System.ComponentModel.Composition 9.0.3
- System.Configuration.ConfigurationManager 9.0.3
- System.Data.OleDb 9.0.3
+- System.ComponentModel.Composition 9.0.2
+- System.Configuration.ConfigurationManager 9.0.2
+- System.Data.OleDb 9.0.2
 - System.Data.SqlClient 4.8.6
- System.Diagnostics.EventLog 9.0.3
- System.Diagnostics.PerformanceCounter 9.0.3
- System.Drawing.Common 9.0.3
+- System.Diagnostics.EventLog 9.0.2
+- System.Diagnostics.PerformanceCounter 9.0.2
+- System.Drawing.Common 9.0.2
 - System.IO.Abstractions 21.0.29
 - System.IO.Abstractions.TestingHelpers 21.0.29
- System.Management 9.0.3
+- System.Management 9.0.2
 - System.Reactive 6.0.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
+- System.Runtime.Caching 9.0.2
+- System.ServiceProcess.ServiceController 9.0.2
+- System.Text.Encoding.CodePages 9.0.2
+- System.Text.Json 9.0.2
 - 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\Exts\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\Exts\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\Exts\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\Exts\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\Exts\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\Exts\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\Exts\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\Exts\ProcessMonitorExtension\ProcessMonitorExtension.csproj", "{C846F7A7-792A-47D9-B0CB-417C900EE03D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SamplePagesExtension", "src\modules\cmdpal\Exts\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\Exts\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\Exts\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\Exts\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\Exts\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\Exts\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\Exts\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\Exts\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,10 +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\Exts\Microsoft.CmdPal.Ext.System\Microsoft.CmdPal.Ext.System.csproj", "{64B88F02-CD88-4ED8-9624-989A800230F9}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2258,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
@@ -2422,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
@@ -2510,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
@@ -2562,26 +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}.Debug|x86.ActiveCfg = Debug|x64
-		{64B88F02-CD88-4ED8-9624-989A800230F9}.Debug|x86.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
-		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x86.ActiveCfg = Release|x64
-		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x86.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2809,49 +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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}
--- a/doc/thirdPartyRunPlugins.md
+++ b/doc/thirdPartyRunPlugins.md
@@ -42,7 +42,6 @@ Contact the developers of a plugin directly for assistance with a specific plugi
 | [CanIUse](https://github.com/skttl/ptrun-caniuse) | [skttl](https://github.com/skttl) | Look up browser feature support with caniuse.com |
 | [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. |

 ## Extending software plugins

@@ -64,4 +63,3 @@ Below are community created plugins that target a website or software.  They are
 | [SSH](https://github.com/8LWXpg/PowerToysRun-SSH) | [8LWXpg](https://github.com/8LWXpg) | Connect to ssh clients |
 | [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 |
--- a/installer/PowerToysSetup/CmdPal.wxs
+++ b/installer/PowerToysSetup/CmdPal.wxs
@@ -1,76 +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" />
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test\Dependencies\x64\Microsoft.WindowsAppRuntime.1.6.msix" />
-      </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" />
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion).0_Test\Dependencies\arm64\Microsoft.WindowsAppRuntime.1.6.msix" />
-      </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,7 @@ 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>
+      </PostBuildEvent>
  </PropertyGroup>
  <PropertyGroup>
    <Name>PowerToysInstaller</Name>
@@ -68,12 +65,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 +104,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 +188,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,10 +79,6 @@
      <ComponentGroupRef Id="ToolComponentGroup" />
      <ComponentGroupRef Id="MonacoSRCHeatGenerated" />
      <ComponentGroupRef Id="WorkspacesComponentGroup" />
-
-      <?if $(var.CIBuild) = "true" ?>
-        <ComponentGroupRef Id="CmdPalComponentGroup" />
-      <?endif?>
    </Feature>

    <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" />
@@ -139,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" />
@@ -155,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 -->
@@ -179,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>
@@ -215,10 +204,6 @@
                    Property="LaunchPowerToys"
                    Value="[INSTALLFOLDER]" />

-    <CustomAction Id="SetInstallCmdPalPackageParam"
-                    Property="InstallCmdPalPackage"
-                    Value="[INSTALLFOLDER]" />
-
    <CustomAction
      Id="LaunchPowerToys"
      Return="ignore"
@@ -442,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"
@@ -457,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""""
--- 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
@@ -2,7 +2,7 @@
 <!-- Some items may be set in Directory.Build.props in root -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <WindowsSdkPackageVersion>10.0.22621.57</WindowsSdkPackageVersion>
+    <WindowsSdkPackageVersion>10.0.22621.48</WindowsSdkPackageVersion>
    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
@@ -14,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/codeAnalysis/GlobalSuppressions.cs
+++ b/src/codeAnalysis/GlobalSuppressions.cs
@@ -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,9 +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
-[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 = "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.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")]
--- a/src/common/Common.UI/SettingsDeepLink.cs
+++ b/src/common/Common.UI/SettingsDeepLink.cs
@@ -31,7 +31,6 @@ namespace Common.UI
            Dashboard,
            AdvancedPaste,
            Workspaces,
-            CmdPal,
            ZoomIt,
        }

@@ -79,8 +78,6 @@ namespace Common.UI
                    return "AdvancedPaste";
                case SettingsWindow.Workspaces:
                    return "Workspaces";
-                case SettingsWindow.CmdPal:
-                    return "CmdPal";
                case SettingsWindow.ZoomIt:
                    return "ZoomIt";
                default:
--- a/src/common/GPOWrapper/GPOWrapper.cpp
+++ b/src/common/GPOWrapper/GPOWrapper.cpp
@@ -16,10 +16,6 @@ namespace winrt::PowerToys::GPOWrapper::implementation
    {
        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredCmdNotFoundEnabledValue());
    }
-    GpoRuleConfigured GPOWrapper::GetConfiguredCmdPalEnabledValue()
-    {
-        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredCmdPalEnabledValue());
-    }
    GpoRuleConfigured GPOWrapper::GetConfiguredColorPickerEnabledValue()
    {
        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredColorPickerEnabledValue());
@@ -236,10 +232,6 @@ namespace winrt::PowerToys::GPOWrapper::implementation
    {
        return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowDataDiagnosticsValue());
    }
-    GpoRuleConfigured GPOWrapper::GetConfiguredNewPlusReplaceVariablesValue()
-    {
-        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredNewPlusReplaceVariablesValue());
-    }
    GpoRuleConfigured GPOWrapper::GetConfiguredRunAtStartupValue()
    {
        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredRunAtStartupValue());
--- a/src/common/GPOWrapper/GPOWrapper.h
+++ b/src/common/GPOWrapper/GPOWrapper.h
@@ -10,7 +10,6 @@ namespace winrt::PowerToys::GPOWrapper::implementation
        static GpoRuleConfigured GetConfiguredAlwaysOnTopEnabledValue();
        static GpoRuleConfigured GetConfiguredAwakeEnabledValue();
        static GpoRuleConfigured GetConfiguredCmdNotFoundEnabledValue();
-        static GpoRuleConfigured GetConfiguredCmdPalEnabledValue();
        static GpoRuleConfigured GetConfiguredColorPickerEnabledValue();
        static GpoRuleConfigured GetConfiguredCropAndLockEnabledValue();
        static GpoRuleConfigured GetConfiguredFancyZonesEnabledValue();
@@ -65,7 +64,6 @@ namespace winrt::PowerToys::GPOWrapper::implementation
        static GpoRuleConfigured GetConfiguredNewPlusHideTemplateFilenameExtensionValue();
        static GpoRuleConfigured GetAllowDataDiagnosticsValue();
        static GpoRuleConfigured GetConfiguredRunAtStartupValue();
-        static GpoRuleConfigured GetConfiguredNewPlusReplaceVariablesValue();
    };
 }

--- a/src/common/GPOWrapper/GPOWrapper.idl
+++ b/src/common/GPOWrapper/GPOWrapper.idl
@@ -14,7 +14,6 @@ namespace PowerToys
            static GpoRuleConfigured GetConfiguredAlwaysOnTopEnabledValue();
            static GpoRuleConfigured GetConfiguredAwakeEnabledValue();
            static GpoRuleConfigured GetConfiguredCmdNotFoundEnabledValue();
-            static GpoRuleConfigured GetConfiguredCmdPalEnabledValue();
            static GpoRuleConfigured GetConfiguredColorPickerEnabledValue();
            static GpoRuleConfigured GetConfiguredCropAndLockEnabledValue();
            static GpoRuleConfigured GetConfiguredFancyZonesEnabledValue();
@@ -69,7 +68,6 @@ namespace PowerToys
            static GpoRuleConfigured GetConfiguredNewPlusHideTemplateFilenameExtensionValue();
            static GpoRuleConfigured GetAllowDataDiagnosticsValue();
            static GpoRuleConfigured GetConfiguredRunAtStartupValue();
-            static GpoRuleConfigured GetConfiguredNewPlusReplaceVariablesValue();
        }
    }
 }
--- a/src/common/ManagedCommon/ModuleType.cs
+++ b/src/common/ManagedCommon/ModuleType.cs
@@ -10,7 +10,6 @@ namespace ManagedCommon
        AlwaysOnTop,
        Awake,
        ColorPicker,
-        CmdPal,
        CropAndLock,
        EnvironmentVariables,
        FancyZones,
--- a/src/common/UITestAutomation/Element/By.cs
+++ b/src/common/UITestAutomation/Element/By.cs
@@ -11,40 +11,17 @@ namespace Microsoft.PowerToys.UITest
    /// </summary>
    public class By
    {
-        private readonly OpenQA.Selenium.By? by;
-        private readonly bool isAccessibilityId;
-        private readonly string? accessibilityId;
+        private readonly OpenQA.Selenium.By by;

        private By(OpenQA.Selenium.By by)
        {
-            isAccessibilityId = false;
            this.by = by;
        }

-        private By(string accessibilityId)
-        {
-            isAccessibilityId = true;
-            this.accessibilityId = accessibilityId;
-        }
-
        public override string ToString()
        {
            // override ToString to return detailed debugging content provided by OpenQA.Selenium.By
-            return this.GetAccessibilityId();
-        }
-
-        public bool GetIsAccessibilityId() => this.isAccessibilityId;
-
-        public string GetAccessibilityId()
-        {
-            if (this.isAccessibilityId)
-            {
-                return this.accessibilityId!;
-            }
-            else
-            {
-                return this.by!.ToString();
-            }
+            return this.by.ToString();
        }

        /// <summary>
@@ -54,13 +31,6 @@ namespace Microsoft.PowerToys.UITest
        /// <returns>A By object.</returns>
        public static By Name(string name) => new By(OpenQA.Selenium.By.Name(name));

-        /// <summary>
-        /// Creates a By object using the className attribute.
-        /// </summary>
-        /// <param name="className">The className attribute to search for.</param>
-        /// <returns>A By object.</returns>
-        public static By ClassName(string className) => new By(OpenQA.Selenium.By.ClassName(className));
-
        /// <summary>
        /// Creates a By object using the ID attribute.
        /// </summary>
@@ -68,13 +38,6 @@ namespace Microsoft.PowerToys.UITest
        /// <returns>A By object.</returns>
        public static By Id(string id) => new By(OpenQA.Selenium.By.Id(id));

-        /// <summary>
-        /// Creates a By object using the ID attribute.
-        /// </summary>
-        /// <param name="accessibilityId">The ID attribute to search for.</param>
-        /// <returns>A By object.</returns>
-        public static By AccessibilityId(string accessibilityId) => new By(accessibilityId);
-
        /// <summary>
        /// Creates a By object using the XPath expression.
        /// </summary>
@@ -107,6 +70,6 @@ namespace Microsoft.PowerToys.UITest
        /// Converts the By object to an OpenQA.Selenium.By object.
        /// </summary>
        /// <returns>An OpenQA.Selenium.By object.</returns>
-        internal OpenQA.Selenium.By ToSeleniumBy() => by!;
+        internal OpenQA.Selenium.By ToSeleniumBy() => by;
    }
 }
--- a/src/common/UITestAutomation/Element/Element.cs
+++ b/src/common/UITestAutomation/Element/Element.cs
@@ -3,13 +3,8 @@
 // See the LICENSE file in the project root for more information.

 using System.Collections.ObjectModel;
-using System.Drawing;
 using System.Runtime.CompilerServices;
-using System.Xml.Linq;
-using ABI.Windows.Foundation;
-using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OpenQA.Selenium;
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.Windows;
 using OpenQA.Selenium.Interactions;
@@ -68,14 +63,6 @@ namespace Microsoft.PowerToys.UITest
            get { return this.windowsElement?.Selected ?? false; }
        }

-        /// <summary>
-        /// Gets the Rect of the UI element.
-        /// </summary>
-        public Rectangle? Rect
-        {
-            get { return this.windowsElement?.Rect; }
-        }
-
        /// <summary>
        /// Gets the AutomationID of the UI element.
        /// </summary>
@@ -151,54 +138,6 @@ namespace Microsoft.PowerToys.UITest
            });
        }

-        /// <summary>
-        /// Drag element move offset.
-        /// </summary>
-        /// <param name="offsetX">The offsetX to move.</param>
-        /// <param name="offsetY">The offsetY to move.</param>
-        public void Drag(int offsetX, int offsetY)
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                actions.MoveToElement(windowElement).MoveByOffset(10, 10).ClickAndHold(windowElement).MoveByOffset(offsetX, offsetY).Release();
-                actions.Build().Perform();
-            });
-        }
-
-        /// <summary>
-        /// Drag element move to other element.
-        /// </summary>
-        /// <param name="element">Move to this element.</param>
-        public void Drag(Element element)
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                actions.MoveToElement(windowElement).ClickAndHold();
-                Assert.IsNotNull(element.windowsElement, "element is null");
-                int dx = (element.windowsElement.Rect.X - windowElement.Rect.X) / 10;
-                int dy = (element.windowsElement.Rect.Y - windowElement.Rect.Y) / 10;
-                for (int i = 0; i < 10; i++)
-                {
-                    actions.MoveByOffset(dx, dy);
-                }
-
-                actions.Release();
-                actions.Build().Perform();
-            });
-        }
-
-        /// <summary>
-        /// Send Key of the element.
-        /// </summary>
-        /// <param name="key">The Key to Send.</param>
-        public void SendKeys(string key)
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                windowElement.SendKeys(key);
-            });
-        }
-
        /// <summary>
        /// Gets the attribute value of the UI element.
        /// </summary>
@@ -283,16 +222,8 @@ namespace Microsoft.PowerToys.UITest
            var foundElements = FindHelper.FindAll<T, AppiumWebElement>(
                () =>
                {
-                    if (by.GetIsAccessibilityId())
-                    {
-                        var elements = this.windowsElement.FindElementsByAccessibilityId(by.GetAccessibilityId());
-                        return elements;
-                    }
-                    else
-                    {
-                        var elements = this.windowsElement.FindElements(by.ToSeleniumBy());
-                        return elements;
-                    }
+                    var elements = this.windowsElement.FindElements(by.ToSeleniumBy());
+                    return elements;
                },
                this.driver,
                timeoutMS);
--- a/src/common/UITestAutomation/FindHelper.cs
+++ b/src/common/UITestAutomation/FindHelper.cs
@@ -17,19 +17,6 @@ namespace Microsoft.PowerToys.UITest
    /// </summary>
    internal static class FindHelper
    {
-        public static ReadOnlyCollection<T>? FindAll<T, TW>(Func<IReadOnlyCollection<TW>> findElementsFunc, WindowsDriver<WindowsElement>? driver, int timeoutMS)
-            where T : Element, new()
-        {
-            var items = findElementsFunc();
-            var res = items.Select(item =>
-            {
-                var element = item as WindowsElement;
-                return NewElement<T>(element, driver, timeoutMS);
-            }).Where(item => item.IsMatchingTarget()).ToList();
-
-            return new ReadOnlyCollection<T>(res);
-        }
-
        public static ReadOnlyCollection<T>? FindAll<T, TW>(Func<ReadOnlyCollection<TW>> findElementsFunc, WindowsDriver<WindowsElement>? driver, int timeoutMS)
            where T : Element, new()
        {
--- a/src/common/UITestAutomation/Session.cs
+++ b/src/common/UITestAutomation/Session.cs
@@ -8,7 +8,6 @@ using System.Xml.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.Windows;
-using OpenQA.Selenium.Interactions;

 namespace Microsoft.PowerToys.UITest
 {
@@ -99,16 +98,8 @@ namespace Microsoft.PowerToys.UITest
            var foundElements = FindHelper.FindAll<T, WindowsElement>(
                () =>
                {
-                    if (by.GetIsAccessibilityId())
-                    {
-                        var elements = this.WindowsDriver.FindElementsByAccessibilityId(by.GetAccessibilityId());
-                        return elements;
-                    }
-                    else
-                    {
-                        var elements = this.WindowsDriver.FindElements(by.ToSeleniumBy());
-                        return elements;
-                    }
+                    var elements = this.WindowsDriver.FindElements(by.ToSeleniumBy());
+                    return elements;
                },
                this.WindowsDriver,
                timeoutMS);
@@ -154,39 +145,6 @@ namespace Microsoft.PowerToys.UITest
            return this.FindAll<Element>(By.Name(name), timeoutMS);
        }

-        /// <summary>
-        /// Keyboard Action key.
-        /// </summary>
-        /// <param name="key1">The Keys1 to click.</param>
-        /// <param name="key2">The Keys2 to click.</param>
-        /// <param name="key3">The Keys3 to click.</param>
-        /// <param name="key4">The Keys4 to click.</param>
-        public void KeyboardAction(string key1, string key2 = "", string key3 = "", string key4 = "")
-        {
-            PerformAction((actions, windowElement) =>
-            {
-                if (string.IsNullOrEmpty(key2))
-                {
-                    actions.SendKeys(key1);
-                }
-                else if (string.IsNullOrEmpty(key3))
-                {
-                    actions.SendKeys(key1).SendKeys(key2);
-                }
-                else if (string.IsNullOrEmpty(key4))
-                {
-                    actions.SendKeys(key1).SendKeys(key2).SendKeys(key3);
-                }
-                else
-                {
-                    actions.SendKeys(key1).SendKeys(key2).SendKeys(key3).SendKeys(key4);
-                }
-
-                actions.Release();
-                actions.Build().Perform();
-            });
-        }
-
        /// <summary>
        /// Attaches to an existing PowerToys module.
        /// </summary>
@@ -231,28 +189,5 @@ namespace Microsoft.PowerToys.UITest

            return this;
        }
-
-        /// <summary>
-        /// Simulates a manual operation on the element.
-        /// </summary>
-        /// <param name="action">The action to perform on the element.</param>
-        /// <param name="msPreAction">The number of milliseconds to wait before the action. Default value is 500 ms</param>
-        /// <param name="msPostAction">The number of milliseconds to wait after the action. Default value is 500 ms</param>
-        protected void PerformAction(Action<Actions, WindowsDriver<WindowsElement>> action, int msPreAction = 500, int msPostAction = 500)
-        {
-            if (msPreAction > 0)
-            {
-                Task.Delay(msPreAction).Wait();
-            }
-
-            var windowsDriver = this.WindowsDriver;
-            Actions actions = new Actions(this.WindowsDriver);
-            action(actions, windowsDriver);
-
-            if (msPostAction > 0)
-            {
-                Task.Delay(msPostAction).Wait();
-            }
-        }
    }
 }
--- a/src/common/UITestAutomation/SessionHelper.cs
+++ b/src/common/UITestAutomation/SessionHelper.cs
@@ -2,7 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
@@ -20,19 +19,15 @@ namespace Microsoft.PowerToys.UITest
        // Default session path is PowerToys settings dashboard
        private readonly string sessionPath = ModuleConfigData.Instance.GetModulePath(PowerToysModule.PowerToysSettings);

-        private string? locationPath;
-
        private WindowsDriver<WindowsElement> Root { get; set; }

        private WindowsDriver<WindowsElement>? Driver { get; set; }

        private Process? appDriver;

-        [UnconditionalSuppressMessage("SingleFile", "IL3000:Avoid accessing Assembly file path when publishing as a single file", Justification = "<Pending>")]
        public SessionHelper(PowerToysModule scope)
        {
            this.sessionPath = ModuleConfigData.Instance.GetModulePath(scope);
-            this.locationPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);

            var winAppDriverProcessInfo = new ProcessStartInfo
            {
@@ -54,12 +49,17 @@ namespace Microsoft.PowerToys.UITest
        /// Initializes the test environment.
        /// </summary>
        /// <param name="scope">The PowerToys module to start.</param>
+        [UnconditionalSuppressMessage("SingleFile", "IL3000:Avoid accessing Assembly file path when publishing as a single file", Justification = "<Pending>")]
        public SessionHelper Init()
        {
-            this.StartExe(locationPath + this.sessionPath);
+            string? path = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            this.StartExe(path + this.sessionPath);

            Assert.IsNotNull(this.Driver, $"Failed to initialize the test environment. Driver is null.");

+            // Set default timeout to 5 seconds
+            this.Driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(5);
+
            return this;
        }

@@ -68,11 +68,9 @@ namespace Microsoft.PowerToys.UITest
        /// </summary>
        public void Cleanup()
        {
-            ExitScopeExe();
            try
            {
                appDriver?.Kill();
-                appDriver?.WaitForExit(); // Optional: Wait for the process to exit
            }
            catch (Exception ex)
            {
@@ -89,53 +87,7 @@ namespace Microsoft.PowerToys.UITest
        {
            var opts = new AppiumOptions();
            opts.AddAdditionalCapability("app", appPath);
-            Console.WriteLine($"appPath: {appPath}");
            this.Driver = new WindowsDriver<WindowsElement>(new Uri(ModuleConfigData.Instance.GetWindowsApplicationDriverUrl()), opts);
-
-            // Set default timeout to 5 seconds
-            this.Driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(5);
-        }
-
-        /// <summary>
-        /// Exit a exe.
-        /// </summary>
-        /// <param name="path">The path to the application executable.</param>
-        public void ExitExe(string path)
-        {
-            // Exit Exe
-            string exeName = Path.GetFileNameWithoutExtension(path);
-
-            // PowerToys.FancyZonesEditor
-            Process[] processes = Process.GetProcessesByName(exeName);
-            foreach (Process process in processes)
-            {
-                try
-                {
-                    process.Kill();
-                    process.WaitForExit(); // Optional: Wait for the process to exit
-                }
-                catch (Exception ex)
-                {
-                    Assert.Fail($"Failed to terminate process {process.ProcessName} (ID: {process.Id}): {ex.Message}");
-                }
-            }
-        }
-
-        /// <summary>
-        /// Exit now exe.
-        /// </summary>
-        public void ExitScopeExe()
-        {
-            ExitExe(sessionPath);
-        }
-
-        /// <summary>
-        /// Restarts now exe and takes control of it.
-        /// </summary>
-        public void RestartScopeExe()
-        {
-            ExitExe(sessionPath);
-            StartExe(locationPath + sessionPath);
        }

        public WindowsDriver<WindowsElement> GetRoot() => this.Root;
--- a/src/common/UITestAutomation/UITestBase.cs
+++ b/src/common/UITestAutomation/UITestBase.cs
@@ -6,7 +6,6 @@ using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
-using System.Xml.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.Windows;
@@ -32,6 +31,11 @@ namespace Microsoft.PowerToys.UITest
            this.Session = new Session(this.sessionHelper.GetRoot(), this.sessionHelper.GetDriver());
        }

+        ~UITestBase()
+        {
+            this.sessionHelper.Cleanup();
+        }
+
        /// <summary>
        /// Initializes the test.
        /// </summary>
@@ -49,15 +53,6 @@ namespace Microsoft.PowerToys.UITest
            }
        }

-        /// <summary>
-        /// UnInitializes the test.
-        /// </summary>
-        [TestCleanup]
-        public void TestClean()
-        {
-            this.sessionHelper.Cleanup();
-        }
-
        /// <summary>
        /// Finds an element by selector.
        /// Shortcut for this.Session.Find<T>(by, timeoutMS)
@@ -158,24 +153,5 @@ namespace Microsoft.PowerToys.UITest
        {
            return this.Session.FindAll<Element>(By.Name(name), timeoutMS);
        }
-
-        /// <summary>
-        /// Restart scope exe.
-        /// </summary>
-        public void RestartScopeExe()
-        {
-            this.sessionHelper.RestartScopeExe();
-            this.Session = new Session(this.sessionHelper.GetRoot(), this.sessionHelper.GetDriver());
-            return;
-        }
-
-        /// <summary>
-        /// Restart scope exe.
-        /// </summary>
-        public void ExitScopeExe()
-        {
-            this.sessionHelper.ExitScopeExe();
-            return;
-        }
    }
 }
--- a/src/common/interop/Constants.cpp
+++ b/src/common/interop/Constants.cpp
@@ -187,8 +187,4 @@ namespace winrt::PowerToys::Interop::implementation
    {
        return CommonSharedConstants::TERMINATE_SETTINGS_SHARED_EVENT;
    }
-    hstring Constants::ShowCmdPalEvent()
-    {
-        return CommonSharedConstants::CMDPAL_SHOW_EVENT;
-    }
 }
--- a/src/common/interop/Constants.h
+++ b/src/common/interop/Constants.h
@@ -50,7 +50,6 @@ namespace winrt::PowerToys::Interop::implementation
        static hstring WorkspacesLaunchEditorEvent();
        static hstring WorkspacesHotkeyEvent();
        static hstring PowerToysRunnerTerminateSettingsEvent();
-        static hstring ShowCmdPalEvent();
    };
 }

--- a/src/common/interop/Constants.idl
+++ b/src/common/interop/Constants.idl
@@ -47,7 +47,6 @@ namespace PowerToys
            static String WorkspacesLaunchEditorEvent();
            static String WorkspacesHotkeyEvent();
            static String PowerToysRunnerTerminateSettingsEvent();
-            static String ShowCmdPalEvent();
        }
    }
 }
--- a/src/common/interop/shared_constants.h
+++ b/src/common/interop/shared_constants.h
@@ -128,10 +128,6 @@ namespace CommonSharedConstants
    const wchar_t ZOOMIT_REFRESH_SETTINGS_EVENT[] = L"Local\\PowerToysZoomIt-RefreshSettingsEvent-f053a563-d519-4b0d-8152-a54489c13324";
    const wchar_t ZOOMIT_EXIT_EVENT[] = L"Local\\PowerToysZoomIt-ExitEvent-36641ce6-df02-4eac-abea-a3fbf9138220";

-    // used from quick access window
-    const wchar_t CMDPAL_SHOW_EVENT[] = L"Local\\PowerToysCmdPal-ShowEvent-62336fcd-8611-4023-9b30-091a6af4cc5a";
-    const wchar_t CMDPAL_EXIT_EVENT[] = L"Local\\PowerToysCmdPal-ExitEvent-eb73f6be-3f22-4b36-aee3-62924ba40bfd";
-
    // Max DWORD for key code to disable keys.
    const DWORD VK_DISABLED = 0x100;
 }
--- a/src/common/utils/gpo.h
+++ b/src/common/utils/gpo.h
@@ -4,10 +4,8 @@
 #include <optional>
 #include <vector>

-namespace powertoys_gpo
-{
-    enum gpo_rule_configured_t
-    {
+namespace powertoys_gpo {
+    enum gpo_rule_configured_t {
        gpo_rule_configured_wrong_value = -3, // The policy is set to an unrecognized value
        gpo_rule_configured_unavailable = -2, // Couldn't access registry
        gpo_rule_configured_not_configured = -1, // Policy is not configured
@@ -55,7 +53,6 @@ namespace powertoys_gpo
    const std::wstring POLICY_CONFIGURE_ENABLED_SHORTCUT_GUIDE = L"ConfigureEnabledUtilityShortcutGuide";
    const std::wstring POLICY_CONFIGURE_ENABLED_TEXT_EXTRACTOR = L"ConfigureEnabledUtilityTextExtractor";
    const std::wstring POLICY_CONFIGURE_ENABLED_ADVANCED_PASTE = L"ConfigureEnabledUtilityAdvancedPaste";
-    const std::wstring POLICY_CONFIGURE_ENABLED_CMD_PAL = L"ConfigureEnabledUtilityCmdPal";
    const std::wstring POLICY_CONFIGURE_ENABLED_ZOOM_IT = L"ConfigureEnabledUtilityZoomIt";
    const std::wstring POLICY_CONFIGURE_ENABLED_REGISTRY_PREVIEW = L"ConfigureEnabledUtilityRegistryPreview";
    const std::wstring POLICY_CONFIGURE_ENABLED_MOUSE_WITHOUT_BORDERS = L"ConfigureEnabledUtilityMouseWithoutBorders";
@@ -89,7 +86,6 @@ namespace powertoys_gpo
    const std::wstring POLICY_MWB_DISABLE_USER_DEFINED_IP_MAPPING_RULES = L"MwbDisableUserDefinedIpMappingRules";
    const std::wstring POLICY_MWB_POLICY_DEFINED_IP_MAPPING_RULES = L"MwbPolicyDefinedIpMappingRules";
    const std::wstring POLICY_NEW_PLUS_HIDE_TEMPLATE_FILENAME_EXTENSION = L"NewPlusHideTemplateFilenameExtension";
-    const std::wstring POLICY_NEW_PLUS_REPLACE_VARIABLES = L"NewPlusReplaceVariablesInTemplateFilenames";

    // Methods used for reading the registry
 #pragma region ReadRegistryMethods
@@ -160,17 +156,16 @@ namespace powertoys_gpo
            machine_key_found = false;
        }

-        if (machine_key_found)
+        if(machine_key_found)
        {
            // If the path was found in the machine, we need to check if the value for the policy exists.
            auto res = RegQueryValueExW(key, registry_value_name.c_str(), nullptr, nullptr, reinterpret_cast<LPBYTE>(&value), &valueSize);

            RegCloseKey(key);

-            if (res != ERROR_SUCCESS)
-            {
+            if (res != ERROR_SUCCESS) {
                // Value not found on the path.
-                machine_key_found = false;
+                machine_key_found=false;
            }
        }

@@ -179,8 +174,7 @@ namespace powertoys_gpo
            // If there's no value found on the machine scope, try to get it from the user scope.
            if (auto res = RegOpenKeyExW(POLICIES_SCOPE_USER, POLICIES_PATH.c_str(), 0, KEY_READ, &key); res != ERROR_SUCCESS)
            {
-                if (res == ERROR_FILE_NOT_FOUND)
-                {
+                if (res == ERROR_FILE_NOT_FOUND) {
                    return gpo_rule_configured_not_configured;
                }
                return gpo_rule_configured_unavailable;
@@ -188,8 +182,7 @@ namespace powertoys_gpo
            auto res = RegQueryValueExW(key, registry_value_name.c_str(), nullptr, nullptr, reinterpret_cast<LPBYTE>(&value), &valueSize);
            RegCloseKey(key);

-            if (res != ERROR_SUCCESS)
-            {
+            if (res != ERROR_SUCCESS) {
                return gpo_rule_configured_not_configured;
            }
        }
@@ -418,11 +411,6 @@ namespace powertoys_gpo
        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_ADVANCED_PASTE);
    }

-    inline gpo_rule_configured_t getConfiguredCmdPalEnabledValue()
-    {
-        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_CMD_PAL);
-    }
-
    inline gpo_rule_configured_t getConfiguredWorkspacesEnabledValue()
    {
        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_WORKSPACES);
@@ -513,7 +501,7 @@ namespace powertoys_gpo
    }

    inline gpo_rule_configured_t getRunPluginEnabledValue(std::string pluginID)
-    {
+    {     
        if (pluginID == "" || pluginID == " ")
        {
            // this plugin id can't exist in the registry
@@ -522,7 +510,7 @@ namespace powertoys_gpo

        std::wstring plugin_id(pluginID.begin(), pluginID.end());
        auto individual_plugin_setting = getPolicyListValue(POWER_LAUNCHER_INDIVIDUAL_PLUGIN_ENABLED_LIST_PATH, plugin_id);
-
+        
        if (individual_plugin_setting.has_value())
        {
            if (*individual_plugin_setting == L"0")
@@ -549,7 +537,7 @@ namespace powertoys_gpo
        {
            // If no individual plugin policy exists, we check the policy with the setting for all plugins.
            return getConfiguredValue(POLICY_CONFIGURE_ENABLED_POWER_LAUNCHER_ALL_PLUGINS);
-        }
+        }        
    }

    inline gpo_rule_configured_t getAllowedAdvancedPasteOnlineAIModelsValue()
@@ -613,7 +601,7 @@ namespace powertoys_gpo
        }
        else
        {
-            return std::wstring();
+            return std::wstring ();
        }
    }

@@ -621,11 +609,5 @@ namespace powertoys_gpo
    {
        return getConfiguredValue(POLICY_NEW_PLUS_HIDE_TEMPLATE_FILENAME_EXTENSION);
    }
-
-    inline gpo_rule_configured_t getConfiguredNewPlusReplaceVariablesValue()
-    {
-        return getConfiguredValue(POLICY_NEW_PLUS_REPLACE_VARIABLES);
-    }
-    
 #pragma endregion IndividualModuleSettingPolicies
 }
--- a/src/common/utils/package.h
+++ b/src/common/utils/package.h
@@ -3,10 +3,7 @@
 #include <Windows.h>

 #include <exception>
-#include <filesystem>
-#include <regex>
 #include <string>
-#include <optional>

 #include <winrt/Windows.ApplicationModel.h>
 #include <winrt/Windows.Foundation.h>
@@ -16,11 +13,6 @@
 #include "../version/version.h"

 namespace package {
-
-    using namespace winrt::Windows::Foundation;
-    using namespace winrt::Windows::ApplicationModel;
-    using namespace winrt::Windows::Management::Deployment;
-
    inline BOOL IsWin11OrGreater()
    {
        OSVERSIONINFOEX osvi{};
@@ -46,35 +38,35 @@ namespace package {
            dwlConditionMask);
    }

-    inline std::optional<Package> GetRegisteredPackage(std::wstring packageDisplayName, bool checkVersion)
+    inline bool IsPackageRegistered(std::wstring packageDisplayName)
    {
+        using namespace winrt::Windows::Foundation;
+        using namespace winrt::Windows::Management::Deployment;
+
        PackageManager packageManager;

-        for (const auto& package : packageManager.FindPackagesForUser({}))
+        for (auto const& package : packageManager.FindPackagesForUser({}))
        {
            const auto& packageFullName = std::wstring{ package.Id().FullName() };
            const auto& packageVersion = package.Id().Version();

            if (packageFullName.contains(packageDisplayName))
            {
-                // If checkVersion is true, verify if the package has the same version as PowerToys.
-                if ((!checkVersion) || (packageVersion.Major == VERSION_MAJOR && packageVersion.Minor == VERSION_MINOR && packageVersion.Revision == VERSION_REVISION))
+                if (packageVersion.Major == VERSION_MAJOR && packageVersion.Minor == VERSION_MINOR && packageVersion.Revision == VERSION_REVISION)
                {
-                    return { package };
+                    return true;
                }
            }
        }

-        return {};
+        return false;
    }

-    inline bool IsPackageRegisteredWithPowerToysVersion(std::wstring packageDisplayName)
+    inline bool RegisterSparsePackage(std::wstring externalLocation, std::wstring sparsePkgPath)
    {
-        return GetRegisteredPackage(packageDisplayName, true).has_value();
-    }
+        using namespace winrt::Windows::Foundation;
+        using namespace winrt::Windows::Management::Deployment;

-    inline bool RegisterSparsePackage(const std::wstring& externalLocation, const std::wstring& sparsePkgPath)
-    {
        try
        {
            Uri externalUri{ externalLocation };
@@ -123,174 +115,4 @@ namespace package {
            return false;
        }
    }
-
-    inline bool UnRegisterPackage(const std::wstring& pkgDisplayName)
-    {
-        try
-        {
-            PackageManager packageManager;
-            const static auto packages = packageManager.FindPackagesForUser({});
-
-            for (auto const& package : packages)
-            {
-                const auto& packageFullName = std::wstring{ package.Id().FullName() };
-
-                if (packageFullName.contains(pkgDisplayName))
-                {
-                    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);
-                    }
-                    else if (deploymentOperation.Status() == AsyncStatus::Canceled)
-                    {
-                        Logger::error(L"Unregister {} package canceled.", packageFullName);
-                    }
-                    else if (deploymentOperation.Status() == AsyncStatus::Completed)
-                    {
-                        Logger::info(L"Unregister {} package completed.", packageFullName);
-                    }
-                    else
-                    {
-                        Logger::debug(L"Unregister {} package started.", packageFullName);
-                    }
-
-                    break;
-                }
-            }
-        }
-        catch (std::exception& e)
-        {
-            Logger::error("Exception thrown while trying to unregister package: {}", e.what());
-            return false;
-        }
-
-        return true;
-    }
-
-    inline std::vector<std::wstring> FindMsixFile(const std::wstring& directoryPath, bool recursive)
-    {
-        if (directoryPath.empty())
-        {
-            return {};
-        }
-
-        if (!std::filesystem::exists(directoryPath))
-        {
-            Logger::error(L"The directory '" + directoryPath + L"' does not exist.");
-        }
-
-        const std::regex pattern(R"(^.+\.(appx|msix|msixbundle)$)", std::regex_constants::icase);
-        std::vector<std::wstring> matchedFiles;
-
-        try
-        {
-            if (recursive)
-            {
-                for (const auto& entry : std::filesystem::recursive_directory_iterator(directoryPath))
-                {
-                    if (entry.is_regular_file())
-                    {
-                        const auto& fileName = entry.path().filename().string();
-                        if (std::regex_match(fileName, pattern))
-                        {
-                            matchedFiles.push_back(entry.path());
-                        }
-                    }
-                }
-            }
-            else
-            {
-                for (const auto& entry : std::filesystem::directory_iterator(directoryPath))
-                {
-                    if (entry.is_regular_file())
-                    {
-                        const auto& fileName = entry.path().filename().string();
-                        if (std::regex_match(fileName, pattern))
-                        {
-                            matchedFiles.push_back(entry.path());
-                        }
-                    }
-                }
-            }
-        }
-        catch (const std::exception& ex)
-        {
-            Logger::error("An error occurred while searching for MSIX files: " + std::string(ex.what()));
-        }
-
-        return matchedFiles;
-    }
-
-    inline bool RegisterPackage(std::wstring pkgPath, std::vector<std::wstring> dependencies)
-    {
-        try
-        {
-            Uri packageUri{ pkgPath };
-
-            PackageManager packageManager;
-
-            // Declare use of an external location
-            DeploymentOptions options = DeploymentOptions::ForceApplicationShutdown;
-
-            Collections::IVector<Uri> uris = winrt::single_threaded_vector<Uri>();
-            if (!dependencies.empty())
-            {
-                for (const auto& dependency : dependencies)
-                {
-                    try
-                    {
-                        uris.Append(Uri(dependency));
-                    }
-                    catch (const winrt::hresult_error& ex)
-                    {
-                        Logger::error(L"Error creating Uri for dependency: %s", ex.message().c_str());
-                    }
-                }
-            }
-
-            IAsyncOperationWithProgress<DeploymentResult, DeploymentProgress> deploymentOperation = packageManager.AddPackageAsync(packageUri, uris, options);
-            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"Register {} package failed. ErrorCode: {}, ErrorText: {}", pkgPath, std::to_wstring(errorCode), errorText);
-                return false;
-            }
-            else if (deploymentOperation.Status() == AsyncStatus::Canceled)
-            {
-                Logger::error(L"Register {} package canceled.", pkgPath);
-                return false;
-            }
-            else if (deploymentOperation.Status() == AsyncStatus::Completed)
-            {
-                Logger::info(L"Register {} package completed.", pkgPath);
-            }
-            else
-            {
-                Logger::debug(L"Register {} package started.", pkgPath);
-            }
-
-        }
-        catch (std::exception& e)
-        {
-            Logger::error("Exception thrown while trying to register package: {}", e.what());
-
-            return false;
-        }
-
-        return true;
-    }
 }
--- a/src/gpo/assets/PowerToys.admx
+++ b/src/gpo/assets/PowerToys.admx
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.
     Licensed under the MIT License. -->
-<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.17" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
+<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.16" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
  <policyNamespaces>
    <target prefix="powertoys" namespace="Microsoft.Policies.PowerToys" />
  </policyNamespaces>
-  <resources minRequiredRevision="1.17"/><!-- Last changed with PowerToys v0.90.0 -->
+  <resources minRequiredRevision="1.16"/><!-- Last changed with PowerToys v0.89.0 -->
  <supportedOn>
    <definitions>
      <definition name="SUPPORTED_POWERTOYS_0_64_0" displayName="$(string.SUPPORTED_POWERTOYS_0_64_0)"/>
@@ -25,7 +25,6 @@
      <definition name="SUPPORTED_POWERTOYS_0_86_0" displayName="$(string.SUPPORTED_POWERTOYS_0_86_0)"/>
      <definition name="SUPPORTED_POWERTOYS_0_88_0" displayName="$(string.SUPPORTED_POWERTOYS_0_88_0)"/>
      <definition name="SUPPORTED_POWERTOYS_0_89_0" displayName="$(string.SUPPORTED_POWERTOYS_0_89_0)"/>
-      <definition name="SUPPORTED_POWERTOYS_0_90_0" displayName="$(string.SUPPORTED_POWERTOYS_0_90_0)"/>
      <definition name="SUPPORTED_POWERTOYS_0_64_0_TO_0_87_1" displayName="$(string.SUPPORTED_POWERTOYS_0_64_0_TO_0_87_1)"/>
    </definitions>
  </supportedOn>
@@ -107,16 +106,6 @@
        <decimal value="0" />
      </disabledValue>
    </policy>
-    <policy name="ConfigureEnabledUtilityCmdPal" class="Both" displayName="$(string.ConfigureEnabledUtilityCmdPal)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityCmdPal">
-      <parentCategory ref="PowerToys" />
-      <supportedOn ref="SUPPORTED_POWERTOYS_0_90_0" />
-      <enabledValue>
-        <decimal value="1" />
-      </enabledValue>
-      <disabledValue>
-        <decimal value="0" />
-      </disabledValue>
-    </policy>
    <policy name="ConfigureEnabledUtilityColorPicker" class="Both" displayName="$(string.ConfigureEnabledUtilityColorPicker)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityColorPicker">
      <parentCategory ref="PowerToys" />
      <supportedOn ref="SUPPORTED_POWERTOYS_0_64_0" />
@@ -682,15 +671,5 @@
        <decimal value="0" />
      </disabledValue>
    </policy>
-    <policy name="NewPlusReplaceVariablesInTemplateFilenames" class="Both" displayName="$(string.NewPlusReplaceVariablesInTemplateFilenames)" explainText="$(string.NewPlusReplaceVariablesInTemplateFilenamesDescription)" key="Software\Policies\PowerToys" valueName="NewPlusReplaceVariablesInTemplateFilenames">
-      <parentCategory ref="NewPlus" />
-      <supportedOn ref="SUPPORTED_POWERTOYS_0_90_0" />
-      <enabledValue>
-        <decimal value="1" />
-      </enabledValue>
-      <disabledValue>
-        <decimal value="0" />
-      </disabledValue>
-    </policy>
  </policies>
 </policyDefinitions>
--- a/src/gpo/assets/en-US/PowerToys.adml
+++ b/src/gpo/assets/en-US/PowerToys.adml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.
     Licensed under the MIT License. -->
-<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.17" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
+<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.16" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
  <displayName>PowerToys</displayName>
  <description>PowerToys</description>
  <resources>
@@ -32,7 +32,6 @@
      <string id="SUPPORTED_POWERTOYS_0_86_0">PowerToys version 0.86.0 or later</string>
      <string id="SUPPORTED_POWERTOYS_0_88_0">PowerToys version 0.88.0 or later</string>
      <string id="SUPPORTED_POWERTOYS_0_89_0">PowerToys version 0.89.0 or later</string>
-      <string id="SUPPORTED_POWERTOYS_0_90_0">PowerToys version 0.90.0 or later</string>
      <string id="SUPPORTED_POWERTOYS_0_64_0_TO_0_87_1">From PowerToys version 0.64.0 until PowerToys version 0.87.1</string>

      <string id="ConfigureAllUtilityGlobalEnabledStateDescription">This policy configures the enabled state for all PowerToys utilities.
@@ -227,14 +226,6 @@ If you enable this policy, the setting is enabled and the extension is hidden.
 If you disable this policy, the setting is disabled and the extension is shown.

 If you don't configure this policy, the user takes control over the setting and can enable or disable it.
-</string>
-      <string id="NewPlusReplaceVariablesInTemplateFilenamesDescription">This policy configures if supported variables will get replaced in template filenames.
-
-If you enable this policy, the setting is enabled and supported variables in filenames will get replaced.
-
-If you disable this policy, the setting is disabled and variables in filenames will not get replaced.
-
-If you don't configure this policy, the user will be able to control the setting and can enable or disable it.
 </string>

      <string id="ConfigureAllUtilityGlobalEnabledState">Configure global utility enabled state</string>
@@ -243,7 +234,6 @@ If you don't configure this policy, the user will be able to control the setting
      <string id="ConfigureEnabledUtilityAwake">Awake: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityColorPicker">Color Picker: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityCmdNotFound">Command Not Found: Configure enabled state</string>
-      <string id="ConfigureEnabledUtilityCmdPal">CmdPal: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityCropAndLock">Crop And Lock: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityEnvironmentVariables">Environment Variables: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityFancyZones">FancyZones: Configure enabled state</string>
@@ -300,7 +290,6 @@ If you don't configure this policy, the user will be able to control the setting
      <string id="NewPlusHideTemplateFilenameExtension">Hide template filename extension</string>
      <string id="AllowDiagnosticData">Allow sending diagnostic data</string>
      <string id="ConfigureRunAtStartup">Configure the run at startup setting</string>
-      <string id="NewPlusReplaceVariablesInTemplateFilenames">Replace variables in template filenames</string>
    </stringTable>

    <presentationTable>
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj
@@ -69,10 +69,6 @@
    <PackageReference Include="WinUIEx" />
    <!-- HACK: To make sure the version pulled in by Microsoft.Extensions.Hosting is current. -->
    <PackageReference Include="System.Text.Json" />
-    <!-- This line forces the WebView2 version used by Windows App SDK to be the one we expect from Directory.Packages.props . -->
-    <PackageReference Include="Microsoft.Web.WebView2" />
-    <!-- HACK: CmdPal uses CommunityToolkit.Common directly. Align the version. -->
-    <PackageReference Include="CommunityToolkit.Common" />
    <Manifest Include="$(ApplicationManifest)" />
  </ItemGroup>

--- a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariables.csproj
+++ b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariables.csproj
@@ -2,7 +2,7 @@
  <!-- Look at Directory.Build.props in root for common stuff as well -->
  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
  <Import Project="..\..\..\Common.SelfContained.props" />
-
+    
  <PropertyGroup>
    <OutputType>WinExe</OutputType>
    <RootNamespace>EnvironmentVariables</RootNamespace>
@@ -67,10 +67,6 @@
    <PackageReference Include="WinUIEx" />
    <!-- HACK: To make sure the version pulled in by Microsoft.Extensions.Hosting is current. -->
    <PackageReference Include="System.Text.Json" />
-    <!-- This line forces the WebView2 version used by Windows App SDK to be the one we expect from Directory.Packages.props . -->
-    <PackageReference Include="Microsoft.Web.WebView2" />
-    <!-- HACK: CmdPal uses CommunityToolkit.Common directly. Align the version. -->
-    <PackageReference Include="CommunityToolkit.Common" />
    <Manifest Include="$(ApplicationManifest)" />
  </ItemGroup>

--- a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesUILib.csproj
+++ b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesUILib.csproj
@@ -15,8 +15,6 @@
    <ProjectPriFileName>PowerToys.EnvironmentVariablesUILib.pri</ProjectPriFileName>
    <GenerateLibraryLayout>true</GenerateLibraryLayout>
    <IsPackable>true</IsPackable>
-    <!-- The default generated file path exceeds the length limit 260 on the build agent. Using a shorter path as a workaround. -->
-    <CompilerGeneratedFilesOutputPath>$(ProjectDir)obj\g</CompilerGeneratedFilesOutputPath>
  </PropertyGroup>

  <PropertyGroup>
@@ -55,8 +53,4 @@
    <PackageReference Include="System.Text.Json" />
    <Manifest Include="$(ApplicationManifest)" />
  </ItemGroup>
-
-  <Target Name="EnsureCompilerGeneratedFilesOutputPathExists" BeforeTargets="XamlPreCompile">
-    <MakeDir Directories="$(CompilerGeneratedFilesOutputPath)" />
-  </Target>
 </Project>
--- a/src/modules/FileLocksmith/FileLocksmithExt/PowerToysModule.cpp
+++ b/src/modules/FileLocksmith/FileLocksmithExt/PowerToysModule.cpp
@@ -83,7 +83,7 @@ public:
            std::wstring path = get_module_folderpath(globals::instance);
            std::wstring packageUri = path + L"\\FileLocksmithContextMenuPackage.msix";

-            if (!package::IsPackageRegisteredWithPowerToysVersion(constants::nonlocalizable::ContextMenuPackageName))
+            if (!package::IsPackageRegistered(constants::nonlocalizable::ContextMenuPackageName))
            {
                package::RegisterSparsePackage(path, packageUri);
            }
--- a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj
+++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj
@@ -63,10 +63,6 @@
    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
    <PackageReference Include="System.Drawing.Common" />
    <PackageReference Include="WinUIEx" />
-    <!-- This line forces the WebView2 version used by Windows App SDK to be the one we expect from Directory.Packages.props . -->
-    <PackageReference Include="Microsoft.Web.WebView2" />
-    <!-- HACK: CmdPal uses CommunityToolkit.Common directly. Align the version. -->
-    <PackageReference Include="CommunityToolkit.Common" />
    <Manifest Include="$(ApplicationManifest)" />
  </ItemGroup>

--- a/src/modules/Hosts/Hosts.Tests/Hosts.Tests.csproj
+++ b/src/modules/Hosts/Hosts.Tests/Hosts.Tests.csproj
@@ -20,8 +20,6 @@
      <!-- This package is a dependency of Microsoft.Extensions.Logging.EventLog, but we need to set it here so we can exclude the assets, so it doesn't conflict with the 8.0.1 dll coming from .NET SDK. -->
      <ExcludeAssets>runtime</ExcludeAssets> <!-- Should already be present on .net sdk runtime, so we avoid the conflicting runtime version from nuget -->
    </PackageReference>
-    <!-- HACK: CmdPal uses CommunityToolkit.Common directly. Align the version. -->
-    <PackageReference Include="CommunityToolkit.Common" />
  </ItemGroup>

  <ItemGroup>
--- a/src/modules/Hosts/Hosts/Hosts.csproj
+++ b/src/modules/Hosts/Hosts/Hosts.csproj
@@ -66,10 +66,6 @@
    <PackageReference Include="WinUIEx" />
    <!-- HACK: To make sure the version pulled in by Microsoft.Extensions.Hosting is current. -->
    <PackageReference Include="System.Text.Json" />
-    <!-- This line forces the WebView2 version used by Windows App SDK to be the one we expect from Directory.Packages.props . -->
-    <PackageReference Include="Microsoft.Web.WebView2" />
-    <!-- HACK: CmdPal uses CommunityToolkit.Common directly. Align the version. -->
-    <PackageReference Include="CommunityToolkit.Common" />
    <Manifest Include="$(ApplicationManifest)" />
  </ItemGroup>

--- a/src/modules/Hosts/Hosts/HostsXAML/App.xaml.cs
+++ b/src/modules/Hosts/Hosts/HostsXAML/App.xaml.cs
@@ -7,7 +7,6 @@ using System.IO.Abstractions;
 using System.Threading;

 using Common.UI;
-using HostsEditor.Telemetry;
 using HostsUILib.Helpers;
 using HostsUILib.Settings;
 using HostsUILib.ViewModels;
@@ -39,8 +38,6 @@ namespace Hosts
        /// </summary>
        public App()
        {
-            PowerToysTelemetry.Log.WriteEvent(new HostEditorStartEvent() { TimeStamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() });
-
            string appLanguage = LanguageHelper.LoadLanguage();
            if (!string.IsNullOrEmpty(appLanguage))
            {
--- a/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml.cs
+++ b/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml.cs
@@ -2,13 +2,10 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
 using Hosts.Helpers;
-using HostsEditor.Telemetry;
 using HostsUILib.Helpers;
 using HostsUILib.Views;
 using ManagedCommon;
-using Microsoft.PowerToys.Telemetry;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
@@ -47,8 +44,6 @@ namespace Hosts
            Activated += MainWindow_Activated;

            MainPage = Host.GetService<HostsMainPage>();
-
-            PowerToysTelemetry.Log.WriteEvent(new HostEditorStartFinishEvent() { TimeStamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() });
        }

        private void MainWindow_Activated(object sender, WindowActivatedEventArgs args)
--- a/src/modules/Hosts/Hosts/Telemetry/HostEditorStartEvent.cs
+++ b/src/modules/Hosts/Hosts/Telemetry/HostEditorStartEvent.cs
@@ -1,18 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Diagnostics.Tracing;
-
-using Microsoft.PowerToys.Telemetry;
-using Microsoft.PowerToys.Telemetry.Events;
-
-namespace HostsEditor.Telemetry;
-
-[EventData]
-public class HostEditorStartEvent() : EventBase, IEvent
-{
-    public long TimeStamp { get; set; }
-
-    public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
-}
--- a/src/modules/Hosts/Hosts/Telemetry/HostEditorStartFinishEvent.cs
+++ b/src/modules/Hosts/Hosts/Telemetry/HostEditorStartFinishEvent.cs
@@ -1,18 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Diagnostics.Tracing;
-
-using Microsoft.PowerToys.Telemetry;
-using Microsoft.PowerToys.Telemetry.Events;
-
-namespace HostsEditor.Telemetry;
-
-[EventData]
-public class HostEditorStartFinishEvent() : EventBase, IEvent
-{
-    public long TimeStamp { get; set; }
-
-    public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
-}
--- a/src/modules/Hosts/HostsUILib/ViewModels/MainViewModel.cs
+++ b/src/modules/Hosts/HostsUILib/ViewModels/MainViewModel.cs
@@ -202,9 +202,7 @@ namespace HostsUILib.ViewModels
                    }

                    _entries.CollectionChanged += Entries_CollectionChanged;
-#pragma warning disable IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
                    Entries = new AdvancedCollectionView(_entries, true);
-#pragma warning restore IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
                    Entries.SortDescriptions.Add(new SortDescription(nameof(Entry.Id), SortDirection.Ascending));
                    ApplyFilters();
                    OnPropertyChanged(nameof(Entries));
--- a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
+++ b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.241114003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.241114003\build\native\Microsoft.WindowsAppSDK.props')" />
  <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" />
  <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')" />
  <PropertyGroup Label="Globals">
@@ -140,8 +140,8 @@
    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
    <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
    <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.241114003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.241114003\build\native\Microsoft.WindowsAppSDK.targets')" />
  </ImportGroup>
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
@@ -152,8 +152,8 @@
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.241114003\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.241114003\build\native\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.241114003\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.241114003\build\native\Microsoft.WindowsAppSDK.targets'))" />
  </Target>
 </Project>
--- a/src/modules/MeasureTool/MeasureToolCore/packages.config
+++ b/src/modules/MeasureTool/MeasureToolCore/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Web.WebView2" version="1.0.2903.40" targetFramework="native" />
+  <package id="Microsoft.Web.WebView2" version="1.0.2739.15" targetFramework="native" />
  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
  <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.2428" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.6.250205002" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.6.241114003" targetFramework="native" />
 </packages>
--- a/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj
+++ b/src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj
@@ -13,7 +13,7 @@
    <ApplicationManifest>app.manifest</ApplicationManifest>
    <UseWinUI>true</UseWinUI>
    <Platforms>x64;ARM64</Platforms>
-    <GenerateSatelliteAssembliesForCore>true</GenerateSatelliteAssembliesForCore>
+    <GenerateSatelliteAssembliesForCore>true</GenerateSatelliteAssembliesForCore>    
    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
@@ -55,8 +55,6 @@
    <PackageReference Include="Microsoft.WindowsAppSDK" />
    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
    <PackageReference Include="WinUIEx" />
-    <!-- This line forces the WebView2 version used by Windows App SDK to be the one we expect from Directory.Packages.props . -->
-    <PackageReference Include="Microsoft.Web.WebView2" />
    <Manifest Include="$(ApplicationManifest)" />
  </ItemGroup>

--- a/src/modules/MouseWithoutBorders/App/Class/Common.Clipboard.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/Common.Clipboard.cs
@@ -153,7 +153,7 @@ namespace MouseWithoutBorders

                        string filePath = stringData;

-                        _ = Launch.ImpersonateLoggedOnUserAndDoSomething(() =>
+                        _ = Common.ImpersonateLoggedOnUserAndDoSomething(() =>
                        {
                            if (File.Exists(filePath) || Directory.Exists(filePath))
                            {
@@ -579,7 +579,7 @@ namespace MouseWithoutBorders
                {
                    if (postAct.Equals("desktop", StringComparison.OrdinalIgnoreCase))
                    {
-                        _ = Launch.ImpersonateLoggedOnUserAndDoSomething(() =>
+                        _ = ImpersonateLoggedOnUserAndDoSomething(() =>
                        {
                            savingFolder = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "\\MouseWithoutBorders\\";

@@ -696,7 +696,7 @@ namespace MouseWithoutBorders
                                Path.GetFileName(fileName),
                                remoteMachine);

-                            _ = Launch.ImpersonateLoggedOnUserAndDoSomething(() =>
+                            _ = ImpersonateLoggedOnUserAndDoSomething(() =>
                            {
                                ProcessStartInfo startInfo = new();
                                startInfo.UseShellExecute = true;
--- a/src/modules/MouseWithoutBorders/App/Class/Common.Event.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/Common.Event.cs
@@ -0,0 +1,277 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Drawing;
+using System.Globalization;
+using System.Threading;
+using System.Threading.Tasks;
+
+// <summary>
+//     Keyboard/Mouse hook callback implementation.
+// </summary>
+// <history>
+//     2008 created by Truong Do (ductdo).
+//     2009-... modified by Truong Do (TruongDo).
+//     2023- Included in PowerToys.
+// </history>
+using MouseWithoutBorders.Class;
+using MouseWithoutBorders.Core;
+using MouseWithoutBorders.Form;
+
+using Thread = MouseWithoutBorders.Core.Thread;
+
+namespace MouseWithoutBorders
+{
+    internal partial class Common
+    {
+        private static readonly DATA KeybdPackage = new();
+        private static readonly DATA MousePackage = new();
+#pragma warning disable SA1307 // Accessible fields should begin with upper-case names
+        internal static ulong inputEventCount;
+        internal static ulong invalidPackageCount;
+#pragma warning restore SA1307
+        internal static int MOVE_MOUSE_RELATIVE = 100000;
+        internal static int XY_BY_PIXEL = 300000;
+
+        static Common()
+        {
+        }
+
+        internal static ulong InvalidPackageCount
+        {
+            get => Common.invalidPackageCount;
+            set => Common.invalidPackageCount = value;
+        }
+
+        internal static ulong InputEventCount
+        {
+            get => Common.inputEventCount;
+            set => Common.inputEventCount = value;
+        }
+
+        internal static ulong RealInputEventCount
+        {
+            get;
+            set;
+        }
+
+        private static Point actualLastPos;
+        private static int myLastX;
+        private static int myLastY;
+
+        [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity", Justification = "Dotnet port with style preservation")]
+        internal static void MouseEvent(MOUSEDATA e, int dx, int dy)
+        {
+            try
+            {
+                PaintCount = 0;
+                bool switchByMouseEnabled = IsSwitchingByMouseEnabled();
+
+                if (switchByMouseEnabled && Sk != null && (DesMachineID == MachineID || !Setting.Values.MoveMouseRelatively) && e.dwFlags == WM_MOUSEMOVE)
+                {
+                    Point p = MachineStuff.MoveToMyNeighbourIfNeeded(e.X, e.Y, MachineStuff.desMachineID);
+
+                    if (!p.IsEmpty)
+                    {
+                        HasSwitchedMachineSinceLastCopy = true;
+
+                        Logger.LogDebug(string.Format(
+                            CultureInfo.CurrentCulture,
+                            "***** Host Machine: newDesMachineIdEx set = [{0}]. Mouse is now at ({1},{2})",
+                            MachineStuff.newDesMachineIdEx,
+                            e.X,
+                            e.Y));
+
+                        myLastX = e.X;
+                        myLastY = e.Y;
+
+                        PrepareToSwitchToMachine(MachineStuff.newDesMachineIdEx, p);
+                    }
+                }
+
+                if (MachineStuff.desMachineID != MachineID && MachineStuff.SwitchLocation.Count <= 0)
+                {
+                    MousePackage.Des = MachineStuff.desMachineID;
+                    MousePackage.Type = PackageType.Mouse;
+                    MousePackage.Md.dwFlags = e.dwFlags;
+                    MousePackage.Md.WheelDelta = e.WheelDelta;
+
+                    // Relative move
+                    if (Setting.Values.MoveMouseRelatively && Math.Abs(dx) >= MOVE_MOUSE_RELATIVE && Math.Abs(dy) >= MOVE_MOUSE_RELATIVE)
+                    {
+                        MousePackage.Md.X = dx;
+                        MousePackage.Md.Y = dy;
+                    }
+                    else
+                    {
+                        MousePackage.Md.X = (e.X - MachineStuff.primaryScreenBounds.Left) * 65535 / screenWidth;
+                        MousePackage.Md.Y = (e.Y - MachineStuff.primaryScreenBounds.Top) * 65535 / screenHeight;
+                    }
+
+                    SkSend(MousePackage, null, false);
+
+                    if (MousePackage.Md.dwFlags is WM_LBUTTONUP or WM_RBUTTONUP)
+                    {
+                        Thread.Sleep(10);
+                    }
+
+                    NativeMethods.GetCursorPos(ref actualLastPos);
+
+                    if (actualLastPos != Common.LastPos)
+                    {
+                        Logger.LogDebug($"Mouse cursor has moved unexpectedly: Expected: {Common.LastPos}, actual: {actualLastPos}.");
+                        Common.LastPos = actualLastPos;
+                    }
+                }
+
+#if SHOW_ON_WINLOGON_EX
+                if (RunOnLogonDesktop && e.dwFlags == WM_RBUTTONUP &&
+                    desMachineID == machineID &&
+                    e.x > 2 && e.x < 100 && e.y > 2 && e.y < 20)
+                {
+                    DoSomethingInUIThread(delegate()
+                    {
+                        MainForm.HideMenuWhenRunOnLogonDesktop();
+                        MainForm.MainMenu.Hide();
+                        MainForm.MainMenu.Show(e.x - 5, e.y - 3);
+                    });
+                }
+#endif
+            }
+            catch (Exception ex)
+            {
+                Logger.Log(ex);
+            }
+        }
+
+        internal static bool IsSwitchingByMouseEnabled()
+        {
+            return (EasyMouseOption)Setting.Values.EasyMouse == EasyMouseOption.Enable || InputHook.EasyMouseKeyDown;
+        }
+
+        internal static void PrepareToSwitchToMachine(ID newDesMachineID, Point desMachineXY)
+        {
+            Logger.LogDebug($"PrepareToSwitchToMachine: newDesMachineID = {newDesMachineID}, desMachineXY = {desMachineXY}");
+
+            if (((GetTick() - MachineStuff.lastJump < 100) && (GetTick() - MachineStuff.lastJump > 0)) || MachineStuff.desMachineID == ID.ALL)
+            {
+                Logger.LogDebug("PrepareToSwitchToMachine: lastJump");
+                return;
+            }
+
+            MachineStuff.lastJump = GetTick();
+
+            string newDesMachineName = MachineStuff.NameFromID(newDesMachineID);
+
+            if (!IsConnectedTo(newDesMachineID))
+            {// Connection lost, cancel switching
+                Logger.LogDebug("No active connection found for " + newDesMachineName);
+
+                // ShowToolTip("No active connection found for [" + newDesMachineName + "]!", 500);
+            }
+            else
+            {
+                MachineStuff.newDesMachineID = newDesMachineID;
+                MachineStuff.SwitchLocation.X = desMachineXY.X;
+                MachineStuff.SwitchLocation.Y = desMachineXY.Y;
+                MachineStuff.SwitchLocation.ResetCount();
+                _ = EvSwitch.Set();
+
+                // PostMessage(mainForm.Handle, WM_SWITCH, IntPtr.Zero, IntPtr.Zero);
+                if (newDesMachineID != DragDrop.DragMachine)
+                {
+                    if (!DragDrop.IsDragging && !DragDrop.IsDropping)
+                    {
+                        if (DragDrop.MouseDown && !RunOnLogonDesktop && !RunOnScrSaverDesktop)
+                        {
+                            DragDrop.DragDropStep02();
+                        }
+                    }
+                    else if (DragDrop.DragMachine != (ID)1)
+                    {
+                        DragDrop.ChangeDropMachine();
+                    }
+                }
+                else
+                {
+                    DragDrop.DragDropStep11();
+                }
+
+                // Change des machine
+                if (MachineStuff.desMachineID != newDesMachineID)
+                {
+                    Logger.LogDebug("MouseEvent: Switching to new machine:" + newDesMachineName);
+
+                    // Ask current machine to hide the Mouse cursor
+                    if (newDesMachineID != ID.ALL && MachineStuff.desMachineID != MachineID)
+                    {
+                        SendPackage(MachineStuff.desMachineID, PackageType.HideMouse);
+                    }
+
+                    DesMachineID = newDesMachineID;
+
+                    if (MachineStuff.desMachineID == MachineID)
+                    {
+                        if (GetTick() - clipboardCopiedTime < BIG_CLIPBOARD_DATA_TIMEOUT)
+                        {
+                            clipboardCopiedTime = 0;
+                            Common.GetRemoteClipboard("PrepareToSwitchToMachine");
+                        }
+                    }
+                    else
+                    {
+                        // Ask the new active machine to get clipboard data (if the data is too big)
+                        SendPackage(MachineStuff.desMachineID, PackageType.MachineSwitched);
+                    }
+
+                    _ = Interlocked.Increment(ref switchCount);
+                }
+            }
+        }
+
+        internal static void SaveSwitchCount()
+        {
+            if (SwitchCount > 0)
+            {
+                _ = Task.Run(() =>
+                {
+                    Setting.Values.SwitchCount += SwitchCount;
+                    _ = Interlocked.Exchange(ref switchCount, 0);
+                });
+            }
+        }
+
+        internal static void KeybdEvent(KEYBDDATA e)
+        {
+            try
+            {
+                PaintCount = 0;
+                if (MachineStuff.desMachineID != MachineStuff.newDesMachineID)
+                {
+                    Logger.LogDebug("KeybdEvent: Switching to new machine...");
+                    DesMachineID = MachineStuff.newDesMachineID;
+                }
+
+                if (MachineStuff.desMachineID != MachineID)
+                {
+                    KeybdPackage.Des = MachineStuff.desMachineID;
+                    KeybdPackage.Type = PackageType.Keyboard;
+                    KeybdPackage.Kd = e;
+                    KeybdPackage.DateTime = GetTick();
+                    SkSend(KeybdPackage, null, false);
+                    if (KeybdPackage.Kd.dwFlags is WM_KEYUP or WM_SYSKEYUP)
+                    {
+                        Thread.Sleep(10);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.Log(ex);
+            }
+        }
+    }
+}
--- a/src/modules/MouseWithoutBorders/App/Class/Common.Helper.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/Common.Helper.cs
@@ -0,0 +1,526 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Security.Principal;
+using System.Windows.Forms;
+
+// <summary>
+//     Some other helper methods.
+// </summary>
+// <history>
+//     2008 created by Truong Do (ductdo).
+//     2009-... modified by Truong Do (TruongDo).
+//     2023- Included in PowerToys.
+// </history>
+using Microsoft.Win32;
+using MouseWithoutBorders.Class;
+using MouseWithoutBorders.Core;
+using static System.Windows.Forms.Control;
+
+namespace MouseWithoutBorders
+{
+    internal partial class Common
+    {
+        internal const string HELPER_FORM_TEXT = "Mouse without Borders Helper";
+        internal const string HelperProcessName = "PowerToys.MouseWithoutBordersHelper";
+        private static bool signalHelperToExit;
+        private static bool signalWatchDogToExit;
+        internal static long WndProcCounter;
+
+        private static void WatchDogThread()
+        {
+            long oldCounter = WndProcCounter;
+
+            do
+            {
+                for (int i = 0; i < 10; i++)
+                {
+                    Thread.Sleep(1000);
+
+                    if (signalWatchDogToExit)
+                    {
+                        break;
+                    }
+                }
+
+                while (BlockingUI)
+                {
+                    Thread.Sleep(1000);
+                }
+
+                if (WndProcCounter == oldCounter)
+                {
+                    Process p = Process.GetCurrentProcess();
+                    string procInfo = $"{p.PrivateMemorySize64 / 1024 / 1024}MB, {p.TotalProcessorTime}, {Environment.ProcessorCount}.";
+                    string threadStacks = $"{procInfo} {Thread.DumpThreadsStack()}";
+                    Logger.TelemetryLogTrace(threadStacks, SeverityLevel.Error);
+                    break;
+                }
+
+                oldCounter = WndProcCounter;
+            }
+            while (true);
+        }
+
+        private static void HelperThread()
+        {
+            // SuppressFlow fixes an issue on service mode, where the helper process can't get enough permissions to be started again.
+            // More details can be found on: https://github.com/microsoft/PowerToys/pull/36892
+            using var asyncFlowControl = System.Threading.ExecutionContext.SuppressFlow();
+
+            try
+            {
+                while (true)
+                {
+                    _ = EvSwitch.WaitOne(); // Switching to another machine?
+
+                    if (signalHelperToExit)
+                    {
+                        break;
+                    }
+
+                    if (MachineStuff.NewDesMachineID != Common.MachineID && MachineStuff.NewDesMachineID != ID.ALL)
+                    {
+                        HideMouseCursor(false);
+                        Common.MainFormDotEx(true);
+                    }
+                    else
+                    {
+                        if (MachineStuff.SwitchLocation.Count > 0)
+                        {
+                            MachineStuff.SwitchLocation.Count--;
+
+                            // When we want to move mouse by pixels, we add 300k to x and y (search for XY_BY_PIXEL for other related code).
+                            Logger.LogDebug($"+++++ Moving mouse to {MachineStuff.SwitchLocation.X}, {MachineStuff.SwitchLocation.Y}");
+
+                            // MaxXY = 65535 so 100k is safe.
+                            if (MachineStuff.SwitchLocation.X > XY_BY_PIXEL - 100000 || MachineStuff.SwitchLocation.Y > XY_BY_PIXEL - 100000)
+                            {
+                                InputSimulation.MoveMouse(MachineStuff.SwitchLocation.X - XY_BY_PIXEL, MachineStuff.SwitchLocation.Y - XY_BY_PIXEL);
+                            }
+                            else
+                            {
+                                InputSimulation.MoveMouseEx(MachineStuff.SwitchLocation.X, MachineStuff.SwitchLocation.Y);
+                            }
+
+                            Common.MainFormDot();
+                        }
+                    }
+
+                    if (MachineStuff.NewDesMachineID == Common.MachineID)
+                    {
+                        ReleaseAllKeys();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                Logger.Log(e);
+            }
+
+            signalHelperToExit = false;
+            Logger.LogDebug("^^^Helper Thread exiting...^^^");
+        }
+
+        internal static void MainFormDotEx(bool bCheckTS)
+        {
+            Logger.LogDebug("***** MainFormDotEx:");
+
+            if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop)
+            {
+                int left = MachineStuff.PrimaryScreenBounds.Left + ((MachineStuff.PrimaryScreenBounds.Right - MachineStuff.PrimaryScreenBounds.Left) / 2) - 1;
+                int top = Setting.Values.HideMouse ? 3 : MachineStuff.PrimaryScreenBounds.Top + ((MachineStuff.PrimaryScreenBounds.Bottom - MachineStuff.PrimaryScreenBounds.Top) / 2);
+
+                Common.MainFormVisible = true;
+
+                if (Setting.Values.HideMouse && Setting.Values.StealFocusWhenSwitchingMachine && Common.SendMessageToHelper(0x407, new IntPtr(left), new IntPtr(top), true) == 0)
+                {
+                    try
+                    {
+                        /* When user just switches to the Logon desktop, user is actually on the "Windows Default Lock Screen" (LockApp).
+                         * If a click is sent to this during switch, it actually triggers a desktop switch on the local machine causing a reconnection affecting the machine switch.
+                         * We can detect and skip in this case.
+                         * */
+                        IntPtr foreGroundWindow = NativeMethods.GetForegroundWindow();
+                        string foreGroundWindowText = GetText(foreGroundWindow);
+
+                        bool mouseClick = true;
+
+                        if (foreGroundWindowText.Equals("Windows Default Lock Screen", StringComparison.OrdinalIgnoreCase))
+                        {
+                            mouseClick = false;
+                        }
+
+                        // Window title may be localized, check process name:
+                        if (mouseClick)
+                        {
+                            _ = NativeMethods.GetWindowThreadProcessId(foreGroundWindow, out uint pid);
+
+                            if (pid > 0)
+                            {
+                                string foreGroundWindowProcess = Process.GetProcessById((int)pid)?.ProcessName;
+
+                                if (foreGroundWindowProcess.Equals("LockApp", StringComparison.OrdinalIgnoreCase))
+                                {
+                                    mouseClick = false;
+                                }
+                            }
+                        }
+
+                        if (mouseClick)
+                        {
+                            InputSimulation.MouseClickDotForm(left + 1, top + 1);
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.Log(e);
+                    }
+                }
+            }
+
+            CustomCursor.ShowFakeMouseCursor(int.MinValue, int.MinValue);
+        }
+
+        internal static void MainForm3Pixels()
+        {
+            Logger.LogDebug("***** MainFormDotLarge:");
+
+            DoSomethingInUIThread(
+                () =>
+            {
+                MainForm.Left = MachineStuff.PrimaryScreenBounds.Left + ((MachineStuff.PrimaryScreenBounds.Right - MachineStuff.PrimaryScreenBounds.Left) / 2) - 2;
+                MainForm.Top = Setting.Values.HideMouse ? 3 : MachineStuff.PrimaryScreenBounds.Top + ((MachineStuff.PrimaryScreenBounds.Bottom - MachineStuff.PrimaryScreenBounds.Top) / 2) - 1;
+                MainForm.Width = 3;
+                MainForm.Height = 3;
+                MainForm.Opacity = 0.11D;
+                MainForm.TopMost = true;
+
+                if (Setting.Values.HideMouse)
+                {
+                    MainForm.BackColor = Color.Black;
+                    MainForm.Show();
+                    Common.MainFormVisible = true;
+                }
+                else
+                {
+                    MainForm.BackColor = Color.White;
+                    MainForm.Hide();
+                    Common.MainFormVisible = false;
+                }
+            },
+                true);
+
+            CustomCursor.ShowFakeMouseCursor(int.MinValue, int.MinValue);
+        }
+
+        internal static void MainFormDot()
+        {
+            DoSomethingInUIThread(
+                () =>
+                {
+                    _ = Common.SendMessageToHelper(0x408, IntPtr.Zero, IntPtr.Zero, false);
+
+                    MainForm.Left = MachineStuff.PrimaryScreenBounds.Left + ((MachineStuff.PrimaryScreenBounds.Right - MachineStuff.PrimaryScreenBounds.Left) / 2) - 1;
+                    MainForm.Top = Setting.Values.HideMouse ? 3 : MachineStuff.PrimaryScreenBounds.Top + ((MachineStuff.PrimaryScreenBounds.Bottom - MachineStuff.PrimaryScreenBounds.Top) / 2);
+                    MainForm.Width = 1;
+                    MainForm.Height = 1;
+                    MainForm.Opacity = 0.15;
+                    MainForm.Hide();
+                    Common.MainFormVisible = false;
+                },
+                true);
+
+            CustomCursor.ShowFakeMouseCursor(int.MinValue, int.MinValue);
+        }
+
+        internal static void ToggleIcon()
+        {
+            try
+            {
+                if (toggleIconsIndex < TOGGLE_ICONS_SIZE)
+                {
+                    Common.DoSomethingInUIThread(() => Common.MainForm.ChangeIcon(toggleIcons[toggleIconsIndex++]));
+                }
+                else
+                {
+                    toggleIconsIndex = 0;
+                    toggleIcons = null;
+                }
+            }
+            catch (Exception e)
+            {
+                Logger.Log(e);
+            }
+        }
+
+        internal static void RunDDHelper(bool cleanUp = false)
+        {
+            if (Common.RunOnLogonDesktop || Common.RunOnScrSaverDesktop)
+            {
+                return;
+            }
+
+            if (cleanUp)
+            {
+                try
+                {
+                    Process[] ps = Process.GetProcessesByName(HelperProcessName);
+                    foreach (Process p in ps)
+                    {
+                        p.KillProcess();
+                    }
+                }
+                catch (Exception e)
+                {
+                    Logger.Log(e);
+                    _ = Common.SendMessageToHelper(SharedConst.QUIT_CMD, IntPtr.Zero, IntPtr.Zero);
+                }
+
+                return;
+            }
+
+            if (!Common.IsMyDesktopActive())
+            {
+                return;
+            }
+
+            if (!Common.IpcChannelCreated)
+            {
+                Logger.TelemetryLogTrace($"{nameof(Common.IpcChannelCreated)} = {Common.IpcChannelCreated}. {Logger.GetStackTrace(new StackTrace())}", SeverityLevel.Warning);
+                return;
+            }
+
+            if (!MainForm.IsDisposed)
+            {
+                MainForm.NotifyIcon.Visible = false;
+                MainForm.NotifyIcon.Visible = Setting.Values.ShowOriginalUI;
+            }
+
+            IntPtr h = (IntPtr)NativeMethods.FindWindow(null, Common.HELPER_FORM_TEXT);
+
+            if (h.ToInt32() <= 0)
+            {
+                _ = Common.CreateProcessInInputDesktopSession(
+                    $"\"{Path.GetDirectoryName(Application.ExecutablePath)}\\{HelperProcessName}.exe\"",
+                    string.Empty,
+                    Common.GetInputDesktop(),
+                    0);
+
+                HasSwitchedMachineSinceLastCopy = true;
+
+                // Common.CreateLowIntegrityProcess("\"" + Path.GetDirectoryName(Application.ExecutablePath) + "\\MouseWithoutBordersHelper.exe\"", string.Empty, 0, false, 0);
+                var processes = Process.GetProcessesByName(HelperProcessName);
+                if (processes?.Length == 0)
+                {
+                    Logger.Log("Unable to start helper process.");
+                    Common.ShowToolTip("Error starting Mouse Without Borders Helper, clipboard sharing will not work!", 5000, ToolTipIcon.Error);
+                }
+                else
+                {
+                    Logger.Log("Helper process started.");
+                }
+            }
+            else
+            {
+                var processes = Process.GetProcessesByName(HelperProcessName);
+                if (processes?.Length > 0)
+                {
+                    Logger.Log("Helper process found running.");
+                }
+                else
+                {
+                    Logger.Log("Invalid helper process found running.");
+                    Common.ShowToolTip("Error finding Mouse Without Borders Helper, clipboard sharing will not work!", 5000, ToolTipIcon.Error);
+                }
+            }
+        }
+
+        internal static int SendMessageToHelper(int msg, IntPtr wparam, IntPtr lparam, bool wait = true, bool log = true)
+        {
+            int h = NativeMethods.FindWindow(null, Common.HELPER_FORM_TEXT);
+            int rv = -1;
+
+            if (h > 0)
+            {
+                rv = wait
+                    ? (int)NativeMethods.SendMessage((IntPtr)h, msg, wparam, lparam)
+                    : NativeMethods.PostMessage((IntPtr)h, msg, wparam, lparam) ? 1 : 0;
+            }
+
+            if (log)
+            {
+                Logger.LogDebug($"SendMessageToHelper: HelperWindow={h}, Return={rv}, msg={msg}, w={wparam.ToInt32()}, l={lparam.ToInt32()}, Post={!wait}");
+            }
+
+            return rv;
+        }
+
+        internal static bool IsWindows8AndUp()
+        {
+            return (Environment.OSVersion.Version.Major == 6 && Environment.OSVersion.Version.Minor >= 2)
+                || Environment.OSVersion.Version.Major > 6;
+        }
+
+        internal static string GetMiniLog(IEnumerable<ControlCollection> optionControls)
+        {
+            string log = string.Empty;
+
+            log += "=============================================================================================================================\r\n";
+            log += $"{Application.ProductName} version {Application.ProductVersion}\r\n";
+
+            log += $"{Setting.Values.Username}/{GetDebugInfo(MyKey)}\r\n";
+            log += $"{MachineName}/{MachineID}/{DesMachineID}\r\n";
+            log += $"Id: {Setting.Values.DeviceId}\r\n";
+            log += $"Matrix: {string.Join(",", MachineStuff.MachineMatrix)}\r\n";
+            log += $"McPool: {Setting.Values.MachinePoolString}\r\n";
+
+            log += "\r\nOPTIONS:\r\n";
+
+            foreach (ControlCollection controlCollection in optionControls)
+            {
+                foreach (object c in controlCollection)
+                {
+                    if (c is CheckBox checkBox)
+                    {
+                        log += $"({(checkBox.Checked ? 1 : 0)}) {checkBox.Text}\r\n";
+                        continue;
+                    }
+
+                    if (c is RadioButton radioButton)
+                    {
+                        log += $"({(radioButton.Checked ? 1 : 0)}) {radioButton.Name}.[{radioButton.Text}]\r\n";
+                        continue;
+                    }
+
+                    if (c is ComboBox comboBox)
+                    {
+                        log += $"{comboBox.Name} = {comboBox.Text}\r\n";
+                        continue;
+                    }
+                }
+            }
+
+            log += "\r\n";
+
+            SocketStuff sk = Sk;
+
+            if (sk?.TcpSockets != null)
+            {
+                foreach (TcpSk tcp in sk.TcpSockets)
+                {
+                    log += $"{Common.MachineName}{(tcp.IsClient ? "=>" : "<=")}{tcp.MachineName}({tcp.MachineId}):{tcp.Status}\r\n";
+                }
+            }
+
+            log += string.Format(CultureInfo.CurrentCulture, "Helper:{0}\r\n", SendMessageToHelper(0x400, IntPtr.Zero, IntPtr.Zero));
+
+            log += Setting.Values.LastPersonalizeLogonScr + "\r\n";
+            log += "Name2IP =\r\n" + Setting.Values.Name2IP + "\r\n";
+
+            log += "Last 10 trace messages:\r\n";
+
+            log += string.Join(Environment.NewLine, Logger.LogCounter.Select(item => $"({item.Value}): {item.Key}").Take(10));
+
+            log += "\r\n=============================================================================================================================";
+
+            return log;
+        }
+
+        internal static bool GetUserName()
+        {
+            if (string.IsNullOrEmpty(Setting.Values.Username) && !Common.RunOnLogonDesktop)
+            {
+                if (Program.User.Contains("system", StringComparison.CurrentCultureIgnoreCase))
+                {
+                    _ = Common.ImpersonateLoggedOnUserAndDoSomething(() =>
+                    {
+                        // See: https://stackoverflow.com/questions/19487541/how-to-get-windows-user-name-from-sessionid
+                        static string GetUsernameBySessionId(int sessionId)
+                        {
+                            string username = "SYSTEM";
+                            if (NativeMethods.WTSQuerySessionInformation(IntPtr.Zero, sessionId, NativeMethods.WTSInfoClass.WTSUserName, out nint buffer, out int strLen) && strLen > 1)
+                            {
+                                username = Marshal.PtrToStringAnsi(buffer);
+                                NativeMethods.WTSFreeMemory(buffer);
+
+                                if (NativeMethods.WTSQuerySessionInformation(IntPtr.Zero, sessionId, NativeMethods.WTSInfoClass.WTSDomainName, out buffer, out strLen) && strLen > 1)
+                                {
+                                    username = @$"{Marshal.PtrToStringAnsi(buffer)}\{username}";
+                                    NativeMethods.WTSFreeMemory(buffer);
+                                }
+                            }
+
+                            return username;
+                        }
+
+                        // The most direct way to fetch the username is WindowsIdentity.GetCurrent(true).Name
+                        // but GetUserName can run within an ExecutionContext.SuppressFlow block, which creates issues
+                        // with WindowsIdentity.GetCurrent.
+                        // See: https://stackoverflow.com/questions/76998988/exception-when-using-executioncontext-suppressflow-in-net-7
+                        // So we use WTSQuerySessionInformation as a workaround.
+                        Setting.Values.Username = GetUsernameBySessionId(Process.GetCurrentProcess().SessionId);
+                    });
+                }
+                else
+                {
+                    Setting.Values.Username = Program.User;
+                }
+
+                Logger.LogDebug("[Username] = " + Setting.Values.Username);
+            }
+
+            return !string.IsNullOrEmpty(Setting.Values.Username);
+        }
+
+        internal static void ShowOneWayModeMessage()
+        {
+            ToggleShowTopMostMessage(
+    @"
+Due to Security Controls, a remote device cannot control a SAW device.
+Please use the keyboard and Mouse from the SAW device.
+(Press Esc to hide this message)
+",
+    string.Empty,
+    10);
+        }
+
+        internal static void ApplyCADSetting()
+        {
+            try
+            {
+                if (Setting.Values.DisableCAD)
+                {
+                    RegistryKey k = Registry.LocalMachine.CreateSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System");
+                    if (k != null)
+                    {
+                        k.SetValue("DisableCAD", 1, RegistryValueKind.DWord);
+                        k.Close();
+                    }
+                }
+                else
+                {
+                    RegistryKey k = Registry.LocalMachine.CreateSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System");
+                    if (k != null)
+                    {
+                        k.SetValue("DisableCAD", 0, RegistryValueKind.DWord);
+                        k.Close();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                Logger.Log(e);
+            }
+        }
+    }
+}
--- a/src/modules/MouseWithoutBorders/App/Class/Common.InitAndCleanup.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/Common.InitAndCleanup.cs
@@ -93,7 +93,7 @@ namespace MouseWithoutBorders

        internal static void Init()
        {
-            _ = Helper.GetUserName();
+            _ = Common.GetUserName();
            Common.GeneratedKey = true;

            try
@@ -148,7 +148,7 @@ namespace MouseWithoutBorders

        private static void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)
        {
-            Helper.WndProcCounter++;
+            Common.WndProcCounter++;

            if (e.Mode is PowerModes.Resume or PowerModes.Suspend)
            {
@@ -167,21 +167,21 @@ namespace MouseWithoutBorders
            watchDogThread.Start();
            */

-            helper = new Thread(new ThreadStart(Helper.HelperThread), "Helper Thread");
+            helper = new Thread(new ThreadStart(HelperThread), "Helper Thread");
            helper.SetApartmentState(ApartmentState.STA);
            helper.Start();
        }

        private static void AskHelperThreadsToExit(int waitTime)
        {
-            Helper.signalHelperToExit = true;
-            Helper.signalWatchDogToExit = true;
+            signalHelperToExit = true;
+            signalWatchDogToExit = true;
            _ = EvSwitch.Set();

            int c = 0;
            if (helper != null && c < waitTime)
            {
-                while (Helper.signalHelperToExit)
+                while (signalHelperToExit)
                {
                    Thread.Sleep(1);
                }
@@ -251,7 +251,7 @@ namespace MouseWithoutBorders
        private static void NetworkChange_NetworkAvailabilityChanged(object sender, NetworkAvailabilityEventArgs e)
        {
            Logger.LogDebug("NetworkAvailabilityEventArgs.IsAvailable: " + e.IsAvailable.ToString(CultureInfo.InvariantCulture));
-            Helper.WndProcCounter++;
+            Common.WndProcCounter++;
            ScheduleReopenSocketsDueToNetworkChanges(!e.IsAvailable);
        }

--- a/src/modules/MouseWithoutBorders/App/Class/Common.Launch.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/Common.Launch.cs
@@ -0,0 +1,314 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Globalization;
+using System.Runtime.InteropServices;
+using System.Security.Principal;
+
+// <summary>
+//     Impersonation.
+// </summary>
+// <history>
+//     2008 created by Truong Do (ductdo).
+//     2009-... modified by Truong Do (TruongDo).
+//     2023- Included in PowerToys.
+// </history>
+using MouseWithoutBorders.Class;
+using MouseWithoutBorders.Core;
+
+namespace MouseWithoutBorders
+{
+    internal partial class Common
+    {
+        internal static bool RunElevated()
+        {
+            return WindowsIdentity.GetCurrent().Owner.IsWellKnown(WellKnownSidType.BuiltinAdministratorsSid);
+        }
+
+        internal static bool ImpersonateLoggedOnUserAndDoSomething(Action targetFunc)
+        {
+            if (Common.RunWithNoAdminRight)
+            {
+                targetFunc();
+                return true;
+            }
+            else
+            {
+                // SuppressFlow fixes an issue on service mode, where WTSQueryUserToken runs successfully once and then fails
+                // on subsequent calls. The reason appears to be an unknown issue with reverting the impersonation,
+                // meaning that subsequent impersonation attempts run as the logged-on user and fail.
+                // This is a workaround.
+                using var asyncFlowControl = System.Threading.ExecutionContext.SuppressFlow();
+
+                uint dwSessionId;
+                IntPtr hUserToken = IntPtr.Zero, hUserTokenDup = IntPtr.Zero;
+                try
+                {
+                    dwSessionId = (uint)Process.GetCurrentProcess().SessionId;
+                    uint rv = NativeMethods.WTSQueryUserToken(dwSessionId, ref hUserToken);
+                    var lastError = rv == 0 ? Marshal.GetLastWin32Error() : 0;
+
+                    Logger.LogDebug($"{nameof(NativeMethods.WTSQueryUserToken)} returned {rv.ToString(CultureInfo.CurrentCulture)}");
+
+                    if (rv == 0)
+                    {
+                        Logger.Log($"{nameof(NativeMethods.WTSQueryUserToken)} failed with: {lastError}.");
+                        return false;
+                    }
+
+                    if (!NativeMethods.DuplicateToken(hUserToken, (int)NativeMethods.SECURITY_IMPERSONATION_LEVEL.SecurityImpersonation, ref hUserTokenDup))
+                    {
+                        Logger.TelemetryLogTrace($"{nameof(NativeMethods.DuplicateToken)} Failed! {Logger.GetStackTrace(new StackTrace())}", SeverityLevel.Warning);
+                        _ = NativeMethods.CloseHandle(hUserToken);
+                        _ = NativeMethods.CloseHandle(hUserTokenDup);
+                        return false;
+                    }
+
+                    if (NativeMethods.ImpersonateLoggedOnUser(hUserTokenDup))
+                    {
+                        targetFunc();
+                        _ = NativeMethods.RevertToSelf();
+                        _ = NativeMethods.CloseHandle(hUserToken);
+                        _ = NativeMethods.CloseHandle(hUserTokenDup);
+                        return true;
+                    }
+                    else
+                    {
+                        Logger.Log("ImpersonateLoggedOnUser Failed!");
+                        _ = NativeMethods.CloseHandle(hUserToken);
+                        _ = NativeMethods.CloseHandle(hUserTokenDup);
+                        return false;
+                    }
+                }
+                catch (Exception e)
+                {
+                    Logger.Log(e);
+                    return false;
+                }
+            }
+        }
+
+        internal static int CreateProcessInInputDesktopSession(string commandLine, string arg, string desktop, short wShowWindow, bool lowIntegrity = false)
+
+        // As user who runs explorer.exe
+        {
+            if (!Program.User.Contains("system", StringComparison.InvariantCultureIgnoreCase))
+            {
+                ProcessStartInfo s = new(commandLine, arg);
+                s.WindowStyle = wShowWindow != 0 ? ProcessWindowStyle.Normal : ProcessWindowStyle.Hidden;
+                Process p = Process.Start(s);
+
+                return p == null ? 0 : p.Id;
+            }
+
+            string commandLineWithArg = commandLine + " " + arg;
+            int lastError;
+            int dwSessionId;
+            IntPtr hUserToken = IntPtr.Zero, hUserTokenDup = IntPtr.Zero;
+
+            Logger.LogDebug("CreateProcessInInputDesktopSession called, launching " + commandLineWithArg + " on " + desktop);
+
+            try
+            {
+                dwSessionId = Process.GetCurrentProcess().SessionId;
+
+                // Get the user token used by DuplicateTokenEx
+                lastError = (int)NativeMethods.WTSQueryUserToken((uint)dwSessionId, ref hUserToken);
+
+                NativeMethods.STARTUPINFO si = default;
+                si.cb = Marshal.SizeOf(si);
+                si.lpDesktop = "winsta0\\" + desktop;
+                si.wShowWindow = wShowWindow;
+
+                NativeMethods.SECURITY_ATTRIBUTES sa = default;
+                sa.Length = Marshal.SizeOf(sa);
+
+                if (!NativeMethods.DuplicateTokenEx(hUserToken, NativeMethods.MAXIMUM_ALLOWED, ref sa, (int)NativeMethods.SECURITY_IMPERSONATION_LEVEL.SecurityIdentification, (int)NativeMethods.TOKEN_TYPE.TokenPrimary, ref hUserTokenDup))
+                {
+                    lastError = Marshal.GetLastWin32Error();
+                    Logger.Log(string.Format(CultureInfo.CurrentCulture, "DuplicateTokenEx error: {0} Token does not have the privilege.", lastError));
+                    _ = NativeMethods.CloseHandle(hUserToken);
+                    return 0;
+                }
+
+                if (lowIntegrity)
+                {
+                    NativeMethods.TOKEN_MANDATORY_LABEL tIL;
+
+                    // Low
+                    string sIntegritySid = "S-1-16-4096";
+
+                    bool rv = NativeMethods.ConvertStringSidToSid(sIntegritySid, out IntPtr pIntegritySid);
+
+                    if (!rv)
+                    {
+                        Logger.Log("ConvertStringSidToSid failed");
+                        _ = NativeMethods.CloseHandle(hUserToken);
+                        _ = NativeMethods.CloseHandle(hUserTokenDup);
+                        return 0;
+                    }
+
+                    tIL.Label.Attributes = NativeMethods.SE_GROUP_INTEGRITY;
+                    tIL.Label.Sid = pIntegritySid;
+
+                    rv = NativeMethods.SetTokenInformation(hUserTokenDup, NativeMethods.TOKEN_INFORMATION_CLASS.TokenIntegrityLevel, ref tIL, (uint)Marshal.SizeOf(tIL) + (uint)IntPtr.Size);
+
+                    if (!rv)
+                    {
+                        Logger.Log("SetTokenInformation failed");
+                        _ = NativeMethods.CloseHandle(hUserToken);
+                        _ = NativeMethods.CloseHandle(hUserTokenDup);
+                        return 0;
+                    }
+                }
+
+                uint dwCreationFlags = NativeMethods.NORMAL_PRIORITY_CLASS | NativeMethods.CREATE_NEW_CONSOLE;
+                IntPtr pEnv = IntPtr.Zero;
+
+                if (NativeMethods.CreateEnvironmentBlock(ref pEnv, hUserTokenDup, true))
+                {
+                    dwCreationFlags |= NativeMethods.CREATE_UNICODE_ENVIRONMENT;
+                }
+                else
+                {
+                    pEnv = IntPtr.Zero;
+                }
+
+                _ = NativeMethods.CreateProcessAsUser(
+                    hUserTokenDup,        // client's access token
+                    null,                   // file to execute
+                    commandLineWithArg,     // command line
+                    ref sa,                 // pointer to process SECURITY_ATTRIBUTES
+                    ref sa,                 // pointer to thread SECURITY_ATTRIBUTES
+                    false,                  // handles are not inheritable
+                    (int)dwCreationFlags,   // creation flags
+                    pEnv,                   // pointer to new environment block
+                    null,                   // name of current directory
+                    ref si,                 // pointer to STARTUPINFO structure
+                    out NativeMethods.PROCESS_INFORMATION pi); // receives information about new process
+
+                // GetLastError should be 0
+                int iResultOfCreateProcessAsUser = Marshal.GetLastWin32Error();
+                Logger.LogDebug("CreateProcessAsUser returned " + iResultOfCreateProcessAsUser.ToString(CultureInfo.CurrentCulture));
+
+                // Close handles task
+                _ = NativeMethods.CloseHandle(hUserToken);
+                _ = NativeMethods.CloseHandle(hUserTokenDup);
+
+                return (iResultOfCreateProcessAsUser == 0) ? (int)pi.dwProcessId : 0;
+            }
+            catch (Exception e)
+            {
+                Logger.Log(e);
+                return 0;
+            }
+        }
+
+#if CUSTOMIZE_LOGON_SCREEN
+        internal static bool CreateLowIntegrityProcess(string commandLine, string args, int wait, bool killIfTimedOut, long limitedMem, short wShowWindow = 0)
+        {
+            int processId = CreateProcessInInputDesktopSession(commandLine, args, "default", wShowWindow, true);
+
+            if (processId <= 0)
+            {
+                return false;
+            }
+
+            if (wait > 0)
+            {
+                if (limitedMem > 0)
+                {
+                    int sec = 0;
+                    while (true)
+                    {
+                        Process p;
+
+                        try
+                        {
+                            if ((p = Process.GetProcessById(processId)) == null)
+                            {
+                                Logger.Log("Process exited!");
+                                break;
+                            }
+                        }
+                        catch (ArgumentException)
+                        {
+                            Logger.Log("GetProcessById.ArgumentException");
+                            break;
+                        }
+
+                        if ((!p.HasExited && p.PrivateMemorySize64 > limitedMem) || (++sec > (wait / 1000)))
+                        {
+                            Logger.Log(string.Format(CultureInfo.CurrentCulture, "Process log (mem): {0}, {1}", sec, p.PrivateMemorySize64));
+                            return false;
+                        }
+
+                        Thread.Sleep(1000);
+                    }
+                }
+                else
+                {
+                    Process p;
+
+                    if ((p = Process.GetProcessById(processId)) == null)
+                    {
+                        Logger.Log("Process exited!");
+                    }
+                    else if (NativeMethods.WaitForSingleObject(p.Handle, wait) != NativeMethods.WAIT_OBJECT_0 && killIfTimedOut)
+                    {
+                        Logger.Log("Process log (time).");
+                        TerminateProcessTree(p.Handle, (uint)processId, -1);
+                        return false;
+                    }
+                }
+            }
+
+            return true;
+        }
+
+        internal static void TerminateProcessTree(IntPtr hProcess, uint processID, int exitCode)
+        {
+            if (processID > 0 && hProcess.ToInt32() > 0)
+            {
+                Process[] processes = Process.GetProcesses();
+                int dwSessionId = Process.GetCurrentProcess().SessionId;
+
+                foreach (Process p in processes)
+                {
+                    if (p.SessionId == dwSessionId)
+                    {
+                        NativeMethods.PROCESS_BASIC_INFORMATION processBasicInformation = default;
+
+                        try
+                        {
+                            if (NativeMethods.NtQueryInformationProcess(p.Handle, 0, ref processBasicInformation, (uint)Marshal.SizeOf(processBasicInformation), out uint bytesWritten) >= 0)
+                            {// NT_SUCCESS(...)
+                                if (processBasicInformation.InheritedFromUniqueProcessId == processID)
+                                {
+                                    TerminateProcessTree(p.Handle, processBasicInformation.UniqueProcessId, exitCode);
+                                }
+                            }
+                        }
+                        catch (InvalidOperationException e)
+                        {
+                            Logger.Log(e);
+                            continue;
+                        }
+                        catch (Win32Exception e)
+                        {
+                            Logger.Log(e);
+                            continue;
+                        }
+                    }
+                }
+
+                _ = NativeMethods.TerminateProcess(hProcess, (IntPtr)exitCode);
+            }
+        }
+#endif
+    }
+}
--- a/src/modules/MouseWithoutBorders/App/Class/Common.Service.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/Common.Service.cs
@@ -0,0 +1,161 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Linq;
+using System.ServiceProcess;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+// <summary>
+//     Service control code.
+// </summary>
+// <history>
+//     2008 created by Truong Do (ductdo).
+//     2009-... modified by Truong Do (TruongDo).
+//     2023- Included in PowerToys.
+// </history>
+using MouseWithoutBorders.Class;
+using MouseWithoutBorders.Core;
+
+[module: SuppressMessage("Microsoft.Globalization", "CA1300:SpecifyMessageBoxOptions", Scope = "member", Target = "MouseWithoutBorders.Common.#StartMouseWithoutBordersService()", Justification = "Dotnet port with style preservation")]
+
+namespace MouseWithoutBorders
+{
+    internal partial class Common
+    {
+        private static bool shownErrMessage;
+        private static DateTime lastStartServiceTime = DateTime.UtcNow;
+
+        internal static void StartMouseWithoutBordersService(string desktopToRunMouseWithoutBordersOn = null, string startTag1 = "byapp", string startTag2 = null)
+        {
+            // NOTE(@yuyoyuppe): the new flow assumes we run both mwb processes directly from the svc.
+            if (Common.RunWithNoAdminRight || true)
+            {
+                return;
+            }
+
+            Logger.Log($"{nameof(StartMouseWithoutBordersService)}: {Logger.GetStackTrace(new StackTrace())}.");
+
+            Task task = Task.Run(() =>
+            {
+                Process[] ps = Process.GetProcessesByName("MouseWithoutBordersSvc");
+
+                if (ps.Length != 0)
+                {
+                    if (DateTime.UtcNow - lastStartServiceTime < TimeSpan.FromSeconds(5))
+                    {
+                        Logger.Log($"{nameof(StartMouseWithoutBordersService)}: Aborted.");
+                        return;
+                    }
+
+                    foreach (Process pp in ps)
+                    {
+                        Logger.Log(string.Format(CultureInfo.InvariantCulture, "Killing process MouseWithoutBordersSvc {0}.", pp.Id));
+                        pp.KillProcess();
+                    }
+                }
+
+                lastStartServiceTime = DateTime.UtcNow;
+                ServiceController service = new("MouseWithoutBordersSvc");
+
+                try
+                {
+                    Logger.Log("Starting " + service.ServiceName);
+                }
+                catch (Exception)
+                {
+                    if (!shownErrMessage)
+                    {
+                        shownErrMessage = true;
+                        _ = MessageBox.Show(
+                            Application.ProductName + " is not installed yet, please run Setup.exe first!",
+                            Application.ProductName,
+                            MessageBoxButtons.OK,
+                            MessageBoxIcon.Error);
+                    }
+
+                    return;
+                }
+
+                try
+                {
+                    int c = 0;
+
+                    while (service.Status != ServiceControllerStatus.Stopped && c++ < 5)
+                    {
+                        Thread.Sleep(1000);
+                        service = new ServiceController("MouseWithoutBordersSvc");
+                    }
+
+                    if (string.IsNullOrWhiteSpace(desktopToRunMouseWithoutBordersOn))
+                    {
+                        startTag2 ??= Process.GetCurrentProcess().SessionId.ToString(CultureInfo.InvariantCulture);
+                        service.Start(new string[] { startTag1, startTag2 });
+                    }
+                    else
+                    {
+                        service.Start(new string[] { desktopToRunMouseWithoutBordersOn });
+                    }
+                }
+                catch (Exception e)
+                {
+                    Logger.Log(e);
+
+                    // ERROR_SERVICE_ALREADY_RUNNING
+                    if (!(shownErrMessage || ((e?.InnerException as Win32Exception)?.NativeErrorCode == 1056)))
+                    {
+                        shownErrMessage = true;
+                        _ = MessageBox.Show(
+                            "Cannot start service " + service.ServiceName + ": " + e.Message,
+                            Common.BinaryName,
+                            MessageBoxButtons.OK,
+                            MessageBoxIcon.Error);
+                    }
+
+                    return;
+                }
+            });
+
+            // Wait for the task while not blocking the UI thread.
+            do
+            {
+                MMSleep(1);
+
+                if (task.IsCanceled || task.IsCompleted || task.IsFaulted)
+                {
+                    break;
+                }
+            }
+            while (true);
+        }
+
+        internal static void StartServiceAndSendLogoffSignal()
+        {
+            try
+            {
+                Process[] p = Process.GetProcessesByName("winlogon");
+                Process me = Process.GetCurrentProcess();
+                string myWinlogon = p?.FirstOrDefault(item => item.SessionId == me.SessionId)?.Id.ToString(CultureInfo.InvariantCulture) ?? null;
+
+                if (string.IsNullOrWhiteSpace(myWinlogon))
+                {
+                    StartMouseWithoutBordersService(null, "logoff");
+                }
+                else
+                {
+                    StartMouseWithoutBordersService(null, "logoff", myWinlogon);
+                }
+            }
+            catch (Exception e)
+            {
+                Logger.Log($"{nameof(StartServiceAndSendLogoffSignal)}: {e.Message}");
+            }
+        }
+    }
+}
--- a/src/modules/MouseWithoutBorders/App/Class/Common.WinAPI.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/Common.WinAPI.cs
@@ -269,7 +269,7 @@ namespace MouseWithoutBorders
            if (!Common.RunWithNoAdminRight)
            {
                Logger.LogDebug("*** Starting on active Desktop: " + desktopToRunMouseWithoutBordersOn);
-                Service.StartMouseWithoutBordersService(desktopToRunMouseWithoutBordersOn);
+                StartMouseWithoutBordersService(desktopToRunMouseWithoutBordersOn);
            }
        }

@@ -279,7 +279,7 @@ namespace MouseWithoutBorders
            {
                if (!IsMyDesktopActive() || Common.CurrentProcess.SessionId != NativeMethods.WTSGetActiveConsoleSessionId())
                {
-                    Helper.RunDDHelper(true);
+                    Common.RunDDHelper(true);
                    int waitCount = 20;

                    while (NativeMethods.WTSGetActiveConsoleSessionId() == 0xFFFFFFFF && waitCount > 0)
--- a/src/modules/MouseWithoutBorders/App/Class/Common.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/Common.cs
@@ -101,10 +101,8 @@ namespace MouseWithoutBorders
        private static bool runOnLogonDesktop;
        private static bool runOnScrSaverDesktop;

-#pragma warning disable SA1307 // Accessible fields should begin with upper-case letter
-        internal static int[] toggleIcons;
-        internal static int toggleIconsIndex;
-#pragma warning restore SA1307
+        private static int[] toggleIcons;
+        private static int toggleIconsIndex;
        internal const int TOGGLE_ICONS_SIZE = 4;
        internal const int ICON_ONE = 0;
        internal const int ICON_ALL = 1;
@@ -116,9 +114,7 @@ namespace MouseWithoutBorders
        internal const int NETWORK_STREAM_BUF_SIZE = 1024 * 1024;
        internal static readonly EventWaitHandle EvSwitch = new(false, EventResetMode.AutoReset);
        private static Point lastPos;
-#pragma warning disable SA1307 // Accessible fields should begin with upper-case names
-        internal static int switchCount;
-#pragma warning restore SA1307
+        private static int switchCount;
        private static long lastReconnectByHotKeyTime;
        private static int tcpPort;
        private static bool secondOpenSocketTry;
@@ -547,7 +543,7 @@ namespace MouseWithoutBorders
        internal static void SendAwakeBeat()
        {
            if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop && Common.IsMyDesktopActive() &&
-                Setting.Values.BlockScreenSaver && lastRealInputEventCount != Event.RealInputEventCount)
+                Setting.Values.BlockScreenSaver && lastRealInputEventCount != Common.RealInputEventCount)
            {
                SendPackage(ID.ALL, PackageType.Awake);
            }
@@ -556,13 +552,13 @@ namespace MouseWithoutBorders
                SendHeartBeat();
            }

-            lastInputEventCount = Event.InputEventCount;
-            lastRealInputEventCount = Event.RealInputEventCount;
+            lastInputEventCount = Common.InputEventCount;
+            lastRealInputEventCount = Common.RealInputEventCount;
        }

        internal static void HumanBeingDetected()
        {
-            if (lastInputEventCount == Event.InputEventCount)
+            if (lastInputEventCount == Common.InputEventCount)
            {
                if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop && Common.IsMyDesktopActive())
                {
@@ -570,7 +566,7 @@ namespace MouseWithoutBorders
                }
            }

-            lastInputEventCount = Event.InputEventCount;
+            lastInputEventCount = Common.InputEventCount;
        }

        private static void PokeMyself()
@@ -585,7 +581,7 @@ namespace MouseWithoutBorders
                InputSimulation.MoveMouseRelative(-x, -y);
                Thread.Sleep(50);

-                if (lastInputEventCount != Event.InputEventCount)
+                if (lastInputEventCount != Common.InputEventCount)
                {
                    break;
                }
@@ -594,8 +590,8 @@ namespace MouseWithoutBorders

        internal static void InitLastInputEventCount()
        {
-            lastInputEventCount = Event.InputEventCount;
-            lastRealInputEventCount = Event.RealInputEventCount;
+            lastInputEventCount = Common.InputEventCount;
+            lastRealInputEventCount = Common.RealInputEventCount;
        }

        internal static void SendHello()
@@ -669,7 +665,7 @@ namespace MouseWithoutBorders
        {
            Common.DoSomethingInUIThread(() =>
            {
-                if (!DragDrop.MouseDown && Helper.SendMessageToHelper(0x401, IntPtr.Zero, IntPtr.Zero) > 0)
+                if (!DragDrop.MouseDown && Common.SendMessageToHelper(0x401, IntPtr.Zero, IntPtr.Zero) > 0)
                {
                    Common.MMSleep(0.2);
                    InputSimulation.SendKey(new KEYBDDATA() { wVk = (int)VK.SNAPSHOT });
@@ -678,14 +674,14 @@ namespace MouseWithoutBorders
                    Logger.LogDebug("PrepareScreenCapture: SNAPSHOT simulated.");

                    _ = NativeMethods.MoveWindow(
-                        (IntPtr)NativeMethods.FindWindow(null, Helper.HELPER_FORM_TEXT),
+                        (IntPtr)NativeMethods.FindWindow(null, Common.HELPER_FORM_TEXT),
                        MachineStuff.DesktopBounds.Left,
                        MachineStuff.DesktopBounds.Top,
                        MachineStuff.DesktopBounds.Right - MachineStuff.DesktopBounds.Left,
                        MachineStuff.DesktopBounds.Bottom - MachineStuff.DesktopBounds.Top,
                        false);

-                    _ = Helper.SendMessageToHelper(0x406, IntPtr.Zero, IntPtr.Zero, false);
+                    _ = Common.SendMessageToHelper(0x406, IntPtr.Zero, IntPtr.Zero, false);
                }
                else
                {
@@ -702,7 +698,7 @@ namespace MouseWithoutBorders
            // {
            //    Process.Start("explorer", "\"" + file + "\"");
            // });
-            _ = Launch.CreateProcessInInputDesktopSession(
+            _ = CreateProcessInInputDesktopSession(
                "\"" + Environment.ExpandEnvironmentVariables(@"%SystemRoot%\System32\Mspaint.exe") +
                "\"",
                "\"" + file + "\"",
@@ -960,8 +956,8 @@ namespace MouseWithoutBorders
                        {
                            // SwitchToMachine(MachineName.Trim());
                            MachineStuff.NewDesMachineID = DesMachineID = MachineID;
-                            MachineStuff.SwitchLocation.X = Event.XY_BY_PIXEL + Event.myLastX;
-                            MachineStuff.SwitchLocation.Y = Event.XY_BY_PIXEL + Event.myLastY;
+                            MachineStuff.SwitchLocation.X = XY_BY_PIXEL + myLastX;
+                            MachineStuff.SwitchLocation.Y = XY_BY_PIXEL + myLastY;
                            MachineStuff.SwitchLocation.ResetCount();
                            EvSwitch.Set();
                        }
@@ -1318,7 +1314,7 @@ namespace MouseWithoutBorders
                }
                else
                {
-                    _ = Launch.ImpersonateLoggedOnUserAndDoSomething(() =>
+                    _ = ImpersonateLoggedOnUserAndDoSomething(() =>
                    {
                        st = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + @"\" + Common.BinaryName;
                        if (!Directory.Exists(st))
--- a/src/modules/MouseWithoutBorders/App/Class/InputHook.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/InputHook.cs
@@ -206,7 +206,7 @@ namespace MouseWithoutBorders.Class
        {
            int rv = 1, dx = 0, dy = 0;
            bool local = false;
-            Event.InputEventCount++;
+            Common.InputEventCount++;

            try
            {
@@ -220,14 +220,14 @@ namespace MouseWithoutBorders.Class
                }
                else
                {
-                    Event.RealInputEventCount++;
+                    Common.RealInputEventCount++;

                    if (MachineStuff.NewDesMachineID == Common.MachineID || MachineStuff.NewDesMachineID == ID.ALL)
                    {
                        local = true;
                        if (Common.MainFormVisible && !DragDrop.IsDropping)
                        {
-                            Helper.MainFormDot();
+                            Common.MainFormDot();
                        }
                    }

@@ -269,10 +269,10 @@ namespace MouseWithoutBorders.Class
                            {
                                MachineStuff.SwitchLocation.Count--;

-                                if (MachineStuff.SwitchLocation.X > Event.XY_BY_PIXEL - 100000 || MachineStuff.SwitchLocation.Y > Event.XY_BY_PIXEL - 100000)
+                                if (MachineStuff.SwitchLocation.X > Common.XY_BY_PIXEL - 100000 || MachineStuff.SwitchLocation.Y > Common.XY_BY_PIXEL - 100000)
                                {
-                                    hookCallbackMouseData.X = MachineStuff.SwitchLocation.X - Event.XY_BY_PIXEL;
-                                    hookCallbackMouseData.Y = MachineStuff.SwitchLocation.Y - Event.XY_BY_PIXEL;
+                                    hookCallbackMouseData.X = MachineStuff.SwitchLocation.X - Common.XY_BY_PIXEL;
+                                    hookCallbackMouseData.Y = MachineStuff.SwitchLocation.Y - Common.XY_BY_PIXEL;
                                }
                                else
                                {
@@ -308,8 +308,8 @@ namespace MouseWithoutBorders.Class
                                    hookCallbackMouseData.Y = MachineStuff.PrimaryScreenBounds.Bottom + 1;
                                }

-                                dx += dx < 0 ? -Event.MOVE_MOUSE_RELATIVE : Event.MOVE_MOUSE_RELATIVE;
-                                dy += dy < 0 ? -Event.MOVE_MOUSE_RELATIVE : Event.MOVE_MOUSE_RELATIVE;
+                                dx += dx < 0 ? -Common.MOVE_MOUSE_RELATIVE : Common.MOVE_MOUSE_RELATIVE;
+                                dy += dy < 0 ? -Common.MOVE_MOUSE_RELATIVE : Common.MOVE_MOUSE_RELATIVE;
                            }
                        }

@@ -336,13 +336,13 @@ namespace MouseWithoutBorders.Class

        private int KeyboardHookProc(int nCode, int wParam, IntPtr lParam)
        {
-            Event.InputEventCount++;
+            Common.InputEventCount++;
            if (!RealData)
            {
                return NativeMethods.CallNextHookEx(hKeyboardHook, nCode, wParam, lParam);
            }

-            Event.RealInputEventCount++;
+            Common.RealInputEventCount++;

            keyboardHookStruct = LParamToKeyboardHookStruct(lParam);
            hookCallbackKeybdData.dwFlags = keyboardHookStruct.Flags;
--- a/src/modules/MouseWithoutBorders/App/Class/InputSimulation.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/InputSimulation.cs
@@ -223,7 +223,7 @@ namespace MouseWithoutBorders.Class

            if (Common.MainFormVisible && !DragDrop.IsDropping)
            {
-                Helper.MainFormDot();
+                Common.MainFormDot();
            }

            return rv;
--- a/src/modules/MouseWithoutBorders/App/Class/Program.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/Program.cs
@@ -36,7 +36,6 @@ using Newtonsoft.Json;
 using StreamJsonRpc;

 using Logger = MouseWithoutBorders.Core.Logger;
-using SettingsHelper = Microsoft.PowerToys.Settings.UI.Library.Utilities.Helper;
 using Thread = MouseWithoutBorders.Core.Thread;

 [module: SuppressMessage("Microsoft.MSInternal", "CA904:DeclareTypesInMicrosoftOrSystemNamespace", Scope = "namespace", Target = "MouseWithoutBorders", Justification = "Dotnet port with style preservation")]
@@ -129,7 +128,7 @@ namespace MouseWithoutBorders.Class
                {
                    if (args.Length > 2)
                    {
-                        SettingsHelper.UserLocalAppDataPath = args[2].Trim();
+                        Helper.UserLocalAppDataPath = args[2].Trim();
                    }
                }

@@ -236,7 +235,7 @@ namespace MouseWithoutBorders.Class
                Application.SetCompatibleTextRenderingDefault(false);

                Common.Init();
-                Core.Helper.WndProcCounter++;
+                Common.WndProcCounter++;

                var formScreen = new FrmScreen();

@@ -431,7 +430,7 @@ namespace MouseWithoutBorders.Class
                Logger.Log(e);
            }

-            Service.StartMouseWithoutBordersService();
+            Common.StartMouseWithoutBordersService();
        }

        internal static string User { get; set; }
--- a/src/modules/MouseWithoutBorders/App/Class/Setting.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/Setting.cs
@@ -33,7 +33,6 @@ using MouseWithoutBorders.Core;
 using Settings.UI.Library.Attributes;

 using Lock = System.Threading.Lock;
-using SettingsHelper = Microsoft.PowerToys.Settings.UI.Library.Utilities.Helper;

 [module: SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Scope = "member", Target = "MouseWithoutBorders.Properties.Setting.Values.#LoadIntSetting(System.String,System.Int32)", Justification = "Dotnet port with style preservation")]
 [module: SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Scope = "member", Target = "MouseWithoutBorders.Properties.Setting.Values.#SaveSetting(System.String,System.Object)", Justification = "Dotnet port with style preservation")]
@@ -194,7 +193,7 @@ namespace MouseWithoutBorders.Class
        {
            _settingsUtils = new SettingsUtils();

-            _watcher = SettingsHelper.GetFileWatcher("MouseWithoutBorders", "settings.json", () =>
+            _watcher = Helper.GetFileWatcher("MouseWithoutBorders", "settings.json", () =>
            {
                try
                {
--- a/src/modules/MouseWithoutBorders/App/Class/SocketStuff.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/SocketStuff.cs
@@ -1684,7 +1684,7 @@ namespace MouseWithoutBorders.Class
            {
                string fileName = null;

-                if (!Launch.ImpersonateLoggedOnUserAndDoSomething(() =>
+                if (!Common.ImpersonateLoggedOnUserAndDoSomething(() =>
                {
                    if (!File.Exists(Common.LastDragDropFile))
                    {
@@ -1873,7 +1873,7 @@ namespace MouseWithoutBorders.Class
            }
            else
            {
-                _ = Launch.ImpersonateLoggedOnUserAndDoSomething(() => { r = SendFileEx(s, ecStream, fileName); });
+                _ = Common.ImpersonateLoggedOnUserAndDoSomething(() => { r = SendFileEx(s, ecStream, fileName); });
            }

            return r;
@@ -2111,7 +2111,7 @@ namespace MouseWithoutBorders.Class
                        }
                    }

-                    _ = Launch.CreateLowIntegrityProcess(
+                    _ = Common.CreateLowIntegrityProcess(
                        "\"" + Path.GetDirectoryName(Application.ExecutablePath) + "\\MouseWithoutBordersHelper.exe\"",
                        "InternalError" + " \"" + msg + "\"",
                        0,
--- a/src/modules/MouseWithoutBorders/App/Core/DragDrop.cs
+++ b/src/modules/MouseWithoutBorders/App/Core/DragDrop.cs
@@ -132,7 +132,7 @@ internal static class DragDrop
    {
        if (!IsDropping)
        {
-            IntPtr h = (IntPtr)NativeMethods.FindWindow(null, Helper.HELPER_FORM_TEXT);
+            IntPtr h = (IntPtr)NativeMethods.FindWindow(null, Common.HELPER_FORM_TEXT);
            if (h.ToInt32() > 0)
            {
                _ = Interlocked.Exchange(ref dragDropStep05ExCalledByIpc, 0);
@@ -189,7 +189,7 @@ internal static class DragDrop

        if (!IsDropping)
        {
-            _ = Launch.ImpersonateLoggedOnUserAndDoSomething(() =>
+            _ = Common.ImpersonateLoggedOnUserAndDoSomething(() =>
            {
                if (!string.IsNullOrEmpty(dragFileName) && (File.Exists(dragFileName) || Directory.Exists(dragFileName)))
                {
--- a/src/modules/MouseWithoutBorders/App/Core/Event.cs
+++ b/src/modules/MouseWithoutBorders/App/Core/Event.cs
@@ -1,274 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Drawing;
-using System.Globalization;
-using System.Threading;
-using System.Threading.Tasks;
-
-using MouseWithoutBorders.Class;
-
-// <summary>
-//     Keyboard/Mouse hook callback implementation.
-// </summary>
-// <history>
-//     2008 created by Truong Do (ductdo).
-//     2009-... modified by Truong Do (TruongDo).
-//     2023- Included in PowerToys.
-// </history>
-namespace MouseWithoutBorders.Core;
-
-internal static class Event
-{
-    private static readonly DATA KeybdPackage = new();
-    private static readonly DATA MousePackage = new();
-#pragma warning disable SA1307 // Accessible fields should begin with upper-case names
-    internal static ulong inputEventCount;
-    internal static ulong invalidPackageCount;
-#pragma warning restore SA1307
-    internal static int MOVE_MOUSE_RELATIVE = 100000;
-    internal static int XY_BY_PIXEL = 300000;
-
-    static Event()
-    {
-    }
-
-    internal static ulong InvalidPackageCount
-    {
-        get => Event.invalidPackageCount;
-        set => Event.invalidPackageCount = value;
-    }
-
-    internal static ulong InputEventCount
-    {
-        get => Event.inputEventCount;
-        set => Event.inputEventCount = value;
-    }
-
-    internal static ulong RealInputEventCount
-    {
-        get;
-        set;
-    }
-
-    private static Point actualLastPos;
-#pragma warning disable SA1307 // Accessible fields should begin with upper-case names
-    internal static int myLastX;
-    internal static int myLastY;
-#pragma warning restore SA1307
-
-    [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity", Justification = "Dotnet port with style preservation")]
-    internal static void MouseEvent(MOUSEDATA e, int dx, int dy)
-    {
-        try
-        {
-            Common.PaintCount = 0;
-            bool switchByMouseEnabled = IsSwitchingByMouseEnabled();
-
-            if (switchByMouseEnabled && Common.Sk != null && (Common.DesMachineID == Common.MachineID || !Setting.Values.MoveMouseRelatively) && e.dwFlags == Common.WM_MOUSEMOVE)
-            {
-                Point p = MachineStuff.MoveToMyNeighbourIfNeeded(e.X, e.Y, MachineStuff.desMachineID);
-
-                if (!p.IsEmpty)
-                {
-                    Common.HasSwitchedMachineSinceLastCopy = true;
-
-                    Logger.LogDebug(string.Format(
-                        CultureInfo.CurrentCulture,
-                        "***** Host Machine: newDesMachineIdEx set = [{0}]. Mouse is now at ({1},{2})",
-                        MachineStuff.newDesMachineIdEx,
-                        e.X,
-                        e.Y));
-
-                    myLastX = e.X;
-                    myLastY = e.Y;
-
-                    PrepareToSwitchToMachine(MachineStuff.newDesMachineIdEx, p);
-                }
-            }
-
-            if (MachineStuff.desMachineID != Common.MachineID && MachineStuff.SwitchLocation.Count <= 0)
-            {
-                MousePackage.Des = MachineStuff.desMachineID;
-                MousePackage.Type = PackageType.Mouse;
-                MousePackage.Md.dwFlags = e.dwFlags;
-                MousePackage.Md.WheelDelta = e.WheelDelta;
-
-                // Relative move
-                if (Setting.Values.MoveMouseRelatively && Math.Abs(dx) >= MOVE_MOUSE_RELATIVE && Math.Abs(dy) >= MOVE_MOUSE_RELATIVE)
-                {
-                    MousePackage.Md.X = dx;
-                    MousePackage.Md.Y = dy;
-                }
-                else
-                {
-                    MousePackage.Md.X = (e.X - MachineStuff.primaryScreenBounds.Left) * 65535 / Common.screenWidth;
-                    MousePackage.Md.Y = (e.Y - MachineStuff.primaryScreenBounds.Top) * 65535 / Common.screenHeight;
-                }
-
-                Common.SkSend(MousePackage, null, false);
-
-                if (MousePackage.Md.dwFlags is Common.WM_LBUTTONUP or Common.WM_RBUTTONUP)
-                {
-                    Thread.Sleep(10);
-                }
-
-                NativeMethods.GetCursorPos(ref actualLastPos);
-
-                if (actualLastPos != Common.LastPos)
-                {
-                    Logger.LogDebug($"Mouse cursor has moved unexpectedly: Expected: {Common.LastPos}, actual: {actualLastPos}.");
-                    Common.LastPos = actualLastPos;
-                }
-            }
-
-#if SHOW_ON_WINLOGON_EX
-            if (RunOnLogonDesktop && e.dwFlags == WM_RBUTTONUP &&
-                desMachineID == machineID &&
-                e.x > 2 && e.x < 100 && e.y > 2 && e.y < 20)
-            {
-                DoSomethingInUIThread(delegate()
-                {
-                    MainForm.HideMenuWhenRunOnLogonDesktop();
-                    MainForm.MainMenu.Hide();
-                    MainForm.MainMenu.Show(e.x - 5, e.y - 3);
-                });
-            }
-#endif
-        }
-        catch (Exception ex)
-        {
-            Logger.Log(ex);
-        }
-    }
-
-    internal static bool IsSwitchingByMouseEnabled()
-    {
-        return (EasyMouseOption)Setting.Values.EasyMouse == EasyMouseOption.Enable || InputHook.EasyMouseKeyDown;
-    }
-
-    internal static void PrepareToSwitchToMachine(ID newDesMachineID, Point desMachineXY)
-    {
-        Logger.LogDebug($"PrepareToSwitchToMachine: newDesMachineID = {newDesMachineID}, desMachineXY = {desMachineXY}");
-
-        if (((Common.GetTick() - MachineStuff.lastJump < 100) && (Common.GetTick() - MachineStuff.lastJump > 0)) || MachineStuff.desMachineID == ID.ALL)
-        {
-            Logger.LogDebug("PrepareToSwitchToMachine: lastJump");
-            return;
-        }
-
-        MachineStuff.lastJump = Common.GetTick();
-
-        string newDesMachineName = MachineStuff.NameFromID(newDesMachineID);
-
-        if (!Common.IsConnectedTo(newDesMachineID))
-        {// Connection lost, cancel switching
-            Logger.LogDebug("No active connection found for " + newDesMachineName);
-
-            // ShowToolTip("No active connection found for [" + newDesMachineName + "]!", 500);
-        }
-        else
-        {
-            MachineStuff.newDesMachineID = newDesMachineID;
-            MachineStuff.SwitchLocation.X = desMachineXY.X;
-            MachineStuff.SwitchLocation.Y = desMachineXY.Y;
-            MachineStuff.SwitchLocation.ResetCount();
-            _ = Common.EvSwitch.Set();
-
-            // PostMessage(mainForm.Handle, WM_SWITCH, IntPtr.Zero, IntPtr.Zero);
-            if (newDesMachineID != DragDrop.DragMachine)
-            {
-                if (!DragDrop.IsDragging && !DragDrop.IsDropping)
-                {
-                    if (DragDrop.MouseDown && !Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop)
-                    {
-                        DragDrop.DragDropStep02();
-                    }
-                }
-                else if (DragDrop.DragMachine != (ID)1)
-                {
-                    DragDrop.ChangeDropMachine();
-                }
-            }
-            else
-            {
-                DragDrop.DragDropStep11();
-            }
-
-            // Change des machine
-            if (MachineStuff.desMachineID != newDesMachineID)
-            {
-                Logger.LogDebug("MouseEvent: Switching to new machine:" + newDesMachineName);
-
-                // Ask current machine to hide the Mouse cursor
-                if (newDesMachineID != ID.ALL && MachineStuff.desMachineID != Common.MachineID)
-                {
-                    Common.SendPackage(MachineStuff.desMachineID, PackageType.HideMouse);
-                }
-
-                Common.DesMachineID = newDesMachineID;
-
-                if (MachineStuff.desMachineID == Common.MachineID)
-                {
-                    if (Common.GetTick() - Common.clipboardCopiedTime < Common.BIG_CLIPBOARD_DATA_TIMEOUT)
-                    {
-                        Common.clipboardCopiedTime = 0;
-                        Common.GetRemoteClipboard("PrepareToSwitchToMachine");
-                    }
-                }
-                else
-                {
-                    // Ask the new active machine to get clipboard data (if the data is too big)
-                    Common.SendPackage(MachineStuff.desMachineID, PackageType.MachineSwitched);
-                }
-
-                _ = Interlocked.Increment(ref Common.switchCount);
-            }
-        }
-    }
-
-    internal static void SaveSwitchCount()
-    {
-        if (Common.SwitchCount > 0)
-        {
-            _ = Task.Run(() =>
-            {
-                Setting.Values.SwitchCount += Common.SwitchCount;
-                _ = Interlocked.Exchange(ref Common.switchCount, 0);
-            });
-        }
-    }
-
-    internal static void KeybdEvent(KEYBDDATA e)
-    {
-        try
-        {
-            Common.PaintCount = 0;
-            if (MachineStuff.desMachineID != MachineStuff.newDesMachineID)
-            {
-                Logger.LogDebug("KeybdEvent: Switching to new machine...");
-                Common.DesMachineID = MachineStuff.newDesMachineID;
-            }
-
-            if (MachineStuff.desMachineID != Common.MachineID)
-            {
-                KeybdPackage.Des = MachineStuff.desMachineID;
-                KeybdPackage.Type = PackageType.Keyboard;
-                KeybdPackage.Kd = e;
-                KeybdPackage.DateTime = Common.GetTick();
-                Common.SkSend(KeybdPackage, null, false);
-                if (KeybdPackage.Kd.dwFlags is Common.WM_KEYUP or Common.WM_SYSKEYUP)
-                {
-                    Thread.Sleep(10);
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            Logger.Log(ex);
-        }
-    }
-}
--- a/src/modules/MouseWithoutBorders/App/Core/Helper.cs
+++ b/src/modules/MouseWithoutBorders/App/Core/Helper.cs
@@ -1,526 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Drawing;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Security.Principal;
-using System.Windows.Forms;
-
-using Microsoft.Win32;
-using MouseWithoutBorders.Class;
-using static System.Windows.Forms.Control;
-
-// <summary>
-//     Some other helper methods.
-// </summary>
-// <history>
-//     2008 created by Truong Do (ductdo).
-//     2009-... modified by Truong Do (TruongDo).
-//     2023- Included in PowerToys.
-// </history>
-namespace MouseWithoutBorders.Core;
-
-internal static class Helper
-{
-    internal const string HELPER_FORM_TEXT = "Mouse without Borders Helper";
-    internal const string HelperProcessName = "PowerToys.MouseWithoutBordersHelper";
-#pragma warning disable SA1307 // Accessible fields should begin with upper-case letter
-    internal static bool signalHelperToExit;
-    internal static bool signalWatchDogToExit;
-#pragma warning restore SA1307
-    internal static long WndProcCounter;
-
-    private static void WatchDogThread()
-    {
-        long oldCounter = WndProcCounter;
-
-        do
-        {
-            for (int i = 0; i < 10; i++)
-            {
-                Thread.Sleep(1000);
-
-                if (signalWatchDogToExit)
-                {
-                    break;
-                }
-            }
-
-            while (Common.BlockingUI)
-            {
-                Thread.Sleep(1000);
-            }
-
-            if (WndProcCounter == oldCounter)
-            {
-                Process p = Process.GetCurrentProcess();
-                string procInfo = $"{p.PrivateMemorySize64 / 1024 / 1024}MB, {p.TotalProcessorTime}, {Environment.ProcessorCount}.";
-                string threadStacks = $"{procInfo} {Thread.DumpThreadsStack()}";
-                Logger.TelemetryLogTrace(threadStacks, SeverityLevel.Error);
-                break;
-            }
-
-            oldCounter = WndProcCounter;
-        }
-        while (true);
-    }
-
-    internal static void HelperThread()
-    {
-        // SuppressFlow fixes an issue on service mode, where the helper process can't get enough permissions to be started again.
-        // More details can be found on: https://github.com/microsoft/PowerToys/pull/36892
-        using var asyncFlowControl = System.Threading.ExecutionContext.SuppressFlow();
-
-        try
-        {
-            while (true)
-            {
-                _ = Common.EvSwitch.WaitOne(); // Switching to another machine?
-
-                if (signalHelperToExit)
-                {
-                    break;
-                }
-
-                if (MachineStuff.NewDesMachineID != Common.MachineID && MachineStuff.NewDesMachineID != ID.ALL)
-                {
-                    Common.HideMouseCursor(false);
-                    Helper.MainFormDotEx(true);
-                }
-                else
-                {
-                    if (MachineStuff.SwitchLocation.Count > 0)
-                    {
-                        MachineStuff.SwitchLocation.Count--;
-
-                        // When we want to move mouse by pixels, we add 300k to x and y (search for XY_BY_PIXEL for other related code).
-                        Logger.LogDebug($"+++++ Moving mouse to {MachineStuff.SwitchLocation.X}, {MachineStuff.SwitchLocation.Y}");
-
-                        // MaxXY = 65535 so 100k is safe.
-                        if (MachineStuff.SwitchLocation.X > Event.XY_BY_PIXEL - 100000 || MachineStuff.SwitchLocation.Y > Event.XY_BY_PIXEL - 100000)
-                        {
-                            InputSimulation.MoveMouse(MachineStuff.SwitchLocation.X - Event.XY_BY_PIXEL, MachineStuff.SwitchLocation.Y - Event.XY_BY_PIXEL);
-                        }
-                        else
-                        {
-                            InputSimulation.MoveMouseEx(MachineStuff.SwitchLocation.X, MachineStuff.SwitchLocation.Y);
-                        }
-
-                        Helper.MainFormDot();
-                    }
-                }
-
-                if (MachineStuff.NewDesMachineID == Common.MachineID)
-                {
-                    Common.ReleaseAllKeys();
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            Logger.Log(e);
-        }
-
-        signalHelperToExit = false;
-        Logger.LogDebug("^^^Helper Thread exiting...^^^");
-    }
-
-    internal static void MainFormDotEx(bool bCheckTS)
-    {
-        Logger.LogDebug("***** MainFormDotEx:");
-
-        if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop)
-        {
-            int left = MachineStuff.PrimaryScreenBounds.Left + ((MachineStuff.PrimaryScreenBounds.Right - MachineStuff.PrimaryScreenBounds.Left) / 2) - 1;
-            int top = Setting.Values.HideMouse ? 3 : MachineStuff.PrimaryScreenBounds.Top + ((MachineStuff.PrimaryScreenBounds.Bottom - MachineStuff.PrimaryScreenBounds.Top) / 2);
-
-            Common.MainFormVisible = true;
-
-            if (Setting.Values.HideMouse && Setting.Values.StealFocusWhenSwitchingMachine && Helper.SendMessageToHelper(0x407, new IntPtr(left), new IntPtr(top), true) == 0)
-            {
-                try
-                {
-                    /* When user just switches to the Logon desktop, user is actually on the "Windows Default Lock Screen" (LockApp).
-                     * If a click is sent to this during switch, it actually triggers a desktop switch on the local machine causing a reconnection affecting the machine switch.
-                     * We can detect and skip in this case.
-                     * */
-                    IntPtr foreGroundWindow = NativeMethods.GetForegroundWindow();
-                    string foreGroundWindowText = Common.GetText(foreGroundWindow);
-
-                    bool mouseClick = true;
-
-                    if (foreGroundWindowText.Equals("Windows Default Lock Screen", StringComparison.OrdinalIgnoreCase))
-                    {
-                        mouseClick = false;
-                    }
-
-                    // Window title may be localized, check process name:
-                    if (mouseClick)
-                    {
-                        _ = NativeMethods.GetWindowThreadProcessId(foreGroundWindow, out uint pid);
-
-                        if (pid > 0)
-                        {
-                            string foreGroundWindowProcess = Process.GetProcessById((int)pid)?.ProcessName;
-
-                            if (foreGroundWindowProcess.Equals("LockApp", StringComparison.OrdinalIgnoreCase))
-                            {
-                                mouseClick = false;
-                            }
-                        }
-                    }
-
-                    if (mouseClick)
-                    {
-                        InputSimulation.MouseClickDotForm(left + 1, top + 1);
-                    }
-                }
-                catch (Exception e)
-                {
-                    Logger.Log(e);
-                }
-            }
-        }
-
-        CustomCursor.ShowFakeMouseCursor(int.MinValue, int.MinValue);
-    }
-
-    internal static void MainForm3Pixels()
-    {
-        Logger.LogDebug("***** MainFormDotLarge:");
-
-        Common.DoSomethingInUIThread(
-            () =>
-        {
-            Common.MainForm.Left = MachineStuff.PrimaryScreenBounds.Left + ((MachineStuff.PrimaryScreenBounds.Right - MachineStuff.PrimaryScreenBounds.Left) / 2) - 2;
-            Common.MainForm.Top = Setting.Values.HideMouse ? 3 : MachineStuff.PrimaryScreenBounds.Top + ((MachineStuff.PrimaryScreenBounds.Bottom - MachineStuff.PrimaryScreenBounds.Top) / 2) - 1;
-            Common.MainForm.Width = 3;
-            Common.MainForm.Height = 3;
-            Common.MainForm.Opacity = 0.11D;
-            Common.MainForm.TopMost = true;
-
-            if (Setting.Values.HideMouse)
-            {
-                Common.MainForm.BackColor = Color.Black;
-                Common.MainForm.Show();
-                Common.MainFormVisible = true;
-            }
-            else
-            {
-                Common.MainForm.BackColor = Color.White;
-                Common.MainForm.Hide();
-                Common.MainFormVisible = false;
-            }
-        },
-            true);
-
-        CustomCursor.ShowFakeMouseCursor(int.MinValue, int.MinValue);
-    }
-
-    internal static void MainFormDot()
-    {
-        Common.DoSomethingInUIThread(
-            () =>
-            {
-                _ = Helper.SendMessageToHelper(0x408, IntPtr.Zero, IntPtr.Zero, false);
-
-                Common.MainForm.Left = MachineStuff.PrimaryScreenBounds.Left + ((MachineStuff.PrimaryScreenBounds.Right - MachineStuff.PrimaryScreenBounds.Left) / 2) - 1;
-                Common.MainForm.Top = Setting.Values.HideMouse ? 3 : MachineStuff.PrimaryScreenBounds.Top + ((MachineStuff.PrimaryScreenBounds.Bottom - MachineStuff.PrimaryScreenBounds.Top) / 2);
-                Common.MainForm.Width = 1;
-                Common.MainForm.Height = 1;
-                Common.MainForm.Opacity = 0.15;
-                Common.MainForm.Hide();
-                Common.MainFormVisible = false;
-            },
-            true);
-
-        CustomCursor.ShowFakeMouseCursor(int.MinValue, int.MinValue);
-    }
-
-    internal static void ToggleIcon()
-    {
-        try
-        {
-            if (Common.toggleIconsIndex < Common.TOGGLE_ICONS_SIZE)
-            {
-                Common.DoSomethingInUIThread(() => Common.MainForm.ChangeIcon(Common.toggleIcons[Common.toggleIconsIndex++]));
-            }
-            else
-            {
-                Common.toggleIconsIndex = 0;
-                Common.toggleIcons = null;
-            }
-        }
-        catch (Exception e)
-        {
-            Logger.Log(e);
-        }
-    }
-
-    internal static void RunDDHelper(bool cleanUp = false)
-    {
-        if (Common.RunOnLogonDesktop || Common.RunOnScrSaverDesktop)
-        {
-            return;
-        }
-
-        if (cleanUp)
-        {
-            try
-            {
-                Process[] ps = Process.GetProcessesByName(HelperProcessName);
-                foreach (Process p in ps)
-                {
-                    p.KillProcess();
-                }
-            }
-            catch (Exception e)
-            {
-                Logger.Log(e);
-                _ = Helper.SendMessageToHelper(SharedConst.QUIT_CMD, IntPtr.Zero, IntPtr.Zero);
-            }
-
-            return;
-        }
-
-        if (!Common.IsMyDesktopActive())
-        {
-            return;
-        }
-
-        if (!Common.IpcChannelCreated)
-        {
-            Logger.TelemetryLogTrace($"{nameof(Common.IpcChannelCreated)} = {Common.IpcChannelCreated}. {Logger.GetStackTrace(new StackTrace())}", SeverityLevel.Warning);
-            return;
-        }
-
-        if (!Common.MainForm.IsDisposed)
-        {
-            Common.MainForm.NotifyIcon.Visible = false;
-            Common.MainForm.NotifyIcon.Visible = Setting.Values.ShowOriginalUI;
-        }
-
-        IntPtr h = (IntPtr)NativeMethods.FindWindow(null, Helper.HELPER_FORM_TEXT);
-
-        if (h.ToInt32() <= 0)
-        {
-            _ = Launch.CreateProcessInInputDesktopSession(
-                $"\"{Path.GetDirectoryName(Application.ExecutablePath)}\\{HelperProcessName}.exe\"",
-                string.Empty,
-                Common.GetInputDesktop(),
-                0);
-
-            Common.HasSwitchedMachineSinceLastCopy = true;
-
-            // Common.CreateLowIntegrityProcess("\"" + Path.GetDirectoryName(Application.ExecutablePath) + "\\MouseWithoutBordersHelper.exe\"", string.Empty, 0, false, 0);
-            var processes = Process.GetProcessesByName(HelperProcessName);
-            if (processes?.Length == 0)
-            {
-                Logger.Log("Unable to start helper process.");
-                Common.ShowToolTip("Error starting Mouse Without Borders Helper, clipboard sharing will not work!", 5000, ToolTipIcon.Error);
-            }
-            else
-            {
-                Logger.Log("Helper process started.");
-            }
-        }
-        else
-        {
-            var processes = Process.GetProcessesByName(HelperProcessName);
-            if (processes?.Length > 0)
-            {
-                Logger.Log("Helper process found running.");
-            }
-            else
-            {
-                Logger.Log("Invalid helper process found running.");
-                Common.ShowToolTip("Error finding Mouse Without Borders Helper, clipboard sharing will not work!", 5000, ToolTipIcon.Error);
-            }
-        }
-    }
-
-    internal static int SendMessageToHelper(int msg, IntPtr wparam, IntPtr lparam, bool wait = true, bool log = true)
-    {
-        int h = NativeMethods.FindWindow(null, Helper.HELPER_FORM_TEXT);
-        int rv = -1;
-
-        if (h > 0)
-        {
-            rv = wait
-                ? (int)NativeMethods.SendMessage((IntPtr)h, msg, wparam, lparam)
-                : NativeMethods.PostMessage((IntPtr)h, msg, wparam, lparam) ? 1 : 0;
-        }
-
-        if (log)
-        {
-            Logger.LogDebug($"SendMessageToHelper: HelperWindow={h}, Return={rv}, msg={msg}, w={wparam.ToInt32()}, l={lparam.ToInt32()}, Post={!wait}");
-        }
-
-        return rv;
-    }
-
-    internal static bool IsWindows8AndUp()
-    {
-        return (Environment.OSVersion.Version.Major == 6 && Environment.OSVersion.Version.Minor >= 2)
-            || Environment.OSVersion.Version.Major > 6;
-    }
-
-    internal static string GetMiniLog(IEnumerable<ControlCollection> optionControls)
-    {
-        string log = string.Empty;
-
-        log += "=============================================================================================================================\r\n";
-        log += $"{Application.ProductName} version {Application.ProductVersion}\r\n";
-
-        log += $"{Setting.Values.Username}/{Common.GetDebugInfo(Common.MyKey)}\r\n";
-        log += $"{Common.MachineName}/{Common.MachineID}/{Common.DesMachineID}\r\n";
-        log += $"Id: {Setting.Values.DeviceId}\r\n";
-        log += $"Matrix: {string.Join(",", MachineStuff.MachineMatrix)}\r\n";
-        log += $"McPool: {Setting.Values.MachinePoolString}\r\n";
-
-        log += "\r\nOPTIONS:\r\n";
-
-        foreach (ControlCollection controlCollection in optionControls)
-        {
-            foreach (object c in controlCollection)
-            {
-                if (c is CheckBox checkBox)
-                {
-                    log += $"({(checkBox.Checked ? 1 : 0)}) {checkBox.Text}\r\n";
-                    continue;
-                }
-
-                if (c is RadioButton radioButton)
-                {
-                    log += $"({(radioButton.Checked ? 1 : 0)}) {radioButton.Name}.[{radioButton.Text}]\r\n";
-                    continue;
-                }
-
-                if (c is ComboBox comboBox)
-                {
-                    log += $"{comboBox.Name} = {comboBox.Text}\r\n";
-                    continue;
-                }
-            }
-        }
-
-        log += "\r\n";
-
-        SocketStuff sk = Common.Sk;
-
-        if (sk?.TcpSockets != null)
-        {
-            foreach (TcpSk tcp in sk.TcpSockets)
-            {
-                log += $"{Common.MachineName}{(tcp.IsClient ? "=>" : "<=")}{tcp.MachineName}({tcp.MachineId}):{tcp.Status}\r\n";
-            }
-        }
-
-        log += string.Format(CultureInfo.CurrentCulture, "Helper:{0}\r\n", SendMessageToHelper(0x400, IntPtr.Zero, IntPtr.Zero));
-
-        log += Setting.Values.LastPersonalizeLogonScr + "\r\n";
-        log += "Name2IP =\r\n" + Setting.Values.Name2IP + "\r\n";
-
-        log += "Last 10 trace messages:\r\n";
-
-        log += string.Join(Environment.NewLine, Logger.LogCounter.Select(item => $"({item.Value}): {item.Key}").Take(10));
-
-        log += "\r\n=============================================================================================================================";
-
-        return log;
-    }
-
-    internal static bool GetUserName()
-    {
-        if (string.IsNullOrEmpty(Setting.Values.Username) && !Common.RunOnLogonDesktop)
-        {
-            if (Program.User.Contains("system", StringComparison.CurrentCultureIgnoreCase))
-            {
-                _ = Launch.ImpersonateLoggedOnUserAndDoSomething(() =>
-                {
-                    // See: https://stackoverflow.com/questions/19487541/how-to-get-windows-user-name-from-sessionid
-                    static string GetUsernameBySessionId(int sessionId)
-                    {
-                        string username = "SYSTEM";
-                        if (NativeMethods.WTSQuerySessionInformation(IntPtr.Zero, sessionId, NativeMethods.WTSInfoClass.WTSUserName, out nint buffer, out int strLen) && strLen > 1)
-                        {
-                            username = Marshal.PtrToStringAnsi(buffer);
-                            NativeMethods.WTSFreeMemory(buffer);
-
-                            if (NativeMethods.WTSQuerySessionInformation(IntPtr.Zero, sessionId, NativeMethods.WTSInfoClass.WTSDomainName, out buffer, out strLen) && strLen > 1)
-                            {
-                                username = @$"{Marshal.PtrToStringAnsi(buffer)}\{username}";
-                                NativeMethods.WTSFreeMemory(buffer);
-                            }
-                        }
-
-                        return username;
-                    }
-
-                    // The most direct way to fetch the username is WindowsIdentity.GetCurrent(true).Name
-                    // but GetUserName can run within an ExecutionContext.SuppressFlow block, which creates issues
-                    // with WindowsIdentity.GetCurrent.
-                    // See: https://stackoverflow.com/questions/76998988/exception-when-using-executioncontext-suppressflow-in-net-7
-                    // So we use WTSQuerySessionInformation as a workaround.
-                    Setting.Values.Username = GetUsernameBySessionId(Process.GetCurrentProcess().SessionId);
-                });
-            }
-            else
-            {
-                Setting.Values.Username = Program.User;
-            }
-
-            Logger.LogDebug("[Username] = " + Setting.Values.Username);
-        }
-
-        return !string.IsNullOrEmpty(Setting.Values.Username);
-    }
-
-    internal static void ShowOneWayModeMessage()
-    {
-        Common.ToggleShowTopMostMessage(
-@"
-Due to Security Controls, a remote device cannot control a SAW device.
-Please use the keyboard and Mouse from the SAW device.
-(Press Esc to hide this message)
-",
-string.Empty,
-10);
-    }
-
-    internal static void ApplyCADSetting()
-    {
-        try
-        {
-            if (Setting.Values.DisableCAD)
-            {
-                RegistryKey k = Registry.LocalMachine.CreateSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System");
-                if (k != null)
-                {
-                    k.SetValue("DisableCAD", 1, RegistryValueKind.DWord);
-                    k.Close();
-                }
-            }
-            else
-            {
-                RegistryKey k = Registry.LocalMachine.CreateSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System");
-                if (k != null)
-                {
-                    k.SetValue("DisableCAD", 0, RegistryValueKind.DWord);
-                    k.Close();
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            Logger.Log(e);
-        }
-    }
-}
--- a/src/modules/MouseWithoutBorders/App/Core/Launch.cs
+++ b/src/modules/MouseWithoutBorders/App/Core/Launch.cs
@@ -1,312 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Runtime.InteropServices;
-using System.Security.Principal;
-
-using MouseWithoutBorders.Class;
-
-// <summary>
-//     Impersonation.
-// </summary>
-// <history>
-//     2008 created by Truong Do (ductdo).
-//     2009-... modified by Truong Do (TruongDo).
-//     2023- Included in PowerToys.
-// </history>
-namespace MouseWithoutBorders.Core;
-
-internal static class Launch
-{
-    private static bool RunElevated()
-    {
-        return WindowsIdentity.GetCurrent().Owner.IsWellKnown(WellKnownSidType.BuiltinAdministratorsSid);
-    }
-
-    internal static bool ImpersonateLoggedOnUserAndDoSomething(Action targetFunc)
-    {
-        if (Common.RunWithNoAdminRight)
-        {
-            targetFunc();
-            return true;
-        }
-        else
-        {
-            // SuppressFlow fixes an issue on service mode, where WTSQueryUserToken runs successfully once and then fails
-            // on subsequent calls. The reason appears to be an unknown issue with reverting the impersonation,
-            // meaning that subsequent impersonation attempts run as the logged-on user and fail.
-            // This is a workaround.
-            using var asyncFlowControl = System.Threading.ExecutionContext.SuppressFlow();
-
-            uint dwSessionId;
-            IntPtr hUserToken = IntPtr.Zero, hUserTokenDup = IntPtr.Zero;
-            try
-            {
-                dwSessionId = (uint)Process.GetCurrentProcess().SessionId;
-                uint rv = NativeMethods.WTSQueryUserToken(dwSessionId, ref hUserToken);
-                var lastError = rv == 0 ? Marshal.GetLastWin32Error() : 0;
-
-                Logger.LogDebug($"{nameof(NativeMethods.WTSQueryUserToken)} returned {rv.ToString(CultureInfo.CurrentCulture)}");
-
-                if (rv == 0)
-                {
-                    Logger.Log($"{nameof(NativeMethods.WTSQueryUserToken)} failed with: {lastError}.");
-                    return false;
-                }
-
-                if (!NativeMethods.DuplicateToken(hUserToken, (int)NativeMethods.SECURITY_IMPERSONATION_LEVEL.SecurityImpersonation, ref hUserTokenDup))
-                {
-                    Logger.TelemetryLogTrace($"{nameof(NativeMethods.DuplicateToken)} Failed! {Logger.GetStackTrace(new StackTrace())}", SeverityLevel.Warning);
-                    _ = NativeMethods.CloseHandle(hUserToken);
-                    _ = NativeMethods.CloseHandle(hUserTokenDup);
-                    return false;
-                }
-
-                if (NativeMethods.ImpersonateLoggedOnUser(hUserTokenDup))
-                {
-                    targetFunc();
-                    _ = NativeMethods.RevertToSelf();
-                    _ = NativeMethods.CloseHandle(hUserToken);
-                    _ = NativeMethods.CloseHandle(hUserTokenDup);
-                    return true;
-                }
-                else
-                {
-                    Logger.Log("ImpersonateLoggedOnUser Failed!");
-                    _ = NativeMethods.CloseHandle(hUserToken);
-                    _ = NativeMethods.CloseHandle(hUserTokenDup);
-                    return false;
-                }
-            }
-            catch (Exception e)
-            {
-                Logger.Log(e);
-                return false;
-            }
-        }
-    }
-
-    internal static int CreateProcessInInputDesktopSession(string commandLine, string arg, string desktop, short wShowWindow, bool lowIntegrity = false)
-
-    // As user who runs explorer.exe
-    {
-        if (!Program.User.Contains("system", StringComparison.InvariantCultureIgnoreCase))
-        {
-            ProcessStartInfo s = new(commandLine, arg);
-            s.WindowStyle = wShowWindow != 0 ? ProcessWindowStyle.Normal : ProcessWindowStyle.Hidden;
-            Process p = Process.Start(s);
-
-            return p == null ? 0 : p.Id;
-        }
-
-        string commandLineWithArg = commandLine + " " + arg;
-        int lastError;
-        int dwSessionId;
-        IntPtr hUserToken = IntPtr.Zero, hUserTokenDup = IntPtr.Zero;
-
-        Logger.LogDebug("CreateProcessInInputDesktopSession called, launching " + commandLineWithArg + " on " + desktop);
-
-        try
-        {
-            dwSessionId = Process.GetCurrentProcess().SessionId;
-
-            // Get the user token used by DuplicateTokenEx
-            lastError = (int)NativeMethods.WTSQueryUserToken((uint)dwSessionId, ref hUserToken);
-
-            NativeMethods.STARTUPINFO si = default;
-            si.cb = Marshal.SizeOf(si);
-            si.lpDesktop = "winsta0\\" + desktop;
-            si.wShowWindow = wShowWindow;
-
-            NativeMethods.SECURITY_ATTRIBUTES sa = default;
-            sa.Length = Marshal.SizeOf(sa);
-
-            if (!NativeMethods.DuplicateTokenEx(hUserToken, NativeMethods.MAXIMUM_ALLOWED, ref sa, (int)NativeMethods.SECURITY_IMPERSONATION_LEVEL.SecurityIdentification, (int)NativeMethods.TOKEN_TYPE.TokenPrimary, ref hUserTokenDup))
-            {
-                lastError = Marshal.GetLastWin32Error();
-                Logger.Log(string.Format(CultureInfo.CurrentCulture, "DuplicateTokenEx error: {0} Token does not have the privilege.", lastError));
-                _ = NativeMethods.CloseHandle(hUserToken);
-                return 0;
-            }
-
-            if (lowIntegrity)
-            {
-                NativeMethods.TOKEN_MANDATORY_LABEL tIL;
-
-                // Low
-                string sIntegritySid = "S-1-16-4096";
-
-                bool rv = NativeMethods.ConvertStringSidToSid(sIntegritySid, out IntPtr pIntegritySid);
-
-                if (!rv)
-                {
-                    Logger.Log("ConvertStringSidToSid failed");
-                    _ = NativeMethods.CloseHandle(hUserToken);
-                    _ = NativeMethods.CloseHandle(hUserTokenDup);
-                    return 0;
-                }
-
-                tIL.Label.Attributes = NativeMethods.SE_GROUP_INTEGRITY;
-                tIL.Label.Sid = pIntegritySid;
-
-                rv = NativeMethods.SetTokenInformation(hUserTokenDup, NativeMethods.TOKEN_INFORMATION_CLASS.TokenIntegrityLevel, ref tIL, (uint)Marshal.SizeOf(tIL) + (uint)IntPtr.Size);
-
-                if (!rv)
-                {
-                    Logger.Log("SetTokenInformation failed");
-                    _ = NativeMethods.CloseHandle(hUserToken);
-                    _ = NativeMethods.CloseHandle(hUserTokenDup);
-                    return 0;
-                }
-            }
-
-            uint dwCreationFlags = NativeMethods.NORMAL_PRIORITY_CLASS | NativeMethods.CREATE_NEW_CONSOLE;
-            IntPtr pEnv = IntPtr.Zero;
-
-            if (NativeMethods.CreateEnvironmentBlock(ref pEnv, hUserTokenDup, true))
-            {
-                dwCreationFlags |= NativeMethods.CREATE_UNICODE_ENVIRONMENT;
-            }
-            else
-            {
-                pEnv = IntPtr.Zero;
-            }
-
-            _ = NativeMethods.CreateProcessAsUser(
-                hUserTokenDup,        // client's access token
-                null,                   // file to execute
-                commandLineWithArg,     // command line
-                ref sa,                 // pointer to process SECURITY_ATTRIBUTES
-                ref sa,                 // pointer to thread SECURITY_ATTRIBUTES
-                false,                  // handles are not inheritable
-                (int)dwCreationFlags,   // creation flags
-                pEnv,                   // pointer to new environment block
-                null,                   // name of current directory
-                ref si,                 // pointer to STARTUPINFO structure
-                out NativeMethods.PROCESS_INFORMATION pi); // receives information about new process
-
-            // GetLastError should be 0
-            int iResultOfCreateProcessAsUser = Marshal.GetLastWin32Error();
-            Logger.LogDebug("CreateProcessAsUser returned " + iResultOfCreateProcessAsUser.ToString(CultureInfo.CurrentCulture));
-
-            // Close handles task
-            _ = NativeMethods.CloseHandle(hUserToken);
-            _ = NativeMethods.CloseHandle(hUserTokenDup);
-
-            return (iResultOfCreateProcessAsUser == 0) ? (int)pi.dwProcessId : 0;
-        }
-        catch (Exception e)
-        {
-            Logger.Log(e);
-            return 0;
-        }
-    }
-
-#if CUSTOMIZE_LOGON_SCREEN
-    internal static bool CreateLowIntegrityProcess(string commandLine, string args, int wait, bool killIfTimedOut, long limitedMem, short wShowWindow = 0)
-    {
-        int processId = CreateProcessInInputDesktopSession(commandLine, args, "default", wShowWindow, true);
-
-        if (processId <= 0)
-        {
-            return false;
-        }
-
-        if (wait > 0)
-        {
-            if (limitedMem > 0)
-            {
-                int sec = 0;
-                while (true)
-                {
-                    Process p;
-
-                    try
-                    {
-                        if ((p = Process.GetProcessById(processId)) == null)
-                        {
-                            Logger.Log("Process exited!");
-                            break;
-                        }
-                    }
-                    catch (ArgumentException)
-                    {
-                        Logger.Log("GetProcessById.ArgumentException");
-                        break;
-                    }
-
-                    if ((!p.HasExited && p.PrivateMemorySize64 > limitedMem) || (++sec > (wait / 1000)))
-                    {
-                        Logger.Log(string.Format(CultureInfo.CurrentCulture, "Process log (mem): {0}, {1}", sec, p.PrivateMemorySize64));
-                        return false;
-                    }
-
-                    Thread.Sleep(1000);
-                }
-            }
-            else
-            {
-                Process p;
-
-                if ((p = Process.GetProcessById(processId)) == null)
-                {
-                    Logger.Log("Process exited!");
-                }
-                else if (NativeMethods.WaitForSingleObject(p.Handle, wait) != NativeMethods.WAIT_OBJECT_0 && killIfTimedOut)
-                {
-                    Logger.Log("Process log (time).");
-                    TerminateProcessTree(p.Handle, (uint)processId, -1);
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    private static void TerminateProcessTree(IntPtr hProcess, uint processID, int exitCode)
-    {
-        if (processID > 0 && hProcess.ToInt32() > 0)
-        {
-            Process[] processes = Process.GetProcesses();
-            int dwSessionId = Process.GetCurrentProcess().SessionId;
-
-            foreach (Process p in processes)
-            {
-                if (p.SessionId == dwSessionId)
-                {
-                    NativeMethods.PROCESS_BASIC_INFORMATION processBasicInformation = default;
-
-                    try
-                    {
-                        if (NativeMethods.NtQueryInformationProcess(p.Handle, 0, ref processBasicInformation, (uint)Marshal.SizeOf(processBasicInformation), out uint bytesWritten) >= 0)
-                        {// NT_SUCCESS(...)
-                            if (processBasicInformation.InheritedFromUniqueProcessId == processID)
-                            {
-                                TerminateProcessTree(p.Handle, processBasicInformation.UniqueProcessId, exitCode);
-                            }
-                        }
-                    }
-                    catch (InvalidOperationException e)
-                    {
-                        Logger.Log(e);
-                        continue;
-                    }
-                    catch (Win32Exception e)
-                    {
-                        Logger.Log(e);
-                        continue;
-                    }
-                }
-            }
-
-            _ = NativeMethods.TerminateProcess(hProcess, (IntPtr)exitCode);
-        }
-    }
-#endif
-}
--- a/src/modules/MouseWithoutBorders/App/Core/Logger.cs
+++ b/src/modules/MouseWithoutBorders/App/Core/Logger.cs
@@ -46,13 +46,13 @@ internal static class Logger
        Logger.Log(log);
    }

-    internal static void Log(Exception e, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    internal static void Log(Exception e)
    {
        if (e is not KnownException)
        {
            string exText = e.ToString();

-            Log($"!Exception!: {exText}", memberName, sourceFilePath, sourceLineNumber);
+            Log($"!Exception!: {exText}");

            if (DateTime.UtcNow.Hour != lastHour)
            {
@@ -77,18 +77,18 @@ internal static class Logger
    private const string HeaderRECEIVED =
        "Be{0},Ke{1},Mo{2},He{3},Mx{4},Tx{5},Im{6},By{7},Cl{8},Dr{9},De{10},Ed{11},In{12},Ni{13},Pc{14}/{15}";

-    internal static void LogDebug(string log, bool clearLog = false, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    internal static void LogDebug(string log, bool clearLog = false)
    {
 #if DEBUG
-        Log(log, clearLog, memberName, sourceFilePath, sourceLineNumber);
+        Log(log, clearLog);
 #endif
    }

-    internal static void Log(string log, bool clearLog = false, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    internal static void Log(string log, bool clearLog = false)
    {
        log = DateTime.Now.ToString("MM/dd HH:mm:ss.fff", CultureInfo.InvariantCulture) + $"({Thread.CurrentThread.ManagedThreadId})" + log;

-        ManagedCommon.Logger.LogInfo(log, memberName, sourceFilePath, sourceLineNumber);
+        ManagedCommon.Logger.LogInfo(log);
        lock (AllLogsLock)
        {
            if (clearLog)
@@ -138,7 +138,7 @@ internal static class Logger
                Common.PackageSent.ClipboardDragDrop,
                Common.PackageSent.ClipboardDragDropEnd,
                Common.PackageSent.ExplorerDragDrop,
-                Event.inputEventCount,
+                Common.inputEventCount,
                Common.PackageSent.Nil);
            Log(log);
            lastPackageSent = Common.PackageSent; // Copy data
@@ -161,7 +161,7 @@ internal static class Logger
                Common.PackageReceived.ClipboardDragDrop,
                Common.PackageReceived.ClipboardDragDropEnd,
                Common.PackageReceived.ExplorerDragDrop,
-                Event.invalidPackageCount,
+                Common.invalidPackageCount,
                Common.PackageReceived.Nil,
                Receiver.processedPackageCount,
                Receiver.skippedPackageCount);
@@ -197,9 +197,15 @@ internal static class Logger
                myThreads.Add(t);
            }

-            Logger.DumpProgramLogs(sb, level);
-            Logger.DumpOtherLogs(sb, level);
-            Logger.DumpStaticTypes(sb, level);
+            _ = Logger.PrivateDump(sb, AllLogs, "[Program logs]\r\n===============\r\n", 0, level, false);
+            _ = Logger.PrivateDump(sb, new Common(), "[Other Logs]\r\n===============\r\n", 0, level, false);
+            Logger.DumpType(sb, typeof(Logger), 0, level);
+            sb.AppendLine("[DragDrop]\r\n===============");
+            Logger.DumpType(sb, typeof(DragDrop), 0, level);
+            sb.AppendLine("[MachineStuff]\r\n===============");
+            Logger.DumpType(sb, typeof(MachineStuff), 0, level);
+            sb.AppendLine("[Receiver]\r\n===============");
+            Logger.DumpType(sb, typeof(Receiver), 0, level);

            log = string.Format(
                CultureInfo.CurrentCulture,
@@ -235,36 +241,6 @@ internal static class Logger
        }
    }

-    internal static void DumpProgramLogs(StringBuilder sb, int level)
-    {
-        _ = Logger.PrivateDump(sb, AllLogs, "[Program logs]\r\n===============\r\n", 0, level, false);
-    }
-
-    internal static void DumpOtherLogs(StringBuilder sb, int level)
-    {
-        _ = Logger.PrivateDump(sb, new Common(), "[Other Logs]\r\n===============\r\n", 0, level, false);
-    }
-
-    internal static void DumpStaticTypes(StringBuilder sb, int level)
-    {
-        sb.AppendLine($"[{nameof(DragDrop)}]\r\n===============");
-        Logger.DumpType(sb, typeof(DragDrop), 0, level);
-        sb.AppendLine($"[{nameof(Event)}]\r\n===============");
-        Logger.DumpType(sb, typeof(Event), 0, level);
-        sb.AppendLine($"[{nameof(Helper)}]\r\n===============");
-        Logger.DumpType(sb, typeof(Helper), 0, level);
-        sb.AppendLine($"[{nameof(Launch)}]\r\n===============");
-        Logger.DumpType(sb, typeof(Launch), 0, level);
-        sb.AppendLine($"[{nameof(Logger)}]\r\n===============");
-        Logger.DumpType(sb, typeof(Logger), 0, level);
-        sb.AppendLine($"[{nameof(MachineStuff)}]\r\n===============");
-        Logger.DumpType(sb, typeof(MachineStuff), 0, level);
-        sb.AppendLine($"[{nameof(Receiver)}]\r\n===============");
-        Logger.DumpType(sb, typeof(Receiver), 0, level);
-        sb.AppendLine($"[{nameof(Service)}]\r\n===============");
-        Logger.DumpType(sb, typeof(Service), 0, level);
-    }
-
    internal static bool PrivateDump(StringBuilder sb, object obj, string objName, int level, int maxLevel, bool stop)
    {
        Type t;
--- a/src/modules/MouseWithoutBorders/App/Core/MachineStuff.cs
+++ b/src/modules/MouseWithoutBorders/App/Core/MachineStuff.cs
@@ -1018,8 +1018,8 @@ internal static class MachineStuff
            }

            NewDesMachineID = Common.DesMachineID = id;
-            SwitchLocation.X = Event.XY_BY_PIXEL + primaryScreenBounds.Left + ((primaryScreenBounds.Right - primaryScreenBounds.Left) / 2);
-            SwitchLocation.Y = Event.XY_BY_PIXEL + primaryScreenBounds.Top + ((primaryScreenBounds.Bottom - primaryScreenBounds.Top) / 2);
+            SwitchLocation.X = Common.XY_BY_PIXEL + primaryScreenBounds.Left + ((primaryScreenBounds.Right - primaryScreenBounds.Left) / 2);
+            SwitchLocation.Y = Common.XY_BY_PIXEL + primaryScreenBounds.Top + ((primaryScreenBounds.Bottom - primaryScreenBounds.Top) / 2);
            SwitchLocation.ResetCount();
            Common.UpdateMultipleModeIconAndMenu();
            Common.HideMouseCursor(false);
--- a/src/modules/MouseWithoutBorders/App/Core/Receiver.cs
+++ b/src/modules/MouseWithoutBorders/App/Core/Receiver.cs
@@ -41,12 +41,12 @@ internal static class Receiver
    {
        if (package.Type == PackageType.Invalid)
        {
-            if ((Event.InvalidPackageCount % 100) == 0)
+            if ((Common.InvalidPackageCount % 100) == 0)
            {
                Common.ShowToolTip("Invalid packages received!", 1000, ToolTipIcon.Warning, false);
            }

-            Event.InvalidPackageCount++;
+            Common.InvalidPackageCount++;
            Logger.Log("Invalid packages received!");
            return false;
        }
@@ -104,7 +104,7 @@ internal static class Receiver
                    {
                        if ((package.Kd.dwFlags & (int)Common.LLKHF.UP) == (int)Common.LLKHF.UP)
                        {
-                            Helper.ShowOneWayModeMessage();
+                            Common.ShowOneWayModeMessage();
                        }

                        return;
@@ -133,7 +133,7 @@ internal static class Receiver
                        {
                            if (package.Md.dwFlags is Common.WM_LBUTTONDOWN or Common.WM_RBUTTONDOWN)
                            {
-                                Helper.ShowOneWayModeMessage();
+                                Common.ShowOneWayModeMessage();
                            }
                        }
                        else if (package.Md.dwFlags is Common.WM_LBUTTONUP or Common.WM_RBUTTONUP)
@@ -144,13 +144,13 @@ internal static class Receiver
                        return;
                    }

-                    if (Math.Abs(package.Md.X) >= Event.MOVE_MOUSE_RELATIVE && Math.Abs(package.Md.Y) >= Event.MOVE_MOUSE_RELATIVE)
+                    if (Math.Abs(package.Md.X) >= Common.MOVE_MOUSE_RELATIVE && Math.Abs(package.Md.Y) >= Common.MOVE_MOUSE_RELATIVE)
                    {
                        if (package.Md.dwFlags == Common.WM_MOUSEMOVE)
                        {
                            InputSimulation.MoveMouseRelative(
-                                package.Md.X < 0 ? package.Md.X + Event.MOVE_MOUSE_RELATIVE : package.Md.X - Event.MOVE_MOUSE_RELATIVE,
-                                package.Md.Y < 0 ? package.Md.Y + Event.MOVE_MOUSE_RELATIVE : package.Md.Y - Event.MOVE_MOUSE_RELATIVE);
+                                package.Md.X < 0 ? package.Md.X + Common.MOVE_MOUSE_RELATIVE : package.Md.X - Common.MOVE_MOUSE_RELATIVE,
+                                package.Md.Y < 0 ? package.Md.Y + Common.MOVE_MOUSE_RELATIVE : package.Md.Y - Common.MOVE_MOUSE_RELATIVE);
                            _ = NativeMethods.GetCursorPos(ref lastXY);

                            Point p = MachineStuff.MoveToMyNeighbourIfNeeded(lastXY.X, lastXY.Y, Common.MachineID);
@@ -195,9 +195,9 @@ internal static class Receiver
            case PackageType.NextMachine:
                Logger.LogDebug("PackageType.NextMachine received!");

-                if (Event.IsSwitchingByMouseEnabled())
+                if (Common.IsSwitchingByMouseEnabled())
                {
-                    Event.PrepareToSwitchToMachine((ID)package.Md.WheelDelta, new Point(package.Md.X, package.Md.Y));
+                    Common.PrepareToSwitchToMachine((ID)package.Md.WheelDelta, new Point(package.Md.X, package.Md.Y));
                }

                break;
@@ -383,7 +383,7 @@ internal static class Receiver
            case PackageType.HideMouse:
                Common.HasSwitchedMachineSinceLastCopy = true;
                Common.HideMouseCursor(true);
-                Helper.MainFormDotEx(false);
+                Common.MainFormDotEx(false);
                Common.ReleaseAllKeys();
                break;

--- a/src/modules/MouseWithoutBorders/App/Core/Service.cs
+++ b/src/modules/MouseWithoutBorders/App/Core/Service.cs
@@ -1,159 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Linq;
-using System.ServiceProcess;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-using MouseWithoutBorders.Class;
-
-[module: SuppressMessage("Microsoft.Globalization", "CA1300:SpecifyMessageBoxOptions", Scope = "member", Target = "MouseWithoutBorders.Common.#StartMouseWithoutBordersService()", Justification = "Dotnet port with style preservation")]
-
-// <summary>
-//     Service control code.
-// </summary>
-// <history>
-//     2008 created by Truong Do (ductdo).
-//     2009-... modified by Truong Do (TruongDo).
-//     2023- Included in PowerToys.
-// </history>
-namespace MouseWithoutBorders.Core;
-
-internal static class Service
-{
-    private static bool shownErrMessage;
-    private static DateTime lastStartServiceTime = DateTime.UtcNow;
-
-    internal static void StartMouseWithoutBordersService(string desktopToRunMouseWithoutBordersOn = null, string startTag1 = "byapp", string startTag2 = null)
-    {
-        // NOTE(@yuyoyuppe): the new flow assumes we run both mwb processes directly from the svc.
-        if (Common.RunWithNoAdminRight || true)
-        {
-            return;
-        }
-
-        Logger.Log($"{nameof(StartMouseWithoutBordersService)}: {Logger.GetStackTrace(new StackTrace())}.");
-
-        Task task = Task.Run(() =>
-        {
-            Process[] ps = Process.GetProcessesByName("MouseWithoutBordersSvc");
-
-            if (ps.Length != 0)
-            {
-                if (DateTime.UtcNow - lastStartServiceTime < TimeSpan.FromSeconds(5))
-                {
-                    Logger.Log($"{nameof(StartMouseWithoutBordersService)}: Aborted.");
-                    return;
-                }
-
-                foreach (Process pp in ps)
-                {
-                    Logger.Log(string.Format(CultureInfo.InvariantCulture, "Killing process MouseWithoutBordersSvc {0}.", pp.Id));
-                    pp.KillProcess();
-                }
-            }
-
-            lastStartServiceTime = DateTime.UtcNow;
-            ServiceController service = new("MouseWithoutBordersSvc");
-
-            try
-            {
-                Logger.Log("Starting " + service.ServiceName);
-            }
-            catch (Exception)
-            {
-                if (!shownErrMessage)
-                {
-                    shownErrMessage = true;
-                    _ = MessageBox.Show(
-                        Application.ProductName + " is not installed yet, please run Setup.exe first!",
-                        Application.ProductName,
-                        MessageBoxButtons.OK,
-                        MessageBoxIcon.Error);
-                }
-
-                return;
-            }
-
-            try
-            {
-                int c = 0;
-
-                while (service.Status != ServiceControllerStatus.Stopped && c++ < 5)
-                {
-                    Thread.Sleep(1000);
-                    service = new ServiceController("MouseWithoutBordersSvc");
-                }
-
-                if (string.IsNullOrWhiteSpace(desktopToRunMouseWithoutBordersOn))
-                {
-                    startTag2 ??= Process.GetCurrentProcess().SessionId.ToString(CultureInfo.InvariantCulture);
-                    service.Start(new string[] { startTag1, startTag2 });
-                }
-                else
-                {
-                    service.Start(new string[] { desktopToRunMouseWithoutBordersOn });
-                }
-            }
-            catch (Exception e)
-            {
-                Logger.Log(e);
-
-                // ERROR_SERVICE_ALREADY_RUNNING
-                if (!(shownErrMessage || ((e?.InnerException as Win32Exception)?.NativeErrorCode == 1056)))
-                {
-                    shownErrMessage = true;
-                    _ = MessageBox.Show(
-                        "Cannot start service " + service.ServiceName + ": " + e.Message,
-                        Common.BinaryName,
-                        MessageBoxButtons.OK,
-                        MessageBoxIcon.Error);
-                }
-
-                return;
-            }
-        });
-
-        // Wait for the task while not blocking the UI thread.
-        do
-        {
-            Common.MMSleep(1);
-
-            if (task.IsCanceled || task.IsCompleted || task.IsFaulted)
-            {
-                break;
-            }
-        }
-        while (true);
-    }
-
-    internal static void StartServiceAndSendLogoffSignal()
-    {
-        try
-        {
-            Process[] p = Process.GetProcessesByName("winlogon");
-            Process me = Process.GetCurrentProcess();
-            string myWinlogon = p?.FirstOrDefault(item => item.SessionId == me.SessionId)?.Id.ToString(CultureInfo.InvariantCulture) ?? null;
-
-            if (string.IsNullOrWhiteSpace(myWinlogon))
-            {
-                StartMouseWithoutBordersService(null, "logoff");
-            }
-            else
-            {
-                StartMouseWithoutBordersService(null, "logoff", myWinlogon);
-            }
-        }
-        catch (Exception e)
-        {
-            Logger.Log($"{nameof(StartServiceAndSendLogoffSignal)}: {e.Message}");
-        }
-    }
-}
--- a/src/modules/MouseWithoutBorders/App/Form/frmInputCallback.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/frmInputCallback.cs
@@ -63,8 +63,8 @@ namespace MouseWithoutBorders
            try
            {
                Common.Hook = new InputHook();
-                Common.Hook.MouseEvent += new InputHook.MouseEvHandler(Event.MouseEvent);
-                Common.Hook.KeyboardEvent += new InputHook.KeybdEvHandler(Event.KeybdEvent);
+                Common.Hook.MouseEvent += new InputHook.MouseEvHandler(Common.MouseEvent);
+                Common.Hook.KeyboardEvent += new InputHook.KeybdEvHandler(Common.KeybdEvent);

                Logger.Log("(((((Keyboard/Mouse hooks installed/reinstalled!)))))");
                /* The hook is called in the context of the thread that installed it.
--- a/src/modules/MouseWithoutBorders/App/Form/frmMatrix.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/frmMatrix.cs
@@ -132,7 +132,7 @@ namespace MouseWithoutBorders

        internal void UpdateKeyTextBox()
        {
-            _ = Helper.GetUserName();
+            _ = Common.GetUserName();
            textBoxEnc.Text = Common.MyKey;
        }

@@ -787,7 +787,7 @@ namespace MouseWithoutBorders
        {
            if (!Common.RunWithNoAdminRight)
            {
-                Helper.ApplyCADSetting();
+                Common.ApplyCADSetting();
                ShowUpdateMessage();
            }
        }
@@ -1163,7 +1163,7 @@ namespace MouseWithoutBorders

        private void LinkLabelMiniLog_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
        {
-            string miniLog = Helper.GetMiniLog(new[] { groupBoxOtherOptions.Controls, groupBoxShortcuts.Controls });
+            string miniLog = Common.GetMiniLog(new[] { groupBoxOtherOptions.Controls, groupBoxShortcuts.Controls });

            Clipboard.SetText(miniLog);
            Common.ShowToolTip("Log has been placed in the clipboard.", 30000, ToolTipIcon.Info, false);
--- a/src/modules/MouseWithoutBorders/App/Form/frmScreen.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/frmScreen.cs
@@ -78,7 +78,7 @@ namespace MouseWithoutBorders
            NotifyIcon.BalloonTipTitle = Application.ProductName;
            menuGenDumpFile.Visible = true;

-            Helper.WndProcCounter++;
+            Common.WndProcCounter++;

            try
            {
@@ -101,7 +101,7 @@ namespace MouseWithoutBorders
            }
            else
            {
-                Service.StartServiceAndSendLogoffSignal();
+                Common.StartServiceAndSendLogoffSignal();
                Quit(true, true);
            }
        }
@@ -119,7 +119,7 @@ namespace MouseWithoutBorders
            NotifyIcon.Dispose();
            if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop)
            {
-                Helper.RunDDHelper(true);
+                Common.RunDDHelper(true);
            }

            // Common.UnhookClipboard();
@@ -133,7 +133,7 @@ namespace MouseWithoutBorders

            Setting.Values.SwitchCount += Common.SwitchCount;
            Process me = Process.GetCurrentProcess();
-            Helper.WndProcCounter++;
+            Common.WndProcCounter++;

            try
            {
@@ -142,13 +142,13 @@ namespace MouseWithoutBorders
                    Common.Cleanup();
                }

-                Helper.WndProcCounter++;
+                Common.WndProcCounter++;
                if (!Common.RunOnScrSaverDesktop)
                {
                    Common.ReleaseAllKeys();
                }

-                Helper.RunDDHelper(true);
+                Common.RunDDHelper(true);
            }
            catch (Exception e)
            {
@@ -285,7 +285,7 @@ namespace MouseWithoutBorders
            helperTimer.Interval = 100;
            helperTimer.Tick += new EventHandler(HelperTimer_Tick);
            helperTimer.Start();
-            Helper.WndProcCounter++;
+            Common.WndProcCounter++;

            if (Environment.OSVersion.Version.Major > 6 ||
                   (Environment.OSVersion.Version.Major == 6 && Environment.OSVersion.Version.Minor >= 1))
@@ -307,7 +307,7 @@ namespace MouseWithoutBorders

        private void HelperTimer_Tick(object sender, EventArgs e)
        {
-            Helper.WndProcCounter++;
+            Common.WndProcCounter++;

            if (busy)
            {
@@ -338,7 +338,7 @@ namespace MouseWithoutBorders

                        if (Common.MainFormVisible)
                        {
-                            Helper.MainFormDot();
+                            Common.MainFormDot();
                        }

                        InputSimulation.ResetSystemKeyFlags();
@@ -357,7 +357,7 @@ namespace MouseWithoutBorders
                    {
                        if (!Common.SecondOpenSocketTry)
                        {
-                            if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop && !Helper.GetUserName())
+                            if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop && !Common.GetUserName())
                            {
                                // While Windows 8 is hybrid-shutting down, user name would be empty (as returned from the .Net API), we should not do anything in this case.
                                Logger.LogDebug("No active user.");
@@ -407,7 +407,7 @@ namespace MouseWithoutBorders
                                // Common.ReHookClipboard();
                            }

-                            Helper.RunDDHelper();
+                            Common.RunDDHelper();
                        }

                        count = 0;
@@ -485,7 +485,7 @@ namespace MouseWithoutBorders
                    // One more time after 1/3 minutes (Sometimes XP has explorer started late)
                    if (count == 600 || count == 1800)
                    {
-                        Helper.RunDDHelper();
+                        Common.RunDDHelper();
                    }

                    if (count == 600)
@@ -545,7 +545,7 @@ namespace MouseWithoutBorders

                    if (Common.ToggleIcons != null)
                    {
-                        Helper.ToggleIcon();
+                        Common.ToggleIcon();
                    }

                    if (count % 20 == 0)
@@ -578,13 +578,13 @@ namespace MouseWithoutBorders
                    }
                    else if ((count % 36005) == 0)
                    {// One hour
-                        Event.SaveSwitchCount();
+                        Common.SaveSwitchCount();

                        int rv = 0;

-                        if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop && Common.IsMyDesktopActive() && (rv = Helper.SendMessageToHelper(0x400, IntPtr.Zero, IntPtr.Zero)) <= 0)
+                        if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop && Common.IsMyDesktopActive() && (rv = Common.SendMessageToHelper(0x400, IntPtr.Zero, IntPtr.Zero)) <= 0)
                        {
-                            Logger.TelemetryLogTrace($"{Helper.HELPER_FORM_TEXT} not found: {rv}", SeverityLevel.Warning);
+                            Logger.TelemetryLogTrace($"{Common.HELPER_FORM_TEXT} not found: {rv}", SeverityLevel.Warning);
                        }
                    }
                }
@@ -776,7 +776,7 @@ namespace MouseWithoutBorders
                    break;

                case NativeMethods.WM_HIDE_DRAG_DROP:
-                    Helper.MainFormDot();
+                    Common.MainFormDot();

                    /*
                    this.Width = 1;
@@ -795,14 +795,14 @@ namespace MouseWithoutBorders
                    break;

                case NativeMethods.WM_HIDE_DD_HELPER:
-                    Helper.MainForm3Pixels();
+                    Common.MainForm3Pixels();
                    Common.MMSleep(0.2);
                    if (m.WParam.ToInt32() == 1)
                    {
                        InputSimulation.MouseUp(); // A file is being dragged
                    }

-                    IntPtr h = (IntPtr)NativeMethods.FindWindow(null, Helper.HELPER_FORM_TEXT);
+                    IntPtr h = (IntPtr)NativeMethods.FindWindow(null, Common.HELPER_FORM_TEXT);

                    if (h.ToInt32() > 0)
                    {
@@ -831,7 +831,7 @@ namespace MouseWithoutBorders

                case WM_QUERYENDSESSION:
                    Logger.LogDebug("WM_QUERYENDSESSION...");
-                    Service.StartServiceAndSendLogoffSignal();
+                    Common.StartServiceAndSendLogoffSignal();
                    break;

                case WM_ENDSESSION:
--- a/src/modules/MouseWithoutBorders/MouseWithoutBorders.UnitTests/Core/Logger.PrivateDump.expected.txt
+++ b/src/modules/MouseWithoutBorders/MouseWithoutBorders.UnitTests/Core/Logger.PrivateDump.expected.txt
@@ -99,111 +99,6 @@ LegalKeyDictionary = Concurrent.ConcurrentDictionary`2[System.String,System.Byte
 --_budget = ????????????
 --_growLockArray = True
 --_comparerIsDefaultForClasses = False
-initDone = False
-REOPEN_WHEN_WSAECONNRESET = -10054
-REOPEN_WHEN_HOTKEY = -10055
-PleaseReopenSocket = 0
-ReopenSocketDueToReadError = False
-<LastResumeSuspendTime>k__BackingField = ????????????
--_dateData = ????????????
--MinValue = 01/01/0001 00:00:00
--MaxValue = 31/12/9999 23:59:59
--UnixEpoch = 01/01/1970 00:00:00
-lastReleaseAllKeysCall = 0
-PackageSent = MouseWithoutBorders.PackageMonitor
--Keyboard = 0
--Mouse = 0
--Heartbeat = 0
--ByeBye = 0
--Hello = 0
--Matrix = 0
--ClipboardText = 0
--ClipboardImage = 0
--Clipboard = 0
--ClipboardDragDrop = 0
--ClipboardDragDropEnd = 0
--ClipboardAsk = 0
--ExplorerDragDrop = 0
--Nil = 0
-PackageReceived = MouseWithoutBorders.PackageMonitor
--Keyboard = 0
--Mouse = 0
--Heartbeat = 0
--ByeBye = 0
--Hello = 0
--Matrix = 0
--ClipboardText = 0
--ClipboardImage = 0
--Clipboard = 0
--ClipboardDragDrop = 0
--ClipboardDragDropEnd = 0
--ClipboardAsk = 0
--ExplorerDragDrop = 0
--Nil = 0
-PackageID = 0
-SensitivePoints = Generic.List`1[Point]
--_items = Point[]
----System.Drawing.Point[] = Point[]: N/A
--_size = 0
--_version = 0
--s_emptyArray = Point[]
----System.Drawing.Point[] = Point[]: N/A
-p = {X=0,Y=0}
--x = 0
--y = 0
--Empty = {X=0,Y=0}
-<IpcChannelCreated>k__BackingField = False
-BIG_CLIPBOARD_DATA_TIMEOUT = 30000
-MAX_CLIPBOARD_DATA_SIZE_CAN_BE_SENT_INSTANTLY_TCP = 1048576
-MAX_CLIPBOARD_FILE_SIZE_CAN_BE_SENT = 104857600
-TEXT_HEADER_SIZE = 12
-DATA_SIZE = 48
-TEXT_TYPE_SEP = {4CFF57F7-BEDD-43d5-AE8F-27A61E886F2F}
-TOGGLE_ICONS_SIZE = 4
-ICON_ONE = 0
-ICON_ALL = 1
-ICON_SMALL_CLIPBOARD = 2
-ICON_BIG_CLIPBOARD = 3
-ICON_ERROR = 4
-JUST_GOT_BACK_FROM_SCREEN_SAVER = 9999
-NETWORK_STREAM_BUF_SIZE = 1048576
-SymAlBlockSize = 16
-PW_LENGTH = 16
-PACKAGE_SIZE = 32
-PACKAGE_SIZE_EX = 64
-WP_PACKAGE_SIZE = 6
-KEYEVENTF_KEYDOWN = 1
-KEYEVENTF_KEYUP = 2
-WH_MOUSE = 7
-WH_KEYBOARD = 2
-WH_MOUSE_LL = 14
-WH_KEYBOARD_LL = 13
-WM_MOUSEMOVE = 512
-WM_LBUTTONDOWN = 513
-WM_RBUTTONDOWN = 516
-WM_MBUTTONDOWN = 519
-WM_XBUTTONDOWN = 523
-WM_LBUTTONUP = 514
-WM_RBUTTONUP = 517
-WM_MBUTTONUP = 520
-WM_XBUTTONUP = 524
-WM_LBUTTONDBLCLK = 515
-WM_RBUTTONDBLCLK = 518
-WM_MBUTTONDBLCLK = 521
-WM_MOUSEWHEEL = 522
-WM_KEYDOWN = 256
-WM_KEYUP = 257
-WM_SYSKEYDOWN = 260
-WM_SYSKEYUP = 261
-[DragDrop]
-===============
-isDragging = False
-dragDropStep05ExCalledByIpc = 0
-isDropping = False
-dragMachine = NONE
-<MouseDown>k__BackingField = False
-[Event]
-===============
 KeybdPackage = MouseWithoutBorders.DATA
 --Type = 0
 --Id = 0
@@ -249,15 +144,113 @@ actualLastPos = {X=0,Y=0}
 --Empty = {X=0,Y=0}
 myLastX = 0
 myLastY = 0
-[Helper]
-===============
 signalHelperToExit = False
 signalWatchDogToExit = False
 WndProcCounter = 0
+initDone = False
+REOPEN_WHEN_WSAECONNRESET = -10054
+REOPEN_WHEN_HOTKEY = -10055
+PleaseReopenSocket = 0
+ReopenSocketDueToReadError = False
+<LastResumeSuspendTime>k__BackingField = ????????????
+--_dateData = ????????????
+--MinValue = 01/01/0001 00:00:00
+--MaxValue = 31/12/9999 23:59:59
+--UnixEpoch = 01/01/1970 00:00:00
+lastReleaseAllKeysCall = 0
+PackageSent = MouseWithoutBorders.PackageMonitor
+--Keyboard = 0
+--Mouse = 0
+--Heartbeat = 0
+--ByeBye = 0
+--Hello = 0
+--Matrix = 0
+--ClipboardText = 0
+--ClipboardImage = 0
+--Clipboard = 0
+--ClipboardDragDrop = 0
+--ClipboardDragDropEnd = 0
+--ClipboardAsk = 0
+--ExplorerDragDrop = 0
+--Nil = 0
+PackageReceived = MouseWithoutBorders.PackageMonitor
+--Keyboard = 0
+--Mouse = 0
+--Heartbeat = 0
+--ByeBye = 0
+--Hello = 0
+--Matrix = 0
+--ClipboardText = 0
+--ClipboardImage = 0
+--Clipboard = 0
+--ClipboardDragDrop = 0
+--ClipboardDragDropEnd = 0
+--ClipboardAsk = 0
+--ExplorerDragDrop = 0
+--Nil = 0
+PackageID = 0
+shownErrMessage = False
+lastStartServiceTime = ????????????
+--_dateData = ????????????
+--MinValue = 01/01/0001 00:00:00
+--MaxValue = 31/12/9999 23:59:59
+--UnixEpoch = 01/01/1970 00:00:00
+SensitivePoints = Generic.List`1[Point]
+--_items = Point[]
+----System.Drawing.Point[] = Point[]: N/A
+--_size = 0
+--_version = 0
+--s_emptyArray = Point[]
+----System.Drawing.Point[] = Point[]: N/A
+p = {X=0,Y=0}
+--x = 0
+--y = 0
+--Empty = {X=0,Y=0}
+<IpcChannelCreated>k__BackingField = False
+BIG_CLIPBOARD_DATA_TIMEOUT = 30000
+MAX_CLIPBOARD_DATA_SIZE_CAN_BE_SENT_INSTANTLY_TCP = 1048576
+MAX_CLIPBOARD_FILE_SIZE_CAN_BE_SENT = 104857600
+TEXT_HEADER_SIZE = 12
+DATA_SIZE = 48
+TEXT_TYPE_SEP = {4CFF57F7-BEDD-43d5-AE8F-27A61E886F2F}
+TOGGLE_ICONS_SIZE = 4
+ICON_ONE = 0
+ICON_ALL = 1
+ICON_SMALL_CLIPBOARD = 2
+ICON_BIG_CLIPBOARD = 3
+ICON_ERROR = 4
+JUST_GOT_BACK_FROM_SCREEN_SAVER = 9999
+NETWORK_STREAM_BUF_SIZE = 1048576
+SymAlBlockSize = 16
+PW_LENGTH = 16
 HELPER_FORM_TEXT = Mouse without Borders Helper
 HelperProcessName = PowerToys.MouseWithoutBordersHelper
-[Launch]
-===============
+PACKAGE_SIZE = 32
+PACKAGE_SIZE_EX = 64
+WP_PACKAGE_SIZE = 6
+KEYEVENTF_KEYDOWN = 1
+KEYEVENTF_KEYUP = 2
+WH_MOUSE = 7
+WH_KEYBOARD = 2
+WH_MOUSE_LL = 14
+WH_KEYBOARD_LL = 13
+WM_MOUSEMOVE = 512
+WM_LBUTTONDOWN = 513
+WM_RBUTTONDOWN = 516
+WM_MBUTTONDOWN = 519
+WM_XBUTTONDOWN = 523
+WM_LBUTTONUP = 514
+WM_RBUTTONUP = 517
+WM_MBUTTONUP = 520
+WM_XBUTTONUP = 524
+WM_LBUTTONDBLCLK = 515
+WM_RBUTTONDBLCLK = 518
+WM_MBUTTONDBLCLK = 521
+WM_MOUSEWHEEL = 522
+WM_KEYDOWN = 256
+WM_KEYUP = 257
+WM_SYSKEYDOWN = 260
+WM_SYSKEYUP = 261
 [Logger]
 ===============
 AllLogsLock = Lock
@@ -326,6 +319,13 @@ MAX_LOG = 10000
 MaxLogExceptionPerHour = 1000
 HeaderSENT = Be{0},Ke{1},Mo{2},He{3},Mx{4},Tx{5},Im{6},By{7},Cl{8},Dr{9},De{10},Ed{11},Ie{12},Ni{13}
 HeaderRECEIVED = Be{0},Ke{1},Mo{2},He{3},Mx{4},Tx{5},Im{6},By{7},Cl{8},Dr{9},De{10},Ed{11},In{12},Ni{13},Pc{14}/{15}
+[DragDrop]
+===============
+isDragging = False
+dragDropStep05ExCalledByIpc = 0
+isDropping = False
+dragMachine = NONE
+<MouseDown>k__BackingField = False
 [MachineStuff]
 ===============
 McMatrixLock = Lock
@@ -424,11 +424,3 @@ lastXY = {X=0,Y=0}
 --x = 0
 --y = 0
 --Empty = {X=0,Y=0}
-[Service]
-===============
-shownErrMessage = False
-lastStartServiceTime = ????????????
--_dateData = ????????????
--MinValue = 01/01/0001 00:00:00
--MaxValue = 31/12/9999 23:59:59
--UnixEpoch = 01/01/1970 00:00:00
--- a/src/modules/MouseWithoutBorders/MouseWithoutBorders.UnitTests/Core/LoggerTests.cs
+++ b/src/modules/MouseWithoutBorders/MouseWithoutBorders.UnitTests/Core/LoggerTests.cs
@@ -114,11 +114,18 @@ public static class LoggerTests
            using var streamReader = new StreamReader(stream);
            var expected = streamReader.ReadToEnd();

-            // copied from DumpObjects in Logger.cs
+            // copied from DumpObjects in Common.Log.cs
            var sb = new StringBuilder(1000000);
-            Logger.DumpProgramLogs(sb, settingsDumpObjectsLevel);
-            Logger.DumpOtherLogs(sb, settingsDumpObjectsLevel);
-            Logger.DumpStaticTypes(sb, settingsDumpObjectsLevel);
+            _ = Logger.PrivateDump(sb, Logger.AllLogs, "[Program logs]\r\n===============\r\n", 0, settingsDumpObjectsLevel, false);
+            _ = Logger.PrivateDump(sb, new Common(), "[Other Logs]\r\n===============\r\n", 0, settingsDumpObjectsLevel, false);
+            sb.AppendLine("[Logger]\r\n===============");
+            Logger.DumpType(sb, typeof(Logger), 0, settingsDumpObjectsLevel);
+            sb.AppendLine("[DragDrop]\r\n===============");
+            Logger.DumpType(sb, typeof(DragDrop), 0, settingsDumpObjectsLevel);
+            sb.AppendLine("[MachineStuff]\r\n===============");
+            Logger.DumpType(sb, typeof(MachineStuff), 0, settingsDumpObjectsLevel);
+            sb.AppendLine("[Receiver]\r\n===============");
+            Logger.DumpType(sb, typeof(Receiver), 0, settingsDumpObjectsLevel);
            var actual = sb.ToString();

            expected = NormalizeLog(expected);
--- a/src/modules/NewPlus/NewShellExtensionContextMenu.win10/NewPlus.ShellExtension.win10.vcxproj
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu.win10/NewPlus.ShellExtension.win10.vcxproj
@@ -83,8 +83,6 @@
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClInclude Include="..\NewShellExtensionContextMenu\constants.h" />
-    <ClInclude Include="..\NewShellExtensionContextMenu\helpers_filesystem.h" />
-    <ClInclude Include="..\NewShellExtensionContextMenu\helpers_variables.h" />
    <ClInclude Include="..\NewShellExtensionContextMenu\new_utilities.h" />
    <ClInclude Include="..\NewShellExtensionContextMenu\settings.h" />
    <ClInclude Include="..\NewShellExtensionContextMenu\shell_context_sub_menu.h" />
@@ -99,7 +97,6 @@
    <ClInclude Include="shell_context_menu_win10.h" />
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="..\..\powerrename\lib\Helpers.cpp" />
    <ClCompile Include="..\NewShellExtensionContextMenu\new_utilities.cpp" />
    <ClCompile Include="..\NewShellExtensionContextMenu\powertoys_module.cpp" />
    <ClCompile Include="..\NewShellExtensionContextMenu\settings.cpp" />
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Shawn Yuan	8755aacd0b	allow partially succeeded build Signed-off-by: Shawn Yuan <shuai.yuan.zju@gmail.com>	2025-04-24 15:58:26 +08:00
Shawn Yuan	e59ea36ccf	update Signed-off-by: Shawn Yuan <shuai.yuan.zju@gmail.com>	2025-04-24 15:17:19 +08:00
Shawn Yuan	2f40aab220	Merge branch 'shawn/testAz' of https://github.com/microsoft/PowerToys into shawn/testAz	2025-04-24 15:13:58 +08:00
Shawn Yuan	33459b718b	update Signed-off-by: Shawn Yuan <shuai.yuan.zju@gmail.com>	2025-04-24 15:13:35 +08:00
Shawn Yuan	7146da92ea	Update ci-using-the-latest-winappsdk.yml for Azure Pipelines	2025-04-23 17:39:58 +08:00
PesBandi	bbe248ca90	[ColorPicker]Only close on escape if focused	2025-03-12 07:06:32 +01:00