GPO line in General instead

Fix spellcheck
Update binary hashes
2026-01-02 10:26:22 +01:00 · 2024-10-01 15:47:35 +01:00 · 2024-10-01 14:05:47 +01:00 · 2024-10-01 13:59:34 +01:00 · 2024-10-01 13:57:57 +01:00 · 2024-09-30 11:35:56 +01:00
260 changed files with 9063 additions and 3336 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -65,6 +65,7 @@ body:
      - Keyboard Manager
      - Mouse Utilities
      - Mouse Without Borders
+      - New+ 
      - Peek
      - PowerRename
      - PowerToys Run
--- a/.github/ISSUE_TEMPLATE/translation_issue.yml
+++ b/.github/ISSUE_TEMPLATE/translation_issue.yml
@@ -39,6 +39,7 @@ body:
    - Keyboard Manager
    - Mouse Utilities
    - Mouse Without Borders
+    - New+
    - Peek
    - PowerRename
    - PowerToys Run
--- a/.github/actions/spell-check/allow/names.txt
+++ b/.github/actions/spell-check/allow/names.txt
@@ -64,6 +64,7 @@ Essey
 ethanfangg
 ferraridavide
 frankychen
+gaardmark
 gabime
 Galaxi
 Garside
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -30,6 +30,7 @@ AFX
 AGGREGATABLE
 AHybrid
 AKV
+akv
 ALarger
 ALLAPPS
 ALLINPUT
@@ -80,6 +81,8 @@ asf
 AShortcut
 ASingle
 ASSOCCHANGED
+ASSOCF
+ASSOCSTR
 ASYNCWINDOWPLACEMENT
 ASYNCWINDOWPOS
 atl
@@ -318,6 +321,7 @@ Dedup
 DEFAULTBOOTSTRAPPERINSTALLFOLDER
 DEFAULTCOLOR
 DEFAULTFLAGS
+DEFAULTICON
 DEFAULTONLY
 DEFAULTTONEAREST
 DEFAULTTONULL
@@ -332,6 +336,7 @@ deletethis
 DENORMAL
 depersist
 deprioritized
+DESELECTOTHERS
 DESKTOPABSOLUTEEDITING
 DESKTOPABSOLUTEPARSING
 desktopshorcutinstalled
@@ -362,6 +367,7 @@ dllmain
 DNLEN
 DONOTROUND
 DONTVALIDATEPATH
+DOPUS
 dotnet
 DPICHANGED
 DPIs
@@ -428,6 +434,7 @@ encodedlaunch
 encryptor
 endpointvolume
 ENDSESSION
+ENSUREVISIBLE
 ENTERSIZEMOVE
 ENU
 EOAC
@@ -509,6 +516,7 @@ FOLDERID
 folderpath
 FORCEMINIMIZE
 formatetc
+FORPARSING
 FRAMECHANGED
 frm
 Froml
@@ -563,6 +571,7 @@ Hashset
 hashtag
 HASHVAL
 HASSTRINGS
+HASSUBCOMMANDS
 hbitmap
 hbm
 hbmp
@@ -641,6 +650,7 @@ IBeam
 ICapture
 IClass
 ICONERROR
+ICONLOCATION
 IData
 IDD
 IDesktop
@@ -658,6 +668,7 @@ IFACEMETHOD
 IFACEMETHODIMP
 IFile
 IFilter
+IGNOREUNKNOWN
 IGraphics
 iid
 Iindex
@@ -719,6 +730,8 @@ ISettings
 IShell
 isocpp
 iss
+issecret
+ISSEPARATOR
 ITask
 ith
 ITHUMBNAIL
@@ -936,6 +949,7 @@ mrw
 msc
 mscorlib
 msdata
+MSDL
 msedge
 MSGFLT
 msiexec
@@ -994,6 +1008,8 @@ newdev
 NEWDIALOGSTYLE
 newitem
 newpath
+newplus
+NEWPLUSCONTEXTMENU
 newrow
 newsgroups
 NIF
@@ -1006,7 +1022,10 @@ NOAGGREGATION
 NOASYNC
 NOCLOSEPROCESS
 NOCOALESCE
+NOCOMM
+NOCONFIRMMKDIR
 NOCOPYBITS
+NOCOPYSECURITYATTRIBS
 nodeca
 nodoc
 NODRAWCAPTION
@@ -1014,6 +1033,7 @@ NODRAWICON
 NOINHERITLAYOUT
 NOINTERFACE
 NOLINKINFO
+NOMCX
 NOMINMAX
 NOMIRRORBITMAP
 NOMOVE
@@ -1122,6 +1142,7 @@ pch
 pchast
 PCIDLIST
 PCWSTR
+pdbs
 pdisp
 pdo
 pdto
@@ -1187,6 +1208,7 @@ ppv
 prc
 Prefixer
 Preinstalled
+prependpath
 prevhost
 previewer
 PREVIEWHANDLERFRAMEINFO
@@ -1244,6 +1266,7 @@ PWSTR
 pwsz
 pwtd
 QDC
+QDir
 qianlifeng
 qit
 QITAB
@@ -1414,6 +1437,8 @@ SHELLEXECUTEINFO
 SHELLEXECUTEINFOW
 shellscalingapi
 SHFILEINFO
+SHFILEOPSTRUCT
+SHGDN
 SHGDNF
 SHGFI
 shinfo
@@ -1421,6 +1446,7 @@ shldisp
 shlobj
 shlwapi
 shmem
+SHNAMEMAPPING
 shobjidl
 SHORTCUTATLEAST
 shortcutcontrol
@@ -1525,7 +1551,7 @@ stringtable
 stringval
 Strm
 Strmiids
-Strret
+strret
 strsafe
 strutil
 sttngs
@@ -1533,7 +1559,7 @@ Stubless
 STYLECHANGED
 STYLECHANGING
 subkeys
-SUBLANG
+sublang
 subquery
 Superbar
 sut
@@ -1541,10 +1567,13 @@ svchost
 SVGIn
 SVGIO
 svgz
+SVSI
 SWC
 SWFO
 SWP
 SWRESTORE
+symbolrequestprod
+SYMCACHE
 SYMED
 SYMOPT
 SYNCMFT
@@ -1615,10 +1644,12 @@ toolkitconverters
 Toolset
 toolwindow
 TOPDOWNDIB
+TOTALCMD
 TOUCHEVENTF
 TOUCHINPUT
 touchpad
 tracelogging
+trafficmanager
 traies
 transicc
 TRAYMOUSEMESSAGE
@@ -1745,6 +1776,7 @@ VSTHRD
 VSTT
 vswhere
 Vtbl
+WANTMAPPINGHANDLE
 WANTPALM
 wbem
 Wbemidl
@@ -1756,6 +1788,7 @@ WCE
 wcex
 WClass
 wcsicmp
+wcsncpy
 wcsnicmp
 WDA
 wdp
@@ -1838,6 +1871,7 @@ workarounds
 WORKSPACESEDITOR
 WORKSPACESLAUNCHER
 WORKSPACESSNAPSHOTTOOL
+WORKSPACESWINDOWARRANGER
 wox
 wparam
 wpf
@@ -1877,6 +1911,7 @@ XLoc
 XNamespace
 XPels
 XPixel
+xplorer
 XResource
 xsi
 XStr
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@@ -178,6 +178,9 @@
                "PowerToys.MouseWithoutBordersHelper.dll",
                "PowerToys.MouseWithoutBordersHelper.exe",

+                "WinUI3Apps\\PowerToys.NewPlus.ShellExtension.dll",
+                "WinUI3Apps\\NewPlusPackage.msix",
+
                "PowerAccent.Core.dll",
                "PowerToys.PowerAccent.dll",
                "PowerToys.PowerAccent.exe",
@@ -191,6 +194,7 @@

                "PowerToys.WorkspacesSnapshotTool.exe",
                "PowerToys.WorkspacesLauncher.exe",
+                "PowerToys.WorkspacesWindowArranger.exe",
                "PowerToys.WorkspacesEditor.exe",
                "PowerToys.WorkspacesEditor.dll",
                "PowerToys.WorkspacesLauncherUI.exe",
--- a/.pipelines/ci/caching.yml
+++ b/.pipelines/ci/caching.yml
@@ -1,41 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/microsoft/azure-pipelines-vscode/main/service-schema.json
-trigger:
-  batch: true
-  branches:
-    include:
-      - main
-      - stable
-  paths:
-    exclude:
-      - doc/*
-      - temp/*
-      - tools/*
-      - '**.md'
-
-pr:
-  branches:
-    include:
-      - main
-      - stable
-  paths:
-    exclude:
-      - '**.md'
-      - doc
-       
-#     0.0.yyMM.dd##
-#     0.0.1904.0900
-name: 0.0.$(Date:yyMM).$(Date:dd)$(Rev:rr)
-
-variables:
-  EnablePipelineCache: true
-
-jobs:
-  - template: ./templates/build-powertoys-precheck.yml
-  - template: ./templates/build-powertoys-ci.yml
-    parameters:
-      platform: x64
-      enableCaching: true
-  - template: ./templates/build-powertoys-ci.yml
-    parameters:
-      platform: arm64
-      enableCaching: true
--- a/.pipelines/ci/ci.yml
+++ b/.pipelines/ci/ci.yml
@@ -1,46 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/microsoft/azure-pipelines-vscode/main/service-schema.json
-trigger:
-  batch: true
-  branches:
-    include:
-      - main
-      - stable
-  paths:
-    exclude:
-      - doc/*
-      - temp/*
-      - tools/*
-      - '**.md'
-
-pr:
-  branches:
-    include:
-      - main
-      - stable
-  paths:
-    exclude:
-      - '**.md'
-      - doc
-       
-#     0.0.yyMM.dd##
-#     0.0.1904.0900
-name: 0.0.$(Date:yyMM).$(Date:dd)$(Rev:rr)
-
-variables:
-  EnablePipelineCache: true
-
-jobs:
-  - template: ./templates/build-powertoys-precheck.yml
-  - template: ./templates/build-powertoys-ci.yml
-    parameters:
-      platform: x64
-      ${{ if eq(variables['System.PullRequest.IsFork'], 'False') }}:
-        enableCaching: true
-  - template: ./templates/build-powertoys-ci.yml
-    parameters:
-      platform: arm64
-      ${{ if eq(variables['System.PullRequest.IsFork'], 'False') }}:
-        enableCaching: true
-#  - template: ./templates/run-ui-tests-ci.yml
-#    parameters:
-#      platform: x64 
--- a/.pipelines/ci/templates/build-powertoys-ci.yml
+++ b/.pipelines/ci/templates/build-powertoys-ci.yml
@@ -1,44 +0,0 @@
-parameters:
-  - name: configuration
-    type: string
-    default: 'Release'
-  - name: platform
-    type: string
-    default: 'x64'
-  - name: additionalBuildArguments
-    type: string
-    default: '-p:RestorePackagesConfig=true -m'
-  - name: enableCaching
-    type: boolean
-    default: false
-
-jobs:
- job: Build${{ parameters.platform }}${{ parameters.configuration }}
-  displayName: Build ${{ parameters.platform }} ${{ parameters.configuration }}
-  dependsOn: Precheck
-  condition: and(succeeded(),ne(dependencies.Precheck.outputs['verifyBuildRequest.skipBuild'], 'Yes'))
-  variables:
-    BuildConfiguration: ${{ parameters.configuration }}
-    BuildPlatform: ${{ parameters.platform }}
-    NUGET_RESTORE_MSBUILD_ARGS: /p:Platform=${{ parameters.platform }} # Required for nuget to work due to self contained
-    NODE_OPTIONS: --max_old_space_size=16384
-  pool:
-    demands: ImageOverride -equals SHINE-VS17-Latest
-    ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
-      name: SHINE-INT-L
-    ${{ else }}:
-      name: SHINE-OSS-L
-  timeoutInMinutes: 120
-  strategy:
-    maxParallel: 10
-  steps:
-  - template: build-powertoys-steps.yml
-    parameters:
-      additionalBuildArguments: ${{ parameters.additionalBuildArguments }}
-      enableCaching: ${{ parameters.enableCaching }}
-
-  # It appears that the Component Governance build task that gets automatically injected stopped working
-  # when we renamed our main branch.
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: 'Component Detection'
-    condition: and(succeededOrFailed(), not(eq(variables['Build.Reason'], 'PullRequest')))
--- a/.pipelines/ci/templates/build-powertoys-installer.yml
+++ b/.pipelines/ci/templates/build-powertoys-installer.yml
@@ -1,20 +0,0 @@
-parameters:
-  configuration: 'Release'
-  platform: ''
-  additionalBuildArguments: '/p:RestorePackagesConfig=true -m'
-
-jobs:
- job: Build${{ parameters.platform }}${{ parameters.configuration }}
-  displayName: Build ${{ parameters.platform }} ${{ parameters.configuration }}
-  variables:
-    BuildConfiguration: ${{ parameters.configuration }}
-    BuildPlatform: ${{ parameters.platform }}
-  pool:
-      name: SHINE-INT-L
-  timeoutInMinutes: 120
-  strategy:
-    maxParallel: 10
-  steps:
-  - template: build-powertoys-steps.yml
-    parameters:
-      additionalBuildArguments: ${{ parameters.additionalBuildArguments }}
--- a/.pipelines/ci/templates/build-powertoys-precheck.yml
+++ b/.pipelines/ci/templates/build-powertoys-precheck.yml
@@ -1,38 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/microsoft/azure-pipelines-vscode/master/service-schema.json
-jobs:
- job: Precheck
-  pool:
-    demands: ImageOverride -equals SHINE-VS17-Latest
-    ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
-      name: SHINE-INT-L
-    ${{ else }}:
-      name: SHINE-OSS-L
-  steps:
-  - checkout: none
-
-  - task: PowerShell@2
-    displayName: Verify Build Request
-    inputs:
-      targetType: 'inline'
-      script: |
-        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'
-          }
-        }
-      pwsh: true
-    name: verifyBuildRequest
--- a/.pipelines/ci/templates/build-powertoys-steps.yml
+++ b/.pipelines/ci/templates/build-powertoys-steps.yml
@@ -1,297 +0,0 @@
-parameters:
-  - name: additionalBuildArguments
-    type: string
-    default: ''
-  - name: enableCaching
-    type: boolean
-    default: false
-
-steps:
- checkout: self
-  fetchDepth: 1
-  submodules: true
-  clean: true
-
- task: UseDotNet@2
-  displayName: 'Use .NET 6 SDK'
-  inputs:
-    packageType: sdk
-    version: '6.x'
-
- task: PowerShell@2
-  displayName: Verify XAML formatting
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\applyXamlStyling.ps1'
-    arguments: -Passive
-    pwsh: true
-
- task: PowerShell@2
-  displayName: Verify Nuget package versions for PowerToys.sln
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyNugetPackages.ps1'
-    arguments: -solution '$(build.sourcesdirectory)\PowerToys.sln'
-    pwsh: true
-
- task: PowerShell@2
-  displayName: Verify Arm64 configuration for PowerToys.sln
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyArm64Configuration.ps1'
-    arguments: -solution '$(build.sourcesdirectory)\PowerToys.sln'
-    pwsh: true
-
- task: PowerShell@2
-  displayName: Verify Arm64 configuration for BugReportTool.sln
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyArm64Configuration.ps1'
-    arguments: -solution '$(build.sourcesdirectory)\tools\BugReportTool\BugReportTool.sln'
-    pwsh: true
-
- task: PowerShell@2
-  displayName: Verify Arm64 configuration for WebcamReportTool.sln
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyArm64Configuration.ps1'
-    arguments: -solution '$(build.sourcesdirectory)\tools\WebcamReportTool\WebcamReportTool.sln'
-    pwsh: true
-
- task: PowerShell@2
-  displayName: Verify Arm64 configuration for StylesReportTool.sln
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyArm64Configuration.ps1'
-    arguments: -solution '$(build.sourcesdirectory)\tools\StylesReportTool\StylesReportTool.sln'
-    pwsh: true
-
- task: PowerShell@2
-  displayName: Verify Arm64 configuration for PowerToysSetup.sln
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyArm64Configuration.ps1'
-    arguments: -solution '$(build.sourcesdirectory)\installer\PowerToysSetup.sln'
-    pwsh: true
-
- task: PowerShell@2
-  displayName: Verify and set latest VCToolsVersion usage
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyAndSetLatestVCToolsVersion.ps1'
-    pwsh: true
-
- task: UseDotNet@2
-  displayName: 'Use .NET 8 SDK'
-  inputs:
-    packageType: sdk
-    version: '8.x'
-    includePreviewVersions: true
-
- task: VisualStudioTestPlatformInstaller@1
-  displayName: Ensure VSTest Platform
-
- task: Cache@2
-  displayName: 'Cache nuget packages (PackageReference)'
-  inputs:
-    key: '"PackageReference" | "$(Agent.OS)" | Directory.Packages.props'
-    restoreKeys: |
-       "PackageReference" | "$(Agent.OS)"
-       "PackageReference"
-    path: $(NUGET_PACKAGES)
-
- task: Cache@2
-  displayName: 'Cache nuget packages (packages.config)'
-  inputs:
-    key: '"packages.config" | "$(Agent.OS)" | **/packages.config'
-    restoreKeys: |
-       "packages.config" | "$(Agent.OS)"
-       "packages.config"
-    path: packages
-
- ${{ if eq(parameters.enableCaching, true) }}:
-  - task: NuGetToolInstaller@1
-    displayName: Install NuGet
-
-  - script: nuget restore packages.config -SolutionDirectory .
-    displayName: 'nuget restore packages.config'
-
- task: VSBuild@1
-  displayName: 'Build and Test PowerToys.sln'
-  inputs:
-    solution: '**\PowerToys.sln'
-    vsVersion: 17.0
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    ${{ if eq(parameters.enableCaching, true) }}:
-      msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} -t:Build;Test -graph -reportfileaccesses -p:MSBuildCacheEnabled=true -p:MSBuildCacheLogDirectory=$(Build.ArtifactStagingDirectory)\logs\MSBuildCache -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToys.binlog -ds:false
-    ${{ else }}:
-      msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} -t:Build;Test -graph -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToys.binlog -ds:false
-    msbuildArchitecture: x64
-    maximumCpuCount: true
-  ${{ if eq(parameters.enableCaching, true) }}:
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-
- task: VSBuild@1
-  displayName: 'Build BugReportTool.sln'
-  inputs:
-    solution: '**\BugReportTool.sln'
-    vsVersion: 17.0
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} -graph -bl:$(Build.ArtifactStagingDirectory)\logs\BugReportTool.binlog -ds:false
-    msbuildArchitecture: x64
-    maximumCpuCount: true
-
- task: VSBuild@1
-  displayName: 'Build WebcamReportTool.sln'
-  inputs:
-    solution: '**\WebcamReportTool.sln'
-    vsVersion: 17.0
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} -graph -bl:$(Build.ArtifactStagingDirectory)\logs\WebcamReportTool.binlog -ds:false
-    msbuildArchitecture: x64
-    maximumCpuCount: true
-
- task: VSBuild@1
-  displayName: 'Build StylesReportTool.sln'
-  inputs:
-    solution: '**\StylesReportTool.sln'
-    vsVersion: 17.0
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} -graph -bl:$(Build.ArtifactStagingDirectory)\logs\StylesReportTool.binlog -ds:false
-    msbuildArchitecture: x64
-    maximumCpuCount: true
-
- task: PowerShell@2
-  displayName: Download and install WiX 3.14 development build
-  inputs:
-    targetType: filePath
-    filePath: '$(build.sourcesdirectory)\.pipelines\installWiX.ps1'
-
- task: VSBuild@1
-  displayName: 'Build PowerToys per-machine MSI'
-  inputs:
-    solution: '**\installer\PowerToysSetup.sln'
-    vsVersion: 17.0
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    msbuildArgs: /t:PowerToysInstaller -restore ${{ parameters.additionalBuildArguments }} -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToysSetup-PowerToysInstaller.binlog -ds:false
-    msbuildArchitecture: x64
-    maximumCpuCount: true
-
- task: VSBuild@1
-  displayName: 'Build PowerToys per-machine Bootstrapper'
-  inputs:
-    solution: '**\installer\PowerToysSetup.sln'
-    vsVersion: 17.0
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    msbuildArgs: /t:PowerToysBootstrapper ${{ parameters.additionalBuildArguments }} -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToysSetup-PowerToysBootstrapper.binlog -ds:false
-    clean: false
-    msbuildArchitecture: x64
-    maximumCpuCount: true
-
- task: PowerShell@2
-  displayName: Clean installer dir before building per-user installer
-  inputs:
-    targetType: inline
-    script: git clean -xfd  -e *exe -- .\installer\
-    pwsh: true
-
- task: VSBuild@1
-  displayName: 'Build PowerToys per-user MSI'
-  inputs:
-    solution: '**\installer\PowerToysSetup.sln'
-    vsVersion: 17.0
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    msbuildArgs: /t:PowerToysInstaller -restore ${{ parameters.additionalBuildArguments }} /p:PerUser=true -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToysSetup-PowerToysInstaller-PerUser.binlog -ds:false
-    msbuildArchitecture: x64
-    maximumCpuCount: true
-
- task: VSBuild@1
-  displayName: 'Build PowerToys per-user Bootstrapper'
-  inputs:
-    solution: '**\installer\PowerToysSetup.sln'
-    vsVersion: 17.0
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    msbuildArgs: /t:PowerToysBootstrapper ${{ parameters.additionalBuildArguments }} /p:PerUser=true -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToysSetup-PowerToysBootstrapper-PerUser.binlog -ds:false
-    clean: false
-    msbuildArchitecture: x64
-    maximumCpuCount: true
-
-# Check if deps.json files don't reference different dll versions.
- task: PowerShell@2
-  displayName: Audit deps.json files for all applications
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyDepsJsonLibraryVersions.ps1'
-    arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'
-    pwsh: true
-
-# Check if asset files on the main application paths are playing nice and avoiding basic conflicts.
- task: PowerShell@2
-  displayName: Audit base applications path asset conflicts
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyPossibleAssetConflicts.ps1'
-    arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'
-    pwsh: true
-
- task: PowerShell@2
-  displayName: Audit WinAppSDK applications path asset conflicts
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyPossibleAssetConflicts.ps1'
-    arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)\WinUI3Apps'
-    pwsh: true
-
-# Publish test results which ran in MSBuild
- task: PublishTestResults@2
-  displayName: 'Publish Test Results'
-  inputs:
-    testResultsFormat: VSTest
-    testResultsFiles: '**/*.trx'
-  condition: ne(variables['BuildPlatform'],'arm64')
-
-# Native dlls
- task: VSTest@2
-  condition: ne(variables['BuildPlatform'],'arm64') # No arm64 agents to run the tests.
-  displayName: 'Native Tests'
-  inputs:
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    testSelector: 'testAssemblies'
-    testAssemblyVer2: |
-      **\KeyboardManagerEngineTest.dll
-      **\KeyboardManagerEditorTest.dll
-      **\UnitTests-CommonLib.dll
-      **\PowerRenameUnitTests.dll
-      **\UnitTests-FancyZones.dll
-      !**\obj\**
-
- task: PowerShell@2
-  displayName: Trigger dotnet welcome message so that it does not cause errors on other scripts
-  inputs:
-    targetType: 'inline'
-    script: |
-      dotnet list $(build.sourcesdirectory)\src\common\Common.UI\Common.UI.csproj package
-
- task: PowerShell@2
-  displayName: Verify Notice.md and Nuget packages match
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyNoticeMdAgainstNugetPackages.ps1'
-    arguments: -path '$(build.sourcesdirectory)\'
-    pwsh: true
-
- publish: $(Build.ArtifactStagingDirectory)\logs
-  displayName: Publish Logs
-  artifact: '$(System.JobDisplayName) logs'
-  condition: always()
-
- task: CopyFiles@2
-  displayName: Copy Build Files
-  condition: and(succeeded(), ne(variables['BuildPlatform'],'arm64')) 
-  inputs:
-    sourceFolder: '$(Build.SourcesDirectory)'
-    contents: '$(BuildPlatform)/$(BuildConfiguration)/**/*'
-    targetFolder: '$(Build.ArtifactStagingDirectory)\$(BuildPlatform)\$(BuildConfiguration)'
-
- publish: $(Build.ArtifactStagingDirectory)\$(BuildPlatform)\$(BuildConfiguration)
-  displayName: Publish Build Artifacts
-  artifact: build-$(BuildPlatform)-$(BuildConfiguration)
-  condition: and(succeeded(), ne(variables['BuildPlatform'],'arm64')) 
--- a/.pipelines/ci/templates/run-ui-tests-ci.yml
+++ b/.pipelines/ci/templates/run-ui-tests-ci.yml
@@ -1,70 +0,0 @@
-parameters:
-  configuration: 'Release'
-  platform: ''
-  
-jobs:
- job: UITest
-  displayName: UI Test ${{ parameters.platform }} ${{ parameters.configuration }}
-  dependsOn: Build${{ parameters.platform }}${{ parameters.configuration }}
-  variables:
-    SrcPath: $(Build.Repository.LocalPath)
-  pool:
-    ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
-      name: SHINE-INT-Testing-x64
-    ${{ else }}:
-      name: SHINE-OSS-Testing-x64
-  steps:
-  - checkout: self
-    fetchDepth: 1
-    submodules: false
-    clean: true
-    fetchTags: false
-
-  - download: current
-    displayName: Download artifacts
-    artifact: build-${{ parameters.platform }}-${{ parameters.configuration }}
-
-  - task: UseDotNet@2
-    displayName: 'Use .NET 6 SDK'
-    inputs:
-      packageType: sdk
-      version: '6.x'
-
-  - task: UseDotNet@2
-    displayName: 'Use .NET 8 SDK'
-    inputs:
-      packageType: sdk
-      version: '8.x'
-      includePreviewVersions: true
-
-  - task: VisualStudioTestPlatformInstaller@1
-    displayName: Ensure VSTest Platform
-
-  - task: PowerShell@2
-    displayName: Download and install WinAppDriver
-    inputs:
-      targetType: filePath
-      filePath: '$(build.sourcesdirectory)\.pipelines\InstallWinAppDriver.ps1'
-      
-  - task: ScreenResolutionUtility@1
-    inputs:
-      displaySettings: 'optimal'
-    
-  - task: VSTest@2
-    displayName: 'UI Tests'
-    condition: and(succeeded(), ne(variables['BuildPlatform'],'arm64')) # No arm64 agents to run the tests.
-    inputs:
-      platform: '$(BuildPlatform)'
-      configuration: '$(BuildConfiguration)'
-      testSelector: 'testAssemblies'
-      searchFolder: '$(Pipeline.Workspace)\build-${{ parameters.platform }}-${{ parameters.configuration }}'
-      vstestLocationMethod: 'location' # otherwise fails to find vstest.console.exe 
-      #vstestLocation: '$(Agent.ToolsDirectory)\VsTest\**\${{ parameters.platform }}\tools\net462\Common7\IDE\Extensions\TestPlatform'
-      vstestLocation: '$(Agent.ToolsDirectory)\VsTest\17.10.0\x64\tools\net462\Common7\IDE\Extensions\TestPlatform'
-      uiTests: true
-      rerunFailedTests: true
-      testAssemblyVer2: |
-        **\UITests-FancyZones.dll
-        **\UITests-FancyZonesEditor.dll
-        !**\obj\**
-        !**\ref\**
--- a/.pipelines/installer-steps.yml
+++ b/.pipelines/installer-steps.yml
@@ -1,152 +0,0 @@
-parameters:
-  - name: versionNumber
-    type: string
-    default: "0.0.1"
-  - name: perUserArg
-    type: string
-    default: "false"
-  - name: buildSubDir
-    type: string
-    default: "MachineSetup"
-  - name: installerPrefix
-    type: string
-    default: "PowerToysSetup"
-  - name: signingParameters
-    type: object
-    default: {}
-
-steps:
-  - task: VSBuild@1
-    displayName: Build PowerToysSetupCustomActions DLL # This dll needs to be build and signed before building the MSI.
-    inputs:
-      solution: "**/installer/PowerToysSetup.sln"
-      vsVersion: 17.0
-      msbuildArgs: -restore /p:RestorePackagesConfig=true /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog /t:PowerToysSetupCustomActions /p:RunBuildEvents=true /p:PerUser=${{parameters.perUserArg}}
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      clean: true
-      maximumCpuCount: true
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
-    displayName: Sign PowerToysSetupCustomActions DLL
-    inputs:
-      ${{ insert }}: ${{ parameters.signingParameters }}
-      FolderPath: 'installer/PowerToysSetupCustomActions/$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}'
-      signType: batchSigning
-      batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-      ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-
-  ## INSTALLER START
-  #### MSI BUILDING AND SIGNING
-  - task: VSBuild@1
-    displayName: Build MSI
-    inputs:
-      solution: "**/installer/PowerToysSetup.sln"
-      vsVersion: 17.0
-      msbuildArgs: /p:CIBuild=true /p:BuildProjectReferences=false /target:PowerToysInstaller /bl:$(Build.SourcesDirectory)\msbuild.binlog /p:RunBuildEvents=false /p:PerUser=${{parameters.perUserArg}}
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      clean: false # don't undo our hard work above by deleting the CustomActions dll
-      maximumCpuCount: true
-
-  - task: CmdLine@2
-    displayName: "Extracting MSI to verify contents"
-    inputs:
-      script: |
-        "C:\Program Files (x86)\WiX Toolset v3.14\bin\dark.exe" -x $(build.sourcesdirectory)\extractedMsi installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-${{ parameters.versionNumber }}-$(BuildPlatform).msi
-        dir $(build.sourcesdirectory)\extractedMsi
-
-  # Check if deps.json files don't reference different dll versions.
-  - task: PowerShell@2
-    displayName: Audit deps.json in MSI extracted files
-    inputs:
-      filePath: '.pipelines/verifyDepsJsonLibraryVersions.ps1'
-      arguments: -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
-      pwsh: true
-
-  # Did we sign all files
-  - task: PowerShell@1
-    displayName: Verifying entire build is signed and version set
-    inputs:
-      scriptName: .pipelines/versionAndSignCheck.ps1
-      arguments: -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
-
-  - task: PowerShell@1
-    displayName: Verifying MSI Custom Actions DLL is signed
-    inputs:
-      scriptName: .pipelines/versionAndSignCheck.ps1
-      arguments: -targetDir '$(build.sourcesdirectory)\extractedMsi\Binary'
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
-    displayName: Sign MSI
-    inputs:
-      ${{ insert }}: ${{ parameters.signingParameters }}
-      FolderPath: 'installer/PowerToysSetup/$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}'
-      signType: batchSigning
-      batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-      ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-  #### END MSI
-  #### BOOTSTRAP BUILDING AND SIGNING
-
-  - task: VSBuild@1
-    displayName: Build Bootstrapper
-    inputs:
-      solution: "**/installer/PowerToysSetup.sln"
-      vsVersion: 17.0
-      msbuildArgs: /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog /t:PowerToysBootstrapper /p:PerUser=${{parameters.perUserArg}}
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      clean: false # don't undo our hard work above by deleting the MSI
-      maximumCpuCount: true
-
-  - task: CmdLine@2
-    displayName: "Insignia: Extract Engine from Bundle"
-    inputs:
-      script: '"C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ib installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\engine.exe'
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
-    displayName: "ESRP CodeSigning (Engine)"
-    inputs:
-      ${{ insert }}: ${{ parameters.signingParameters }}
-      FolderPath: "installer"
-      Pattern: engine.exe
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-            {
-                "KeyCode": "CP-230012",
-                "OperationCode": "SigntoolSign",
-                "Parameters": {
-                    "OpusName": "Microsoft",
-                    "OpusInfo": "http://www.microsoft.com",
-                    "FileDigest": "/fd \"SHA256\"",
-                    "PageHash": "/NPH",
-                    "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                },
-                "ToolName": "sign",
-                "ToolVersion": "1.0"
-            },
-            {
-                "KeyCode": "CP-230012",
-                "OperationCode": "SigntoolVerify",
-                "Parameters": {},
-                "ToolName": "sign",
-                "ToolVersion": "1.0"
-            }
-        ]
-
-  - task: CmdLine@2
-    displayName: "Insignia: Merge Engine into Bundle"
-    inputs:
-      script: '"C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ab installer\engine.exe installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-${{ parameters.versionNumber }}-$(BuildPlatform).exe'
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
-    displayName: Sign Bootstrapper
-    inputs:
-      ${{ insert }}: ${{ parameters.signingParameters }}
-      FolderPath: 'installer/PowerToysSetup/$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}'
-      signType: batchSigning
-      batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-      ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-  #### END BOOTSTRAP
-  ## END INSTALLER
--- a/.pipelines/release.yml
+++ b/.pipelines/release.yml
@@ -1,551 +0,0 @@
-# This build should never run as CI or against a pull request.
-name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
-trigger: none
-pr: none
-
-resources:
-  repositories:
-  - repository: 1ESPipelineTemplates
-    type: git
-    name: 1ESPipelineTemplates/1ESPipelineTemplates
-    ref: refs/tags/release
-
-parameters:
-  - name: buildConfigurations
-    type: object
-    default:
-      - Release
-  - name: buildPlatforms
-    type: object
-    default:
-      - x64
-      - arm64
-  - name: versionNumber
-    type: string
-    default: '0.0.1'
-  - name: signingParameters
-    type: object
-    default:
-      ConnectedServiceName: $(SigningServiceName)
-      AppRegistrationClientId: $(SigningAppId)
-      AppRegistrationTenantId: $(SigningTenantId)
-      AuthAKVName: $(SigningAKVName)
-      AuthCertName: $(SigningAuthCertName)
-      AuthSignCertName: $(SigningSignCertName)
-
-extends:
-  template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
-  parameters:
-    customBuildTags:
-    - 1ES.PT.ViaStartRight
-    pool:
-      name: SHINE-INT-S
-      image: SHINE-VS17-Latest
-      os: windows
-    sdl:
-      tsa:
-        enabled: true
-        configFile: '$(Build.SourcesDirectory)\.pipelines\tsa.json'
-
-    stages:
-    - stage: build
-      displayName: Build (Complete)
-      pool:
-        name: SHINE-INT-L
-        image: SHINE-VS17-Latest
-        os: windows
-      jobs:
-      - job: Build
-        strategy:
-          matrix:
-            ${{ each config in parameters.buildConfigurations }}:
-              ${{ each platform in parameters.buildPlatforms }}:
-                ${{ config }}_${{ platform }}:
-                  BuildConfiguration: ${{ config }}
-                  BuildPlatform: ${{ platform }}
-        templateContext:
-          outputs:
-          - output: pipelineArtifact
-            artifactName: setup-$(BuildPlatform)
-            targetPath: $(Build.ArtifactStagingDirectory)
-        displayName: Build
-        timeoutInMinutes: 240 # Some of the 1ES Pipeline stuff and Loc take a very long time
-        cancelTimeoutInMinutes: 1
-        variables:
-          NUGET_RESTORE_MSBUILD_ARGS: /p:Platform=$(BuildPlatform) # Required for nuget to work due to self contained
-          NODE_OPTIONS: --max_old_space_size=16384
-          IsPipeline: 1 # The installer uses this to detect whether it should pick up localizations
-          SkipCppCodeAnalysis: 1 # Skip the code analysis to speed up release CI. It runs on PR CI, anyway
-          # IsExperimentationLive: 1 # The build and installer use this to turn on experimentation
-        steps:
-        - checkout: self
-          clean: true
-          submodules: true
-          persistCredentials: True
-
-      # Sets versions for all PowerToy created DLLs
-        - task: PowerShell@1
-          displayName: Set Versions.Prop
-          inputs:
-            scriptName: .pipelines/versionSetting.ps1
-            arguments: -versionNumber '${{ parameters.versionNumber }}' -DevEnvironment ''
-
-      # ESRP needs 'Microsoft.NETCore.App', version '6.0.0' (x64)
-        - task: UseDotNet@2
-          displayName: 'Use .NET 6 SDK'
-          inputs:
-            packageType: sdk
-            version: '6.x'
-
-        - task: UseDotNet@2
-          displayName: 'Use .NET 8 SDK'
-          inputs:
-            packageType: sdk
-            version: '8.x'
-
-        - task: PowerShell@2
-          displayName: Verify and set latest VCToolsVersion usage
-          inputs:
-            filePath: '$(build.sourcesdirectory)\.pipelines\verifyAndSetLatestVCToolsVersion.ps1'
-            pwsh: true
-
-        - task: NuGetAuthenticate@1
-            
-        - task: NuGetToolInstaller@1
-          displayName: Use NuGet Installer latest
-
-      # this will restore the following nugets:
-      # - main solution
-      # - Bug report tool
-      # - Webcam report tool
-      # - Installer
-      # - Bootstrapper Installer
-        - task: PowerShell@2
-          displayName: Download and install WiX 3.14 development build
-          inputs:
-            targetType: filePath
-            filePath: '$(build.sourcesdirectory)\.pipelines\installWiX.ps1'
-
-        - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@3
-          displayName: 'Download Localization Files -- PowerToys 37400'
-          inputs:
-            teamId: 37400
-            TDBuildServiceConnection: $(TouchdownServiceConnection)
-            authType: SubjectNameIssuer
-            resourceFilePath: |
-             **\Resources.resx
-             **\Resource.resx
-             **\Resources.resw
-            appendRelativeDir: true
-            localizationTarget: false
-            # pseudoSetting: Included
-
-        - task: PowerShell@2
-          displayName: Move Loc files into correct locations
-          inputs:
-            targetType: inline
-            script: >-
-              $VerbosePreference = "Continue"
-
-              ./tools/build/move-and-rename-resx.ps1
-
-              ./tools/build/move-uwp-resw.ps1
-            pwsh: true
-            
-        - task: CmdLine@2
-          displayName: Moving telem files
-          inputs:
-            script: |
-              call nuget.exe restore -configFile .pipelines/release-nuget.config -PackagesDirectory . .pipelines/packages.config || exit /b 1
-              move /Y "Microsoft.PowerToys.Telemetry.2.0.0\build\include\TraceLoggingDefines.h" "src\common\Telemetry\TraceLoggingDefines.h" || exit /b 1
-              move /Y "Microsoft.PowerToys.Telemetry.2.0.0\build\include\TelemetryBase.cs" "src\common\Telemetry\TelemetryBase.cs" || exit /b 1
-
-      ## ALL BUT INSTALLER BUILDING
-        - task: VSBuild@1
-          displayName: Build PowerToys main project
-          inputs:
-            solution: '**\PowerToys.sln'
-            vsVersion: 17.0
-            msbuildArgs: -restore -graph /p:RestorePackagesConfig=true /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            clean: true
-            maximumCpuCount: true
-
-        ### BEGIN SECTION - build and sign nuget packages for abstracted UI utils
-        - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
-          displayName: Sign Utilities libraries
-          inputs:
-            ${{ insert }}: ${{ parameters.signingParameters }}
-            FolderPath: 'src/modules'
-            signType: batchSigning
-            batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_abstracted_utils_dll.json'
-            ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-
-        - task: VSBuild@1
-          displayName: Create Hosts File Editor package
-          inputs:
-            solution: '**\HostsUILib.csproj'
-            vsVersion: 17.0
-            msbuildArgs: /p:CIBuild=true -t:pack /bl:$(Build.SourcesDirectory)\msbuild.binlog
-            configuration: $(BuildConfiguration)
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Create Environment Variables Editor package
-          inputs:
-            solution: '**\EnvironmentVariablesUILib.csproj'
-            vsVersion: 17.0
-            msbuildArgs: /p:CIBuild=true -t:pack /bl:$(Build.SourcesDirectory)\msbuild.binlog
-            configuration: $(BuildConfiguration)
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Create Registry Preview package
-          inputs:
-            solution: '**\RegistryPreviewUILib.csproj'
-            vsVersion: 17.0
-            msbuildArgs: /p:CIBuild=true -t:pack /bl:$(Build.SourcesDirectory)\msbuild.binlog
-            configuration: $(BuildConfiguration)
-            maximumCpuCount: true
-
-        - task: CopyFiles@2
-          displayName: Copying nuget packages file over
-          inputs:
-            contents: "**/bin/Release/PowerToys*.nupkg"
-            flattenFolders: True
-            targetFolder: $(Build.ArtifactStagingDirectory)/nupkg
-
-        - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
-          displayName: Submit *.nupkg to ESRP for code signing
-          inputs:
-            ${{ insert }}: ${{ parameters.signingParameters }}
-            FolderPath: $(Build.ArtifactStagingDirectory)/nupkg
-            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"
-                  }
-              ]
-        ### END SECTION - build and sign nuget packages for abstracted UI utils
-
-        - task: VSBuild@1
-          displayName: Build BugReportTool
-          inputs:
-            solution: '**/tools/BugReportTool/BugReportTool.sln'
-            vsVersion: 17.0
-            msbuildArgs: -restore -graph /p:RestorePackagesConfig=true /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            clean: true
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Build WebcamReportTool
-          inputs:
-            solution: '**/tools/WebcamReportTool/WebcamReportTool.sln'
-            vsVersion: 17.0
-            msbuildArgs: -restore -graph /p:RestorePackagesConfig=true /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            clean: true
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Build StylesReportTool
-          inputs:
-            solution: '**/tools/StylesReportTool/StylesReportTool.sln'
-            vsVersion: 17.0
-            msbuildArgs: -restore -graph /p:RestorePackagesConfig=true /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            clean: true
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Publish Settings for Packaging
-          inputs:
-            solution: 'src/settings-ui/Settings.UI/PowerToys.Settings.csproj'
-            vsVersion: 17.0
-            msbuildArgs: >-
-              /target:Publish
-              /graph
-              /p:Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);AppxBundle=Never
-              /p:VCRTForwarders-IncludeDebugCRT=false
-              /p:PowerToysRoot=$(Build.SourcesDirectory)
-              /p:PublishProfile=InstallationPublishProfile.pubxml
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Publish Launcher for Packaging
-          inputs:
-            solution: 'src/modules/launcher/PowerLauncher/PowerLauncher.csproj'
-            vsVersion: 17.0
-            # The arguments should be the same as the ones for Settings; make sure they are.
-            msbuildArgs: >-
-              /target:Publish
-              /graph
-              /p:Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);AppxBundle=Never
-              /p:VCRTForwarders-IncludeDebugCRT=false
-              /p:PowerToysRoot=$(Build.SourcesDirectory)
-              /p:PublishProfile=InstallationPublishProfile.pubxml
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Publish Monaco Preview Handler for Packaging
-          inputs:
-            solution: 'src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj'
-            vsVersion: 17.0
-            # The arguments should be the same as the ones for Settings; make sure they are.
-            msbuildArgs: >-
-              /target:Publish
-              /graph
-              /p:Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);AppxBundle=Never
-              /p:VCRTForwarders-IncludeDebugCRT=false
-              /p:PowerToysRoot=$(Build.SourcesDirectory)
-              /p:PublishProfile=InstallationPublishProfile.pubxml
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Publish Markdown Preview Handler for Packaging
-          inputs:
-            solution: 'src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj'
-            vsVersion: 17.0
-            # The arguments should be the same as the ones for Settings; make sure they are.
-            msbuildArgs: >-
-              /target:Publish
-              /graph
-              /p:Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);AppxBundle=Never
-              /p:VCRTForwarders-IncludeDebugCRT=false
-              /p:PowerToysRoot=$(Build.SourcesDirectory)
-              /p:PublishProfile=InstallationPublishProfile.pubxml
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Publish Svg Preview Handler for Packaging
-          inputs:
-            solution: 'src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj'
-            vsVersion: 17.0
-            # The arguments should be the same as the ones for Settings; make sure they are.
-            msbuildArgs: >-
-              /target:Publish
-              /graph
-              /p:Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);AppxBundle=Never
-              /p:VCRTForwarders-IncludeDebugCRT=false
-              /p:PowerToysRoot=$(Build.SourcesDirectory)
-              /p:PublishProfile=InstallationPublishProfile.pubxml
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Publish Svg Thumbnail Provider for Packaging
-          inputs:
-            solution: 'src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj'
-            vsVersion: 17.0
-            # The arguments should be the same as the ones for Settings; make sure they are.
-            msbuildArgs: >-
-              /target:Publish
-              /graph
-              /p:Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);AppxBundle=Never
-              /p:VCRTForwarders-IncludeDebugCRT=false
-              /p:PowerToysRoot=$(Build.SourcesDirectory)
-              /p:PublishProfile=InstallationPublishProfile.pubxml
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Publish File Locksmith UI for Packaging
-          inputs:
-            solution: 'src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj'
-            vsVersion: 17.0
-            # The arguments should be the same as the ones for Settings; make sure they are.
-            msbuildArgs: >-
-              /target:Publish
-              /graph
-              /p:Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);AppxBundle=Never
-              /p:VCRTForwarders-IncludeDebugCRT=false
-              /p:PowerToysRoot=$(Build.SourcesDirectory)
-              /p:PublishProfile=InstallationPublishProfile.pubxml
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            maximumCpuCount: true
-
-        # Check if deps.json files don't reference different dll versions.
-        - task: PowerShell@2
-          displayName: Audit deps.json files for all applications
-          inputs:
-            filePath: '.pipelines/verifyDepsJsonLibraryVersions.ps1'
-            arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'
-            pwsh: true
-
-        # Check if asset files on the main application paths are playing nice and avoiding basic conflicts.
-        - task: PowerShell@2
-          displayName: Audit base applications path asset conflicts
-          inputs:
-            filePath: '.pipelines/verifyPossibleAssetConflicts.ps1'
-            arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'
-            pwsh: true
-
-        - task: PowerShell@2
-          displayName: Audit WinAppSDK applications path asset conflicts
-          inputs:
-            filePath: '.pipelines/verifyPossibleAssetConflicts.ps1'
-            arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)\WinUI3Apps'
-            pwsh: true
-
-      #### MAIN SIGNING AREA
-      # reference https://dev.azure.com/microsoft/Dart/_git/AppDriver?path=/ESRPSigning.json&version=GBarm64-netcore&_a=contents for winappdriver
-      # https://dev.azure.com/microsoft/Dart/_git/AppDriver?path=/CIPolicy.xml&version=GBarm64-netcore&_a=contents
-
-        - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
-          displayName: Sign Core PT
-          inputs:
-            ${{ insert }}: ${{ parameters.signingParameters }}
-            FolderPath: '$(BuildPlatform)/$(BuildConfiguration)' # Video conf uses x86 and x64.
-            signType: batchSigning
-            batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_core.json'
-            ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-
-        - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
-          displayName: Sign DSC Powershell files
-          inputs:
-            ${{ insert }}: ${{ parameters.signingParameters }}
-            FolderPath: 'src/dsc/Microsoft.PowerToys.Configure'
-            signType: batchSigning
-            batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_DSC.json'
-            ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-
-        - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
-          displayName: Sign x86 directshow VCM
-          inputs:
-            ${{ insert }}: ${{ parameters.signingParameters }}
-            FolderPath: 'x86/$(BuildConfiguration)' # Video conf uses x86 and x64.
-            signType: batchSigning
-            batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_vcm.json'
-            ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-      #### END SIGNING 
-      ## END MAIN
-
-        - pwsh: |-
-            Move-Item msbuild.binlog "$(Build.ArtifactStagingDirectory)/"
-          displayName: Stage binlog into artifact directory
-          condition: always()
-
-        - task: ComponentGovernanceComponentDetection@0
-          displayName: Component Detection
-
-        - task: CopyFiles@2
-          displayName: Copying files for symbols
-          inputs:
-            contents: >-
-              **/*.pdb
-            flattenFolders: True
-            targetFolder: $(Build.ArtifactStagingDirectory)/Symbols-$(BuildPlatform)/
-         
-        - task: PowerShell@2
-          displayName: 'Remove unneeded files from ArtifactStagingDirectory'
-          inputs:
-            targetType: 'inline'
-            script: |
-              cd $(Build.ArtifactStagingDirectory)/Symbols-$(BuildPlatform)/
-              Remove-Item vc143.pdb
-              Remove-Item *test*
-
-        - task: PublishSymbols@2
-          displayName: Publish symbols path
-          continueOnError: True
-          inputs:
-            SearchPattern: |
-              $(Build.ArtifactStagingDirectory)/Symbols-$(BuildPlatform)/**/*.*
-            IndexSources: false
-            SymbolServerType: TeamServices
-            
-        - template: .pipelines/installer-steps.yml@self
-          parameters:
-            signingParameters: ${{ parameters.signingParameters }}
-            versionNumber: ${{ parameters.versionNumber }}
-            perUserArg: "false"
-            buildSubDir: "MachineSetup"
-            installerPrefix: "PowerToysSetup"
-
-        - task: PowerShell@2
-          displayName: Clean installer dir before building per-user installer
-          inputs:
-            targetType: inline
-            script: git clean -xfd  -e *exe -- .\installer\
-            pwsh: true
-
-        - template: .pipelines/installer-steps.yml@self
-          parameters:
-            signingParameters: ${{ parameters.signingParameters }}
-            versionNumber: ${{ parameters.versionNumber }}
-            perUserArg: "true"
-            buildSubDir: "UserSetup"
-            installerPrefix: "PowerToysUserSetup"
-
-        - task: CopyFiles@2
-          displayName: Copying setup file over
-          inputs:
-            contents: "**/PowerToys*Setup-*.exe"
-            flattenFolders: True
-            targetFolder: $(Build.ArtifactStagingDirectory)
-
-        - task: PowerShell@2
-          displayName: 'Calculating SHA256 hash'
-          inputs:
-            targetType: 'inline'
-            script: |
-              $p = "$(System.ArtifactsDirectory)\";
-              $staging = "$(Build.ArtifactStagingDirectory)\"
-              $userHash = ((get-item $p\PowerToysUserSetup*.exe | Get-FileHash).Hash);
-              $machineHash = ((get-item $p\PowerToysSetup*.exe | Get-FileHash).Hash);
-              $userPlat = "hash_user_$(BuildPlatform).txt";
-              $machinePlat = "hash_machine_$(BuildPlatform).txt";
-              $combinedUserPath = $staging + $userPlat;
-              $combinedMachinePath = $staging + $machinePlat;
-              
-              echo $p
-
-              echo $userPlat
-              echo $userHash
-              echo $combinedUserPath
-
-              echo $machinePlat
-              echo $machineHash
-              echo $combinedMachinePath
-              
-              $userHash | out-file -filepath $combinedUserPath
-              $machineHash | out-file -filepath $combinedMachinePath
-            pwsh: true
-
-        # Publishing the GPO files
-        - pwsh: |-
-            New-Item "$(Build.ArtifactStagingDirectory)/gpo" -Type Directory
-            Copy-Item src\gpo\assets\* "$(Build.ArtifactStagingDirectory)/gpo" -Recurse
-          displayName: Stage the GPO files
-
-...
--- a/.pipelines/tsa.json
+++ b/.pipelines/tsa.json
@@ -3,5 +3,5 @@
    "notificationAliases": ["powertoys@microsoft.com"],
    "instanceUrl": "https://microsoft.visualstudio.com",
    "projectName": "OS",
-    "areaPath": "OS\\Windows Client and Services\\ADEPT\\E4D-Engineered for Developers\\SHINE\\PowerToys"
+    "areaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys"
 }
--- a/.pipelines/v2/ci.yml
+++ b/.pipelines/v2/ci.yml
@@ -0,0 +1,46 @@
+trigger:
+  batch: true
+  branches:
+    include:
+      - main
+      - stable
+  paths:
+    exclude:
+      - doc/*
+      - temp/*
+      - tools/*
+      - '**.md'
+
+pr:
+  branches:
+    include:
+      - main
+      - stable
+  paths:
+    exclude:
+      - '**.md'
+      - doc
+
+name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
+
+parameters:
+  - name: buildPlatforms
+    type: object
+    default:
+      - x64
+      - arm64
+  - name: enableMsBuildCaching
+    type: boolean
+    displayName: "Enable MSBuild Caching"
+    default: true
+  - name: runTests
+    type: boolean
+    displayName: "Run Tests"
+    default: true
+
+extends:
+  template: templates/pipeline-ci-build.yml
+  parameters:
+    buildPlatforms: ${{ parameters.buildPlatforms }}
+    enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+    runTests: ${{ parameters.runTests }}
--- a/.pipelines/v2/release.yml
+++ b/.pipelines/v2/release.yml
@@ -0,0 +1,106 @@
+trigger: none
+pr: none
+
+resources:
+  repositories:
+  - repository: 1ESPipelineTemplates
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+
+# Expose all of these parameters for user configuration.
+parameters:
+  - name: publishSymbolsToPublic
+    displayName: "Publish Symbols to **PUBLIC** (use only for Final Builds)"
+    type: boolean
+    default: false
+
+  - name: versionNumber
+    displayName: "Version Number"
+    type: string
+    default: '0.0.1'
+
+  - name: buildConfigurations
+    displayName: "Build Configurations"
+    type: object
+    default:
+      - Release
+
+  - name: buildPlatforms
+    displayName: "Build Platforms"
+    type: object
+    default:
+      - x64
+      - arm64
+
+name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
+
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
+  parameters:
+    customBuildTags:
+    - 1ES.PT.ViaStartRight
+    pool:
+      name: SHINE-INT-S
+      image: SHINE-VS17-Latest
+      os: windows
+    sdl:
+      tsa:
+        enabled: true
+        configFile: '$(Build.SourcesDirectory)\.pipelines\tsa.json'
+
+    stages:
+      - stage: Build
+        displayName: Build
+        dependsOn: []
+        jobs:
+          - template: .pipelines/v2/templates/job-build-project.yml@self
+            parameters:
+              pool:
+                name: SHINE-INT-L
+                image: SHINE-VS17-Latest
+                os: windows
+              variables:
+                IsPipeline: 1 # The installer uses this to detect whether it should pick up localizations
+                SkipCppCodeAnalysis: 1 # Skip the code analysis to speed up release CI. It runs on PR CI, anyway
+                # IsExperimentationLive: 1 # The build and installer use this to turn on experimentation
+              buildPlatforms: ${{ parameters.buildPlatforms }}
+              buildConfigurations: ${{ parameters.buildConfigurations }}
+              versionNumber: ${{ parameters.versionNumber }}
+              publishArtifacts: false # 1ES PT handles publication for us.
+              codeSign: true
+              runTests: false
+              signingIdentity:
+                serviceName: $(SigningServiceName)
+                appId: $(SigningAppId)
+                tenantId: $(SigningTenantId)
+                akvName: $(SigningAKVName)
+                authCertName: $(SigningAuthCertName)
+                signCertName: $(SigningSignCertName)
+              # Have msbuild use the release nuget config profile
+              additionalBuildOptions: /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config"
+              beforeBuildSteps:
+                # Sets versions for all PowerToy created DLLs
+                - pwsh: |-
+                    .pipelines/versionSetting.ps1 -versionNumber '${{ parameters.versionNumber }}' -DevEnvironment ''
+                  displayName: Prepare versioning
+
+                # Prepare the localizations and telemetry config before the release build
+                - template: .pipelines/v2/templates/steps-fetch-and-prepare-localizations.yml@self
+
+                - script: |
+                    call nuget.exe restore -configFile .pipelines/release-nuget.config -PackagesDirectory . .pipelines/packages.config || exit /b 1
+                    move /Y "Microsoft.PowerToys.Telemetry.2.0.0\build\include\TraceLoggingDefines.h" "src\common\Telemetry\TraceLoggingDefines.h" || exit /b 1
+                    move /Y "Microsoft.PowerToys.Telemetry.2.0.0\build\include\TelemetryBase.cs" "src\common\Telemetry\TelemetryBase.cs" || exit /b 1
+                  displayName: Emplace telemetry files
+
+      - stage: Publish
+        displayName: Publish
+        dependsOn: [Build]
+        jobs:
+          - template: .pipelines/v2/templates/job-publish-symbols-using-symbolrequestprod-api.yml@self
+            parameters:
+              versionNumber: ${{ parameters.versionNumber }}
+              includePublicSymbolServer: ${{ parameters.publishSymbolsToPublic }}
+              subscription: $(SymbolPublishingServiceConnection)
+              symbolProject: $(SymbolPublishingProject)
--- a/.pipelines/v2/templates/job-build-project.yml
+++ b/.pipelines/v2/templates/job-build-project.yml
@@ -0,0 +1,538 @@
+parameters:
+  - name: additionalBuildOptions
+    type: string
+    default: ''
+  - name: buildConfigurations
+    type: object
+    default:
+      - Release
+  - name: buildPlatforms
+    type: object
+    default:
+      - x64
+      - arm64
+  - name: codeSign
+    type: boolean
+    default: false
+  - name: artifactStem
+    type: string
+    default: ''
+  - name: jobName
+    type: string
+    default: 'Build'
+  - name: condition
+    type: string
+    default: ''
+  - name: dependsOn
+    type: object
+    default: []
+  - name: pool
+    type: object
+    default: []
+  - name: beforeBuildSteps
+    type: stepList
+    default: []
+  - name: variables
+    type: object
+    default: {}
+  - name: publishArtifacts
+    type: boolean
+    default: true
+  - name: signingIdentity
+    type: object
+    default: {}
+  - name: enablePackageCaching
+    type: boolean
+    default: false
+  - name: enableMsBuildCaching
+    type: boolean
+    default: false
+  - name: runTests
+    type: boolean
+    default: true
+
+  - name: versionNumber
+    type: string
+    default: '0.0.1'
+  - name: csProjectsToPublish
+    type: object
+    default:
+      - 'src/settings-ui/Settings.UI/PowerToys.Settings.csproj'
+      - 'src/modules/launcher/PowerLauncher/PowerLauncher.csproj'
+      - 'src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj'
+      - 'src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj'
+      - 'src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj'
+      - 'src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj'
+      - 'src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj'
+
+jobs:
+- job: ${{ parameters.jobName }}
+  ${{ if ne(length(parameters.pool), 0) }}:
+    pool: ${{ parameters.pool }}
+  dependsOn: ${{ parameters.dependsOn }}
+  condition: ${{ parameters.condition }}
+  strategy:
+    matrix:
+      ${{ each config in parameters.buildConfigurations }}:
+        ${{ each platform in parameters.buildPlatforms }}:
+          ${{ config }}_${{ platform }}:
+            BuildConfiguration: ${{ config }}
+            BuildPlatform: ${{ platform }}
+            ${{ if eq(platform, 'x86') }}:
+              OutputBuildPlatform: Win32
+            ${{ elseif eq(platform, 'Any CPU') }}:
+              OutputBuildPlatform: AnyCPU
+            ${{ else }}:
+              OutputBuildPlatform: ${{ platform }}
+  variables:
+    # 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.
+    # Yup.
+    MSBuildCacheParameters: ' '
+    JobOutputDirectory: $(Build.ArtifactStagingDirectory)
+    LogOutputDirectory: $(Build.ArtifactStagingDirectory)\logs
+    JobOutputArtifactName: build-$(BuildPlatform)-$(BuildConfiguration)${{ parameters.artifactStem }}
+    NUGET_RESTORE_MSBUILD_ARGS: /p:Platform=$(BuildPlatform) # Required for nuget to work due to self contained
+    NODE_OPTIONS: --max_old_space_size=16384
+    ${{ if eq(parameters.runTests, true) }}:
+      MSBuildMainBuildTargets: Build;Test
+    ${{ else }}:
+      MSBuildMainBuildTargets: Build
+    ${{ insert }}: ${{ parameters.variables }}
+  displayName: Build
+  timeoutInMinutes: 240
+  cancelTimeoutInMinutes: 1
+  templateContext: # Required when this template is hosted in 1ES PT
+    outputs:
+    - output: pipelineArtifact
+      artifactName: $(JobOutputArtifactName)
+      targetPath: $(Build.ArtifactStagingDirectory)
+  steps:
+  - checkout: self
+    clean: true
+    submodules: true
+    persistCredentials: True
+    fetchTags: false
+    fetchDepth: 1
+
+  - ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+    - pwsh: |-
+        $MSBuildCacheParameters = ""
+        $MSBuildCacheParameters += " -graph"
+        $MSBuildCacheParameters += " -reportfileaccesses"
+        $MSBuildCacheParameters += " -p:MSBuildCacheEnabled=true"
+        $MSBuildCacheParameters += " -p:MSBuildCacheLogDirectory=$(LogOutputDirectory)\MSBuildCacheLogs"
+        Write-Host "MSBuildCacheParameters: $MSBuildCacheParameters"
+        Write-Host "##vso[task.setvariable variable=MSBuildCacheParameters]$MSBuildCacheParameters"
+      displayName: Prepare MSBuildCache variables
+
+  - ${{ if eq(parameters.codeSign, true) }}:
+    # Only required if we're using ESRP
+    - template: steps-ensure-dotnet-version.yml
+      parameters:
+        sdk: true
+        version: '6.0'
+
+  - template: steps-ensure-dotnet-version.yml
+    parameters:
+      sdk: true
+      version: '8.0'
+
+  - ${{ if eq(parameters.runTests, true) }}:
+    - task: VisualStudioTestPlatformInstaller@1
+      displayName: Ensure VSTest Platform
+
+  - pwsh: |-
+      & '.pipelines/applyXamlStyling.ps1' -Passive
+      & '.pipelines/verifyNugetPackages.ps1' -solution '$(build.sourcesdirectory)\PowerToys.sln'
+      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\PowerToys.sln'
+      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\tools\BugReportTool\BugReportTool.sln'
+      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\tools\WebcamReportTool\WebcamReportTool.sln'
+      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\tools\StylesReportTool\StylesReportTool.sln'
+      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\installer\PowerToysSetup.sln'
+    displayName: Verify formatting, nuget, and ARM64 configurations
+
+  - ${{ if eq(parameters.enablePackageCaching, true) }}:
+    - task: Cache@2
+      displayName: 'Cache nuget packages (PackageReference)'
+      inputs:
+        key: '"PackageReference" | "$(Agent.OS)" | Directory.Packages.props'
+        restoreKeys: |
+           "PackageReference" | "$(Agent.OS)"
+           "PackageReference"
+        path: $(NUGET_PACKAGES)
+
+    - task: Cache@2
+      displayName: 'Cache nuget packages (packages.config)'
+      inputs:
+        key: '"packages.config" | "$(Agent.OS)" | **/packages.config'
+        restoreKeys: |
+           "packages.config" | "$(Agent.OS)"
+           "packages.config"
+        path: packages
+
+  - template: .\steps-restore-nuget.yml
+
+  - pwsh: |-
+      & "$(build.sourcesdirectory)\.pipelines\verifyAndSetLatestVCToolsVersion.ps1"
+    displayName: Work around DD-1541167 (VCToolsVersion)
+
+  - pwsh: |-
+      & "$(build.sourcesdirectory)\.pipelines\installWiX.ps1"
+    displayName: Download and install WiX 3.14 development build
+
+  - ${{ parameters.beforeBuildSteps }}
+
+  - task: VSBuild@1
+    ${{ if eq(parameters.runTests, true) }}:
+      displayName: Build and Test PowerToys main project
+    ${{ else }}:
+      displayName: Build PowerToys main project
+    inputs:
+      solution: 'PowerToys.sln'
+      vsVersion: 17.0
+      msbuildArgs: >-
+        -restore -graph
+        /p:RestorePackagesConfig=true
+        /p:CIBuild=true
+        /bl:$(LogOutputDirectory)\build-0-main.binlog
+        ${{ parameters.additionalBuildOptions }}
+        $(MSBuildCacheParameters)
+        /t:$(MSBuildMainBuildTargets)
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+    ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
+  - ${{ if eq(parameters.codeSign, true) }}:
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: Sign Utilities
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: 'src/modules'
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_abstracted_utils_dll.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+
+  - task: VSBuild@1
+    displayName: Create Hosts File Editor package
+    inputs:
+      solution: '**\HostsUILib.csproj'
+      vsVersion: 17.0
+      msbuildArgs: /p:CIBuild=true;NoBuild=true -t:pack /bl:$(LogOutputDirectory)\build-hosts.binlog
+      configuration: $(BuildConfiguration)
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+    ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
+  - task: VSBuild@1
+    displayName: Create Environment Variables Editor package
+    inputs:
+      solution: '**\EnvironmentVariablesUILib.csproj'
+      vsVersion: 17.0
+      msbuildArgs: /p:CIBuild=true;NoBuild=true -t:pack /bl:$(LogOutputDirectory)\build-env-var-editor.binlog
+      configuration: $(BuildConfiguration)
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+    ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
+  - task: VSBuild@1
+    displayName: Create Registry Preview package
+    inputs:
+      solution: '**\RegistryPreviewUILib.csproj'
+      vsVersion: 17.0
+      msbuildArgs: /p:CIBuild=true;NoBuild=true -t:pack /bl:$(LogOutputDirectory)\build-registry-preview.binlog
+      configuration: $(BuildConfiguration)
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+    ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
+  - task: CopyFiles@2
+    displayName: Stage NuGet packages
+    inputs:
+      contents: "**/bin/Release/PowerToys*.nupkg"
+      flattenFolders: True
+      targetFolder: $(JobOutputDirectory)/nupkg
+
+  - ${{ if eq(parameters.codeSign, true) }}:
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: Sign NuGet packages
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: $(JobOutputDirectory)/nupkg
+          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"
+                }
+            ]
+
+  - task: VSBuild@1
+    displayName: Build BugReportTool
+    inputs:
+      solution: '**/tools/BugReportTool/BugReportTool.sln'
+      vsVersion: 17.0
+      msbuildArgs: >-
+        -restore -graph
+        /p:RestorePackagesConfig=true
+        /p:CIBuild=true
+        /bl:$(LogOutputDirectory)\build-bug-report.binlog
+        ${{ parameters.additionalBuildOptions }}
+        $(MSBuildCacheParameters)
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+    ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
+  - task: VSBuild@1
+    displayName: Build WebcamReportTool
+    inputs:
+      solution: '**/tools/WebcamReportTool/WebcamReportTool.sln'
+      vsVersion: 17.0
+      msbuildArgs: >-
+        -restore -graph
+        /p:RestorePackagesConfig=true
+        /p:CIBuild=true
+        /bl:$(LogOutputDirectory)\build-webcam-report.binlog
+        ${{ parameters.additionalBuildOptions }}
+        $(MSBuildCacheParameters)
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+    ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
+  - task: VSBuild@1
+    displayName: Build StylesReportTool
+    inputs:
+      solution: '**/tools/StylesReportTool/StylesReportTool.sln'
+      vsVersion: 17.0
+      msbuildArgs: >-
+        -restore -graph
+        /p:RestorePackagesConfig=true
+        /p:CIBuild=true
+        /bl:$(LogOutputDirectory)\build-styles-report.binlog
+        ${{ parameters.additionalBuildOptions }}
+        $(MSBuildCacheParameters)
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+    ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
+  - ${{ each project in parameters.csProjectsToPublish }}:
+    - task: VSBuild@1
+      displayName: Publish ${{ project }} for Packaging
+      inputs:
+        solution: ${{ project }}
+        vsVersion: 17.0
+        msbuildArgs: >-
+          /target:Publish
+          /graph
+          /p:Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);AppxBundle=Never
+          /p:VCRTForwarders-IncludeDebugCRT=false
+          /p:PowerToysRoot=$(Build.SourcesDirectory)
+          /p:PublishProfile=InstallationPublishProfile.pubxml
+          /bl:$(LogOutputDirectory)\publish-${{ join('_',split(project, '/')) }}.binlog
+        platform: $(BuildPlatform)
+        configuration: $(BuildConfiguration)
+        msbuildArchitecture: x64
+        maximumCpuCount: true
+
+  # Check if deps.json files don't reference different dll versions.
+  - pwsh: |-
+      & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'
+    displayName: Audit deps.json files for all applications
+
+  # Check if asset files on the main application paths are playing nice and avoiding basic conflicts.
+  - pwsh: |-
+      & '.pipelines/verifyPossibleAssetConflicts.ps1' -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'
+    displayName: Audit base applications path asset conflicts
+
+  - pwsh: |-
+      & '.pipelines/verifyPossibleAssetConflicts.ps1' -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)\WinUI3Apps'
+    displayName: Audit WinAppSDK applications path asset conflicts
+
+  - pwsh: |-
+      & '.pipelines/verifyNoticeMdAgainstNugetPackages.ps1' -path '$(build.sourcesdirectory)\'
+    displayName: Verify NOTICE.md and NuGet packages match
+
+  - ${{ if eq(parameters.runTests, true) }}:
+    # Publish test results which ran in MSBuild
+    - task: PublishTestResults@2
+      displayName: 'Publish Test Results'
+      inputs:
+        testResultsFormat: VSTest
+        testResultsFiles: '**/*.trx'
+      condition: ne(variables['BuildPlatform'],'arm64')
+
+    # Native dlls
+    - task: VSTest@2
+      condition: ne(variables['BuildPlatform'],'arm64') # No arm64 agents to run the tests.
+      displayName: 'Native Tests'
+      inputs:
+        platform: '$(BuildPlatform)'
+        configuration: '$(BuildConfiguration)'
+        testSelector: 'testAssemblies'
+        testAssemblyVer2: |
+          **\KeyboardManagerEngineTest.dll
+          **\KeyboardManagerEditorTest.dll
+          **\UnitTests-CommonLib.dll
+          **\PowerRenameUnitTests.dll
+          **\UnitTests-FancyZones.dll
+          !**\obj\**
+
+  - ${{ if eq(parameters.codeSign, true) }}:
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: Sign Core PowerToys
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: '$(BuildPlatform)/$(BuildConfiguration)' # Video conf uses x86 and x64.
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_core.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: Sign DSC files
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: 'src/dsc/Microsoft.PowerToys.Configure'
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_DSC.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: Sign x86 DirectShow VCM
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: 'x86/$(BuildConfiguration)' # Video conf uses x86 and x64.
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_vcm.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+
+  - template: steps-build-installer.yml
+    parameters:
+      codeSign: ${{ parameters.codeSign }}
+      signingIdentity: ${{ parameters.signingIdentity }}
+      versionNumber: ${{ parameters.versionNumber }}
+      additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
+
+  - template: steps-build-installer.yml
+    parameters:
+      codeSign: ${{ parameters.codeSign }}
+      signingIdentity: ${{ parameters.signingIdentity }}
+      versionNumber: ${{ parameters.versionNumber }}
+      additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
+      buildUserInstaller: true # NOTE: This is the distinction between the above and below rules
+
+  # This saves ~1GiB per architecture. We won't need these later.
+  # Removes:
+  # - All .pdbs from any static libs .libs (which were only used during linking)
+  - pwsh: |-
+      $binDir = '$(Build.SourcesDirectory)'
+      $ImportLibs = Get-ChildItem $binDir -Recurse -File -Filter '*.exp' | ForEach-Object { $_.FullName -Replace "exp$","lib" }
+      $StaticLibs = Get-ChildItem $binDir -Recurse -File -Filter '*.lib' | Where-Object FullName -NotIn $ImportLibs
+
+      $Items = @()
+      $Items += Get-Item ($StaticLibs.FullName -Replace "lib$","pdb") -ErrorAction:Ignore
+
+      $Items | Remove-Item -Recurse -Force -Verbose -ErrorAction:Ignore
+    displayName: Clean up static libs PDBs
+    errorActionPreference: silentlyContinue # It's OK if this silently fails
+
+  - task: CopyFiles@2
+    displayName: Stage Installers
+    inputs:
+      contents: "**/PowerToys*Setup-*.exe"
+      flattenFolders: True
+      targetFolder: $(JobOutputDirectory)
+
+  - task: CopyFiles@2
+    displayName: Stage Symbols
+    inputs:
+      contents: |-
+        **\*.pdb
+        !**\vc143.pdb
+        !**\*test*.pdb
+      flattenFolders: True
+      targetFolder: $(JobOutputDirectory)/symbols-$(BuildPlatform)/
+
+  - pwsh: |-
+      $p = "$(JobOutputDirectory)\"
+      $userHash = ((Get-Item $p\PowerToysUserSetup*.exe | Get-FileHash).Hash);
+      $machineHash = ((Get-Item $p\PowerToysSetup*.exe | Get-FileHash).Hash);
+      $userPlat = "hash_user_$(BuildPlatform).txt";
+      $machinePlat = "hash_machine_$(BuildPlatform).txt";
+      $combinedUserPath = $p + $userPlat;
+      $combinedMachinePath = $p + $machinePlat;
+      
+      echo $p
+
+      echo $userPlat
+      echo $userHash
+      echo $combinedUserPath
+
+      echo $machinePlat
+      echo $machineHash
+      echo $combinedMachinePath
+      
+      $userHash | out-file -filepath $combinedUserPath
+      $machineHash | out-file -filepath $combinedMachinePath
+    displayName: Calculate file hashes
+
+  # Publishing the GPO files
+  - pwsh: |-
+      New-Item "$(JobOutputDirectory)/gpo" -Type Directory
+      Copy-Item src\gpo\assets\* "$(JobOutputDirectory)/gpo" -Recurse
+    displayName: Stage GPO files
+
+  # Running the tests may result in future jobs consuming artifacts out of this build
+  - ${{ if eq(parameters.runTests, true) }}:
+    - task: CopyFiles@2
+      displayName: Stage entire build output
+      inputs:
+        sourceFolder: '$(Build.SourcesDirectory)'
+        contents: '$(BuildPlatform)/$(BuildConfiguration)/**/*'
+        targetFolder: '$(JobOutputDirectory)\$(BuildPlatform)\$(BuildConfiguration)'
+
+  - ${{ if eq(parameters.publishArtifacts, true) }}:
+    - publish: $(JobOutputDirectory)
+      artifact: $(JobOutputArtifactName)
+      displayName: Publish all outputs
+      condition: always()
--- 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-publish-symbols-using-symbolrequestprod-api.yml
+++ b/.pipelines/v2/templates/job-publish-symbols-using-symbolrequestprod-api.yml
@@ -0,0 +1,116 @@
+parameters:
+  - name: includePublicSymbolServer
+    type: boolean
+    default: false
+  - name: pool
+    type: object
+    default: []
+  - name: dependsOn
+    type: object
+    default: null
+  - name: versionNumber
+    type: string
+    default: '0.0.1'
+  - name: artifactStem
+    type: string
+    default: ''
+  - name: jobName
+    type: string
+    default: PublishSymbols
+  - name: symbolExpiryTime
+    type: string
+    default: 36530 # This is the default from PublishSymbols@2
+  - name: variables
+    type: object
+    default: {}
+  - name: subscription
+    type: string
+  - name: symbolProject
+    type: string
+
+jobs:
+- job: ${{ parameters.jobName }}
+  ${{ if ne(length(parameters.pool), 0) }}:
+    pool: ${{ parameters.pool }}
+  ${{ if eq(parameters.includePublicSymbolServer, true) }}:
+    displayName: Publish Symbols to Internal and MSDL
+  ${{ else }}:
+    displayName: Publish Symbols Internally
+  dependsOn: ${{ parameters.dependsOn }}
+  variables:
+    ${{ insert }}: ${{ parameters.variables }}
+    SymbolsArtifactName: "PowerToys_${{parameters.versionNumber}}_$(Build.BuildNumber)"
+  steps:
+  - checkout: self
+    clean: true
+    fetchDepth: 1
+    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
+    submodules: true
+    persistCredentials: True
+
+  - task: DownloadPipelineArtifact@2
+    displayName: Download all PDBs from all prior build phases
+    inputs:
+      itemPattern: '**/*.pdb'
+      targetPath: '$(Build.SourcesDirectory)/symbolStaging'
+
+  - powershell: |-
+      Get-PackageProvider -Name NuGet -ForceBootstrap
+      Install-Module -Verbose -AllowClobber -Force Az.Accounts, Az.Storage, Az.Network, Az.Resources, Az.Compute
+    displayName: Install Azure Module Dependencies
+
+  # Transit the Azure token from the Service Connection into a secret variable for the rest of the pipeline to use.
+  - task: AzurePowerShell@5
+    displayName: Generate an Azure Token
+    inputs:
+      azureSubscription: ${{ parameters.subscription }}
+      azurePowerShellVersion: LatestVersion
+      pwsh: true
+      ScriptType: InlineScript
+      Inline: |-
+        $AzToken = (Get-AzAccessToken -ResourceUrl api://30471ccf-0966-45b9-a979-065dbedb24c1).Token
+        Write-Host "##vso[task.setvariable variable=SymbolAccessToken;issecret=true]$AzToken"
+
+
+  - task: PublishSymbols@2
+    displayName: Publish Symbols (to current Azure DevOps tenant)
+    continueOnError: True
+    inputs:
+      SymbolsFolder: '$(Build.SourcesDirectory)/symbolStaging'
+      SearchPattern: '**/*.pdb'
+      IndexSources: false
+      DetailedLog: true
+      SymbolsMaximumWaitTime: 30
+      SymbolServerType: 'TeamServices'
+      SymbolsProduct: 'PowerToys Converged Symbols'
+      SymbolsVersion: '${{ parameters.versionNumber }}'
+      SymbolsArtifactName: $(SymbolsArtifactName)
+      SymbolExpirationInDays: ${{ parameters.symbolExpiryTime }}
+    env:
+      LIB: $(Build.SourcesDirectory)
+
+  - pwsh: |-
+      # Prepare the defaults for IRM
+      $PSDefaultParameterValues['Invoke-RestMethod:Headers'] = @{ Authorization = "Bearer $(SymbolAccessToken)" }
+      $PSDefaultParameterValues['Invoke-RestMethod:ContentType'] = "application/json"
+      $PSDefaultParameterValues['Invoke-RestMethod:Method'] = "POST"
+
+      $BaseUri = "https://symbolrequestprod.trafficmanager.net/projects/${{ parameters.symbolProject }}/requests"
+
+      # Prepare the request
+      $expiration = (Get-Date).Add([TimeSpan]::FromDays(${{ parameters.symbolExpiryTime }}))
+      $createRequestBody = @{
+        requestName = "$(SymbolsArtifactName)";
+        expirationTime = $expiration.ToString();
+      }
+      Write-Host "##[debug]Starting request $($createRequestBody.requestName) with expiration date of $($createRequestBody.expirationTime)"
+      Invoke-RestMethod -Uri "$BaseUri" -Body ($createRequestBody | ConvertTo-Json -Compress) -Verbose
+
+      # Request symbol publication
+      $publishRequestBody = @{
+        publishToInternalServer = $true;
+        publishToPublicServer = $${{ parameters.includePublicSymbolServer }};
+      }
+      Write-Host "##[debug]Submitting request $($createRequestBody.requestName) ($($publishRequestBody | ConvertTo-Json -Compress))"
+      Invoke-RestMethod -Uri "$BaseUri/$($createRequestBody.requestName)" -Body ($publishRequestBody | ConvertTo-Json -Compress) -Verbose
+    displayName: Publish Symbols using internal REST API
--- a/.pipelines/v2/templates/job-test-project.yml
+++ b/.pipelines/v2/templates/job-test-project.yml
@@ -0,0 +1,76 @@
+parameters:
+  - name: configuration
+    type: string
+    default: "Release"
+  - name: platform
+    type: string
+    default: ""
+  - name: inputArtifactStem
+    type: string
+    default: ""
+
+jobs:
+- job: Test${{ parameters.platform }}${{ parameters.configuration }}
+  displayName: Test ${{ parameters.platform }} ${{ parameters.configuration }}
+  variables:
+    BuildPlatform: ${{ parameters.platform }}
+    BuildConfiguration: ${{ parameters.configuration }}
+    SrcPath: $(Build.Repository.LocalPath)
+  pool:
+    ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
+      ${{ if ne(parameters.platform, 'ARM64') }}:
+        name: SHINE-INT-Testing-x64
+      ${{ else }}:
+        name: SHINE-INT-Testing-arm64
+    ${{ else }}:
+      ${{ if ne(parameters.platform, 'ARM64') }}:
+        name: SHINE-OSS-Testing-x64
+      ${{ else }}:
+        name: SHINE-OSS-Testing-arm64
+  steps:
+  - checkout: self
+    submodules: false
+    clean: true
+    fetchDepth: 1
+    fetchTags: false
+
+  - download: current
+    displayName: Download artifacts
+    artifact: build-${{ parameters.platform }}-${{ parameters.configuration }}${{ parameters.inputArtifactStem }}
+    patterns: |-
+      **
+      !**\*.pdb
+      !**\*.lib
+
+  - template: steps-ensure-dotnet-version.yml
+    parameters:
+      sdk: true
+      version: '8.0'
+
+  - task: VisualStudioTestPlatformInstaller@1
+    displayName: Ensure VSTest Platform
+
+  - pwsh: |-
+      & '$(build.sourcesdirectory)\.pipelines\InstallWinAppDriver.ps1'
+    displayName: Download and install WinAppDriver
+
+  - ${{ if ne(parameters.platform, 'arm64') }}:
+    - task: ScreenResolutionUtility@1
+      inputs:
+        displaySettings: 'optimal'
+
+  - task: VSTest@3
+    displayName: Run UI Tests
+    inputs:
+      platform: '$(BuildPlatform)'
+      configuration: '$(BuildConfiguration)'
+      testSelector: 'testAssemblies'
+      searchFolder: '$(Pipeline.Workspace)\build-${{ parameters.platform }}-${{ parameters.configuration }}${{ parameters.inputArtifactStem }}'
+      vsTestVersion: 'toolsInstaller'
+      uiTests: true
+      rerunFailedTests: true
+      testAssemblyVer2: |
+        **\UITests-FancyZones.dll
+        **\UITests-FancyZonesEditor.dll
+        !**\obj\**
+        !**\ref\**
--- a/.pipelines/v2/templates/pipeline-ci-build.yml
+++ b/.pipelines/v2/templates/pipeline-ci-build.yml
@@ -0,0 +1,62 @@
+variables:
+  - name: runCodesignValidationInjectionBG
+    value: false
+  - name: EnablePipelineCache
+    value: true
+  - ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+    - name: EnablePipelineCache
+      value: true
+
+parameters:
+  - name: buildPlatforms
+    type: object
+    default:
+      - x64
+      - arm64
+  - name: enableMsBuildCaching
+    type: boolean
+    default: false
+  - name: runTests
+    type: boolean
+    default: true
+
+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 }}
+      ${{ if ne(variables['Build.Reason'], 'Manual') }}:
+        dependsOn: [Precheck]
+      ${{ else }}:
+        dependsOn: []
+      jobs:
+        - template: job-build-project.yml
+          parameters:
+            condition: and(succeeded(), or(eq(variables['Build.Reason'], 'Manual'), ne(stageDependencies.Precheck.Precheck.outputs['verifyBuildRequest.skipBuild'], 'Yes')))
+            pool:
+              ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
+                name: SHINE-INT-L
+              ${{ else }}:
+                name: SHINE-OSS-L
+            buildPlatforms:
+              - ${{ platform }}
+            buildConfigurations: [Release]
+            enablePackageCaching: true
+            enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+            runTests: ${{ parameters.runTests }}
+
+    - ${{ if eq(parameters.runTests, true) }}:
+      - stage: Test_${{ platform }}
+        displayName: Test ${{ platform }}
+        dependsOn:
+          - Build_${{platform}}
+        jobs:
+          - template: job-test-project.yml
+            parameters:
+              platform: ${{ platform }}
+              configuration: Release
--- a/.pipelines/v2/templates/steps-build-installer.yml
+++ b/.pipelines/v2/templates/steps-build-installer.yml
@@ -0,0 +1,184 @@
+parameters:
+  - name: versionNumber
+    type: string
+    default: "0.0.1"
+  - name: buildUserInstaller
+    type: boolean
+    default: false
+  - name: codeSign
+    type: boolean
+    default: false
+  - name: signingIdentity
+    type: object
+    default: {}
+  - name: additionalBuildOptions
+    type: string
+    default: ''
+
+steps:
+  - pwsh: |-
+      & git clean -xfd -e *exe -- .\installer\
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Clean installer to reduce cross-contamination
+
+  - pwsh: |-
+      $IsPerUser = $${{ parameters.buildUserInstaller }}
+      $InstallerBuildSlug = "MachineSetup"
+      $InstallerBasename = "PowerToysSetup"
+      If($IsPerUser) {
+        $InstallerBuildSlug = "UserSetup"
+        $InstallerBasename = "PowerToysUserSetup"
+      }
+      $InstallerBasename += "-${{ parameters.versionNumber }}-$(BuildPlatform)"
+      Write-Host "##vso[task.setvariable variable=InstallerBuildSlug]$InstallerBuildSlug"
+      Write-Host "##vso[task.setvariable variable=InstallerRelativePath]$(BuildPlatform)\$(BuildConfiguration)\$InstallerBuildSlug"
+      Write-Host "##vso[task.setvariable variable=InstallerBasename]$InstallerBasename"
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Prepare Installer variables
+
+  # This dll needs to be built and signed before building the MSI.
+  - task: VSBuild@1
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build PowerToysSetupCustomActions
+    inputs:
+      solution: "**/installer/PowerToysSetup.sln"
+      vsVersion: 17.0
+      msbuildArgs: >-
+        /t:PowerToysSetupCustomActions
+        /p:RunBuildEvents=true;PerUser=${{parameters.buildUserInstaller}};RestorePackagesConfig=true;CIBuild=true
+        -restore -graph
+        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-actions.binlog
+        ${{ parameters.additionalBuildOptions }}
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      clean: true
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+
+  - ${{ if eq(parameters.codeSign, true) }}:
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign PowerToysSetupCustomActions
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: 'installer/PowerToysSetupCustomActions/$(InstallerRelativePath)'
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+
+  ## INSTALLER START
+  #### MSI BUILDING AND SIGNING
+  - task: VSBuild@1
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build MSI
+    inputs:
+      solution: "**/installer/PowerToysSetup.sln"
+      vsVersion: 17.0
+      msbuildArgs: >-
+        -restore
+        /t:PowerToysInstaller
+        /p:RunBuildEvents=false;PerUser=${{parameters.buildUserInstaller}};BuildProjectReferences=false;CIBuild=true
+        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-msi.binlog
+        ${{ parameters.additionalBuildOptions }}
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      clean: false # don't undo our hard work above by deleting the CustomActions dll
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+
+  - script: |-
+      "C:\Program Files (x86)\WiX Toolset v3.14\bin\dark.exe" -x $(build.sourcesdirectory)\extractedMsi installer\PowerToysSetup\$(InstallerRelativePath)\$(InstallerBasename).msi
+      dir $(build.sourcesdirectory)\extractedMsi
+    displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Extract and verify MSI"
+
+  # Check if deps.json files don't reference different dll versions.
+  - pwsh: |-
+      & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Audit deps.json in MSI extracted files
+
+  - ${{ if eq(parameters.codeSign, true) }}:
+    - pwsh: |-
+        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
+        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMsi\Binary'
+        git clean -xfd ./extractedMsi
+      displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Verify all binaries are signed and versioned
+
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign MSI
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: 'installer/PowerToysSetup/$(InstallerRelativePath)'
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+
+  #### END MSI
+  #### BOOTSTRAP BUILDING AND SIGNING
+
+  - task: VSBuild@1
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build Bootstrapper
+    inputs:
+      solution: "**/installer/PowerToysSetup.sln"
+      vsVersion: 17.0
+      msbuildArgs: >-
+        /t:PowerToysBootstrapper
+        /p:PerUser=${{parameters.buildUserInstaller}};CIBuild=true
+        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-bootstrapper.binlog
+        -restore -graph
+        ${{ parameters.additionalBuildOptions }}
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      clean: false # don't undo our hard work above by deleting the MSI
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+
+  # The entirety of bundle unpacking/re-packing is unnecessary if we are not code signing it.
+  - ${{ if eq(parameters.codeSign, true) }}:
+    - script: |-
+        "C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ib installer\PowerToysSetup\$(InstallerRelativePath)\$(InstallerBasename).exe -o installer\engine.exe
+      displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Insignia: Extract Engine from Bundle"
+
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign WiX Engine
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: "installer"
+          Pattern: engine.exe
+          signConfigType: inlineSignParams
+          inlineOperation: |
+            [
+                {
+                    "KeyCode": "CP-230012",
+                    "OperationCode": "SigntoolSign",
+                    "Parameters": {
+                        "OpusName": "Microsoft",
+                        "OpusInfo": "http://www.microsoft.com",
+                        "FileDigest": "/fd \"SHA256\"",
+                        "PageHash": "/NPH",
+                        "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+                    },
+                    "ToolName": "sign",
+                    "ToolVersion": "1.0"
+                },
+                {
+                    "KeyCode": "CP-230012",
+                    "OperationCode": "SigntoolVerify",
+                    "Parameters": {},
+                    "ToolName": "sign",
+                    "ToolVersion": "1.0"
+                }
+            ]
+
+    - script: |-
+        "C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ab installer\engine.exe installer\PowerToysSetup\$(InstallerRelativePath)\$(InstallerBasename).exe -o installer\PowerToysSetup\$(InstallerRelativePath)\$(InstallerBasename).exe
+      displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Insignia: Merge Engine into Bundle"
+
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign Final Bootstrapper
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: 'installer/PowerToysSetup/$(InstallerRelativePath)'
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+  #### END BOOTSTRAP
+  ## END INSTALLER
--- a/.pipelines/v2/templates/steps-ensure-dotnet-version.yml
+++ b/.pipelines/v2/templates/steps-ensure-dotnet-version.yml
@@ -0,0 +1,27 @@
+parameters:
+- name: version
+  type: string
+  default: "8.0"
+- name: sdk
+  type: boolean
+  default: false
+
+# You might be wondering, "Why didn't they use UseDotNet?"
+# Azure Pipelines is practically unmaintained, that's why.
+#
+# "[BUG]: UseDotNet task installs x86 build on Windows arm64"
+# https://github.com/microsoft/azure-pipelines-tasks/issues/20300
+#
+# Herein we replicate 90% of the meaningful logic in that task.
+steps:
+- pwsh: |-
+    curl.exe -J -L -O "https://dot.net/v1/dotnet-install.ps1"
+    $NEW_DOTNET_ROOT = "$(Agent.ToolsDirectory)\dotnet"
+    & ./dotnet-install.ps1 -Channel "${{parameters.version}}" -InstallDir $NEW_DOTNET_ROOT
+    Write-Host "##vso[task.setvariable variable=DOTNET_ROOT]${NEW_DOTNET_ROOT}"
+    Write-Host "##vso[task.prependpath]${NEW_DOTNET_ROOT}"
+    Remove-Item dotnet-install.ps1 -ErrorAction:Ignore
+  ${{ if eq(parameters.sdk, true) }}:
+    displayName: "Install .NET ${{parameters.version}} SDK"
+  ${{ else }}:
+    displayName: "Install .NET ${{parameters.version}}"
--- a/.pipelines/v2/templates/steps-ensure-nuget-version.yml
+++ b/.pipelines/v2/templates/steps-ensure-nuget-version.yml
@@ -0,0 +1,5 @@
+steps:
+- task: NuGetToolInstaller@1
+  displayName: Use NuGet 6.6.1
+  inputs:
+    versionSpec: 6.6.1
--- a/.pipelines/v2/templates/steps-esrp-signing.yml
+++ b/.pipelines/v2/templates/steps-esrp-signing.yml
@@ -0,0 +1,22 @@
+parameters:
+  - name: displayName
+    type: string
+    default: ESRP Code Signing
+  - name: inputs
+    type: object
+    default: {}
+  - name: signingIdentity
+    type: object
+    default: {}
+
+steps:
+  - task: EsrpCodeSigning@5
+    displayName: 🔏 ${{ parameters.displayName }}
+    inputs:
+      ConnectedServiceName: ${{ parameters.signingIdentity.serviceName }}
+      AppRegistrationClientId: ${{ parameters.signingIdentity.appId }}
+      AppRegistrationTenantId: ${{ parameters.signingIdentity.tenantId }}
+      AuthAKVName: ${{ parameters.signingIdentity.akvName }}
+      AuthCertName: ${{ parameters.signingIdentity.authCertName }}
+      AuthSignCertName: ${{ parameters.signingIdentity.signCertName }}
+      ${{ insert }}: ${{ parameters.inputs }}
--- a/.pipelines/v2/templates/steps-fetch-and-prepare-localizations.yml
+++ b/.pipelines/v2/templates/steps-fetch-and-prepare-localizations.yml
@@ -0,0 +1,26 @@
+parameters:
+  - name: includePseudoLoc
+    type: boolean
+    default: false
+
+steps:
+  - task: TouchdownBuildTask@3
+    displayName: 'Download Localization Files -- PowerToys 37400'
+    inputs:
+      teamId: 37400
+      TDBuildServiceConnection: $(TouchdownServiceConnection)
+      authType: SubjectNameIssuer
+      resourceFilePath: |
+       **\Resources.resx
+       **\Resource.resx
+       **\Resources.resw
+      appendRelativeDir: true
+      localizationTarget: false
+      ${{ if eq(parameters.includePseudoLoc, true) }}:
+        pseudoSetting: Included
+
+  - pwsh: |-
+      $VerbosePreference = "Continue"
+      ./tools/build/move-and-rename-resx.ps1
+      ./tools/build/move-uwp-resw.ps1
+    displayName: Move Loc files into final locations
--- a/.pipelines/v2/templates/steps-restore-nuget.yml
+++ b/.pipelines/v2/templates/steps-restore-nuget.yml
@@ -0,0 +1,20 @@
+steps:
+- template: steps-ensure-nuget-version.yml
+
+- task: NuGetAuthenticate@1
+
+- script: |-
+    echo ##vso[task.setvariable variable=NUGET_RESTORE_MSBUILD_ARGS]/p:Platform=$(BuildPlatform)
+  displayName: Ensure NuGet restores for $(BuildPlatform)
+  condition: and(succeeded(), ne(variables['BuildPlatform'], 'Any CPU'))
+
+# In the Microsoft Azure DevOps tenant, NuGetCommand is ambiguous.
+# This should be `task: NuGetCommand@2`
+- task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
+  displayName: Restore NuGet packages
+  inputs:
+    command: restore
+    feedsToUse: config
+    configPath: NuGet.config
+    restoreSolution: packages.config
+    restoreDirectory: '$(Build.SourcesDirectory)\packages'
--- a/.pipelines/versionSetting.ps1
+++ b/.pipelines/versionSetting.ps1
@@ -58,3 +58,21 @@ $imageResizerContextMenuAppManifestReadFileLocation = $imageResizerContextMenuAp
 $imageResizerContextMenuAppManifest.Package.Identity.Version = $versionNumber + '.0'
 Write-Host "ImageResizerContextMenu version" $imageResizerContextMenuAppManifest.Package.Identity.Version
 $imageResizerContextMenuAppManifest.Save($imageResizerContextMenuAppManifestWriteFileLocation);
+
+# Set FileLocksmithContextMenu package version in AppManifest.xml
+$fileLocksmithContextMenuAppManifestWriteFileLocation = $PSScriptRoot + '/../src/modules/FileLocksmith/FileLocksmithContextMenu/AppxManifest.xml';
+$fileLocksmithContextMenuAppManifestReadFileLocation = $fileLocksmithContextMenuAppManifestWriteFileLocation;
+
+[XML]$fileLocksmithContextMenuAppManifest = Get-Content $fileLocksmithContextMenuAppManifestReadFileLocation
+$fileLocksmithContextMenuAppManifest.Package.Identity.Version = $versionNumber + '.0'
+Write-Host "FileLocksmithContextMenu version" $fileLocksmithContextMenuAppManifest.Package.Identity.Version
+$fileLocksmithContextMenuAppManifest.Save($fileLocksmithContextMenuAppManifestWriteFileLocation);
+
+# Set NewPlusContextMenu package version in AppManifest.xml
+$newPlusContextMenuAppManifestWriteFileLocation = $PSScriptRoot + '/../src/modules/NewPlus/NewShellExtensionContextMenu/AppxManifest.xml';
+$newPlusContextMenuAppManifestReadFileLocation = $newPlusContextMenuAppManifestWriteFileLocation;
+
+[XML]$newPlusContextMenuAppManifest = Get-Content $newPlusContextMenuAppManifestReadFileLocation
+$newPlusContextMenuAppManifest.Package.Identity.Version = $versionNumber + '.0'
+Write-Host "NewPlusContextMenu version" $newPlusContextMenuAppManifest.Package.Identity.Version
+$newPlusContextMenuAppManifest.Save($newPlusContextMenuAppManifestWriteFileLocation);
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -273,6 +273,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{B39DC643
 		src\common\utils\HDropIterator.h = src\common\utils\HDropIterator.h
 		src\common\utils\HttpClient.h = src\common\utils\HttpClient.h
 		src\common\utils\json.h = src\common\utils\json.h
+		src\common\utils\language_helper.h = src\common\utils\language_helper.h
 		src\common\utils\logger_helper.h = src\common\utils\logger_helper.h
 		src\common\utils\modulesRegistry.h = src\common\utils\modulesRegistry.h
 		src\common\utils\MsiUtils.h = src\common\utils\MsiUtils.h
@@ -582,6 +583,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerToys.Settings.DSC.Sche
 		{020A7474-3601-4160-A159-D7B70B77B15F} = {020A7474-3601-4160-A159-D7B70B77B15F}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewPlus.ShellExtension", "src\modules\NewPlus\NewShellExtensionContextMenu\NewShellExtensionContextMenu.vcxproj", "{8ACB33D9-C95B-47D4-8363-9731EE0930A0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "New+", "New+", "{CA716AE6-FE5C-40AC-BB8F-2C87912687AC}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerToys.Interop", "src\common\interop\PowerToys.Interop.vcxproj", "{F055103B-F80B-4D0C-BF48-057C55620033}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workspaces", "Workspaces", "{A2221D7E-55E7-4BEA-90D1-4F162D670BBF}"
@@ -615,6 +620,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkspacesEditor", "src\mod
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesLauncher", "src\modules\Workspaces\WorkspacesLauncher\WorkspacesLauncher.vcxproj", "{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesWindowArranger", "src\modules\Workspaces\WorkspacesWindowArranger\WorkspacesWindowArranger.vcxproj", "{37D07516-4185-43A4-924F-3C7A5D95ECF6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2621,6 +2628,16 @@ Global
 		{1D6893CB-BC0C-46A8-A76C-9728706CA51A}.Release|x64.Build.0 = Release|x64
 		{1D6893CB-BC0C-46A8-A76C-9728706CA51A}.Release|x86.ActiveCfg = Release|x64
 		{1D6893CB-BC0C-46A8-A76C-9728706CA51A}.Release|x86.Build.0 = Release|x64
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Debug|ARM64.Build.0 = Debug|ARM64
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Debug|x64.ActiveCfg = Debug|x64
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Debug|x64.Build.0 = Debug|x64
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Debug|x86.ActiveCfg = Debug|x64
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Release|ARM64.ActiveCfg = Release|ARM64
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Release|ARM64.Build.0 = Release|ARM64
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Release|x64.ActiveCfg = Release|x64
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Release|x64.Build.0 = Release|x64
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Release|x86.ActiveCfg = Release|x64
 		{F055103B-F80B-4D0C-BF48-057C55620033}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{F055103B-F80B-4D0C-BF48-057C55620033}.Debug|ARM64.Build.0 = Debug|ARM64
 		{F055103B-F80B-4D0C-BF48-057C55620033}.Debug|x64.ActiveCfg = Debug|x64
@@ -2705,6 +2722,18 @@ Global
 		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Release|x64.Build.0 = Release|x64
 		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Release|x86.ActiveCfg = Release|x64
 		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Release|x86.Build.0 = Release|x64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Debug|ARM64.Build.0 = Debug|ARM64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Debug|x64.ActiveCfg = Debug|x64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Debug|x64.Build.0 = Debug|x64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Debug|x86.ActiveCfg = Debug|x64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Debug|x86.Build.0 = Debug|x64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Release|ARM64.ActiveCfg = Release|ARM64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Release|ARM64.Build.0 = Release|ARM64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Release|x64.ActiveCfg = Release|x64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Release|x64.Build.0 = Release|x64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Release|x86.ActiveCfg = Release|x64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Release|x86.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2920,6 +2949,8 @@ Global
 		{3A9A791E-94A9-49F8-8401-C11CE288D5FB} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{C0974915-8A1D-4BF0-977B-9587D3807AB7} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{1D6893CB-BC0C-46A8-A76C-9728706CA51A} = {557C4636-D7E1-4838-A504-7D19B725EE95}
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0} = {CA716AE6-FE5C-40AC-BB8F-2C87912687AC}
+		{CA716AE6-FE5C-40AC-BB8F-2C87912687AC} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{F055103B-F80B-4D0C-BF48-057C55620033} = {5A7818A8-109C-4E1C-850D-1A654E234B0E}
 		{A2221D7E-55E7-4BEA-90D1-4F162D670BBF} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{BE126CBB-AE12-406A-9837-A05ACFCA57A7} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
@@ -2930,6 +2961,7 @@ Global
 		{3D63307B-9D27-44FD-B033-B26F39245B85} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{367D7543-7DBA-4381-99F1-BF6142A996C4} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}
--- a/README.md
+++ b/README.md
@@ -22,10 +22,10 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 | [Environment Variables](https://aka.ms/PowerToysOverview_EnvironmentVariables) | [FancyZones](https://aka.ms/PowerToysOverview_FancyZones) | [File Explorer Add-ons](https://aka.ms/PowerToysOverview_FileExplorerAddOns) |
 | [File Locksmith](https://aka.ms/PowerToysOverview_FileLocksmith) | [Hosts File Editor](https://aka.ms/PowerToysOverview_HostsFileEditor) | [Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) |
 | [Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) | [Mouse utilities](https://aka.ms/PowerToysOverview_MouseUtilities) | [Mouse Without Borders](https://aka.ms/PowerToysOverview_MouseWithoutBorders) |
-| [Peek](https://aka.ms/PowerToysOverview_Peek) | [Paste as Plain Text](https://aka.ms/PowerToysOverview_PastePlain) | [PowerRename](https://aka.ms/PowerToysOverview_PowerRename) |
-| [PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) | [Quick Accent](https://aka.ms/PowerToysOverview_QuickAccent) | [Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) |
-| [Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) | [Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) | [Text Extractor](https://aka.ms/PowerToysOverview_TextExtractor) |
-| [Video Conference Mute](https://aka.ms/PowerToysOverview_VideoConference) | [Workspaces](https://aka.ms/PowerToysOverview_Workspaces) |
+| [New+](https://aka.ms/PowerToysOverview_NewPlus) | [Peek](https://aka.ms/PowerToysOverview_Peek) | [Paste as Plain Text](https://aka.ms/PowerToysOverview_PastePlain) |
+| [PowerRename](https://aka.ms/PowerToysOverview_PowerRename) | [PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) | [Quick Accent](https://aka.ms/PowerToysOverview_QuickAccent) |
+| [Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) | [Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) | [Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) |
+| [Text Extractor](https://aka.ms/PowerToysOverview_TextExtractor) | [Video Conference Mute](https://aka.ms/PowerToysOverview_VideoConference) | [Workspaces](https://aka.ms/PowerToysOverview_Workspaces) |

 ## Installing and running Microsoft PowerToys

@@ -41,19 +41,19 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 Go to the [Microsoft PowerToys GitHub releases page][github-release-link] and click on `Assets` at the bottom to show the files available in the release. Please use the appropriate PowerToys installer that matches your machine's architecture and install scope. For most, it is `x64` and per-user.

 <!-- items that need to be updated release to release -->
-[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.85%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.84%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.1/PowerToysUserSetup-0.84.1-x64.exe
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.1/PowerToysUserSetup-0.84.1-arm64.exe
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.1/PowerToysSetup-0.84.1-x64.exe
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.1/PowerToysSetup-0.84.1-arm64.exe
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.86%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.85%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.85.0/PowerToysUserSetup-0.85.0-x64.exe
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.85.0/PowerToysUserSetup-0.85.0-arm64.exe
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.85.0/PowerToysSetup-0.85.0-x64.exe
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.85.0/PowerToysSetup-0.85.0-arm64.exe
 
 |  Description   | Filename | sha256 hash |
 |----------------|----------|-------------|
-| Per user - x64       | [PowerToysUserSetup-0.84.1-x64.exe][ptUserX64] | 1CDAF3482B031D84DAE15188DE292FB44C5D211698089921040D94B256EBD3CA |
-| Per user - ARM64     | [PowerToysUserSetup-0.84.1-arm64.exe][ptUserArm64] | E0207EF5147EE281D4F438E87A30586D8CAA24DE948950FF1B12E05454622CD9 |
-| Machine wide - x64   | [PowerToysSetup-0.84.1-x64.exe][ptMachineX64] | 10DF9774DE1857051E135B9790A18A92C5C7F42587C733DEE991186E67231EE0 |
-| Machine wide - ARM64 | [PowerToysSetup-0.84.1-arm64.exe][ptMachineArm64] | EB5DDA5EFBA17E813DBF24AFF668DDF5424ED3659234ABBC15441D478D812699 |
+| Per user - x64       | [PowerToysUserSetup-0.85.0-x64.exe][ptUserX64] | 28A8BEA61040751287FF47C9BAC627A53A4670CFEA0C17B96EE947219E9A6EA9 |
+| Per user - ARM64     | [PowerToysUserSetup-0.85.0-arm64.exe][ptUserArm64] | 2CA077E842B7C53BAFC75A25DBD16C1A4FCE20924C36FDA5AD8CF23CD836B855 |
+| Machine wide - x64   | [PowerToysSetup-0.85.0-x64.exe][ptMachineX64] | 4A248AA914EEE339AA99D467FDFBDB1FCD7A49A8564DDBBB811D0EC69CEBAB75 |
+| Machine wide - ARM64 | [PowerToysSetup-0.85.0-arm64.exe][ptMachineArm64] | B5FB04EAF44C4203E785411FF55025842B9C39D4970C0C934CB8ADBE79EF31AF |

 This is our preferred method.

@@ -99,99 +99,117 @@ For guidance on developing for PowerToys, please read the [developer docs](/doc/

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

-### 0.84 - August 2024 Update
+### 0.85 - September 2024 Update

-In this release, we focused on adding a new utility (PowerToys Workspaces), Advanced paste custom actions feature, stability, and improvements.
+In this release, we focused on new features, stability, and improvements.

 **Highlights**

- - New utility: PowerToys Workspaces - this utility can launch a set of applications to a custom layout and configuration on the desktop. App arrangements can be saved as a workspace and then relaunched with one click from the Workspaces Editor or from a desktop shortcut. In the editor, app configuration can be customized using CLI arguments and "launch as admin" modifiers, and app window sizes and positions can be updated as desired. This is our first public version of Workspaces and we are excited for you to try it out for yourself! Make sure to file issues you encounter on our GitHub so the team can continue to improve the utility.
-    - Known issues - the team is actively working on fixing these:
-       - Apps that launch as admin are unable to be repositioned to the desired layout.
-       - Border of "Remove" / "Add Back" app button in editor is not clearly visible on light themes.
- - Added Awake --use-parent-pid CLI argument to attach to parent process. Thanks [@dend](https://github.com/dend)!
- - Added custom actions - user-specified pre-defined prompts for the AI model. Additionally, actions (both standard and custom) are now searchable from prompt box and Ctrl + number in-app shortcuts are now applicable for first 9 search results.
- - Ported all C++/CX code to C++/WinRT as part of a refactor and upgrade series aimed at enabling AOT (Ahead of Time) compilation for enhanced performance and reduced disk footprint.
+ - New utility: New+ - allows setting a personalized set of templates to quickly create files and folders from a File Explorer context menu. Thanks [@cgaarden](https://github.com/cgaarden)!
+ - Language selection - it's now possible to select which UI language should be used by PowerToys utilities.
+ - Lots of quality fixes for Workspaces, improving the number of supported applications.
+ - Reduced Peek memory usage by fixing image leaks. Thanks [@daverayment](https://github.com/daverayment)!

 ### General

- - Added DSC support for ImageResizer resize sizes property.
- 
+ - Added a general setting to select which UI language should be used in PowerToys utilities.
+ - Fixed internal code of some policies for Group Policy Objects, that were reading registry entries using the wrong internal functions, and structured code better to avoid future mistakes of the same kind. Thanks [@htcfreek](https://github.com/htcfreek)!
+
 ### Advanced Paste

- - Added custom actions - user-specified pre-defined prompts for the AI model. Additionally, actions (both standard and custom) are now searchable from prompt box and Ctrl + number in-app shortcuts are now applicable for first 9 search results.
+ - Fixed some telemetry calls to signal Advanced Paste activation on the cases where a direct shortcut is being used without showing the UI.
+ - User-defined custom actions can only be used with AI turned on, so custom actions were disabled on Settings when AI is disabled and were hidden from the Advanced Paste UI.

 ### Awake

- - Added --use-parent-pid CLI argument to attach to parent process and fixed issue causing tray icon to disappear. Thanks [@dend](https://github.com/dend)!
+ - Fixed tray icon behaviors, not appearing and showing incorrect time. Thanks [@dend](https://github.com/dend)!

-### Hosts File Editor
+### Environment Variables Editor

- -  Fixed save failure when the hosts file is hidden. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Added the `_NT_SYMBOL_PATH`, `_NT_ALT_SYMBOL_PATH` and `_NT_SYMCACHE_PATH` as variables that are shown as lists. Thanks [@chwarr](https://github.com/chwarr)!

-### File Explorer add-ons
+### FancyZones

- - Fixed multiple preview form positioning issues causing floating, detached windows, CoreWebView2 related exception and process leak. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Allow snapping applications that were launched by Workspaces.

-### Keyboard Manager
+### File Locksmith

- - Convert RemapBufferRow to a struct with descriptive field names. Thanks [@masaru-iritani](https://github.com/masaru-iritani)!
- - Fixed issue causing stuck Ctrl key when shortcuts contain AltGr key.
+ - Fixed an issue causing File Locksmith to be triggered by unrelated verbs in the context menu.
+
+### Mouse Pointer Crosshairs
+
+ - Allow crosshairs radius to be 0 pixels. Thanks [@octastylos-pseudodipteros](https://github.com/octastylos-pseudodipteros)!
+
+### New+
+
+ - New utility - Allows setting a personalized set of templates to quickly create files and folders from a File Explorer context menu. Thanks [@cgaarden](https://github.com/cgaarden)!
+ - Added missing entry for New+ policy state reporting in the Bug Report tool. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Added a policy for enabling/disabling whether filename extensions should be shown. Thanks [@htcfreek](https://github.com/htcfreek)!

 ### Peek

- - Added long paths support. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
-
-### Quick Accent
-
- - Moved number superscripts and subscripts from Portuguese to all languages definition. Thanks [@octastylos-pseudodipteros](https://github.com/octastylos-pseudodipteros)!
-
-### PowerRename
-
- - Updated the tooltip text of the replace box info button. Thanks [@Agnibaan](https://github.com/Agnibaan)!
+ - Properly show file's modified date instead of creation date in the file previewer. Thanks [@daverayment](https://github.com/daverayment)!
+ - Fixed memory leak caused by unmanaged bitmap images not being freed. Thanks [@daverayment](https://github.com/daverayment)!
+ - Fixed an issue causing Peek to not be displayed the first time when using a preview handler to display files. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Prevent tooltip in file previewer from overlapping with title bar controls. Thanks [@daverayment](https://github.com/daverayment)!
+ - Fixed memory leaks in thumbnails and refactored image previewer. Thanks [@daverayment](https://github.com/daverayment)!

 ### PowerToys Run

- - Fixed window positioning on start-up introduced in 0.83.
- - Improved default web browser detection. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Fixed volume ounces conversion to support both imperial and metric. Thanks [@GhostVaibhav](https://github.com/GhostVaibhav)!
- - Fixed thread-safety issue causing results not to be shown on first launch.
+ - Improved the message boxes to be more specific when PowerToys Run failed to initialize itself or any plugin. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Use capital letters when showing degree results in the Unit Converter plugin. Thanks [@PesBandi](https://github.com/PesBandi)!

-### Screen Ruler
+### Quick Accent

- - Added multiple measurements support for all measuring tools.
+ - Add the Middle Eastern Romanization character set. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Add the degree sign, integral and vertical ellipsis when "All Languages" is selected. Thanks [@rddunphy](https://github.com/rddunphy)!

 ### Settings

- - Improved disabled animations InfoBar in Find My Mouse page. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Fixed the link to the Workspaces documentation. (This was a hotfix for 0.84)
+ - Fixed flyout issues after the Windows App SDK upgrade. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Fixed initialization for the New+ settings page. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Fixed enabled state of a control on the New+ settings page if the module is enabled by policy. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Fixed a crash when cancelling the template folder selection in the New+ settings page.

 ### Workspaces

- - New utility: PowerToys Workspaces - this utility can launch a set of applications to a custom layout and configuration on the desktop. App arrangements can be saved as a workspace and then relaunched with one click from the Workspaces Editor or from a desktop shortcut. In the editor, app configuration can be customized using CLI arguments and "launch as admin" modifiers, and app window sizes and positions can be updated as desired. This is our first public version of Workspaces and we are excited for you to try it out for yourself! Make sure to file issues you encounter on our GitHub so the team can continue to improve the utility.
+ - Fixed detecting and snapping applications like Discord. (This was a hotfix for 0.84)
+ - Fixed detecting and snapping applications like Steam. (This was a hotfix for 0.84)
+ - Fixed button visibility in the UI. (This was a hotfix for 0.84)
+ - Fixed an issue launching the wrong project when the editor was closed without saving or cancelling a new project.
+ - Properly handle repositioning windows running as administrator.
+ - Properly handle cases where the monitor where a workspace was saved is no longer present.
+ - Fixed the workspace launcher restarting itself in a loop without success.
+ - Properly handle standalone applications.
+ - Fixed issues causing icons to not show.

 ### Documentation

- - Added ChatGPTPowerToys plugin mention to thirdPartyRunPlugins.md. Thanks [@ferraridavide](https://github.com/ferraridavide)!
+ - Fixed the thirdPartyRunPlugins.md entry for the RDP plugin. Thanks [@YisroelTech](https://github.com/YisroelTech)! 

 ### Development

- - Ported all C++/CX code to C++/WinRT.
- - Moved Version.props import to Directory.Build.props.
- - Extracted self-containment related .csproj properties to src/Common.SelfContained.props.
- - Unused and obsolete dependencies cleanup. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Extracted CSWinRT related .csproj properties to src/Common.Dotnet.CsWinRT.props.
- - Upgraded Microsoft.Windows.CsWinRT to 2.0.8 and updated verifyDepsJsonLibraryVersions.ps1 to unblock PRs.
- - Explicitly Set NuGet Audit Mode to Direct in Directory.Build.props to revert changes made with VS 17.12 update. Thanks [@snickler](https://github.com/snickler)!
- - Upgraded UnitsNet to 5.56.0.
+ - Upgraded Windows App SDK to 1.6.
+ - Upgraded the Target Platform Version to 10.0.22621.0.
+ - Added a bot trigger to automatically add a label to Workspaces issues. Thanks [@plante-msft](https://github.com/plante-msft)!
+ - Fixed a regular expression in the bot triggers for wanting to submit community contributions. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Fixed analyzer errors after the Visual Studio 17.12 update. Thanks [@snickler](https://github.com/snickler)!
+ - Fixed the TSA configuration for release CI builds.
+ - Refactored automated file component generation during installer builds.
+ - Rewrote the Azure Devops build system to be more modular and share more definitions between PR CI and Release CI.
+ - Fixed debugging of the New+ page of the Settings application when a settings file was not present.
+ - Fixed setting the version of the App Manifest in the File Locksmith and New+ context menu app packages.
+ - Fixed abstracted UI library nuget package signing on release CI.
+ - Removed build status from GitHub README.

-#### What is being planned for version 0.84
+#### What is being planned for version 0.86

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

 - Stability / bug fixes
- - Language selection
 - New module: File Actions Menu
- - New module: New+
+ - Integrate Sysinternals ZoomIt

 ## PowerToys Community

--- a/doc/devdocs/modules/launcher/plugins/community.unitconverter.md
+++ b/doc/devdocs/modules/launcher/plugins/community.unitconverter.md
@@ -19,13 +19,13 @@ This plugin uses a package called [UnitsNet](https://github.com/angularsen/Units
 - [Temperature](https://github.com/angularsen/UnitsNet/blob/master/UnitsNet/GeneratedCode/Units/TemperatureUnit.g.cs)
 - [Volume](https://github.com/angularsen/UnitsNet/blob/master/UnitsNet/GeneratedCode/Units/VolumeUnit.g.cs)

- These are the ones that are currently enabled (though UnitsNet supports many more). They are defined in [`Main.cs`](/src/modules/launcher/Plugins/Community.PowerToys.Run.UnitConverter/Main.cs).
+ These are the ones that are currently enabled (though UnitsNet supports many more). They are defined in [`UnitHandler.cs`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/UnitHandler.cs).


-### [`InputInterpreter`](/src/modules/launcher/Plugins/Community.PowerToys.Run.UnitConverter/InputInterpreter.cs)
+### [`InputInterpreter`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/InputInterpreter.cs)
 - Class which manipulates user input such that it may be interpreted correctly and thus converted.
 - Uses a regex amongst other things to do this.

-### [`UnitHandler`](/src/modules/launcher/Plugins/Community.PowerToys.Run.UnitConverter/UnitHandler.cs)
+### [`UnitHandler`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/UnitHandler.cs)
 - Class that does the actual conversion.
 - Supports abbreviations in user input (single, double, or none).
--- a/doc/planning/awake.md
+++ b/doc/planning/awake.md
@@ -10,13 +10,22 @@ The build ID can be found in `Core\Constants.cs` in the `BuildId` variable - it

 The build ID moniker is made up of two components - a reference to a [Halo](https://en.wikipedia.org/wiki/Halo_(franchise)) character, and the date when the work on the specific build started in the format of `MMDDYYYY`.

-| Build ID                                                           | Build Date      |
-|:-------------------------------------------------------------------|:----------------|
-| [`VISEGRADRELAY_08152024`](#VISEGRADRELAY_08152024-august-15-2024) | August 15, 2024 |
-| [`DAISY023_04102024`](#DAISY023_04102024-april-10-2024)            | April 10, 2024  |
-| [`ATRIOX_04132023`](#ATRIOX_04132023-april-13-2023)                | April 13, 2023  |
-| [`LIBRARIAN_03202022`](#librarian_03202022-march-20-2022)          | March 20, 2022  |
-| `ARBITER_01312022`                                                 | January 31, 2022 |
+| Build ID                                                           | Build Date         |
+|:-------------------------------------------------------------------|:------------------|
+| [`PROMETHEAN_09082024`](#PROMETHEAN_09082024-september-8-2024)     | September 8, 2024 |
+| [`VISEGRADRELAY_08152024`](#VISEGRADRELAY_08152024-august-15-2024) | August 15, 2024   |
+| [`DAISY023_04102024`](#DAISY023_04102024-april-10-2024)            | April 10, 2024    |
+| [`ATRIOX_04132023`](#ATRIOX_04132023-april-13-2023)                | April 13, 2023    |
+| [`LIBRARIAN_03202022`](#librarian_03202022-march-20-2022)          | March 20, 2022    |
+| `ARBITER_01312022`                                                 | January 31, 2022  |
+
+### `PROMETHEAN_09082024` (September 8, 2024)
+
+>[!NOTE]
+>See pull request: [Awake - `PROMETHEAN_09082024`](https://github.com/microsoft/PowerToys/pull/34717)
+
+- Updating the initialization logic to make sure that settings are respected for proper group policy and single-instance detection.
+- [#34148] Fixed a bug from the previous release that incorrectly synchronized threads for shell icon creation and initialized parent PID when it was not parented.

 ### `VISEGRADRELAY_08152024` (August 15, 2024)

--- a/installer/PowerToysSetup/NewPlus.wxs
+++ b/installer/PowerToysSetup/NewPlus.wxs
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+   xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+   <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+   <?define NewPlusAssetsFiles=?>
+   <?define NewPlusAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\?>
+   <?define NewPlusTemplateFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\Templates\?>
+   <?define NewPlusTemplateSubFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\Templates\Example folder\?>
+
+   <Fragment>
+
+      <!-- Assets -->
+      <DirectoryRef Id="WinUI3AppsAssetsFolder">
+         <Directory Id="NewPlusAssetsInstallFolder" Name="NewPlus" />
+      </DirectoryRef>
+      <DirectoryRef Id="NewPlusAssetsInstallFolder" FileSource="$(var.NewPlusAssetsFilesPath)">
+         <!-- Generated by generateFileComponents.ps1 -->
+         <!--NewPlusAssetsFiles_Component_Def-->
+      </DirectoryRef>
+
+      <ComponentGroup Id="NewPlusComponentGroup">
+         <Component Id="RemoveNewPlusFolder" Guid="4189C789-56EB-409D-912E-3F4F3F4F1FFA" Directory="NewPlusAssetsInstallFolder" >
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+               <RegistryValue Type="string" Name="RemoveNewPlusFolder" Value="" KeyPath="yes"/>
+            </RegistryKey>
+            <RemoveFolder Id="RemoveFolderNewPlusAssetsFolder" Directory="NewPlusAssetsInstallFolder" On="uninstall"/>
+         </Component>
+      </ComponentGroup>
+
+      
+      <!-- Example templates -->
+      <DirectoryRef Id="WinUI3AppsAssetsFolder">
+         <Directory Id="NewPlusInstallFolder" Name="NewPlus">
+            <Directory Id="NewPlusTemplatesInstallFolder" Name="Templates">
+               <Directory Id="NewPlusTemplatesSubInstallFolder" Name="Example folder"/>
+            </Directory>
+         </Directory>
+      </DirectoryRef>
+      <DirectoryRef Id="NewPlusTemplatesInstallFolder" FileSource="$(var.NewPlusTemplateFilesPath)">
+         <Component Id="NewPlusTemplateFiles_Component" Win64="yes" Guid="39264075-4B7F-40E3-A76F-21E68576D43E">
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+               <RegistryValue Type="string" Name="NewPlusTemplateFiles_Component" Value="" KeyPath="yes"/>
+            </RegistryKey>
+            <File Id="NewPlusTemplateFiles_File_1.md" Source="$(var.NewPlusTemplateFilesPath)Any files or folders placed in the template folder are available via New+.txt" />
+         </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="NewPlusTemplatesSubInstallFolder" FileSource="$(var.NewPlusTemplateSubFilesPath)">
+         <Component Id="NewPlusTemplateSubFiles_Component" Win64="yes" Guid="7618E61C-CCB8-492F-B284-E1AE2954AF0B">
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+               <RegistryValue Type="string" Name="NewPlusTemplateSubFiles_Component" Value="" KeyPath="yes"/>
+            </RegistryKey>
+            <File Id="NewPlusTemplateSubFiles_File_1.md" Source="$(var.NewPlusTemplateSubFilesPath)Example txt file.txt" />
+            <File Id="NewPlusTemplateSubFiles_File_2.md" Source="$(var.NewPlusTemplateSubFilesPath)Another example txt file.txt" />
+         </Component>
+      </DirectoryRef>
+
+      <ComponentGroup Id="NewPlusTemplatesComponentGroup">
+         <Component Id="RemoveNewPlusTemplateFolder" Guid="3E9B15CA-A50C-42DA-977F-5E9914562FE7" Directory="NewPlusInstallFolder" >
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+               <RegistryValue Type="string" Name="RemoveNewPlusTemplateFolder" Value="" KeyPath="yes"/>
+            </RegistryKey>
+            <RemoveFolder Id="RemoveFolderNewPlusInstallFolder" Directory="NewPlusInstallFolder" On="uninstall"/>
+            <RemoveFolder Id="RemoveFolderNewPlusTemplatesInstallFolder" Directory="NewPlusTemplatesInstallFolder" On="uninstall"/>
+            <RemoveFolder Id="RemoveFolderNewPlusTemplatesSubInstallFolder" Directory="NewPlusTemplatesSubInstallFolder" On="uninstall"/>
+         </Component>
+         <ComponentRef Id="NewPlusTemplateFiles_Component" />
+         <ComponentRef Id="NewPlusTemplateSubFiles_Component" />
+      </ComponentGroup>
+
+   </Fragment>
+</Wix>
--- a/installer/PowerToysSetup/PowerToysInstaller.wixproj
+++ b/installer/PowerToysSetup/PowerToysInstaller.wixproj
@@ -1,9 +1,7 @@
 <?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="..\wix.props" Condition="Exists('..\wix.props')" />
-
  <PropertyGroup Condition="'$(Platform)' == 'x64'">
    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC</DefineConstants>
    <!-- THIS IS AN INNER LOOP OPTIMIZATION
@@ -18,7 +16,6 @@ call "..\..\..\publish.cmd" x64
 call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs"
    </PreBuildEvent>
  </PropertyGroup>
-
  <PropertyGroup Condition="'$(Platform)' != 'x64'">
    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\Assets\Monaco\monacoSRC</DefineConstants>
    <PreBuildEvent>IF NOT DEFINED IsPipeline (
@@ -32,31 +29,32 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
  <PropertyGroup>
    <RunPostBuildEvent>Always</RunPostBuildEvent>
    <PostBuildEvent>
-    call move /Y ..\..\..\AdvancedPaste.wxs.bk ..\..\..\AdvancedPaste.wxs
-    call move /Y ..\..\..\Awake.wxs.bk ..\..\..\Awake.wxs
-    call move /Y ..\..\..\BaseApplications.wxs.bk ..\..\..\BaseApplications.wxs
-    call move /Y ..\..\..\ColorPicker.wxs.bk ..\..\..\ColorPicker.wxs
-    call move /Y ..\..\..\Core.wxs.bk ..\..\..\Core.wxs
-    call move /Y ..\..\..\EnvironmentVariables.wxs.bk ..\..\..\EnvironmentVariables.wxs
-    call move /Y ..\..\..\FileExplorerPreview.wxs.bk ..\..\..\FileExplorerPreview.wxs
-    call move /Y ..\..\..\FileLocksmith.wxs.bk ..\..\..\FileLocksmith.wxs
-    call move /Y ..\..\..\Hosts.wxs.bk ..\..\..\Hosts.wxs
-    call move /Y ..\..\..\ImageResizer.wxs.bk ..\..\..\ImageResizer.wxs
-    call move /Y ..\..\..\KeyboardManager.wxs.bk ..\..\..\KeyboardManager.wxs
-    call move /Y ..\..\..\MouseWithoutBorders.wxs.bk ..\..\..\MouseWithoutBorders.wxs
-    call move /Y ..\..\..\Peek.wxs.bk ..\..\..\Peek.wxs
-    call move /Y ..\..\..\PowerRename.wxs.bk ..\..\..\PowerRename.wxs
-    call move /Y ..\..\..\Product.wxs.bk ..\..\..\Product.wxs
-    call move /Y ..\..\..\RegistryPreview.wxs.bk ..\..\..\RegistryPreview.wxs
-    call move /Y ..\..\..\Resources.wxs.bk ..\..\..\Resources.wxs
-    call move /Y ..\..\..\Run.wxs.bk ..\..\..\Run.wxs
-    call move /Y ..\..\..\Settings.wxs.bk ..\..\..\Settings.wxs
-    call move /Y ..\..\..\ShortcutGuide.wxs.bk ..\..\..\ShortcutGuide.wxs
-    call move /Y ..\..\..\Tools.wxs.bk ..\..\..\Tools.wxs
-    call move /Y ..\..\..\VideoConference.wxs.bk ..\..\..\VideoConference.wxs
-    call move /Y ..\..\..\WinAppSDK.wxs.bk ..\..\..\WinAppSDK.wxs
-    call move /Y ..\..\..\WinUI3Applications.wxs.bk ..\..\..\WinUI3Applications.wxs
-    </PostBuildEvent>
+      call move /Y ..\..\..\AdvancedPaste.wxs.bk ..\..\..\AdvancedPaste.wxs
+      call move /Y ..\..\..\Awake.wxs.bk ..\..\..\Awake.wxs
+      call move /Y ..\..\..\BaseApplications.wxs.bk ..\..\..\BaseApplications.wxs
+      call move /Y ..\..\..\ColorPicker.wxs.bk ..\..\..\ColorPicker.wxs
+      call move /Y ..\..\..\Core.wxs.bk ..\..\..\Core.wxs
+      call move /Y ..\..\..\EnvironmentVariables.wxs.bk ..\..\..\EnvironmentVariables.wxs
+      call move /Y ..\..\..\FileExplorerPreview.wxs.bk ..\..\..\FileExplorerPreview.wxs
+      call move /Y ..\..\..\FileLocksmith.wxs.bk ..\..\..\FileLocksmith.wxs
+      call move /Y ..\..\..\Hosts.wxs.bk ..\..\..\Hosts.wxs
+      call move /Y ..\..\..\ImageResizer.wxs.bk ..\..\..\ImageResizer.wxs
+      call move /Y ..\..\..\KeyboardManager.wxs.bk ..\..\..\KeyboardManager.wxs
+      call move /Y ..\..\..\MouseWithoutBorders.wxs.bk ..\..\..\MouseWithoutBorders.wxs
+      call move /Y ..\..\..\NewPlus.wxs.bk ..\..\..\NewPlus.wxs
+      call move /Y ..\..\..\Peek.wxs.bk ..\..\..\Peek.wxs
+      call move /Y ..\..\..\PowerRename.wxs.bk ..\..\..\PowerRename.wxs
+      call move /Y ..\..\..\Product.wxs.bk ..\..\..\Product.wxs
+      call move /Y ..\..\..\RegistryPreview.wxs.bk ..\..\..\RegistryPreview.wxs
+      call move /Y ..\..\..\Resources.wxs.bk ..\..\..\Resources.wxs
+      call move /Y ..\..\..\Run.wxs.bk ..\..\..\Run.wxs
+      call move /Y ..\..\..\Settings.wxs.bk ..\..\..\Settings.wxs
+      call move /Y ..\..\..\ShortcutGuide.wxs.bk ..\..\..\ShortcutGuide.wxs
+      call move /Y ..\..\..\Tools.wxs.bk ..\..\..\Tools.wxs
+      call move /Y ..\..\..\VideoConference.wxs.bk ..\..\..\VideoConference.wxs
+      call move /Y ..\..\..\WinAppSDK.wxs.bk ..\..\..\WinAppSDK.wxs
+      call move /Y ..\..\..\WinUI3Applications.wxs.bk ..\..\..\WinUI3Applications.wxs
+      </PostBuildEvent>
  </PropertyGroup>
  <PropertyGroup>
    <Name>PowerToysInstaller</Name>
@@ -67,7 +65,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' != 'true' ">
    <DefineConstants>$(DefineConstants);PerUser=false</DefineConstants>
  </PropertyGroup>
-
  <PropertyGroup>
    <!-- We do not support debug installer builds -->
    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
@@ -102,8 +99,8 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
    <Compile Include="CustomDialogs\PTInstallDirDlg.wxs" />
    <Compile Include="CustomDialogs\PTLicenseDlg.wxs" />
    <Compile Include="CustomDialogs\WixUI_PTInstallDir.wxs" />
+    <Compile Include="NewPlus.wxs" />
    <Compile Include="Product.wxs" />
-
    <Compile Include="AdvancedPaste.wxs" />
    <Compile Include="Awake.wxs" />
    <Compile Include="BaseApplications.wxs" />
@@ -124,9 +121,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
    <Compile Include="VideoConference.wxs" />
    <Compile Include="MouseWithoutBorders.wxs" />
    <Compile Include="WinUI3Applications.wxs" />
-
    <Compile Include="MonacoSRC.wxs" />
-
    <Compile Include="Core.wxs" />
    <Compile Include="Resources.wxs" />
    <Compile Include="WinAppSDK.wxs" />
@@ -184,9 +179,8 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
 	<Target Name="AfterBuild">
 	</Target> -->
  <Target Name="BeforeBuild">
-    <HeatDirectory Directory="..\..\src\common\FilePreviewCommon\Assets\Monaco\monacoSRC" PreprocessorVariable="var.MonacoSRCHarvestPath" OutputFile="MonacoSRC.wxs" ComponentGroupName="MonacoSRCHeatGenerated" DirectoryRefId="MonacoPreviewHandlerMonacoSRCFolder" AutogenerateGuids="false" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" RunAsSeparateProcess="true" SuppressFragments="false" SuppressRegistry="false" SuppressRootDirectory="true"/>
+    <HeatDirectory Directory="..\..\src\common\FilePreviewCommon\Assets\Monaco\monacoSRC" PreprocessorVariable="var.MonacoSRCHarvestPath" OutputFile="MonacoSRC.wxs" ComponentGroupName="MonacoSRCHeatGenerated" DirectoryRefId="MonacoPreviewHandlerMonacoSRCFolder" AutogenerateGuids="false" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" RunAsSeparateProcess="true" SuppressFragments="false" SuppressRegistry="false" SuppressRootDirectory="true" />
  </Target>
-
  <!-- Prevents NU1503 -->
  <Target Name="_IsProjectRestoreSupported" Returns="@(_ValidProjectsForRestore)">
    <ItemGroup>
--- a/installer/PowerToysSetup/Product.wxs
+++ b/installer/PowerToysSetup/Product.wxs
@@ -73,6 +73,8 @@
      <ComponentGroupRef Id="MouseWithoutBordersComponentGroup" />
      <ComponentGroupRef Id="EnvironmentVariablesComponentGroup" />
      <ComponentGroupRef Id="AdvancedPasteComponentGroup" />
+      <ComponentGroupRef Id="NewPlusComponentGroup" />
+      <ComponentGroupRef Id="NewPlusTemplatesComponentGroup" />
      <ComponentGroupRef Id="ResourcesComponentGroup" />
      <ComponentGroupRef Id="WindowsAppSDKComponentGroup" />
      <ComponentGroupRef Id="ToolComponentGroup" />
--- a/installer/PowerToysSetup/generateAllFileComponents.ps1
+++ b/installer/PowerToysSetup/generateAllFileComponents.ps1
@@ -6,6 +6,130 @@ Param(
    [string]$installscopeperuser = "false"
 )

+Function Generate-FileList() {
+    [CmdletBinding()]
+    Param(
+        # Can be multiple files separated by ; as long as they're on the same directory
+        [Parameter(Mandatory = $True, Position = 1)]
+        [AllowEmptyString()]
+        [string]$fileDepsJson,
+        [Parameter(Mandatory = $True, Position = 2)]
+        [string]$fileListName,
+        [Parameter(Mandatory = $True, Position = 3)]
+        [string]$wxsFilePath,
+        # If there is no deps.json file, just pass path to files
+        [Parameter(Mandatory = $False, Position = 4)]
+        [string]$depsPath,
+        # launcher plugins are being loaded into launcher process,
+        # so there are some additional dependencies to skip
+        [Parameter(Mandatory = $False, Position = 5)]
+        [bool]$isLauncherPlugin
+    )
+
+    $fileWxs = Get-Content $wxsFilePath;
+
+    $fileExclusionList = @("*.pdb", "*.lastcodeanalysissucceeded", "createdump.exe", "powertoys.exe")
+
+    $fileInclusionList = @("*.dll", "*.exe", "*.json", "*.msix", "*.png", "*.gif", "*.ico", "*.cur", "*.svg", "index.html", "reg.js", "gitignore.js", "monacoSpecialLanguages.js", "customTokenColors.js", "*.pri")
+
+    $dllsToIgnore = @("System.CodeDom.dll", "WindowsBase.dll")
+
+    if ($fileDepsJson -eq [string]::Empty) {
+        $fileDepsRoot = $depsPath
+    } else {
+        $multipleDepsJson = $fileDepsJson.Split(";")
+
+        foreach ( $singleDepsJson in $multipleDepsJson )
+        {
+
+            $fileDepsRoot = (Get-ChildItem $singleDepsJson).Directory.FullName
+            $depsJson = Get-Content $singleDepsJson | ConvertFrom-Json
+
+            $runtimeList = ([array]$depsJson.targets.PSObject.Properties)[-1].Value.PSObject.Properties | Where-Object {
+                $_.Name -match "runtimepack.*Runtime"
+            };
+
+            $runtimeList | ForEach-Object {
+                $_.Value.PSObject.Properties.Value | ForEach-Object {
+                    $fileExclusionList += $_.PSObject.Properties.Name
+                }
+            }
+        }
+    }
+
+    $fileExclusionList = $fileExclusionList | Where-Object {$_ -notin $dllsToIgnore}
+
+    if ($isLauncherPlugin -eq $True) {
+        $fileInclusionList += @("*.deps.json")
+        $fileExclusionList += @("Ijwhost.dll", "PowerToys.Common.UI.dll", "PowerToys.GPOWrapper.dll", "PowerToys.GPOWrapperProjection.dll", "PowerToys.PowerLauncher.Telemetry.dll", "PowerToys.ManagedCommon.dll", "PowerToys.Settings.UI.Lib.dll", "Wox.Infrastructure.dll", "Wox.Plugin.dll")
+    }
+
+    $fileList = Get-ChildItem $fileDepsRoot -Include $fileInclusionList -Exclude $fileExclusionList -File -Name
+
+    $fileWxs = $fileWxs -replace "(<\?define $($fileListName)=)", "<?define $fileListName=$($fileList -join ';')"
+
+    Set-Content -Path $wxsFilePath -Value $fileWxs
+}
+
+Function Generate-FileComponents() {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $True, Position = 1)]
+        [string]$fileListName,
+        [Parameter(Mandatory = $True, Position = 2)]
+        [string]$wxsFilePath,
+        [Parameter(Mandatory = $True, Position = 3)]
+        [string]$regroot
+    )
+
+    $wxsFile = Get-Content $wxsFilePath;
+
+    $wxsFile | ForEach-Object {
+        if ($_ -match "(<?define $fileListName=)(.*)\?>") {
+            [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssignments', 'fileList',
+            Justification = 'variable is used in another scope')]
+
+            $fileList = $matches[2] -split ';'
+            return
+        }
+    }
+
+    $componentId = "$($fileListName)_Component"
+
+    $componentDefs = "`r`n"
+    $componentDefs +=
+    @"
+            <Component Id="$($componentId)" Win64="yes" Guid="$((New-Guid).ToString().ToUpper())">
+              <RegistryKey Root="$($regroot)" Key="Software\Classes\powertoys\components">
+                <RegistryValue Type="string" Name="$($componentId)" Value="" KeyPath="yes"/>
+              </RegistryKey>`r`n
+"@
+
+    foreach ($file in $fileList) {
+        $fileTmp = $file -replace "-", "_"
+        $componentDefs +=
+    @"
+              <File Id="$($fileListName)_File_$($fileTmp)" Source="`$(var.$($fileListName)Path)\$($file)" />`r`n
+"@
+    }
+
+    $componentDefs +=
+    @"
+            </Component>`r`n
+"@
+
+    $wxsFile = $wxsFile -replace "\s+(<!--$($fileListName)_Component_Def-->)", $componentDefs
+
+    $componentRef =
+    @"
+            <ComponentRef Id="$($componentId)" />
+"@
+
+    $wxsFile = $wxsFile -replace "\s+(</ComponentGroup>)", "$componentRef`r`n    </ComponentGroup>"
+
+    Set-Content -Path $wxsFilePath -Value $wxsFile
+}
+
 if ($platform -ceq "arm64") {
    $platform = "ARM64"
 }
@@ -17,175 +141,179 @@ if ($installscopeperuser -eq "true") {
 }

 #BaseApplications
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName BaseApplicationsFiles -wxsFilePath $PSScriptRoot\BaseApplications.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""BaseApplicationsFiles"" -wxsFilePath $PSScriptRoot\BaseApplications.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName BaseApplicationsFiles -wxsFilePath $PSScriptRoot\BaseApplications.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release"
+Generate-FileComponents -fileListName "BaseApplicationsFiles" -wxsFilePath $PSScriptRoot\BaseApplications.wxs -regroot $registryroot

 #WinUI3Applications
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WinUI3ApplicationsFiles -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinUI3ApplicationsFiles"" -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName WinUI3ApplicationsFiles -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps"
+Generate-FileComponents -fileListName "WinUI3ApplicationsFiles" -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -regroot $registryroot

 #AdvancedPaste
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName AdvancedPasteAssetsFiles -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\AdvancedPaste"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""AdvancedPasteAssetsFiles"" -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName AdvancedPasteAssetsFiles -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\AdvancedPaste"
+Generate-FileComponents -fileListName "AdvancedPasteAssetsFiles" -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs -regroot $registryroot

 #AwakeFiles
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName AwakeImagesFiles -wxsFilePath $PSScriptRoot\Awake.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\Awake"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""AwakeImagesFiles"" -wxsFilePath $PSScriptRoot\Awake.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName AwakeImagesFiles -wxsFilePath $PSScriptRoot\Awake.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Awake"
+Generate-FileComponents -fileListName "AwakeImagesFiles" -wxsFilePath $PSScriptRoot\Awake.wxs -regroot $registryroot

 #ColorPicker
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ColorPickerAssetsFiles -wxsFilePath $PSScriptRoot\ColorPicker.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\ColorPicker"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ColorPickerAssetsFiles"" -wxsFilePath $PSScriptRoot\ColorPicker.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName ColorPickerAssetsFiles -wxsFilePath $PSScriptRoot\ColorPicker.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ColorPicker"
+Generate-FileComponents -fileListName "ColorPickerAssetsFiles" -wxsFilePath $PSScriptRoot\ColorPicker.wxs -regroot $registryroot

 #Environment Variables
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName EnvironmentVariablesAssetsFiles -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\EnvironmentVariables"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""EnvironmentVariablesAssetsFiles"" -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName EnvironmentVariablesAssetsFiles -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\EnvironmentVariables"
+Generate-FileComponents -fileListName "EnvironmentVariablesAssetsFiles" -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs -regroot $registryroot

 #FileExplorerAdd-ons
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName MonacoPreviewHandlerMonacoAssetsFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName MonacoPreviewHandlerCustomLanguagesFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco\customLanguages"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""MonacoPreviewHandlerMonacoAssetsFiles"" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""MonacoPreviewHandlerCustomLanguagesFiles"" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName MonacoPreviewHandlerMonacoAssetsFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco"
+Generate-FileList -fileDepsJson "" -fileListName MonacoPreviewHandlerCustomLanguagesFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco\customLanguages"
+Generate-FileComponents -fileListName "MonacoPreviewHandlerMonacoAssetsFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "MonacoPreviewHandlerCustomLanguagesFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot

 #FileLocksmith
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName FileLocksmithAssetsFiles -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\FileLocksmith"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""FileLocksmithAssetsFiles"" -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName FileLocksmithAssetsFiles -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\FileLocksmith"
+Generate-FileComponents -fileListName "FileLocksmithAssetsFiles" -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -regroot $registryroot

 #Hosts
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName HostsAssetsFiles -wxsFilePath $PSScriptRoot\Hosts.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Hosts"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""HostsAssetsFiles"" -wxsFilePath $PSScriptRoot\Hosts.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName HostsAssetsFiles -wxsFilePath $PSScriptRoot\Hosts.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Hosts"
+Generate-FileComponents -fileListName "HostsAssetsFiles" -wxsFilePath $PSScriptRoot\Hosts.wxs -regroot $registryroot

 #ImageResizer
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ImageResizerAssetsFiles -wxsFilePath $PSScriptRoot\ImageResizer.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\ImageResizer"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ImageResizerAssetsFiles"" -wxsFilePath $PSScriptRoot\ImageResizer.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName ImageResizerAssetsFiles -wxsFilePath $PSScriptRoot\ImageResizer.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ImageResizer"
+Generate-FileComponents -fileListName "ImageResizerAssetsFiles" -wxsFilePath $PSScriptRoot\ImageResizer.wxs -regroot $registryroot
+
+#New+
+Generate-FileList -fileDepsJson "" -fileListName NewPlusAssetsFiles -wxsFilePath $PSScriptRoot\NewPlus.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\NewPlus"
+Generate-FileComponents -fileListName "NewPlusAssetsFiles" -wxsFilePath $PSScriptRoot\NewPlus.wxs -regroot $registryroot

 #Peek
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PeekAssetsFiles -wxsFilePath $PSScriptRoot\Peek.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Peek\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PeekAssetsFiles"" -wxsFilePath $PSScriptRoot\Peek.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName PeekAssetsFiles -wxsFilePath $PSScriptRoot\Peek.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Peek\"
+Generate-FileComponents -fileListName "PeekAssetsFiles" -wxsFilePath $PSScriptRoot\Peek.wxs -regroot $registryroot

 #PowerRename
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PowerRenameAssetsFiles -wxsFilePath $PSScriptRoot\PowerRename.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\PowerRename\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerRenameAssetsFiles"" -wxsFilePath $PSScriptRoot\PowerRename.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName PowerRenameAssetsFiles -wxsFilePath $PSScriptRoot\PowerRename.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\PowerRename\"
+Generate-FileComponents -fileListName "PowerRenameAssetsFiles" -wxsFilePath $PSScriptRoot\PowerRename.wxs -regroot $registryroot

 #RegistryPreview
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName RegistryPreviewAssetsFiles -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\RegistryPreview\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""RegistryPreviewAssetsFiles"" -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName RegistryPreviewAssetsFiles -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\RegistryPreview\"
+Generate-FileComponents -fileListName "RegistryPreviewAssetsFiles" -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -regroot $registryroot

 #Run
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName launcherImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\PowerLauncher"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""launcherImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName launcherImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\PowerLauncher"
+Generate-FileComponents -fileListName "launcherImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ## Plugins
 ###Calculator
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Microsoft.PowerToys.Run.Plugin.Calculator.deps.json"" -fileListName calcComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName calcImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""calcComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""calcImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Microsoft.PowerToys.Run.Plugin.Calculator.deps.json" -fileListName calcComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName calcImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Images"
+Generate-FileComponents -fileListName "calcComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "calcImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Folder
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Microsoft.Plugin.Folder.deps.json"" -fileListName FolderComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName FolderImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""FolderComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""FolderImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Microsoft.Plugin.Folder.deps.json" -fileListName FolderComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName FolderImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Images"
+Generate-FileComponents -fileListName "FolderComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "FolderImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Program
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Microsoft.Plugin.Program.deps.json"" -fileListName ProgramComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ProgramImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ProgramComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ProgramImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Microsoft.Plugin.Program.deps.json" -fileListName ProgramComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName ProgramImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Images"
+Generate-FileComponents -fileListName "ProgramComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ProgramImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Shell
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Microsoft.Plugin.Shell.deps.json"" -fileListName ShellComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ShellImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ShellComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ShellImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Microsoft.Plugin.Shell.deps.json" -fileListName ShellComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName ShellImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Images"
+Generate-FileComponents -fileListName "ShellComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ShellImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Indexer
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Microsoft.Plugin.Indexer.deps.json"" -fileListName IndexerComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName IndexerImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""IndexerComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""IndexerImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Microsoft.Plugin.Indexer.deps.json" -fileListName IndexerComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName IndexerImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Images"
+Generate-FileComponents -fileListName "IndexerComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "IndexerImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###UnitConverter
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Community.PowerToys.Run.Plugin.UnitConverter.deps.json"" -fileListName UnitConvCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName UnitConvImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""UnitConvCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""UnitConvImagesCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Community.PowerToys.Run.Plugin.UnitConverter.deps.json" -fileListName UnitConvCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName UnitConvImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Images"
+Generate-FileComponents -fileListName "UnitConvCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "UnitConvImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###WebSearch
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Community.PowerToys.Run.Plugin.WebSearch.deps.json"" -fileListName WebSrchCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WebSrchImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WebSrchCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WebSrchImagesCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Community.PowerToys.Run.Plugin.WebSearch.deps.json" -fileListName WebSrchCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName WebSrchImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Images"
+Generate-FileComponents -fileListName "WebSrchCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WebSrchImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###History
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Microsoft.PowerToys.Run.Plugin.History.deps.json"" -fileListName HistoryPluginComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName HistoryPluginImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""HistoryPluginComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""HistoryPluginImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Microsoft.PowerToys.Run.Plugin.History.deps.json" -fileListName HistoryPluginComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName HistoryPluginImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Images"
+Generate-FileComponents -fileListName "HistoryPluginComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "HistoryPluginImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Uri
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Microsoft.Plugin.Uri.deps.json"" -fileListName UriComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName UriImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""UriComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""UriImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Microsoft.Plugin.Uri.deps.json" -fileListName UriComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName UriImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Images"
+Generate-FileComponents -fileListName "UriComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "UriImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###VSCodeWorkspaces
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.deps.json"" -fileListName VSCWrkCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName VSCWrkImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""VSCWrkCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""VSCWrkImagesCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.deps.json" -fileListName VSCWrkCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName VSCWrkImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Images"
+Generate-FileComponents -fileListName "VSCWrkCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "VSCWrkImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###WindowWalker
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Microsoft.Plugin.WindowWalker.deps.json"" -fileListName WindowWlkrCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WindowWlkrImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WindowWlkrCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WindowWlkrImagesCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Microsoft.Plugin.WindowWalker.deps.json" -fileListName WindowWlkrCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName WindowWlkrImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Images"
+Generate-FileComponents -fileListName "WindowWlkrCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WindowWlkrImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###OneNote
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Microsoft.PowerToys.Run.Plugin.OneNote.deps.json"" -fileListName OneNoteComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName OneNoteImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""OneNoteComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""OneNoteImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Microsoft.PowerToys.Run.Plugin.OneNote.deps.json" -fileListName OneNoteComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName OneNoteImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Images"
+Generate-FileComponents -fileListName "OneNoteComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "OneNoteImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Registry
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Microsoft.PowerToys.Run.Plugin.Registry.deps.json"" -fileListName RegistryComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName RegistryImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""RegistryComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""RegistryImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Microsoft.PowerToys.Run.Plugin.Registry.deps.json" -fileListName RegistryComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName RegistryImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Images"
+Generate-FileComponents -fileListName "RegistryComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "RegistryImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Service
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Microsoft.PowerToys.Run.Plugin.Service.deps.json"" -fileListName ServiceComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ServiceImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ServiceComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ServiceImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Microsoft.PowerToys.Run.Plugin.Service.deps.json" -fileListName ServiceComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName ServiceImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Images"
+Generate-FileComponents -fileListName "ServiceComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ServiceImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###System
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Microsoft.PowerToys.Run.Plugin.System.deps.json"" -fileListName SystemComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SystemImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SystemComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SystemImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Microsoft.PowerToys.Run.Plugin.System.deps.json" -fileListName SystemComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName SystemImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Images"
+Generate-FileComponents -fileListName "SystemComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SystemImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###TimeDate
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Microsoft.PowerToys.Run.Plugin.TimeDate.deps.json"" -fileListName TimeDateComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName TimeDateImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""TimeDateComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""TimeDateImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Microsoft.PowerToys.Run.Plugin.TimeDate.deps.json" -fileListName TimeDateComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName TimeDateImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Images"
+Generate-FileComponents -fileListName "TimeDateComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "TimeDateImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###WindowsSettings
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Microsoft.PowerToys.Run.Plugin.WindowsSettings.deps.json"" -fileListName WinSetCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WinSetImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinSetCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinSetImagesCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Microsoft.PowerToys.Run.Plugin.WindowsSettings.deps.json" -fileListName WinSetCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName WinSetImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Images"
+Generate-FileComponents -fileListName "WinSetCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WinSetImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###WindowsTerminal
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.deps.json"" -fileListName WinTermCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WinTermImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinTermCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinTermImagesCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.deps.json" -fileListName WinTermCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName WinTermImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Images"
+Generate-FileComponents -fileListName "WinTermCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WinTermImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###PowerToys
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Microsoft.PowerToys.Run.Plugin.PowerToys.deps.json"" -fileListName PowerToysCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PowerToysImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerToysCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerToysImagesCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Microsoft.PowerToys.Run.Plugin.PowerToys.deps.json" -fileListName PowerToysCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName PowerToysImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Images"
+Generate-FileComponents -fileListName "PowerToysCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "PowerToysImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###ValueGenerator
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Community.PowerToys.Run.Plugin.ValueGenerator.deps.json"" -fileListName ValueGeneratorCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ValueGeneratorImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ValueGeneratorCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ValueGeneratorImagesCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Community.PowerToys.Run.Plugin.ValueGenerator.deps.json" -fileListName ValueGeneratorCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName ValueGeneratorImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Images"
+Generate-FileComponents -fileListName "ValueGeneratorCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ValueGeneratorImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ## Plugins

 #ShortcutGuide
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ShortcutGuideSvgFiles -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\ShortcutGuide\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ShortcutGuideSvgFiles"" -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName ShortcutGuideSvgFiles -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ShortcutGuide\"
+Generate-FileComponents -fileListName "ShortcutGuideSvgFiles" -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -regroot $registryroot

 #Settings
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2AssetsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2AssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2OOBEAssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\OOBE\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2OOBEAssetsFluentIconsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Icons\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2AssetsFiles"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2AssetsModulesFiles"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2OOBEAssetsModulesFiles"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2OOBEAssetsFluentIconsFiles"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName SettingsV2AssetsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\"
+Generate-FileList -fileDepsJson "" -fileListName SettingsV2AssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\"
+Generate-FileList -fileDepsJson "" -fileListName SettingsV2OOBEAssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\OOBE\"
+Generate-FileList -fileDepsJson "" -fileListName SettingsV2OOBEAssetsFluentIconsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Icons\"
+Generate-FileComponents -fileListName "SettingsV2AssetsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SettingsV2AssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SettingsV2OOBEAssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SettingsV2OOBEAssetsFluentIconsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
--- a/installer/PowerToysSetup/generateFileComponents.ps1
+++ b/installer/PowerToysSetup/generateFileComponents.ps1
@@ -1,56 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory = $True, Position = 1)]
-    [string]$fileListName,
-    [Parameter(Mandatory = $True, Position = 2)]
-    [string]$wxsFilePath,
-    [Parameter(Mandatory = $True, Position = 3)]
-    [string]$regroot
-)
-
-$wxsFile = Get-Content $wxsFilePath;
-
-$wxsFile | ForEach-Object {
-    if ($_ -match "(<?define $fileListName=)(.*)\?>") {
-        [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssignments', 'fileList',
-        Justification = 'variable is used in another scope')]
-
-        $fileList = $matches[2] -split ';'
-        return
-    }
-}
-
-$componentId = "$($fileListName)_Component"
-
-$componentDefs = "`r`n"
-$componentDefs +=
-@"
-        <Component Id="$($componentId)" Win64="yes" Guid="$((New-Guid).ToString().ToUpper())">
-          <RegistryKey Root="$($regroot)" Key="Software\Classes\powertoys\components">
-            <RegistryValue Type="string" Name="$($componentId)" Value="" KeyPath="yes"/>
-          </RegistryKey>`r`n
-"@
-
-foreach ($file in $fileList) {
-    $fileTmp = $file -replace "-", "_"
-    $componentDefs +=
-@"
-          <File Id="$($fileListName)_File_$($fileTmp)" Source="`$(var.$($fileListName)Path)\$($file)" />`r`n
-"@
-}
-
-$componentDefs +=
-@"
-        </Component>`r`n
-"@
-
-$wxsFile = $wxsFile -replace "\s+(<!--$($fileListName)_Component_Def-->)", $componentDefs
-
-$componentRef =
-@"
-        <ComponentRef Id="$($componentId)" />
-"@
-
-$wxsFile = $wxsFile -replace "\s+(</ComponentGroup>)", "$componentRef`r`n    </ComponentGroup>"
-
-Set-Content -Path $wxsFilePath -Value $wxsFile
--- a/installer/PowerToysSetup/generateFileList.ps1
+++ b/installer/PowerToysSetup/generateFileList.ps1
@@ -1,62 +0,0 @@
-[CmdletBinding()]
-Param(
-    # Can be multiple files separated by ; as long as they're on the same directory
-    [Parameter(Mandatory = $True, Position = 1)]
-    [AllowEmptyString()]
-    [string]$fileDepsJson,
-    [Parameter(Mandatory = $True, Position = 2)]
-    [string]$fileListName,
-    [Parameter(Mandatory = $True, Position = 3)]
-    [string]$wxsFilePath,
-    # If there is no deps.json file, just pass path to files
-    [Parameter(Mandatory = $False, Position = 4)]
-    [string]$depsPath,
-    # launcher plugins are being loaded into launcher process,
-    # so there are some additional dependencies to skip
-    [Parameter(Mandatory = $False, Position = 5)]
-    [bool]$isLauncherPlugin
-)
-
-$fileWxs = Get-Content $wxsFilePath;
-
-$fileExclusionList = @("*.pdb", "*.lastcodeanalysissucceeded", "createdump.exe", "powertoys.exe")
-
-$fileInclusionList = @("*.dll", "*.exe", "*.json", "*.msix", "*.png", "*.gif", "*.ico", "*.cur", "*.svg", "index.html", "reg.js", "gitignore.js", "monacoSpecialLanguages.js", "customTokenColors.js", "*.pri")
-
-$dllsToIgnore = @("System.CodeDom.dll", "WindowsBase.dll")
-
-if ($fileDepsJson -eq [string]::Empty) {
-    $fileDepsRoot = $depsPath
-} else {
-    $multipleDepsJson = $fileDepsJson.Split(";")
-
-    foreach ( $singleDepsJson in $multipleDepsJson )
-    {
-
-        $fileDepsRoot = (Get-ChildItem $singleDepsJson).Directory.FullName
-        $depsJson = Get-Content $singleDepsJson | ConvertFrom-Json
-
-        $runtimeList = ([array]$depsJson.targets.PSObject.Properties)[-1].Value.PSObject.Properties | Where-Object {
-            $_.Name -match "runtimepack.*Runtime"
-        };
-
-        $runtimeList | ForEach-Object {
-            $_.Value.PSObject.Properties.Value | ForEach-Object {
-                $fileExclusionList += $_.PSObject.Properties.Name
-            }
-        }
-    }
-}
-
-$fileExclusionList = $fileExclusionList | Where-Object {$_ -notin $dllsToIgnore}
-
-if ($isLauncherPlugin -eq $True) {
-    $fileInclusionList += @("*.deps.json")
-    $fileExclusionList += @("Ijwhost.dll", "PowerToys.Common.UI.dll", "PowerToys.GPOWrapper.dll", "PowerToys.GPOWrapperProjection.dll", "PowerToys.PowerLauncher.Telemetry.dll", "PowerToys.ManagedCommon.dll", "PowerToys.Settings.UI.Lib.dll", "Wox.Infrastructure.dll", "Wox.Plugin.dll")
-}
-
-$fileList = Get-ChildItem $fileDepsRoot -Include $fileInclusionList -Exclude $fileExclusionList -File -Name
-
-$fileWxs = $fileWxs -replace "(<\?define $($fileListName)=)", "<?define $fileListName=$($fileList -join ';')"
-
-Set-Content -Path $wxsFilePath -Value $fileWxs
--- a/installer/PowerToysSetupCustomActions/CustomAction.cpp
+++ b/installer/PowerToysSetupCustomActions/CustomAction.cpp
@@ -1148,7 +1148,7 @@ UINT __stdcall UnRegisterContextMenuPackagesCA(MSIHANDLE hInstall)
    try
    {
        // Packages to unregister
-        const std::vector<std::wstring> packagesToRemoveDisplayName{ { L"PowerRenameContextMenu" }, { L"ImageResizerContextMenu" }, { L"FileLocksmithContextMenu" } };
+        const std::vector<std::wstring> packagesToRemoveDisplayName{ { L"PowerRenameContextMenu" }, { L"ImageResizerContextMenu" }, { L"FileLocksmithContextMenu" }, { L"NewPlusContextMenu" } };

        PackageManager packageManager;

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

-    std::array<std::wstring_view, 36> processesToTerminate = {
+    std::array<std::wstring_view, 37> processesToTerminate = {
        L"PowerToys.PowerLauncher.exe",
        L"PowerToys.Settings.exe",
        L"PowerToys.AdvancedPaste.exe",
@@ -1259,6 +1259,7 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
        L"PowerToys.WorkspacesLauncher.exe",
        L"PowerToys.WorkspacesLauncherUI.exe",
        L"PowerToys.WorkspacesEditor.exe",
+        L"PowerToys.WorkspacesWindowArranger.exe",
        L"PowerToys.exe",
    };

--- a/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj
+++ b/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj
@@ -36,6 +36,9 @@
    <OutDir Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup\</OutDir>
    <IntDir Condition=" '$(PerUser)' != 'true' ">$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\MachineSetup\obj\</IntDir>
    <IntDir Condition=" '$(PerUser)' == 'true' ">$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\UserSetup\obj\</IntDir>
+    <!-- The CMD script below checks this value, and it is **CASE SENSITIVE** -->
+    <NormalizedPerUserValue>false</NormalizedPerUserValue>
+    <NormalizedPerUserValue Condition=" '$(PerUser)' == 'true' ">true</NormalizedPerUserValue>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
    <LinkIncremental>true</LinkIncremental>
@@ -60,6 +63,7 @@
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\ImageResizer.wxs"" ""$(ProjectDir)..\PowerToysSetup\ImageResizer.wxs.bk""""
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\KeyboardManager.wxs"" ""$(ProjectDir)..\PowerToysSetup\KeyboardManager.wxs.bk""""
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\MouseWithoutBorders.wxs"" ""$(ProjectDir)..\PowerToysSetup\MouseWithoutBorders.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\NewPlus.wxs"" ""$(ProjectDir)..\PowerToysSetup\NewPlus.wxs.bk""""
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Peek.wxs"" ""$(ProjectDir)..\PowerToysSetup\Peek.wxs.bk""""
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\PowerRename.wxs"" ""$(ProjectDir)..\PowerToysSetup\PowerRename.wxs.bk""""
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Product.wxs"" ""$(ProjectDir)..\PowerToysSetup\Product.wxs.bk""""
@@ -72,8 +76,8 @@
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\VideoConference.wxs"" ""$(ProjectDir)..\PowerToysSetup\VideoConference.wxs.bk""""
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\WinAppSDK.wxs"" ""$(ProjectDir)..\PowerToysSetup\WinAppSDK.wxs.bk""""
      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\WinUI3Applications.wxs"" ""$(ProjectDir)..\PowerToysSetup\WinUI3Applications.wxs.bk""""
-      if not "$(PerUser)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetup\generateAllFileComponents.ps1 -platform $(Platform)
-      if "$(PerUser)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetup\generateAllFileComponents.ps1 -platform $(Platform) -installscopeperuser $(PerUser)
+      if not "$(NormalizedPerUserValue)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetup\generateAllFileComponents.ps1 -platform $(Platform)
+      if "$(NormalizedPerUserValue)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetup\generateAllFileComponents.ps1 -platform $(Platform) -installscopeperuser $(NormalizedPerUserValue)
      </Command>
      <Message>Backing up original files and populating .NET and WPF Runtime dependencies </Message>
    </PreBuildEvent>
--- a/src/common/GPOWrapper/GPOWrapper.cpp
+++ b/src/common/GPOWrapper/GPOWrapper.cpp
@@ -176,6 +176,10 @@ namespace winrt::PowerToys::GPOWrapper::implementation
    {
        return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteOnlineAIModelsValue());
    }
+    GpoRuleConfigured GPOWrapper::GetConfiguredNewPlusEnabledValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredNewPlusEnabledValue());
+    }
    GpoRuleConfigured GPOWrapper::GetConfiguredWorkspacesEnabledValue()
    {
        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredWorkspacesEnabledValue());
@@ -216,4 +220,8 @@ namespace winrt::PowerToys::GPOWrapper::implementation
        // Convert std::wstring to winrt::hstring
        return to_hstring(rules.c_str());
    }
+    GpoRuleConfigured GPOWrapper::GetConfiguredNewPlusHideTemplateFilenameExtensionValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredNewPlusHideTemplateFilenameExtensionValue());
+    }
 }
--- a/src/common/GPOWrapper/GPOWrapper.h
+++ b/src/common/GPOWrapper/GPOWrapper.h
@@ -50,6 +50,7 @@ namespace winrt::PowerToys::GPOWrapper::implementation
        static GpoRuleConfigured GetConfiguredQoiPreviewEnabledValue();
        static GpoRuleConfigured GetConfiguredQoiThumbnailsEnabledValue();
        static GpoRuleConfigured GetAllowedAdvancedPasteOnlineAIModelsValue();
+        static GpoRuleConfigured GetConfiguredNewPlusEnabledValue();
        static GpoRuleConfigured GetConfiguredWorkspacesEnabledValue();
        static GpoRuleConfigured GetConfiguredMwbClipboardSharingEnabledValue();
        static GpoRuleConfigured GetConfiguredMwbFileTransferEnabledValue();
@@ -59,6 +60,7 @@ namespace winrt::PowerToys::GPOWrapper::implementation
        static GpoRuleConfigured GetConfiguredMwbValidateRemoteIpValue();
        static GpoRuleConfigured GetConfiguredMwbDisableUserDefinedIpMappingRulesValue();
        static winrt::hstring GPOWrapper::GetConfiguredMwbPolicyDefinedIpMappingRules();
+        static GpoRuleConfigured GetConfiguredNewPlusHideTemplateFilenameExtensionValue();
    };
 }

--- a/src/common/GPOWrapper/GPOWrapper.idl
+++ b/src/common/GPOWrapper/GPOWrapper.idl
@@ -54,6 +54,7 @@ namespace PowerToys
            static GpoRuleConfigured GetConfiguredQoiPreviewEnabledValue();
            static GpoRuleConfigured GetConfiguredQoiThumbnailsEnabledValue();
            static GpoRuleConfigured GetAllowedAdvancedPasteOnlineAIModelsValue();
+            static GpoRuleConfigured GetConfiguredNewPlusEnabledValue();
            static GpoRuleConfigured GetConfiguredWorkspacesEnabledValue();
            static GpoRuleConfigured GetConfiguredMwbClipboardSharingEnabledValue();
            static GpoRuleConfigured GetConfiguredMwbFileTransferEnabledValue();
@@ -63,6 +64,7 @@ namespace PowerToys
            static GpoRuleConfigured GetConfiguredMwbValidateRemoteIpValue();
            static GpoRuleConfigured GetConfiguredMwbDisableUserDefinedIpMappingRulesValue();
            static String GetConfiguredMwbPolicyDefinedIpMappingRules();
+            static GpoRuleConfigured GetConfiguredNewPlusHideTemplateFilenameExtensionValue();
        }
    }
 }
--- a/src/common/ManagedCommon/LanguageHelper.cs
+++ b/src/common/ManagedCommon/LanguageHelper.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.IO;
+using System.IO.Abstractions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace ManagedCommon
+{
+    public static class LanguageHelper
+    {
+        public const string SettingsFilePath = "\\Microsoft\\PowerToys\\";
+        public const string SettingsFile = "language.json";
+
+        internal sealed class OutGoingLanguageSettings
+        {
+            [JsonPropertyName("language")]
+            public string LanguageTag { get; set; }
+        }
+
+        public static string LoadLanguage()
+        {
+            FileSystem fileSystem = new FileSystem();
+            var localAppDataDir = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+            var file = localAppDataDir + SettingsFilePath + SettingsFile;
+
+            if (fileSystem.File.Exists(file))
+            {
+                try
+                {
+                    Stream inputStream = fileSystem.File.Open(file, FileMode.Open);
+                    StreamReader reader = new StreamReader(inputStream);
+                    string data = reader.ReadToEnd();
+                    inputStream.Close();
+                    reader.Dispose();
+
+                    return JsonSerializer.Deserialize<OutGoingLanguageSettings>(data).LanguageTag;
+                }
+                catch (Exception)
+                {
+                }
+            }
+
+            return string.Empty;
+        }
+    }
+}
--- a/src/common/ManagedCommon/ModuleType.cs
+++ b/src/common/ManagedCommon/ModuleType.cs
@@ -22,6 +22,7 @@ namespace ManagedCommon
        MouseJump,
        MousePointerCrosshairs,
        MouseWithoutBorders,
+        NewPlus,
        Peek,
        PowerRename,
        PowerLauncher,
--- a/src/common/Themes/theme_helpers.cpp
+++ b/src/common/Themes/theme_helpers.cpp
@@ -3,13 +3,23 @@
 #include "dwmapi.h"
 #include <windows.h>
 #include <vector>
-#pragma comment (lib,"Dwmapi.lib")
+#pragma comment(lib, "Dwmapi.lib")

 #define DWMWA_USE_IMMERSIVE_DARK_MODE 20
 #define HKEY_WINDOWS_THEME L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"

 // based on https://stackoverflow.com/questions/51334674/how-to-detect-windows-10-light-dark-mode-in-win32-application
-AppTheme ThemeHelpers::GetAppTheme()
+Theme ThemeHelpers::GetAppTheme()
+{
+    return ThemeRegistryHelper(L"AppsUseLightTheme");
+}
+
+Theme ThemeHelpers::GetSystemTheme()
+{
+    return ThemeRegistryHelper(L"SystemUsesLightTheme");
+}
+
+Theme ThemeHelpers::ThemeRegistryHelper(LPCWSTR theme_key)
 {
    // The value is expected to be a REG_DWORD, which is a signed 32-bit little-endian
    auto buffer = std::vector<char>(4);
@@ -17,21 +27,22 @@ AppTheme ThemeHelpers::GetAppTheme()
    auto res = RegGetValueW(
        HKEY_CURRENT_USER,
        HKEY_WINDOWS_THEME,
-        L"AppsUseLightTheme",
-        RRF_RT_REG_DWORD, // expected value type
+        theme_key,
+        RRF_RT_REG_DWORD,
        nullptr,
        buffer.data(),
        &cbData);

    if (res != ERROR_SUCCESS)
    {
-        return AppTheme::Light;
+        // Defaulting to Light
+        return Theme::Light;
    }

    // convert bytes written to our buffer to an int, assuming little-endian
    auto i = static_cast<int>(buffer[3] << 24 | buffer[2] << 16 | buffer[1] << 8 | buffer[0]);

-    return AppTheme(i);
+    return Theme(i);
 }

 void ThemeHelpers::SetImmersiveDarkMode(HWND window, bool enabled)
--- a/src/common/Themes/theme_helpers.h
+++ b/src/common/Themes/theme_helpers.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <windows.h>

-enum class AppTheme
+enum class Theme
 {
    Dark = 0,
    Light = 1
@@ -9,6 +9,10 @@ enum class AppTheme

 struct ThemeHelpers
 {
-    static AppTheme GetAppTheme();
-    static void ThemeHelpers::SetImmersiveDarkMode(HWND window, bool enabled);
+    static Theme GetAppTheme();
+    static Theme GetSystemTheme();
+    static void SetImmersiveDarkMode(HWND window, bool enabled);
+
+protected:
+    static Theme ThemeRegistryHelper(LPCWSTR theme_key);
 };
--- a/src/common/Themes/theme_listener.h
+++ b/src/common/Themes/theme_listener.h
@@ -22,7 +22,7 @@ public:
        dwThreadId = 0;
    }

-    AppTheme AppTheme;
+    Theme AppTheme;
    void ThemeListener::AddChangedHandler(THEME_HANDLE handle);
    void ThemeListener::DelChangedHandler(THEME_HANDLE handle);
    void CheckTheme();
--- a/src/common/Themes/windows_colors.cpp
+++ b/src/common/Themes/windows_colors.cpp
@@ -66,7 +66,7 @@ WindowsColors::Color WindowsColors::get_background_color()

 bool WindowsColors::is_dark_mode()
 {
-    return ThemeHelpers::GetAppTheme() == AppTheme::Dark;
+    return ThemeHelpers::GetAppTheme() == Theme::Dark;
 }

 bool WindowsColors::update()
--- a/src/common/interop/PowerToys.Interop.vcxproj
+++ b/src/common/interop/PowerToys.Interop.vcxproj
@@ -168,6 +168,11 @@
    <Midl Include="LayoutMapManaged.idl" />
    <Midl Include="TwoWayPipeMessageIPCManaged.idl" />
  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\version\version.vcxproj">
+      <Project>{cc6e41ac-8174-4e8a-8d22-85dd7f4851df}</Project>
+    </ProjectReference>
+  </ItemGroup>
  <ImportGroup Label="ExtensionTargets" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/src/common/logger/logger_settings.h
+++ b/src/common/logger/logger_settings.h
@@ -69,8 +69,11 @@ struct LogSettings
    inline const static std::string environmentVariablesLoggerName = "environment-variables";
    inline const static std::wstring cmdNotFoundLogPath = L"Logs\\cmd-not-found-log.txt";
    inline const static std::string cmdNotFoundLoggerName = "cmd-not-found";
+    inline const static std::string newLoggerName = "NewPlus";
    inline const static std::string workspacesLauncherLoggerName = "workspaces-launcher";
    inline const static std::wstring workspacesLauncherLogPath = L"workspaces-launcher-log.txt";
+    inline const static std::string workspacesWindowArrangerLoggerName = "workspaces-window-arranger";
+    inline const static std::wstring workspacesWindowArrangerLogPath = L"workspaces-window-arranger-log.txt";
    inline const static std::string workspacesSnapshotToolLoggerName = "workspaces-snapshot-tool";
    inline const static std::wstring workspacesSnapshotToolLogPath = L"workspaces-snapshot-tool-log.txt";
    inline const static int retention = 30;
--- a/src/common/utils/gpo.h
+++ b/src/common/utils/gpo.h
@@ -60,6 +60,7 @@ namespace powertoys_gpo {
    const std::wstring POLICY_CONFIGURE_ENABLED_ENVIRONMENT_VARIABLES = L"ConfigureEnabledUtilityEnvironmentVariables";
    const std::wstring POLICY_CONFIGURE_ENABLED_QOI_PREVIEW = L"ConfigureEnabledUtilityFileExplorerQOIPreview";
    const std::wstring POLICY_CONFIGURE_ENABLED_QOI_THUMBNAILS = L"ConfigureEnabledUtilityFileExplorerQOIThumbnails";
+    const std::wstring POLICY_CONFIGURE_ENABLED_NEWPLUS = L"ConfigureEnabledUtilityNewPlus";
    const std::wstring POLICY_CONFIGURE_ENABLED_WORKSPACES = L"ConfigureEnabledUtilityWorkspaces";

    // The registry value names for PowerToys installer and update policies.
@@ -81,7 +82,10 @@ namespace powertoys_gpo {
    const std::wstring POLICY_MWB_VALIDATE_REMOTE_IP = L"MwbValidateRemoteIp";
    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";

+    // Methods used for reading the registry
+#pragma region ReadRegistryMethods
    inline std::optional<std::wstring> readRegistryStringValue(HKEY hRootKey, const std::wstring& subKey, const std::wstring& value_name, const bool is_multi_line_text = false)
    {
        // Set value type
@@ -249,7 +253,11 @@ namespace powertoys_gpo {
            return getConfiguredValue(POLICY_CONFIGURE_ENABLED_GLOBAL_ALL_UTILITIES);
        }
    }
+#pragma endregion ReadRegistryMethods

+    // Utility enabled state policies
+    // (Always use 'getUtilityEnabledValue()'.)
+#pragma region UtilityEnabledStatePolicies
    inline gpo_rule_configured_t getConfiguredAlwaysOnTopEnabledValue()
    {
        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_ALWAYS_ON_TOP);
@@ -430,6 +438,25 @@ namespace powertoys_gpo {
        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_ENVIRONMENT_VARIABLES);
    }

+    inline gpo_rule_configured_t getConfiguredQoiPreviewEnabledValue()
+    {
+        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_QOI_PREVIEW);
+    }
+
+    inline gpo_rule_configured_t getConfiguredQoiThumbnailsEnabledValue()
+    {
+        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_QOI_THUMBNAILS);
+    }
+
+    inline gpo_rule_configured_t getConfiguredNewPlusEnabledValue()
+    {
+        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_NEWPLUS);
+    }
+#pragma endregion UtilityEnabledStatePolicies
+
+    // Individual module setting policies
+    // (Never use 'getUtilityEnabledValue()'!)
+#pragma region IndividualModuleSettingPolicies
    inline gpo_rule_configured_t getDisablePerUserInstallationValue()
    {
        return getConfiguredValue(POLICY_DISABLE_PER_USER_INSTALLATION);
@@ -500,54 +527,44 @@ namespace powertoys_gpo {
        }        
    }

-    inline gpo_rule_configured_t getConfiguredQoiPreviewEnabledValue()
-    {
-        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_QOI_PREVIEW);
-    }
-
-    inline gpo_rule_configured_t getConfiguredQoiThumbnailsEnabledValue()
-    {
-        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_QOI_THUMBNAILS);
-    }
-
    inline gpo_rule_configured_t getAllowedAdvancedPasteOnlineAIModelsValue()
    {
-        return getUtilityEnabledValue(POLICY_ALLOW_ADVANCED_PASTE_ONLINE_AI_MODELS);
+        return getConfiguredValue(POLICY_ALLOW_ADVANCED_PASTE_ONLINE_AI_MODELS);
    }

    inline gpo_rule_configured_t getConfiguredMwbClipboardSharingEnabledValue()
    {
-        return getUtilityEnabledValue(POLICY_MWB_CLIPBOARD_SHARING_ENABLED);
+        return getConfiguredValue(POLICY_MWB_CLIPBOARD_SHARING_ENABLED);
    }

    inline gpo_rule_configured_t getConfiguredMwbFileTransferEnabledValue()
    {
-        return getUtilityEnabledValue(POLICY_MWB_FILE_TRANSFER_ENABLED);
+        return getConfiguredValue(POLICY_MWB_FILE_TRANSFER_ENABLED);
    }

    inline gpo_rule_configured_t getConfiguredMwbUseOriginalUserInterfaceValue()
    {
-        return getUtilityEnabledValue(POLICY_MWB_USE_ORIGINAL_USER_INTERFACE);
+        return getConfiguredValue(POLICY_MWB_USE_ORIGINAL_USER_INTERFACE);
    }

    inline gpo_rule_configured_t getConfiguredMwbDisallowBlockingScreensaverValue()
    {
-        return getUtilityEnabledValue(POLICY_MWB_DISALLOW_BLOCKING_SCREENSAVER);
+        return getConfiguredValue(POLICY_MWB_DISALLOW_BLOCKING_SCREENSAVER);
    }

    inline gpo_rule_configured_t getConfiguredMwbSameSubnetOnlyValue()
    {
-        return getUtilityEnabledValue(POLICY_MWB_SAME_SUBNET_ONLY);
+        return getConfiguredValue(POLICY_MWB_SAME_SUBNET_ONLY);
    }

    inline gpo_rule_configured_t getConfiguredMwbValidateRemoteIpValue()
    {
-        return getUtilityEnabledValue(POLICY_MWB_VALIDATE_REMOTE_IP);
+        return getConfiguredValue(POLICY_MWB_VALIDATE_REMOTE_IP);
    }

    inline gpo_rule_configured_t getConfiguredMwbDisableUserDefinedIpMappingRulesValue()
    {
-        return getUtilityEnabledValue(POLICY_MWB_DISABLE_USER_DEFINED_IP_MAPPING_RULES);
+        return getConfiguredValue(POLICY_MWB_DISABLE_USER_DEFINED_IP_MAPPING_RULES);
    }

    inline std::wstring getConfiguredMwbPolicyDefinedIpMappingRules()
@@ -569,4 +586,10 @@ namespace powertoys_gpo {
            return std::wstring ();
        }
    }
+
+    inline gpo_rule_configured_t getConfiguredNewPlusHideTemplateFilenameExtensionValue()
+    {
+        return getConfiguredValue(POLICY_NEW_PLUS_HIDE_TEMPLATE_FILENAME_EXTENSION);
+    }
+#pragma endregion IndividualModuleSettingPolicies
 }
--- a/src/common/utils/language_helper.h
+++ b/src/common/utils/language_helper.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <filesystem>
+#include <common/SettingsAPI/settings_helpers.h>
+#include <common/utils/json.h>
+
+namespace LanguageHelpers
+{
+    inline std::wstring load_language()
+    {
+        std::filesystem::path languageJsonFilePath(PTSettingsHelper::get_root_save_folder_location() + L"\\language.json");
+
+        auto langJson = json::from_file(languageJsonFilePath.c_str());
+        if (!langJson.has_value())
+        {
+            return {};
+        }
+
+        std::wstring language = langJson->GetNamedString(L"language", L"").c_str();
+        return language;
+    }
+}
--- a/src/common/utils/resources.h
+++ b/src/common/utils/resources.h
@@ -4,33 +4,204 @@
 #include <string>
 #include <atlstr.h>

-// Get a string from the resource file
-inline std::wstring get_resource_string(UINT resource_id, HINSTANCE instance, const wchar_t* fallback)
+#include <common/utils/language_helper.h>
+
+
+inline std::wstring get_english_fallback_string(UINT resource_id, HINSTANCE instance)
 {
-    wchar_t* text_ptr;
-    auto length = LoadStringW(instance, resource_id, reinterpret_cast<wchar_t*>(&text_ptr), 0);
-    if (length == 0)
+    // Try to load en-us string as the first fallback.
+    WORD english_language = MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US);
+
+    ATL::CStringW english_string;
+    try
    {
-        // Try to load en-us string as the first fallback.
-        WORD english_language = MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US);
-        ATL::CStringW english_string;
+        if (!english_string.LoadStringW(instance, resource_id, english_language))
+        {
+            return {};
+        }
+    }
+    catch (...)
+    {
+        return {};
+    }
+
+    return std::wstring(english_string);
+}
+
+inline std::wstring get_resource_string_language_override(UINT resource_id, HINSTANCE instance)
+{
+    static std::wstring language = LanguageHelpers::load_language();
+    unsigned lang = LANG_ENGLISH;
+    unsigned sublang = SUBLANG_ENGLISH_US;
+
+    if (!language.empty())
+    {
+        // Language list taken from Resources.wxs
+        if (language == L"ar-SA")
+        {
+            lang = LANG_ARABIC;
+            sublang = SUBLANG_ARABIC_SAUDI_ARABIA;
+        }
+        else if (language == L"cs-CZ")
+        {
+            lang = LANG_CZECH;
+            sublang = SUBLANG_CZECH_CZECH_REPUBLIC;
+        }
+        else if (language == L"de-DE")
+        {
+            lang = LANG_GERMAN;
+            sublang = SUBLANG_GERMAN;
+        }
+        else if (language == L"en-US")
+        {
+            lang = LANG_ENGLISH;
+            sublang = SUBLANG_ENGLISH_US;
+        }
+        else if (language == L"es-ES")
+        {
+            lang = LANG_SPANISH;
+            sublang = SUBLANG_SPANISH;
+        }
+        else if (language == L"fa-IR")
+        {
+            lang = LANG_PERSIAN;
+            sublang = SUBLANG_PERSIAN_IRAN;
+        }
+        else if (language == L"fr-FR")
+        {
+            lang = LANG_FRENCH;
+            sublang = SUBLANG_FRENCH;
+        }
+        else if (language == L"he-IL")
+        {
+            lang = LANG_HEBREW;
+            sublang = SUBLANG_HEBREW_ISRAEL;
+        }
+        else if (language == L"hu-HU")
+        {
+            lang = LANG_HUNGARIAN;
+            sublang = SUBLANG_HUNGARIAN_HUNGARY;
+        }
+        else if (language == L"it-IT")
+        {
+            lang = LANG_ITALIAN;
+            sublang = SUBLANG_ITALIAN;
+        }
+        else if (language == L"ja-JP")
+        {
+            lang = LANG_JAPANESE;
+            sublang = SUBLANG_JAPANESE_JAPAN;
+        }
+        else if (language == L"ko-KR")
+        {
+            lang = LANG_KOREAN;
+            sublang = SUBLANG_KOREAN;
+        }
+        else if (language == L"nl-NL")
+        {
+            lang = LANG_DUTCH;
+            sublang = SUBLANG_DUTCH;
+        }
+        else if (language == L"pl-PL")
+        {
+            lang = LANG_POLISH;
+            sublang = SUBLANG_POLISH_POLAND;
+        }
+        else if (language == L"pt-BR")
+        {
+            lang = LANG_PORTUGUESE;
+            sublang = SUBLANG_PORTUGUESE_BRAZILIAN;
+        }
+        else if (language == L"pt-PT")
+        {
+            lang = LANG_PORTUGUESE;
+            sublang = SUBLANG_PORTUGUESE;
+        }
+        else if (language == L"ru-RU")
+        {
+            lang = LANG_RUSSIAN;
+            sublang = SUBLANG_RUSSIAN_RUSSIA;
+        }
+        else if (language == L"sv-SE")
+        {
+            lang = LANG_SWEDISH;
+            sublang = SUBLANG_SWEDISH;
+        }
+        else if (language == L"tr-TR")
+        {
+            lang = LANG_TURKISH;
+            sublang = SUBLANG_TURKISH_TURKEY;
+        }
+        else if (language == L"uk-UA")
+        {
+            lang = LANG_UKRAINIAN;
+            sublang = SUBLANG_UKRAINIAN_UKRAINE;
+        }
+        else if (language == L"zh-CN")
+        {
+            lang = LANG_CHINESE_SIMPLIFIED;
+            sublang = SUBLANG_CHINESE_SIMPLIFIED;
+        }
+        else if (language == L"zh-TW")
+        {
+            lang = LANG_CHINESE_TRADITIONAL;
+            sublang = SUBLANG_CHINESE_TRADITIONAL;
+        }
+
+        WORD languageID = MAKELANGID(lang, sublang);
+        ATL::CStringW result;
        try
        {
-            if (!english_string.LoadStringW(instance, resource_id, english_language))
+            if (!result.LoadStringW(instance, resource_id, languageID))
            {
-                return fallback;
+                return {};
            }
        }
        catch (...)
        {
-            return fallback;
+            return {};
        }

-        return std::wstring(english_string);
+        if (!result.IsEmpty())
+        {
+            return std::wstring(result);
+        }
+    }
+
+    return {};
+}
+
+// Get a string from the resource file
+inline std::wstring get_resource_string(UINT resource_id, HINSTANCE instance, const wchar_t* fallback)
+{
+    // Try to load en-us string as the first fallback.
+    std::wstring english_string = get_english_fallback_string(resource_id, instance);
+
+    std::wstring language_override_resource = get_resource_string_language_override(resource_id, instance);
+
+    if (!language_override_resource.empty())
+    {
+        return language_override_resource;
    }
    else
    {
-        return { text_ptr, static_cast<std::size_t>(length) };
+        wchar_t* text_ptr;
+        auto length = LoadStringW(instance, resource_id, reinterpret_cast<wchar_t*>(&text_ptr), 0);
+        if (length == 0)
+        {
+            if (!english_string.empty())
+            {
+                return std::wstring(english_string);
+            }
+            else
+            {
+                return fallback;
+            }
+        }
+        else
+        {
+            return { text_ptr, static_cast<std::size_t>(length) };
+        }
    }
 }

--- a/src/dsc/Microsoft.PowerToys.Configure/examples/disableAllModules.dsc.yaml
+++ b/src/dsc/Microsoft.PowerToys.Configure/examples/disableAllModules.dsc.yaml
@@ -35,6 +35,8 @@ properties:
          Enabled: false
        MouseWithoutBorders:
          Enabled: false
+        NewPlus:
+          Enabled: false
        Peek:
          Enabled: false
        PowerRename:
--- a/src/dsc/Microsoft.PowerToys.Configure/examples/enableAllModules.dsc.yaml
+++ b/src/dsc/Microsoft.PowerToys.Configure/examples/enableAllModules.dsc.yaml
@@ -35,6 +35,8 @@ properties:
          Enabled: true
        MouseWithoutBorders:
          Enabled: true
+        NewPlus:
+          Enabled: true
        Peek:
          Enabled: true
        PowerRename:
--- 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.12" 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.13" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
  <policyNamespaces>
    <target prefix="powertoys" namespace="Microsoft.Policies.PowerToys" />
  </policyNamespaces>
-  <resources minRequiredRevision="1.12"/><!-- Last changed with PowerToys v0.84.0 -->
+  <resources minRequiredRevision="1.13"/><!-- Last changed with PowerToys v0.85.0 -->
  <supportedOn>
    <definitions>
      <definition name="SUPPORTED_POWERTOYS_0_64_0" displayName="$(string.SUPPORTED_POWERTOYS_0_64_0)"/>
@@ -21,6 +21,7 @@
      <definition name="SUPPORTED_POWERTOYS_0_81_1" displayName="$(string.SUPPORTED_POWERTOYS_0_81_1)"/>
      <definition name="SUPPORTED_POWERTOYS_0_83_0" displayName="$(string.SUPPORTED_POWERTOYS_0_83_0)"/>
      <definition name="SUPPORTED_POWERTOYS_0_84_0" displayName="$(string.SUPPORTED_POWERTOYS_0_84_0)"/>
+      <definition name="SUPPORTED_POWERTOYS_0_85_0" displayName="$(string.SUPPORTED_POWERTOYS_0_85_0)"/>
    </definitions>
  </supportedOn>
  <categories>
@@ -40,6 +41,9 @@
    <category name="GeneralSettings" displayName="$(string.GeneralSettings)">
      <parentCategory ref="PowerToys" />
    </category>
+    <category name="NewPlus" displayName="$(string.NewPlus)">
+      <parentCategory ref="PowerToys" />
+    </category>
  </categories>
  <policies>

@@ -335,6 +339,16 @@
        <decimal value="0" />
      </disabledValue>
    </policy>
+    <policy name="ConfigureEnabledUtilityNewPlus" class="Both" displayName="$(string.ConfigureEnabledUtilityNewPlus)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityNewPlus">
+      <parentCategory ref="PowerToys" />
+      <supportedOn ref="SUPPORTED_POWERTOYS_0_85_0" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
    <policy name="ConfigureEnabledUtilityPeek" class="Both" displayName="$(string.ConfigureEnabledUtilityPeek)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityPeek">
      <parentCategory ref="PowerToys" />
      <supportedOn ref="SUPPORTED_POWERTOYS_0_70_0" />
@@ -600,5 +614,15 @@
        <multiText id="MwbPolicyDefinedIpMappingsList" valueName="MwbPolicyDefinedIpMappingRules" maxLength="65" required="true"/>
      </elements>
    </policy>
+    <policy name="NewPlusHideTemplateFilenameExtension" class="Both" displayName="$(string.NewPlusHideTemplateFilenameExtension)" explainText="$(string.NewPlusHideTemplateFilenameExtensionDescription)" key="Software\Policies\PowerToys" valueName="NewPlusHideTemplateFilenameExtension">
+      <parentCategory ref="NewPlus" />
+      <supportedOn ref="SUPPORTED_POWERTOYS_0_85_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.12" 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.13" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
  <displayName>PowerToys</displayName>
  <description>PowerToys</description>
  <resources>
@@ -12,6 +12,7 @@
      <string id="AdvancedPaste">Advanced Paste</string>
      <string id="MouseWithoutBorders">Mouse Without Borders</string>
      <string id="GeneralSettings">General settings</string>
+      <string id="NewPlus">New+</string>

      <string id="SUPPORTED_POWERTOYS_0_64_0">PowerToys version 0.64.0 or later</string>
      <string id="SUPPORTED_POWERTOYS_0_68_0">PowerToys version 0.68.0 or later</string>
@@ -26,6 +27,7 @@
      <string id="SUPPORTED_POWERTOYS_0_81_1">PowerToys version 0.81.1 or later</string>
      <string id="SUPPORTED_POWERTOYS_0_83_0">PowerToys version 0.83.0 or later</string>
      <string id="SUPPORTED_POWERTOYS_0_84_0">PowerToys version 0.84.0 or later</string>
+      <string id="SUPPORTED_POWERTOYS_0_85_0">PowerToys version 0.85.0 or later</string>

      <string id="ConfigureAllUtilityGlobalEnabledStateDescription">This policy configures the enabled state for all PowerToys utilities.

@@ -188,6 +190,14 @@ If you enable this policy, you can define IP Address mapping rules that the user
 Please enter one mapping per line in the format: "hostname IP"

 If you disable or don't configure this policy, no predefined rules are applied.
+</string>
+      <string id="NewPlusHideTemplateFilenameExtensionDescription">This policy configures if the template filenames are shown with extension or not.
+
+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="ConfigureAllUtilityGlobalEnabledState">Configure global utility enabled state</string>
@@ -217,6 +227,7 @@ If you disable or don't configure this policy, no predefined rules are applied.
      <string id="ConfigureEnabledUtilityMouseJump">Mouse Jump: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityMousePointerCrosshairs">Mouse Pointer Crosshairs: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityMouseWithoutBorders">Mouse Without Borders: Configure enabled state</string>
+      <string id="ConfigureEnabledUtilityNewPlus">New+: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityPeek">Peek: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityPowerRename">Power Rename: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityPowerLauncher">PowerToys Run: Configure enabled state</string>
@@ -246,6 +257,7 @@ If you disable or don't configure this policy, no predefined rules are applied.
      <string id="MwbValidateRemoteIp">Validate remote machine IP Address</string>
      <string id="MwbDisableUserDefinedIpMappingRules">Disable user defined IP Address mapping rules</string>
      <string id="MwbPolicyDefinedIpMappingRules">Predefined IP Address mapping rules</string>
+      <string id="NewPlusHideTemplateFilenameExtension">Hide template filename extension</string>
    </stringTable>

    <presentationTable>
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml.cs
@@ -50,6 +50,12 @@ namespace AdvancedPaste
        /// </summary>
        public App()
        {
+            string appLanguage = LanguageHelper.LoadLanguage();
+            if (!string.IsNullOrEmpty(appLanguage))
+            {
+                Microsoft.Windows.Globalization.ApplicationLanguages.PrimaryLanguageOverride = appLanguage;
+            }
+
            this.InitializeComponent();

            Host = Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder().UseContentRoot(AppContext.BaseDirectory).ConfigureServices((context, services) =>
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/MainWindow.xaml.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/MainWindow.xaml.cs
@@ -6,6 +6,7 @@ using System;

 using AdvancedPaste.Helpers;
 using AdvancedPaste.Settings;
+using AdvancedPaste.ViewModels;
 using ManagedCommon;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
@@ -26,18 +27,26 @@ namespace AdvancedPaste
            this.InitializeComponent();

            _userSettings = App.GetService<IUserSettings>();
+            var optionsViewModel = App.GetService<OptionsViewModel>();

            var baseHeight = MinHeight;

            void UpdateHeight()
            {
-                var trimmedCustomActionCount = Math.Min(_userSettings.CustomActions.Count, 5);
+                var trimmedCustomActionCount = optionsViewModel.IsPasteWithAIEnabled ? Math.Min(_userSettings.CustomActions.Count, 5) : 0;
                Height = MinHeight = baseHeight + (trimmedCustomActionCount * 40);
            }

            UpdateHeight();

            _userSettings.CustomActions.CollectionChanged += (_, _) => UpdateHeight();
+            optionsViewModel.PropertyChanged += (_, e) =>
+            {
+                if (e.PropertyName == nameof(optionsViewModel.IsPasteWithAIEnabled))
+                {
+                    UpdateHeight();
+                }
+            };

            AppWindow.SetIcon("Assets/AdvancedPaste/AdvancedPaste.ico");
            this.ExtendsContentIntoTitleBar = true;
--- a/src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs
@@ -51,6 +51,7 @@ namespace AdvancedPaste.ViewModels
        [ObservableProperty]
        [NotifyPropertyChangedFor(nameof(InputTxtBoxPlaceholderText))]
        [NotifyPropertyChangedFor(nameof(GeneralErrorText))]
+        [NotifyPropertyChangedFor(nameof(IsPasteWithAIEnabled))]
        [NotifyPropertyChangedFor(nameof(IsCustomAIEnabled))]
        private bool _isAllowedByGPO;

@@ -67,7 +68,9 @@ namespace AdvancedPaste.ViewModels

        public ObservableCollection<PasteFormat> CustomActionPasteFormats { get; } = [];

-        public bool IsCustomAIEnabled => IsAllowedByGPO && IsClipboardDataText && aiHelper.IsAIEnabled;
+        public bool IsPasteWithAIEnabled => IsAllowedByGPO && aiHelper.IsAIEnabled;
+
+        public bool IsCustomAIEnabled => IsPasteWithAIEnabled && IsClipboardDataText;

        public event EventHandler<CustomActionActivatedEventArgs> CustomActionActivated;

@@ -94,6 +97,7 @@ namespace AdvancedPaste.ViewModels

            ClipboardHistoryEnabled = IsClipboardHistoryEnabled();
            ReadClipboard();
+            UpdateOpenAIKey();
            _clipboardTimer = new() { Interval = TimeSpan.FromSeconds(1) };
            _clipboardTimer.Tick += ClipboardTimer_Tick;
            _clipboardTimer.Start();
@@ -102,7 +106,7 @@ namespace AdvancedPaste.ViewModels
            _userSettings.CustomActions.CollectionChanged += (_, _) => EnqueueRefreshPasteFormats();
            PropertyChanged += (_, e) =>
            {
-                if (e.PropertyName == nameof(Query))
+                if (e.PropertyName == nameof(Query) || e.PropertyName == nameof(IsPasteWithAIEnabled))
                {
                    EnqueueRefreshPasteFormats();
                }
@@ -158,11 +162,14 @@ namespace AdvancedPaste.ViewModels
            }

            CustomActionPasteFormats.Clear();
-            foreach (var customAction in _userSettings.CustomActions)
+            if (IsPasteWithAIEnabled)
            {
-                if (Filter(customAction.Name) || Filter(customAction.Prompt))
+                foreach (var customAction in _userSettings.CustomActions)
                {
-                    CustomActionPasteFormats.Add(new PasteFormat(customAction, GetNextShortcutText()));
+                    if (Filter(customAction.Name) || Filter(customAction.Prompt))
+                    {
+                        CustomActionPasteFormats.Add(new PasteFormat(customAction, GetNextShortcutText()));
+                    }
                }
            }
        }
@@ -182,34 +189,19 @@ namespace AdvancedPaste.ViewModels
        public void OnShow()
        {
            ReadClipboard();
-            UpdateAllowedByGPO();

-            if (IsAllowedByGPO)
+            if (UpdateOpenAIKey())
            {
-                var openAIKey = AICompletionsHelper.LoadOpenAIKey();
-                var currentKey = aiHelper.GetKey();
-                bool keyChanged = openAIKey != currentKey;
+                app.GetMainWindow()?.StartLoading();

-                if (keyChanged)
+                _dispatcherQueue.TryEnqueue(() =>
                {
-                    app.GetMainWindow().StartLoading();
-
-                    Task.Run(() =>
-                    {
-                        aiHelper.SetOpenAIKey(openAIKey);
-                    }).ContinueWith(
-                        (t) =>
-                        {
-                            _dispatcherQueue.TryEnqueue(() =>
-                            {
-                                app.GetMainWindow().FinishLoading(aiHelper.IsAIEnabled);
-                                OnPropertyChanged(nameof(InputTxtBoxPlaceholderText));
-                                OnPropertyChanged(nameof(GeneralErrorText));
-                                OnPropertyChanged(nameof(IsCustomAIEnabled));
-                            });
-                        },
-                        TaskScheduler.Default);
-                }
+                    app.GetMainWindow()?.FinishLoading(aiHelper.IsAIEnabled);
+                    OnPropertyChanged(nameof(InputTxtBoxPlaceholderText));
+                    OnPropertyChanged(nameof(GeneralErrorText));
+                    OnPropertyChanged(nameof(IsPasteWithAIEnabled));
+                    OnPropertyChanged(nameof(IsCustomAIEnabled));
+                });
            }

            ClipboardHistoryEnabled = IsClipboardHistoryEnabled();
@@ -462,7 +454,7 @@ namespace AdvancedPaste.ViewModels
        {
            Logger.LogTrace();

-            if (string.IsNullOrWhiteSpace(inputInstructions))
+            if (string.IsNullOrWhiteSpace(inputInstructions) || !IsCustomAIEnabled)
            {
                return string.Empty;
            }
@@ -573,5 +565,20 @@ namespace AdvancedPaste.ViewModels
        {
            IsAllowedByGPO = PowerToys.GPOWrapper.GPOWrapper.GetAllowedAdvancedPasteOnlineAIModelsValue() != PowerToys.GPOWrapper.GpoRuleConfigured.Disabled;
        }
+
+        private bool UpdateOpenAIKey()
+        {
+            UpdateAllowedByGPO();
+
+            if (IsAllowedByGPO)
+            {
+                var oldKey = aiHelper.GetKey();
+                var newKey = AICompletionsHelper.LoadOpenAIKey();
+                aiHelper.SetOpenAIKey(newKey);
+                return newKey != oldKey;
+            }
+
+            return false;
+        }
    }
 }
--- a/src/modules/AdvancedPaste/AdvancedPasteModuleInterface/dllmain.cpp
+++ b/src/modules/AdvancedPaste/AdvancedPasteModuleInterface/dllmain.cpp
@@ -13,7 +13,9 @@
 #include <common/interop/shared_constants.h>
 #include <common/utils/logger_helper.h>
 #include <common/utils/winapi_error.h>
+#include <common/utils/gpo.h>

+#include <winrt/Windows.Security.Credentials.h>
 #include <atlfile.h>
 #include <atlstr.h>
 #include <vector>
@@ -54,6 +56,9 @@ namespace
    const wchar_t JSON_KEY_PASTE_AS_JSON_HOTKEY[] = L"paste-as-json-hotkey";
    const wchar_t JSON_KEY_SHOW_CUSTOM_PREVIEW[] = L"ShowCustomPreview";
    const wchar_t JSON_KEY_VALUE[] = L"value";
+
+    const wchar_t OPENAI_VAULT_RESOURCE[] = L"https://platform.openai.com/api-keys";
+    const wchar_t OPENAI_VAULT_USERNAME[] = L"PowerToys_AdvancedPaste_OpenAIKey";
 }

 class AdvancedPaste : public PowertoyModuleIface
@@ -133,6 +138,34 @@ private:
        return jsonObject;
    }

+    static bool open_ai_key_exists()
+    {
+        try
+        {
+            winrt::Windows::Security::Credentials::PasswordVault().Retrieve(OPENAI_VAULT_RESOURCE, OPENAI_VAULT_USERNAME);
+            return true;
+        }
+        catch (const winrt::hresult_error& ex)
+        {
+            // Looks like the only way to access the PasswordVault is through the an API that throws an exception in case the resource doesn't exist.
+            // If the debugger breaks here, just continue.
+            // If you want to disable breaking here in a more permanent way, just add a condition in Visual Studio's Exception Settings to not break on win::hresult_error, but that might make you not hit other exceptions you might want to catch.
+            if (ex.code() == HRESULT_FROM_WIN32(ERROR_NOT_FOUND))
+            {
+                return false; // Credential doesn't exist.
+            }
+            Logger::error("Unexpected error while retrieving OpenAI key from vault: {}", winrt::to_string(ex.message()));
+            return false;
+        }
+    }
+
+    bool is_open_ai_enabled()
+    {
+        return gpo_policy_enabled_configuration() != powertoys_gpo::gpo_rule_configured_disabled &&
+               powertoys_gpo::getAllowedAdvancedPasteOnlineAIModelsValue() != powertoys_gpo::gpo_rule_configured_disabled &&
+               open_ai_key_exists();
+    }
+
    bool migrate_data_and_remove_data_file(Hotkey& old_paste_as_plain_hotkey)
    {
        const wchar_t OLD_JSON_KEY_ACTIVATION_SHORTCUT[] = L"ActivationShortcut";
@@ -216,15 +249,17 @@ private:
                    if (propertiesObject.HasKey(JSON_KEY_CUSTOM_ACTIONS))
                    {
                        const auto customActions = propertiesObject.GetNamedObject(JSON_KEY_CUSTOM_ACTIONS).GetNamedArray(JSON_KEY_VALUE);
-
-                        for (const auto& customAction : customActions)
+                        if (customActions.Size() > 0 && is_open_ai_enabled())
                        {
-                            const auto object = customAction.GetObjectW();
-
-                            if (object.GetNamedBoolean(JSON_KEY_IS_SHOWN, false))
+                            for (const auto& customAction : customActions)
                            {
-                                m_custom_action_hotkeys.push_back(parse_single_hotkey(object.GetNamedObject(JSON_KEY_SHORTCUT)));
-                                m_custom_action_ids.push_back(static_cast<int>(object.GetNamedNumber(JSON_KEY_ID)));
+                                const auto object = customAction.GetObjectW();
+
+                                if (object.GetNamedBoolean(JSON_KEY_IS_SHOWN, false))
+                                {
+                                    m_custom_action_hotkeys.push_back(parse_single_hotkey(object.GetNamedObject(JSON_KEY_SHORTCUT)));
+                                    m_custom_action_ids.push_back(static_cast<int>(object.GetNamedNumber(JSON_KEY_ID)));
+                                }
                            }
                        }
                    }
--- a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/App.xaml.cs
+++ b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/App.xaml.cs
@@ -44,6 +44,12 @@ namespace EnvironmentVariables
        /// </summary>
        public App()
        {
+            string appLanguage = LanguageHelper.LoadLanguage();
+            if (!string.IsNullOrEmpty(appLanguage))
+            {
+                Microsoft.Windows.Globalization.ApplicationLanguages.PrimaryLanguageOverride = appLanguage;
+            }
+
            this.InitializeComponent();

            Host = Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder().UseContentRoot(AppContext.BaseDirectory).ConfigureServices((context, services) =>
--- a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Models/Variable.cs
+++ b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Models/Variable.cs
@@ -64,7 +64,15 @@ namespace EnvironmentVariablesUILib.Models

        private bool IsList()
        {
-            List<string> listVariables = new() { "PATH", "PATHEXT", "PSMODULEPATH" };
+            List<string> listVariables = new()
+            {
+                "_NT_ALT_SYMBOL_PATH",
+                "_NT_SYMBOL_PATH",
+                "_NT_SYMCACHE_PATH",
+                "PATH",
+                "PATHEXT",
+                "PSMODULEPATH",
+            };

            foreach (var name in listVariables)
            {
--- a/src/modules/FileLocksmith/FileLocksmithContextMenu/pch.h
+++ b/src/modules/FileLocksmith/FileLocksmithContextMenu/pch.h
@@ -7,6 +7,8 @@
 #ifndef PCH_H
 #define PCH_H

+#include <atlbase.h>
+
 // add headers that you want to pre-compile here
 #include "framework.h"

--- a/src/modules/FileLocksmith/FileLocksmithExt/ExplorerCommand.cpp
+++ b/src/modules/FileLocksmith/FileLocksmithExt/ExplorerCommand.cpp
@@ -166,51 +166,58 @@ IFACEMETHODIMP ExplorerCommand::QueryContextMenu(HMENU hmenu, UINT indexMenu, UI

 IFACEMETHODIMP ExplorerCommand::InvokeCommand(CMINVOKECOMMANDINFO* pici)
 {
-    Trace::Invoked();
-    ipc::Writer writer;
+    HRESULT hr = E_FAIL;

-    if (HRESULT result = writer.start(); FAILED(result))
+    if (FileLocksmithSettingsInstance().GetEnabled() &&
+        pici && (IS_INTRESOURCE(pici->lpVerb)) &&
+        (LOWORD(pici->lpVerb) == 0))
    {
-        Trace::InvokedRet(result);
-        return result;
-    }
+        Trace::Invoked();
+        ipc::Writer writer;

-    if (HRESULT result = LaunchUI(pici, &writer); FAILED(result))
-    {
-        Trace::InvokedRet(result);
-        return result;
-    }
-
-    IShellItemArray* shell_item_array;
-    HRESULT result = SHCreateShellItemArrayFromDataObject(m_data_obj, __uuidof(IShellItemArray), reinterpret_cast<void**>(&shell_item_array));
-    if (SUCCEEDED(result))
-    {
-        DWORD num_items;
-        shell_item_array->GetCount(&num_items);
-        for (DWORD i = 0; i < num_items; i++)
+        if (HRESULT result = writer.start(); FAILED(result))
        {
-            IShellItem* item;
-            result = shell_item_array->GetItemAt(i, &item);
-            if (SUCCEEDED(result))
-            {
-                LPWSTR file_path;
-                result = item->GetDisplayName(SIGDN_FILESYSPATH, &file_path);
-                if (SUCCEEDED(result))
-                {
-                    // TODO Aggregate items and send to UI
-                    writer.add_path(file_path);
-                    CoTaskMemFree(file_path);
-                }
-
-                item->Release();
-            }
+            Trace::InvokedRet(result);
+            return result;
        }

-        shell_item_array->Release();
+        if (HRESULT result = LaunchUI(pici, &writer); FAILED(result))
+        {
+            Trace::InvokedRet(result);
+            return result;
+        }
+
+        IShellItemArray* shell_item_array;
+        hr = SHCreateShellItemArrayFromDataObject(m_data_obj, __uuidof(IShellItemArray), reinterpret_cast<void**>(&shell_item_array));
+        if (SUCCEEDED(hr))
+        {
+            DWORD num_items;
+            shell_item_array->GetCount(&num_items);
+            for (DWORD i = 0; i < num_items; i++)
+            {
+                IShellItem* item;
+                hr = shell_item_array->GetItemAt(i, &item);
+                if (SUCCEEDED(hr))
+                {
+                    LPWSTR file_path;
+                    hr = item->GetDisplayName(SIGDN_FILESYSPATH, &file_path);
+                    if (SUCCEEDED(hr))
+                    {
+                        // TODO Aggregate items and send to UI
+                        writer.add_path(file_path);
+                        CoTaskMemFree(file_path);
+                    }
+
+                    item->Release();
+                }
+            }
+
+            shell_item_array->Release();
+        }
    }

-    Trace::InvokedRet(S_OK);
-    return S_OK;
+    Trace::InvokedRet(hr);
+    return hr;
 }

 IFACEMETHODIMP ExplorerCommand::GetCommandString(UINT_PTR idCmd, UINT uType, UINT* pReserved, CHAR* pszName, UINT cchMax)
--- a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/App.xaml.cs
+++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/App.xaml.cs
@@ -23,6 +23,12 @@ namespace FileLocksmithUI
        /// </summary>
        public App()
        {
+            string appLanguage = LanguageHelper.LoadLanguage();
+            if (!string.IsNullOrEmpty(appLanguage))
+            {
+                Microsoft.Windows.Globalization.ApplicationLanguages.PrimaryLanguageOverride = appLanguage;
+            }
+
            Logger.InitializeLogger("\\File Locksmith\\FileLocksmithUI\\Logs");

            this.InitializeComponent();
--- a/src/modules/Hosts/Hosts/HostsXAML/App.xaml.cs
+++ b/src/modules/Hosts/Hosts/HostsXAML/App.xaml.cs
@@ -38,6 +38,12 @@ namespace Hosts
        /// </summary>
        public App()
        {
+            string appLanguage = LanguageHelper.LoadLanguage();
+            if (!string.IsNullOrEmpty(appLanguage))
+            {
+                Microsoft.Windows.Globalization.ApplicationLanguages.PrimaryLanguageOverride = appLanguage;
+            }
+
            InitializeComponent();

            Host.HostInstance = Microsoft.Extensions.Hosting.Host.
--- a/src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/App.xaml.cs
+++ b/src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/App.xaml.cs
@@ -24,6 +24,12 @@ namespace MeasureToolUI
        {
            Logger.InitializeLogger("\\Measure Tool\\MeasureToolUI\\Logs");

+            string appLanguage = LanguageHelper.LoadLanguage();
+            if (!string.IsNullOrEmpty(appLanguage))
+            {
+                Microsoft.Windows.Globalization.ApplicationLanguages.PrimaryLanguageOverride = appLanguage;
+            }
+
            this.InitializeComponent();
        }

--- a/src/modules/NewPlus/NewShellExtensionContextMenu/AppxManifest.xml
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/AppxManifest.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:uap2="http://schemas.microsoft.com/appx/manifest/uap/windows10/2"
+  xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
+  xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
+  xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5"
+  xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
+  xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10" IgnorableNamespaces="uap uap2 uap3 rescap desktop desktop4 desktop5 uap10 com">
+	<Identity Name="Microsoft.PowerToys.NewPlusContextMenu" ProcessorArchitecture="neutral" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="1.0.0.0" />
+	<Properties>
+		<DisplayName>PowerToys New+</DisplayName>
+		<PublisherDisplayName>Microsoft</PublisherDisplayName>
+		<Logo>Assets\NewPlus\StoreLogo.png</Logo>
+		<uap10:AllowExternalContent>true</uap10:AllowExternalContent>
+	</Properties>
+	<Resources>
+		<Resource Language="en-us" />
+	</Resources>
+	<Dependencies>
+		<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18950.0" MaxVersionTested="10.0.19000.0" />
+	</Dependencies>
+	<Capabilities>
+		<rescap:Capability Name="runFullTrust" />
+		<rescap:Capability Name="unvirtualizedResources"/>
+	</Capabilities>
+	<Applications>
+		<Application Id="Microsoft.PowerToys.NewPlusContextMenu" Executable="NewPlus.exe" uap10:TrustLevel="mediumIL" uap10:RuntimeBehavior="win32App">
+			<uap:VisualElements AppListEntry="none" DisplayName="PowerToys New+" Description="New+ File Explorer Context Menu" BackgroundColor="transparent" Square150x150Logo="Assets\NewPlus\Square150x150Logo.png" Square44x44Logo="Assets\NewPlus\Square44x44Logo.png">
+				<uap:DefaultTile Wide310x150Logo="Assets\NewPlus\Wide310x150Logo.png" Square310x310Logo="Assets\NewPlus\LargeTile.png" Square71x71Logo="Assets\NewPlus\SmallTile.png"></uap:DefaultTile>
+				<uap:SplashScreen Image="Assets\NewPlus\SplashScreen.png" />
+			</uap:VisualElements>
+			<Extensions>
+				<desktop4:Extension Category="windows.fileExplorerContextMenus">
+					<desktop4:FileExplorerContextMenus>
+						<desktop5:ItemType Type="Directory">
+							<desktop5:Verb Id="NewPlusCommand" Clsid="69824FC6-4660-4A09-9E7C-48DA63C6CC0F" />
+						</desktop5:ItemType>
+						<desktop5:ItemType Type="Directory\Background">
+							<desktop5:Verb Id="NewPlusCommand" Clsid="69824FC6-4660-4A09-9E7C-48DA63C6CC0F" />
+						</desktop5:ItemType>
+					</desktop4:FileExplorerContextMenus>
+				</desktop4:Extension>
+				<com:Extension Category="windows.comServer" uap10:RuntimeBehavior="packagedClassicApp">
+					<com:ComServer>
+						<com:SurrogateServer DisplayName="Context menu verb handler">
+							<com:Class Id="69824FC6-4660-4A09-9E7C-48DA63C6CC0F" Path="PowerToys.NewPlus.ShellExtension.dll" ThreadingModel="STA"/>
+						</com:SurrogateServer>
+					</com:ComServer>
+				</com:Extension>
+			</Extensions>
+		</Application>
+	</Applications>
+</Package>
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/LargeTile.png
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/LargeTile.png
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/New_dark.ico
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/New_dark.ico
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/New_light.ico
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/New_light.ico
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/Open_templates_dark.ico
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/Open_templates_dark.ico
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/Open_templates_light.ico
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/Open_templates_light.ico
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/SmallTile.png
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/SmallTile.png
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/SplashScreen.png
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/SplashScreen.png
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/Square150x150Logo.png
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/Square150x150Logo.png
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/Square44x44Logo.png
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/Square44x44Logo.png
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/StoreLogo.png
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/StoreLogo.png
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/Wide310x150Logo.png
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/Assets/NewPlus/Wide310x150Logo.png
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project 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')" />
+  <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
+    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h new.base.rc new.rc" />
+  </Target>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{8acb33d9-c95b-47d4-8363-9731ee0930a0}</ProjectGuid>
+    <RootNamespace>NewPlusShellExtension</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
+    <ProjectName>NewPlus.ShellExtension</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <TargetExt>.dll</TargetExt>
+    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\</OutDir>
+    <TargetName>PowerToys.NewPlus.ShellExtension</TargetName>
+    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\TemporaryBuild\obj\$(ProjectName)\</IntDir>
+    <LinkIncremental />
+    <IgnoreImportLibrary />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\</OutDir>
+    <TargetName>PowerToys.NewPlus.ShellExtension</TargetName>
+    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)\TemporaryBuild\obj\$(ProjectName)\</IntDir>
+    <LinkIncremental />
+    <IgnoreImportLibrary />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;NEWPLUSCONTEXTMENU_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <AdditionalIncludeDirectories>..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+      <ModuleDefinitionFile>dll.def</ModuleDefinitionFile>
+      <AdditionalDependencies>runtimeobject.lib;$(CoreLibraryDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
+    </Link>
+    <PreBuildEvent>
+      <Command>del $(OutDir)\NewPlusPackage.msix /q
+MakeAppx.exe pack /d . /p $(OutDir)NewPlusPackage.msix /nv</Command>
+    </PreBuildEvent>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;NEWPLUSCONTEXTMENU_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <AdditionalIncludeDirectories>..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+      <ModuleDefinitionFile>dll.def</ModuleDefinitionFile>
+      <AdditionalDependencies>runtimeobject.lib;$(CoreLibraryDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
+    </Link>
+    <PreBuildEvent>
+      <Command>del $(OutDir)\NewPlusPackage.msix /q
+MakeAppx.exe pack /d . /p $(OutDir)NewPlusPackage.msix /nv</Command>
+    </PreBuildEvent>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="dll_main.h" />
+    <ClInclude Include="shell_context_menu.h" />
+    <ClInclude Include="shell_context_sub_menu.h" />
+    <ClInclude Include="shell_context_sub_menu_item.h" />
+    <ClInclude Include="constants.h" />
+    <ClInclude Include="settings.h" />
+    <ClInclude Include="trace.h" />
+    <ClInclude Include="new_utilities.h" />
+    <ClInclude Include="resource.base.h" />
+    <ClInclude Include="template_folder.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="Generated Files/resource.h" />
+    <ClInclude Include="template_item.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="shell_context_menu.cpp" />
+    <ClCompile Include="shell_context_sub_menu.cpp" />
+    <ClCompile Include="shell_context_sub_menu_item.cpp" />
+    <ClCompile Include="dll_main.cpp" />
+    <ClCompile Include="powertoys_module.cpp" />
+    <ClCompile Include="settings.cpp" />
+    <ClCompile Include="trace.cpp" />
+    <ClCompile Include="template_folder.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="template_item.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="dll.def" />
+    <None Include="packages.config" />
+    <CopyFileToFolders Include="TemplateExamples\Any files or folders placed in the template folder are available via New+.txt">
+      <DeploymentContent>true</DeploymentContent>
+      <FileType>Document</FileType>
+      <DestinationFolders>$(OutDir)\Assets\NewPlus\Templates</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="TemplateExamples\Example folder\Example txt file.txt">
+      <DeploymentContent>true</DeploymentContent>
+      <FileType>Document</FileType>
+      <DestinationFolders>$(OutDir)\Assets\NewPlus\Templates\Example folder</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="TemplateExamples\Example folder\Another example txt file.txt">
+      <DeploymentContent>true</DeploymentContent>
+      <FileType>Document</FileType>
+      <DestinationFolders>$(OutDir)\Assets\NewPlus\Templates\Example folder</DestinationFolders>
+    </CopyFileToFolders>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
+      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\Themes\Themes.vcxproj">
+      <Project>{98537082-0fdb-40de-abd8-0dc5a4269bab}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\version\version.vcxproj">
+      <Project>{cc6e41ac-8174-4e8a-8d22-85dd7f4851df}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Generated Files/new.rc" />
+    <None Include="new.base.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Assets\NewPlus\LargeTile.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Assets\NewPlus\New_dark.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Assets\NewPlus\New_light.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Assets\NewPlus\Open_templates_dark.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Assets\NewPlus\Open_templates_light.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Assets\NewPlus\SmallTile.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Assets\NewPlus\SplashScreen.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Assets\NewPlus\Square150x150Logo.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Assets\NewPlus\Square44x44Logo.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Assets\NewPlus\StoreLogo.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Assets\NewPlus\Wide310x150Logo.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="resources.resx">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="AppxManifest.xml" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="..\..\..\..\deps\spdlog.props" />
+  <ImportGroup Label="ExtensionTargets">
+      <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')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
+</Project>
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj.filters
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj.filters
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="shell_context_menu.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="shell_context_sub_menu.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="shell_context_sub_menu_item.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="template_folder.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="template_item.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="dll_main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="pch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="powertoys_module.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="settings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="trace.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="template_folder.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="template_item.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="shell_context_sub_menu_item.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="shell_context_sub_menu.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="shell_context_menu.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="pch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="dll_main.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="constants.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="settings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="trace.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="new_utilities.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Generated Files/resource.h">
+      <Filter>Generated Files</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="Assets\NewPlus\SmallTile.png">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\SplashScreen.png">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\Square150x150Logo.png">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\Square44x44Logo.png">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\StoreLogo.png">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\Wide310x150Logo.png">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\SmallTile.png">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\SplashScreen.png">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\Square150x150Logo.png">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\Square44x44Logo.png">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\StoreLogo.png">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\Wide310x150Logo.png">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="resources.resx">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="new.base.rc">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="dll.def">
+      <Filter>Source Files</Filter>
+    </None>
+    <None Include="AppxManifest.xml">
+      <Filter>Source Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\New.ico">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\SmallTile.png">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\SplashScreen.png">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\Square150x150Logo.png">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\Square44x44Logo.png">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\StoreLogo.png">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\Wide310x150Logo.png">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\LargeTile.png">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\New_dark.ico">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\New_light.ico">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\Open_templates_dark.ico">
+      <Filter>Asset Files</Filter>
+    </None>
+    <None Include="Assets\NewPlus\Open_templates_light.ico">
+      <Filter>Asset Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{82bf7d46-1201-4fc2-99e0-6c1f48f97f1f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{0c915b9c-0e6a-4d16-8620-507a10fc29c9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Asset Files">
+      <UniqueIdentifier>{0c64a1a0-1f9e-4663-8649-454da469d15c}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{4f319851-7d86-4180-b3a3-fd497a320c34}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Generated Files">
+      <UniqueIdentifier>{a998f674-d126-488b-8457-7673fe986f94}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Template Examples">
+      <UniqueIdentifier>{b442cb0f-9f62-46e8-b269-fefa8ceacb21}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Template Examples\Example folder">
+      <UniqueIdentifier>{e7904759-7b6c-4609-9c6d-e3eae3cb866c}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Generated Files/new.rc">
+      <Filter>Generated Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="TemplateExamples\Example folder\Another example txt file.txt">
+      <Filter>Template Examples\Example folder</Filter>
+    </Text>
+    <Text Include="TemplateExamples\Example folder\Example txt file.txt">
+      <Filter>Template Examples\Example folder</Filter>
+    </Text>
+    <Text Include="TemplateExamples\Any files or folders placed in the template folder are available via New+.txt">
+      <Filter>Template Examples</Filter>
+    </Text>
+  </ItemGroup>
+</Project>
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/TemplateExamples/Any
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/TemplateExamples/Any
@@ -0,0 +1 @@
+Learn more about New+ by visiting https://aka.ms/PowerToysOverview_NewPlus
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/TemplateExamples/Example
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/TemplateExamples/Example
@@ -0,0 +1 @@
+Another example txt file
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/TemplateExamples/Example
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/TemplateExamples/Example
@@ -0,0 +1 @@
+Example txt file
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/constants.h
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/constants.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "pch.h"
+
+namespace newplus::constants::non_localizable
+{
+    constexpr WCHAR powertoy_key[] = L"NewPlus";
+
+    constexpr WCHAR powertoy_name[] = L"NewPlus";
+
+    constexpr WCHAR settings_json_data_file_path[] = L"\\settings.json";
+
+    constexpr WCHAR settings_json_key_hide_file_extension[] = L"HideFileExtension";
+
+    constexpr WCHAR settings_json_key_hide_starting_digits[] = L"HideStartingDigits";
+
+    constexpr WCHAR settings_json_key_template_location[] = L"TemplateLocation";
+
+    constexpr WCHAR context_menu_package_name[] = L"NewPlusContextMenu";
+
+    constexpr WCHAR msix_package_name[] = L"NewPlusPackage.msix";
+    
+    constexpr WCHAR module_name[] = L"NewPlus.ShellExtension";
+
+    constexpr WCHAR new_icon_light_resource_relative_path[] = L"\\Assets\\NewPlus\\New_light.ico";
+
+    constexpr WCHAR new_icon_dark_resource_relative_path[] = L"\\Assets\\NewPlus\\New_dark.ico";
+
+    constexpr WCHAR open_templates_icon_light_resource_relative_path[] = L"\\Assets\\NewPlus\\Open_templates_light.ico";
+
+    constexpr WCHAR open_templates_icon_dark_resource_relative_path[] = L"\\Assets\\NewPlus\\Open_templates_dark.ico";
+
+    constexpr WCHAR desktop_ini_filename[] = L"desktop.ini";
+}
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/dll.def
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/dll.def
@@ -0,0 +1,5 @@
+LIBRARY
+EXPORTS             
+DllCanUnloadNow           PRIVATE
+DllGetClassObject         PRIVATE
+DllGetActivationFactory   PRIVATE
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/dll_main.cpp
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/dll_main.cpp
@@ -0,0 +1,41 @@
+#include "pch.h"
+
+#include "shell_context_menu.h"
+#include "dll_main.h"
+#include "trace.h"
+
+HMODULE module_instance_handle = 0;
+
+BOOL APIENTRY DllMain(HMODULE module_handle, DWORD ul_reason_for_call, LPVOID reserved)
+{
+    switch (ul_reason_for_call)
+    {
+    case DLL_PROCESS_ATTACH:
+        module_instance_handle = module_handle;
+        Trace::RegisterProvider();
+        newplus::utilities::init_logger();
+        break;
+
+    case DLL_PROCESS_DETACH:
+        Trace::UnregisterProvider();
+        break;
+    }
+    return TRUE;
+}
+
+STDAPI DllGetActivationFactory(_In_ HSTRING activatableClassId, _COM_Outptr_ IActivationFactory** factory)
+{
+    return Module<ModuleType::InProc>::GetModule().GetActivationFactory(activatableClassId, factory);
+}
+
+STDAPI DllCanUnloadNow()
+{
+    return Module<InProc>::GetModule().GetObjectCount() == 0 ? S_OK : S_FALSE;
+}
+
+STDAPI DllGetClassObject(_In_ REFCLSID rclsid, _In_ REFIID riid, _Outptr_ LPVOID FAR* ppv)
+{
+    return Module<InProc>::GetModule().GetClassObject(rclsid, riid, ppv);
+}
+
+CoCreatableClass(shell_context_menu)
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/dll_main.h
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/dll_main.h
@@ -0,0 +1,3 @@
+#pragma once
+
+extern HMODULE module_instance_handle;
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/new.base.rc
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/new.base.rc
@@ -0,0 +1,49 @@
+#include <windows.h>
+#include "Generated Files/resource.h"
+#include "../../../common/version/version.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+#include "winres.h"
+#undef APSTUDIO_READONLY_SYMBOLS
+
+1 VERSIONINFO
+ FILEVERSION FILE_VERSION
+ PRODUCTVERSION PRODUCT_VERSION
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1 ICON "Assets/NewPlus/New_light.ico"
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/new_utilities.h
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/new_utilities.h
@@ -0,0 +1,177 @@
+#pragma once
+
+#include "pch.h"
+
+#include <common/utils/process_path.h>
+#include <common/utils/package.h>
+
+#include "constants.h"
+#include "settings.h"
+
+#pragma comment(lib, "Shlwapi.lib")
+
+namespace newplus::utilities
+{
+
+    inline std::wstring get_explorer_icon(std::filesystem::path path)
+    {
+        SHFILEINFO shell_file_info = { 0 };
+        const std::wstring filepath = path.wstring();
+        DWORD_PTR result = SHGetFileInfo(filepath.c_str(), 0, &shell_file_info, sizeof(shell_file_info), SHGFI_ICONLOCATION);
+        std::wstring icon_path = shell_file_info.szDisplayName;
+        if (icon_path != L"")
+        {
+            const int icon_index = shell_file_info.iIcon;
+            std::wstring icon_resource = icon_path + std::wstring(L",") + std::to_wstring(icon_index);
+            return icon_resource;
+        }
+
+        WCHAR icon_resource_specifier[MAX_PATH] = { 0 };
+        DWORD buffer_length = MAX_PATH;
+        const std::wstring extension = path.extension().wstring();
+        const HRESULT hr = AssocQueryString(ASSOCF_INIT_IGNOREUNKNOWN,
+                                            ASSOCSTR_DEFAULTICON,
+                                            extension.c_str(),
+                                            NULL,
+                                            icon_resource_specifier,
+                                            &buffer_length);
+        const std::wstring icon_resource = icon_resource_specifier;
+        return icon_resource;
+    }
+
+    inline bool is_hidden(const std::filesystem::path path)
+    {
+        const std::filesystem::path::string_type name = path.filename();
+        if (name == constants::non_localizable::desktop_ini_filename)
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    inline bool wstring_same_when_comparing_ignore_case(std::wstring stringA, std::wstring stringB)
+    {
+        transform(stringA.begin(), stringA.end(), stringA.begin(), towupper);
+        transform(stringB.begin(), stringB.end(), stringB.begin(), towupper);
+
+        return (stringA == stringB);
+    }
+
+    inline void process_pending_window_messages(HWND window_handle = NULL)
+    {
+        if (window_handle == NULL)
+        {
+            window_handle = GetActiveWindow();
+        }
+
+        MSG current_message;
+        while (PeekMessage(&current_message, window_handle, NULL, NULL, PM_REMOVE))
+        {
+            DispatchMessage(&current_message);
+        }
+    }
+
+    inline std::wstring get_new_template_folder_location()
+    {
+        return NewSettingsInstance().GetTemplateLocation();
+    }
+
+    inline bool get_newplus_setting_hide_extension()
+    {
+        return NewSettingsInstance().GetHideFileExtension();
+    }
+
+    inline bool get_newplus_setting_hide_starting_digits()
+    {
+        return NewSettingsInstance().GetHideStartingDigits();
+    }
+
+    inline void create_folder_if_not_exist(const std::filesystem::path path)
+    {
+        std::filesystem::create_directory(path);
+    }
+
+    inline std::wstring get_new_icon_resource_filepath(const HMODULE module_instance_handle, const Theme theme)
+    {
+        auto iconResourcePath = get_module_folderpath(module_instance_handle);
+
+        if (theme == Theme::Dark)
+        {
+            iconResourcePath += constants::non_localizable::new_icon_dark_resource_relative_path;
+        }
+        else
+        {
+            // Defaulting to the Light icon
+            iconResourcePath += constants::non_localizable::new_icon_light_resource_relative_path;
+        }
+
+        return iconResourcePath;
+    }
+
+    inline std::wstring get_open_templates_icon_resource_filepath(const HMODULE module_instance_handle, const Theme theme)
+    {
+        auto iconResourcePath = get_module_folderpath(module_instance_handle);
+
+        if (theme == Theme::Dark)
+        {
+            iconResourcePath += constants::non_localizable::open_templates_icon_dark_resource_relative_path;
+        }
+        else
+        {
+            // Defaulting to the Light icon
+            iconResourcePath += constants::non_localizable::open_templates_icon_light_resource_relative_path;
+        }
+
+        return iconResourcePath;
+    }
+
+    inline void init_logger()
+    {
+        LoggerHelpers::init_logger(
+            constants::non_localizable::powertoy_name,
+            constants::non_localizable::module_name,
+            LogSettings::newLoggerName);
+    }
+
+    inline void register_msix_package()
+    {
+        if (package::IsWin11OrGreater())
+        {
+            static const auto new_dll_path = get_module_folderpath(module_instance_handle);
+            auto new_package_uri = new_dll_path + L"\\" + constants::non_localizable::msix_package_name;
+
+            if (!package::IsPackageRegistered(constants::non_localizable::context_menu_package_name))
+            {
+                package::RegisterSparsePackage(new_dll_path, new_package_uri);
+            }
+        }
+    }
+
+    inline std::wstring get_path_from_unknown_site(const ComPtr<IUnknown> site_of_folder)
+    {
+        ComPtr<IServiceProvider> service_provider;
+        site_of_folder->QueryInterface(IID_PPV_ARGS(&service_provider));
+        ComPtr<IFolderView> folder_view;
+        service_provider->QueryService(__uuidof(IFolderView), IID_PPV_ARGS(&folder_view));
+        ComPtr<IShellFolder> shell_folder;
+        folder_view->GetFolder(IID_PPV_ARGS(&shell_folder));
+        STRRET strings_returned;
+        shell_folder->GetDisplayNameOf(0, SHGDN_FORPARSING, &strings_returned);
+        LPWSTR path;
+        StrRetToStr(&strings_returned, NULL, &path);
+        return path;
+    }
+
+    inline std::wstring get_path_from_folder_view(const ComPtr<IFolderView> folder_view)
+    {
+        ComPtr<IShellFolder> shell_folder;
+        folder_view->GetFolder(IID_PPV_ARGS(&shell_folder));
+        STRRET strings_returned;
+        shell_folder->GetDisplayNameOf(0, SHGDN_FORPARSING, &strings_returned);
+        LPWSTR path;
+        StrRetToStr(&strings_returned, NULL, &path);
+        return path;
+    }
+
+}
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/packages.config
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
+</packages>
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/pch.cpp
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/pch.cpp
@@ -0,0 +1,3 @@
+// pch.cpp: source file corresponding to the pre-compiled header
+
+#include "pch.h"
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/pch.h
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/pch.h
@@ -0,0 +1,37 @@
+// Precompiled header file.
+
+#pragma once
+
+#define WIN32_LEAN_AND_MEAN
+#define NOMCX
+#define NOHELP
+#define NOCOMM
+
+// Windows and STL
+#include <Shobjidl.h>
+#include <shlwapi.h>
+#include <shellapi.h>
+#include <Windows.h>
+#include <shlobj.h>
+#include <vector>
+#include <system_error>
+#include <memory>
+#include <iostream>
+#include <atlbase.h>
+#include <wrl.h>
+#include <wrl/module.h>
+#include <unknwn.h>
+
+// PowerToys project common
+#include <ProjectTelemetry.h>
+#include <common/utils/resources.h>
+#include <common/logger/logger.h>
+#include <common/logger/logger_settings.h>
+#include <common/utils/logger_helper.h>
+#include <common/Themes/theme_helpers.h>
+
+// New project specific
+#include "dll_main.h"
+#include "template_folder.h"
+#include "settings.h"
+#include "new_utilities.h"
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/powertoys_module.cpp
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/powertoys_module.cpp
@@ -0,0 +1,134 @@
+#include "pch.h"
+
+#include <filesystem>
+#include <string>
+
+#include <winrt/Windows.Data.Json.h>
+
+#include <common/SettingsAPI/settings_objects.h>
+#include <common/utils/gpo.h>
+#include <common/utils/process_path.h>
+#include <common/utils/resources.h>
+#include <interface/powertoy_module_interface.h>
+
+#include "constants.h"
+#include "settings.h"
+#include "trace.h"
+#include "new_utilities.h"
+#include "Generated Files/resource.h"
+
+// Note: Settings are managed via Settings and UI Settings
+class NewModule : public PowertoyModuleIface
+{
+public:
+    NewModule()
+    {
+        init_settings();
+    }
+
+    virtual const wchar_t* get_name() override
+    {
+        static const std::wstring localized_context_menu_item =
+            GET_RESOURCE_STRING_FALLBACK(IDS_CONTEXT_MENU_ITEM_NEW, L"New+");
+
+        return localized_context_menu_item.c_str();
+    }
+
+    virtual const wchar_t* get_key() override
+    {
+        // This setting key must match EnabledModules.cs [JsonPropertyName("NewPlus")]
+        return newplus::constants::non_localizable::powertoy_key;
+    }
+
+    virtual powertoys_gpo::gpo_rule_configured_t gpo_policy_enabled_configuration() override
+    {
+        return powertoys_gpo::getConfiguredNewPlusEnabledValue();
+    }
+
+    virtual bool get_config(_Out_ PWSTR buffer, _Out_ int* buffer_size) override
+    {
+        // Not implemented as Settings are propagating via json
+        return true;
+    }
+
+    virtual void set_config(PCWSTR config) override
+    {
+        // The following just checks to see if the Template Location was changed for metrics purposes
+        // Note: We are not saving the settings here and instead relying on read/write of json in Settings App .cs code paths
+        try
+        {
+            json::JsonObject config_as_json = json::JsonValue::Parse(winrt::to_hstring(config)).GetObjectW();
+
+            const auto latest_location_value = config_as_json.GetNamedString(newplus::constants::non_localizable::settings_json_key_template_location).data();
+            const auto existing_location_value = NewSettingsInstance().GetTemplateLocation();
+
+            if (!newplus::utilities::wstring_same_when_comparing_ignore_case(latest_location_value, existing_location_value))
+            {
+                Trace::EventChangedTemplateLocation();
+            }
+        }
+        catch (std::exception& e)
+        {
+            Logger::error("Configuration parsing failed: {}", std::string{ e.what() });
+        }
+    }
+
+    virtual bool is_enabled_by_default() const override
+    { 
+        return false; 
+    }
+
+    virtual void enable() override
+    {
+        Logger::info("New+ enabled via Settings UI");
+
+        newplus::utilities::register_msix_package();
+
+        powertoy_new_enabled = true;
+    }
+
+    virtual void disable() override
+    {
+        Logger::info("New+ disabled via Settings UI");
+
+        powertoy_new_enabled = false;
+    }
+
+    virtual bool is_enabled() override
+    {
+        return powertoy_new_enabled;
+    }
+
+    virtual void hide_file_extension(bool hide_file_extension)
+    {
+        Logger::info("New+ hide file extension {}", hide_file_extension);
+    }
+
+    virtual void hide_starting_digits(bool hide_starting_digits)
+    {
+        Logger::info("New+ hide starting digits {}", hide_starting_digits);
+    }
+
+    virtual void template_location(std::wstring path_location)
+    {
+        Logger::info("New+ template location");
+    }
+
+    virtual void destroy() override
+    {
+        delete this;
+    }
+
+private:
+    bool powertoy_new_enabled = false;
+
+    void init_settings()
+    {
+        powertoy_new_enabled = NewSettingsInstance().GetEnabled();
+    }
+};
+
+extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
+{
+    return new NewModule();
+}
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/resource.base.h
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/resource.base.h
@@ -0,0 +1,13 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by AlwaysOnTop.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "PowerToys.New+"
+#define INTERNAL_NAME "PowerToys.New+"
+#define ORIGINAL_FILENAME "PowerToys.NewPlus.ShellExtension.dll"
+
+// Non-localizable
+//////////////////////////////
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/resources.resx
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/resources.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="context_menu_item_new" xml:space="preserve">
+    <value>New+</value>
+    <comment>The main context menu item that users click on. This should be localized to match New in Windows. e.g. Danish it would become Ny+</comment>
+  </data>
+  <data name="context_menu_item_open_templates" xml:space="preserve">
+    <value>Open templates</value>
+    <comment>The menu item in the context menu that enables user to open the folder that contains their templates.</comment>
+  </data>
+  <data name="default_template_sub_folder_name_where_templates_are_stored" xml:space="preserve">
+    <value>Templates</value>
+    <comment>Default subfolder name where templates are stored.</comment>
+  </data>
+</root>
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/settings.cpp
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/settings.cpp
@@ -0,0 +1,235 @@
+#include "pch.h"
+
+#include <common/utils/gpo.h>
+#include <common/utils/json.h>
+#include <common/SettingsAPI/settings_helpers.h>
+
+#include "settings.h"
+#include "constants.h"
+#include "Generated Files/resource.h"
+
+// NewSettings are stored in PowerToys/New/settings.json
+// The New PowerToy enabled state is stored in the general PowerToys/settings.json
+
+static bool LastModifiedTime(const std::wstring& file_Path, FILETIME* returned_file_timestamp)
+{
+    WIN32_FILE_ATTRIBUTE_DATA attr{};
+    if (GetFileAttributesExW(file_Path.c_str(), GetFileExInfoStandard, &attr))
+    {
+        *returned_file_timestamp = attr.ftLastWriteTime;
+        return true;
+    }
+    return false;
+}
+
+NewSettings::NewSettings()
+{
+    // New+ overall enable state is stored in the general settings json file
+    general_settings_json_file_path = PTSettingsHelper::get_powertoys_general_save_file_location();
+
+    // New+' actual settings are stored in new_settings_json_file_path
+    std::wstring settings_save_path = PTSettingsHelper::get_module_save_folder_location(newplus::constants::non_localizable::powertoy_key);
+    new_settings_json_file_path = settings_save_path + newplus::constants::non_localizable::settings_json_data_file_path;
+
+    RefreshEnabledState();
+
+    Load();
+}
+
+void NewSettings::Save()
+{
+    json::JsonObject new_settings_json_data;
+
+    new_settings_json_data.SetNamedValue(newplus::constants::non_localizable::settings_json_key_hide_file_extension,
+                                         json::value(new_settings.hide_file_extension));
+
+    new_settings_json_data.SetNamedValue(newplus::constants::non_localizable::settings_json_key_hide_starting_digits,
+                                         json::value(new_settings.hide_starting_digits));
+
+    new_settings_json_data.SetNamedValue(newplus::constants::non_localizable::settings_json_key_template_location,
+                                         json::value(new_settings.template_location));
+
+    json::to_file(new_settings_json_file_path, new_settings_json_data);
+
+    GetSystemTimeAsFileTime(&new_settings_last_loaded_timestamp);
+}
+
+void NewSettings::Load()
+{
+    if (!std::filesystem::exists(new_settings_json_file_path))
+    {
+        InitializeWithDefaultSettings();
+
+        Save();
+    }
+    else
+    {
+        ParseJson();
+    }
+}
+
+void NewSettings::InitializeWithDefaultSettings()
+{
+    // Init the default New settings - in case the New/settings.json doesn't exist
+    // Currently a similar defaulting logic is also in InitializeWithDefaultSettings in NewViewModel.cs
+    SetHideFileExtension(true);
+
+    SetTemplateLocation(GetTemplateLocationDefaultPath());
+}
+
+void NewSettings::RefreshEnabledState()
+{
+    // Load json general settings from data file, if it was modified since we last checked
+    FILETIME last_modified_timestamp{};
+    if (!(LastModifiedTime(general_settings_json_file_path, &last_modified_timestamp) &&
+          CompareFileTime(&last_modified_timestamp, &general_settings_last_loaded_timestamp) == 1))
+    {
+        return;
+    }
+
+    general_settings_last_loaded_timestamp = last_modified_timestamp;
+
+    auto json = json::from_file(general_settings_json_file_path);
+    if (!json)
+    {
+        return;
+    }
+
+    // Load the enabled settings for the New PowerToy via the general settings
+    const json::JsonObject& json_general_settings = json.value();
+    try
+    {
+        json::JsonObject powertoy_new_enabled_state;
+        json::get(json_general_settings, L"enabled", powertoy_new_enabled_state, json::JsonObject{});
+        json::get(powertoy_new_enabled_state, newplus::constants::non_localizable::powertoy_key, new_settings.enabled, false);
+    }
+    catch (const winrt::hresult_error&)
+    {
+        Logger::error(L"New+ unable to load enabled state from json");
+    }
+}
+
+void NewSettings::Reload()
+{
+    // Load json New settings from data file, if it was modified since we last checked.
+    FILETIME very_latest_modified_timestamp{};
+    if (LastModifiedTime(new_settings_json_file_path, &very_latest_modified_timestamp) &&
+        CompareFileTime(&very_latest_modified_timestamp, &new_settings_last_loaded_timestamp) == 1)
+    {
+        Load();
+    }
+}
+
+void NewSettings::ParseJson()
+{
+    auto json = json::from_file(new_settings_json_file_path);
+    if (json)
+    {
+        try
+        {
+            const json::JsonObject& new_settings_json = json.value();
+
+            if (json::has(new_settings_json, newplus::constants::non_localizable::settings_json_key_hide_file_extension, json::JsonValueType::Boolean))
+            {
+                new_settings.hide_file_extension = new_settings_json.GetNamedBoolean(
+                    newplus::constants::non_localizable::settings_json_key_hide_file_extension);
+            }
+
+            if (json::has(new_settings_json, newplus::constants::non_localizable::settings_json_key_hide_starting_digits, json::JsonValueType::Boolean))
+            {
+                new_settings.hide_starting_digits = new_settings_json.GetNamedBoolean(
+                    newplus::constants::non_localizable::settings_json_key_hide_starting_digits);
+            }
+
+            if (json::has(new_settings_json, newplus::constants::non_localizable::settings_json_key_template_location, json::JsonValueType::String))
+            {
+                new_settings.template_location = new_settings_json.GetNamedString(
+                    newplus::constants::non_localizable::settings_json_key_template_location);
+            }
+        }
+        catch (const winrt::hresult_error&)
+        {
+        }
+    }
+    GetSystemTimeAsFileTime(&new_settings_last_loaded_timestamp);
+}
+
+bool NewSettings::GetEnabled()
+{
+    auto gpoSetting = powertoys_gpo::getConfiguredNewPlusEnabledValue();
+    if (gpoSetting == powertoys_gpo::gpo_rule_configured_enabled)
+    {
+        return true;
+    }
+    if (gpoSetting == powertoys_gpo::gpo_rule_configured_disabled)
+    {
+        return false;
+    }
+
+    Reload();
+
+    RefreshEnabledState();
+
+    return new_settings.enabled;
+}
+
+bool NewSettings::GetHideFileExtension() const
+{
+    auto gpoSetting = powertoys_gpo::getConfiguredNewPlusHideTemplateFilenameExtensionValue();
+    if (gpoSetting == powertoys_gpo::gpo_rule_configured_enabled)
+    {
+        return true;
+    }
+    if (gpoSetting == powertoys_gpo::gpo_rule_configured_disabled)
+    {
+        return false;
+    }
+
+    return new_settings.hide_file_extension;
+}
+
+void NewSettings::SetHideFileExtension(const bool hide_file_extension)
+{
+    new_settings.hide_file_extension = hide_file_extension;
+}
+
+bool NewSettings::GetHideStartingDigits() const
+{
+    return new_settings.hide_starting_digits;
+}
+
+void NewSettings::SetHideStartingDigits(const bool hide_starting_digits)
+{
+    new_settings.hide_starting_digits = hide_starting_digits;
+}
+
+std::wstring NewSettings::GetTemplateLocation() const
+{
+    return new_settings.template_location;
+}
+
+void NewSettings::SetTemplateLocation(const std::wstring template_location)
+{
+    new_settings.template_location = template_location;
+}
+
+std::wstring NewSettings::GetTemplateLocationDefaultPath()
+{
+    static const std::wstring default_template_sub_folder_name =
+        GET_RESOURCE_STRING_FALLBACK(
+            IDS_DEFAULT_TEMPLATE_SUB_FOLDER_NAME_WHERE_TEMPLATES_ARE_STORED,
+            L"Templates");
+
+    static const std::wstring full_path = PTSettingsHelper::get_module_save_folder_location(
+                                              newplus::constants::non_localizable::powertoy_key) +
+                                          L"\\" + default_template_sub_folder_name;
+
+    return full_path;
+}
+
+NewSettings& NewSettingsInstance()
+{
+    static NewSettings instance;
+
+    return instance;
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jaime Bernardo	8981e1a825	GPO line in General instead	2024-10-01 15:47:35 +01:00
Jaime Bernardo	e0c1a1d32b	Fix spellcheck	2024-10-01 14:05:47 +01:00
Jaime Bernardo	3d413eff80	Update binary hashes	2024-10-01 13:59:34 +01:00
Jaime Bernardo	2720368d22	Update with latest repo changes	2024-10-01 13:57:57 +01:00
Jaime Bernardo	b0e4336c36	Address PR feedback	2024-09-30 11:35:56 +01:00
Jaime Bernardo	bd867c03fe	Update README.md Co-authored-by: Heiko <61519853+htcfreek@users.noreply.github.com>	2024-09-30 11:32:39 +01:00
Jaime Bernardo	24d7e60d55	Mention ZoomIt	2024-09-27 17:12:07 +01:00
Jaime Bernardo	a0088b6335	0.85 changelog	2024-09-27 15:07:37 +01:00
Dustin L. Howett	474c6f7322	[Build]reintroduce variables.EnablePipelineCache (#35087 ) * build: reintroduce variables.EnablePipelineCache	2024-09-27 10:39:42 +01:00
Dustin L. Howett	e79b0163b7	[ci]Disable recompilation for the NuGet packages (#35085 ) -t:Pack is insufficient for packing a NuGet package after you've signed the DLLs. Without -p:NoBuild=true, sometimes it will rebuild (or re-link) them for you.	2024-09-27 10:26:47 +01:00
Laszlo Nemeth	dca8b7ac35	[Workspaces] implement standalone app handling (#34948 )	2024-09-26 19:54:16 +02:00
Den Delimarsky	49a828236a	[Awake]PROMETHEAN_09082024 - tray icon fixes (#34717 ) * Update with bug fixes for tray icon and support for parent process * Process information enum * Update the docs * Fix spelling * Make sure that PID is used in PT config flow * Logic for checks based on #34148 * Update with link to PR * Small cleanup * Proper task segmentation in a function * Cleanup the code * Fix synchronization context issue * Update planning doc * Test disabling caching to see if that manages to pass CI	2024-09-26 15:25:30 +01:00
Stefan Markovic	3cdb30c647	[NewPlus]Set package version in CI (#35080 )	2024-09-26 14:48:47 +01:00
Ethan Fang	6909887844	[GitHub]Adding New+ to the GitHub Issue Templates (#35072 ) Updated bug_report.yml & translation_issue.yml	2024-09-26 11:24:03 +01:00
Stefan Markovic	5b616c9eed	[General]Support language selection (#34971 ) * Language setting * spellcheck * Set FileLocksmithContextMenu package version in AppManifest.xml * Fix ambigious symbol build error * Fix ambigious symbol build error #2 * Revert unneeded changes * Improve perf * try fix ci build	2024-09-25 21:20:15 +01:00
Dustin L. Howett	2b4b55cfeb	release: do not publish symbols to the public by default (#35070 ) This also moves the checkbox higher up so it is more prominent.	2024-09-25 13:15:18 -05:00
Ani	13c9ba9f81	[Settings][New+]Crash when running Dev build of Settings (#35066 )	2024-09-25 17:44:14 +01:00
Seraphima Zykova	471db8bf9c	[FancyZones] Allow snapping apps launched by Workspaces (#35067 )	2024-09-25 18:36:36 +02:00
Dustin L. Howett	ad1f20408c	Rewrite the entire Azure DevOps build system (#34984 ) This pull request rewrites the entire Azure DevOps build system. The guiding principles behind this rewrite are: - No pipeline definitions should contain steps (or tasks) directly. - All jobs should be in template files. - Any set of steps that is reused across multiple jobs must be in template files. - All artifact names can be customized (via a property called `artifactStem` on all templates that produce or consume artifacts). - No compilation happens outside of the "Build" phase, to consolidate the production and indexing of PDBs. - All step and job templates are named with `step` or `job` _first_, which disambiguates them in the templates directory. - Most jobs can be run on different `pool`s, so that we can put expensive jobs on expensive build agents and cheap jobs on cheap build agents. Some jobs handle pool selection on their own, however. Our original build pipelines used the `VSBuild` task _all over the place._ This resulted in PowerToys being built in myriad ways, different for every pipeline. There was an attempt at standardization early on, where `ci.yml` consumed jobs and steps templates... but when `release.yml` was added, all of that went out the window. It's the same story as Terminal (https://github.com/microsoft/terminal/pull/15808). The new pipelines are consistent and focus on a small, well-defined set of jobs: - `job-build-project` - This is the big one! - Takes a list of build configurations and platforms. - Produces an artifact named `build-PLATFORM-CONFIG` for the entire matrix of possibilities. - Builds all of the installers. - Optionally signs the output (all of the output). - Admittedly has a lot going on. - `job-test-project` - Takes one build config and one platform. - Consumes `build-PLATFORM-CONFIG` - Selects its own pools (hardcoded) because it knows about architectures and must choose the right agent arch. - Runs tests (directly on the build agent). - `job-publish-symbols-using-symbolrequestprod-api` - Consumes `*/.pdb` from all prior build phases. - Uploads all PDBs in one artifact to Azure DevOps - Uses Microsoft's internal symbol publication REST API to submit stripped symbols to MSDL for public consumption. Finally, this pull request has some additional benefits: - Symbols are published to the private and public feeds at the same time, in the same step. They should be available in the public symbol server for public folks to debug against! - We have all the underpinnings necessary to run tests on ARM64 build agents. - Right now, `ScreenResolutionUtility` is broken - I had to introduce a custom version of `UseDotNet` which would install the right architecture (🤦); see https://github.com/microsoft/azure-pipelines-tasks/issues/20300. - All dotnet and nuget versioning is consolidated into a small set of step templates. - This will provide a great place for us to handle versioning changes later, since all versioning happens in one place.	2024-09-25 09:23:58 -07:00
Seraphima Zykova	4240a7cee0	[Workspaces] Fix restart launcher when elevated (#35064 )	2024-09-25 17:56:31 +02:00
Ani	cf5addab28	[Settings][New+]Fixed crash when canceling template folder selection (#35060 ) [New+] Fixed crash when cancel template folder selection	2024-09-25 14:29:08 +01:00
PesBandi	7c48f5ebd2	[PTRun][UnitConverter]Use capital letters in DegreePrefixer (#34845 ) * [Run-UnitConverter] Use capital letters in DegreePrefixer * doc update * Update tests * Remove FeetToFt * trigger checks	2024-09-25 13:59:49 +01:00
octastylos-pseudodipteros	bbad1eb461	[MouseUtils]Allow crosshairs radius to be 0 px (#35036 )	2024-09-25 13:58:41 +01:00
Laszlo Nemeth	605a16d95c	[Workspaces] add monitor detection (#35018 )	2024-09-25 13:38:57 +02:00
Ani	a8b858f612	[AdvancedPaste]Hide custom actions on Paste menu when Paste with AI disabled (#35047 )	2024-09-25 11:10:11 +01:00
Seraphima Zykova	1e18e83af6	[Workspaces] Handle admin windows repositioning. (#34965 )	2024-09-25 11:13:38 +02:00
Ani	499dc9bb7a	[AdvancedPaste]Check "Paste with AI" enabled state for enabling custom actions (#35026 ) * [AdvancedPaste] Check OpenAI enabled state for custom actions * Add some more explanations to the expected exception * Add description saying that it requires Paste with AI to be enabled * Check openAI enabled only if we have custom actions --------- Co-authored-by: Jaime Bernardo <jaime@janeasystems.com>	2024-09-24 18:16:20 +01:00
Heiko	734b0f8a54	[New+, Enterprise]Policy for showing filename extension (#35000 ) * add gpo: admx, gpo utils * todo note * BugReport tool * implement policy in utility * settings ui * remove todo comment * code fixes * code fixes 2 * spell fix	2024-09-24 16:33:01 +01:00
R. David Dunphy	b927b340ec	[QuickAccent]Add degree sign, integral, and vertical ellipsis to all languages (#34747 )	2024-09-24 16:07:06 +01:00
Stefan Markovic	c890eb95ca	[FileLocksmith]Fix triggering FileLocksmith unexpectedly through verbs (#34905 )	2024-09-24 11:04:07 +01:00
PesBandi	cc586a0357	[QuickAccent]Add Middle Eastern Romanization (#31905 ) * [Quick Accent] Add support for Middle Eastern Romanization * Update ToUpper() (PowerAccent.cs) * Add right single quotation mark * rework ToUpper() * rework ToUpper() * Update ToUpper() * Internal strings more about Romanization	2024-09-24 09:18:44 +01:00
Dustin L. Howett	6415afc27d	Significantly rework GenerateAllFileComponents (#34985 ) There is no reason to use Invoke-Expression to execute a string containing a path to another powershell script. You can just run the powershell script directly. But then if you're going to do that, why not make it all part of the same script and use functions?	2024-09-23 14:34:56 -07:00
Dustin L. Howett	0f7d263dad	build: fix the TSA configuration (#35023 ) Fix the TSA configuration Quite literally, ship the org chart	2024-09-23 14:25:16 -05:00
Dave Rayment	360b6d0ccf	[Peek] Fix thumbnails being created and not used. Fix icon bitmaps leaking memory. Simplify ImagePreviewer. (#34544 ) Consolidated IconHelper and ThumbnailHelper. Fixed icon memory leak. Fixed ImagePreviewer thumbnails being created and then not used. Refactored ImagePreviewer.	2024-09-23 17:00:34 +01:00
Dave Rayment	a70aafb3b8	[Peek]Update FilePreviewer to prevent tooltips from obscuring title bar controls (#34718 ) * Update FilePreviewer to prevent tooltips from obscuring title bar controls. Fixes #34496 * Small tidy to pointer move handler and StringBuilder setup.	2024-09-23 16:00:28 +01:00
Davide Giacometti	035d70dd04	[PTRun]Improve error MessageBox title and message (#34564 ) * include utility name in error MessageBox for better context * aligned loading/init error messages * Update src/modules/launcher/PowerLauncher/Plugin/PluginManager.cs --------- Co-authored-by: Heiko <61519853+htcfreek@users.noreply.github.com>	2024-09-23 15:50:53 +01:00
Christopher Warrington	688d7d9c85	[EnvVar]Treat well-known debugging environment variables as lists (#34689 ) * [EnvVar] Treat well-known debugging environment variables as lists The following environment variables are semi-colon lists, like "PATH" * _NT_SYMBOL_PATH * _NT_ALT_SYMBOL_PATH * _NT_SYMCACHE_PATH Treat them as lists in the Environment Variable editor. Windows Debugger paths are [documented as being semi-colon delimited][0]. The [`_NT_SYMCACHE_PATH` is used by WPA][1], and it also documented as being semi-colon delimited. [0]: https://learn.microsoft.com/en-us/windows/win32/debug/symbol-paths [1]: https://learn.microsoft.com/en-us/windows-hardware/test/wpt/loading-symbols * [EnvVar] Add SYMCACHE to expected words list	2024-09-23 15:20:47 +01:00
Davide Giacometti	056fba0dcf	[Peek] Fix PreviewHandler previewer not visible on first activation (#34991 ) ensure containerHwnd is created before usage	2024-09-23 13:58:08 +01:00
Heiko	7e4baa14bb	[BugReport] Add new policy for enabled state of New+ utility (#35006 ) Update ReportGPOValues.cpp	2024-09-23 13:37:40 +01:00
Heiko	f7932af806	[Enterprise, GPO] gpo.h: Fixes wrong function use and code order improvements (#35002 ) * changes and fixes * spell fix * spell fix * improve comments	2024-09-23 13:33:12 +01:00
Heiko	da212b9fb9	[New+ > Settings page] Init fix and fix for enabled state of controls (#34999 ) * fix settings init (#34996) * fix control state if module gpo is aplied (#34997)	2024-09-23 13:28:39 +01:00
Laszlo Nemeth	cf470a6dbf	[Workspaces] add check on project id when launching from editor (#34802 )	2024-09-20 12:10:29 +02:00
Christian Gaarden Gaardmark	3f44ad186d	New Utility: New+ (#33136 ) Co-authored-by: Jaime Bernardo <jaime@janeasystems.com> Co-authored-by: Stefan Markovic <stefan@janeasystems.com>	2024-09-19 17:12:24 +01:00
				`@@ -0,0 +1 @@`
				`Learn more about New+ by visiting https://aka.ms/PowerToysOverview_NewPlus`