Fix VIProductName

Remove crufty version defines
Get rid of all extra VERSIONINFO resources
2026-01-11 23:06:45 +01:00 · 2024-09-18 16:14:14 -05:00 · 2024-09-18 16:13:53 -05:00 · 2024-09-18 16:11:40 -05:00 · 2024-09-18 15:46:04 -05:00 · 2024-09-18 13:48:01 -05:00
1000 changed files with 16584 additions and 3408 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -76,6 +76,7 @@ body:
      - System tray interaction
      - TextExtractor
      - Video Conference Mute
+      - Workspaces
      - Welcome / PowerToys Tour window
  validations:
    required: true
--- a/.github/ISSUE_TEMPLATE/translation_issue.yml
+++ b/.github/ISSUE_TEMPLATE/translation_issue.yml
@@ -50,6 +50,7 @@ body:
    - System tray interaction
    - TextExtractor
    - Video Conference Mute
+    - Workspaces
    - Welcome / PowerToys Tour window
  validations:
    required: true
--- a/.github/actions/spell-check/allow/names.txt
+++ b/.github/actions/spell-check/allow/names.txt
@@ -28,7 +28,7 @@ videoconference

 # USERS

-8LWXpg
+LWXpg  # (number eight)LWXpg is actual user name but spell checker throws error with a numeric leading value ... which is kinda odd
 Adoumie
 Advaith
 alekhyareddy
@@ -62,6 +62,7 @@ DHowett
 ductdo
 Essey
 ethanfangg
+ferraridavide
 frankychen
 gabime
 Galaxi
--- a/.github/actions/spell-check/excludes.txt
+++ b/.github/actions/spell-check/excludes.txt
@@ -117,6 +117,7 @@
 ^\Qsrc/modules/previewpane/UnitTests-StlThumbnailProvider/HelperFiles/sample.stl\E$
 ^\Qtools/project_template/ModuleTemplate/resource.h\E$
 ^doc/devdocs/akaLinks\.md$
+^src/modules/launcher/Plugins/Microsoft\.PowerToys\.Run\.Plugin\.TimeDate/Properties/
 ^src/modules/MouseWithoutBorders/App/.*/NativeMethods\.cs$
 ^src/modules/MouseWithoutBorders/App/Form/.*\.Designer\.cs$
 ^src/modules/MouseWithoutBorders/App/Form/.*\.resx$
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -56,11 +56,14 @@ APPBARDATA
 appdata
 APPEXECLINK
 Appium
+applayout
 Applicationcan
+APPLICATIONFRAMEHOST
 appmanifest
 APPNAME
 appref
 appsettings
+appsfolder
 appwindow
 appwiz
 APSTUDIO
@@ -189,7 +192,6 @@ CLIPBOARDUPDATE
 CLIPCHILDREN
 CLIPSIBLINGS
 closesocket
-clrcall
 CLSCTX
 Clusion
 cmder
@@ -200,8 +202,8 @@ CMINVOKECOMMANDINFO
 CMINVOKECOMMANDINFOEX
 CMock
 CMONITORS
-cmph
 cmpgt
+cmph
 cne
 CNF
 coclass
@@ -241,16 +243,14 @@ CONTEXTMENUHANDLER
 CONTROLL
 CONTROLPARENT
 copiedcolorrepresentation
+COREWINDOW
 cotaskmem
 COULDNOT
 countof
 cph
 CPower
 cppblog
-cppruntime
-cppstd
 cppwinrt
-CProj
 createdump
 CREATESCHEDULEDTASK
 CREATESTRUCT
@@ -266,6 +266,7 @@ CSettings
 cso
 CSRW
 CStyle
+cswinrt
 CSY
 CTest
 currentculture
@@ -605,7 +606,6 @@ hmenu
 hmodule
 hmonitor
 homljgmgpmcbpjbnjpfijnhipfkiclkd
-HOOKPROC
 Hostbackdropbrush
 hotkeycontrol
 hotkeys
@@ -673,7 +673,6 @@ imageresizerinput
 imageresizersettings
 imagingdevices
 ime
-imperialounce
 inetcpl
 Infobar
 INFOEXAMPLE
@@ -838,6 +837,7 @@ lpwcx
 lpwndpl
 LReader
 LRESULT
+LSTATUS
 lstrcmp
 lstrcmpi
 lstrlen
@@ -934,7 +934,6 @@ MRT
 mru
 mrw
 msc
-msclr
 mscorlib
 msdata
 msedge
@@ -1114,6 +1113,7 @@ PATINVERT
 PATPAINT
 PAUDIO
 pbc
+pbi
 PBlob
 pcb
 pcch
@@ -1127,6 +1127,7 @@ pdo
 pdto
 pdtobj
 pdw
+Peb
 pef
 PElems
 Pels
@@ -1210,6 +1211,8 @@ projectname
 PROPBAG
 PROPERTYKEY
 propkey
+propsys
+PROPVARIANT
 propvarutil
 prvpane
 psapi
@@ -1375,6 +1378,7 @@ sddl
 SDKDDK
 sdns
 searchterm
+SEARCHUI
 secpol
 SENDCHANGE
 sendinput
@@ -1506,7 +1510,6 @@ STATICEDGE
 STATSTG
 stdafx
 STDAPI
-stdcpp
 stdcpplatest
 STDMETHODCALLTYPE
 STDMETHODIMP
@@ -1558,7 +1561,9 @@ SYSKEYUP
 SYSLIB
 SYSMENU
 SYSTEMAPPS
+systemsettings
 SYSTEMTIME
+SYSTEMWOW
 tapp
 TApplication
 TApplied
@@ -1670,11 +1675,12 @@ urlmon
 Usb
 USEDEFAULT
 USEFILEATTRIBUTES
+USEPOSITION
 USERDATA
 Userenv
 USESHOWWINDOW
+USESIZE
 USESTDHANDLES
-usounce
 USRDLL
 UType
 uuidv
@@ -1711,6 +1717,7 @@ VIDEOINFOHEADER
 viewmodel
 vih
 VIRTUALDESK
+VISEGRADRELAY
 visiblecolorformats
 Visibletrue
 visualeffects
@@ -1740,6 +1747,7 @@ vswhere
 Vtbl
 WANTPALM
 wbem
+Wbemidl
 wbemuuid
 WBounds
 Wca
@@ -1827,6 +1835,9 @@ WNDCLASSEXW
 WNDCLASSW
 WNDPROC
 workarounds
+WORKSPACESEDITOR
+WORKSPACESLAUNCHER
+WORKSPACESSNAPSHOTTOOL
 wox
 wparam
 wpf
--- a/.github/policies/resourceManagement.yml
+++ b/.github/policies/resourceManagement.yml
@@ -236,11 +236,22 @@ configuration:
    - if:
      - payloadType: Issue_Comment
      - commentContains:
-          pattern: 'I would [like|love] [to help|helping|to contribute|contributing|to implement|implementing|to fix|fixing]'
+          pattern: "I(( would|'d) (like|love|be happy)| want) (to help|helping|to contribute|contributing|to implement|implementing|to fix|fixing)"
          isRegex: True
      then:
      - addReply:
          reply: Hi! Your last comment indicates to our system, that you might want to contribute to this feature/fix this bug. Thank you! Please make us aware on our ["Would you like to contribute to PowerToys?" thread](https://github.com/microsoft/PowerToys/issues/28769), as we don't see all the comments. <br /><br />_I'm a bot (beep!) so please excuse any mistakes I may make_
+      description:
+    - if:
+      - payloadType: Issues
+      - isAction:
+          action: Opened
+      - bodyContains:
+          pattern: 'Area\(s\) with issue\?\s*\nWorkspaces'
+          isRegex: True
+      then:
+      - addLabel:
+          label: Product-Workspaces
      description: 
 onFailure: 
 onSuccess: 
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@@ -189,6 +189,14 @@
                "WinUI3Apps\\PowerToys.PowerRenameContextMenu.dll",
                "WinUI3Apps\\PowerRenameContextMenuPackage.msix",

+                "PowerToys.WorkspacesSnapshotTool.exe",
+                "PowerToys.WorkspacesLauncher.exe",
+                "PowerToys.WorkspacesEditor.exe",
+                "PowerToys.WorkspacesEditor.dll",
+                "PowerToys.WorkspacesLauncherUI.exe",
+                "PowerToys.WorkspacesLauncherUI.dll",
+                "PowerToys.WorkspacesModuleInterface.dll",
+
                "WinUI3Apps\\PowerToys.RegistryPreviewExt.dll",
                "WinUI3Apps\\PowerToys.RegistryPreviewUILib.dll",
                "WinUI3Apps\\PowerToys.RegistryPreview.dll",
--- a/.pipelines/installer-steps.yml
+++ b/.pipelines/installer-steps.yml
@@ -1,7 +1,4 @@
 parameters:
-  - name: versionNumber
-    type: string
-    default: "0.0.1"
  - name: perUserArg
    type: string
    default: "false"
@@ -53,7 +50,7 @@ steps:
    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
+        "C:\Program Files (x86)\WiX Toolset v3.14\bin\dark.exe" -x $(build.sourcesdirectory)\extractedMsi installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-$(XES_BINARYVERSION)-$(BuildPlatform).msi
        dir $(build.sourcesdirectory)\extractedMsi

  # Check if deps.json files don't reference different dll versions.
@@ -102,7 +99,7 @@ steps:
  - 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'
+      script: '"C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ib installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-$(XES_BINARYVERSION)-$(BuildPlatform).exe -o installer\engine.exe'

  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
    displayName: "ESRP CodeSigning (Engine)"
@@ -138,7 +135,7 @@ steps:
  - 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'
+      script: '"C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ab installer\engine.exe installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-$(XES_BINARYVERSION)-$(BuildPlatform).exe -o installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-$(XES_BINARYVERSION)-$(BuildPlatform).exe'

  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
    displayName: Sign Bootstrapper
--- a/.pipelines/release.yml
+++ b/.pipelines/release.yml
@@ -20,9 +20,6 @@ parameters:
    default:
      - x64
      - arm64
-  - name: versionNumber
-    type: string
-    default: '0.0.1'
  - name: signingParameters
    type: object
    default:
@@ -83,13 +80,6 @@ extends:
          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'
@@ -120,6 +110,13 @@ extends:
      # - Webcam report tool
      # - Installer
      # - Bootstrapper Installer
+
+        - pwsh: |-
+            nuget install -configFile .pipelines/release-nuget.config Microsoft.Windows.Terminal.Versioning -OutputDirectory _versioning
+            $VersionRoot = (Get-Item _versioning\Microsoft.Windows.*).FullName
+            & "$VersionRoot\build\Setup.ps1" -ProjectDirectory "$(Build.SourcesDirectory)" -Verbose
+          displayName: Set up versioning via M.W.T.V
+
        - task: PowerShell@2
          displayName: Download and install WiX 3.14 development build
          inputs:
@@ -487,7 +484,6 @@ extends:
        - template: .pipelines/installer-steps.yml@self
          parameters:
            signingParameters: ${{ parameters.signingParameters }}
-            versionNumber: ${{ parameters.versionNumber }}
            perUserArg: "false"
            buildSubDir: "MachineSetup"
            installerPrefix: "PowerToysSetup"
@@ -502,7 +498,6 @@ extends:
        - template: .pipelines/installer-steps.yml@self
          parameters:
            signingParameters: ${{ parameters.signingParameters }}
-            versionNumber: ${{ parameters.versionNumber }}
            perUserArg: "true"
            buildSubDir: "UserSetup"
            installerPrefix: "PowerToysUserSetup"
--- a/.vsconfig
+++ b/.vsconfig
@@ -7,7 +7,7 @@
    "Microsoft.VisualStudio.Workload.ManagedDesktop",
    "Microsoft.VisualStudio.Workload.Universal",
    "Microsoft.VisualStudio.Component.Windows10SDK.19041",
-    "Microsoft.VisualStudio.Component.Windows10SDK.20348",
+    "Microsoft.VisualStudio.Component.Windows10SDK.22621",
    "Microsoft.VisualStudio.ComponentGroup.UWP.VC",
    "Microsoft.VisualStudio.Component.UWP.VC.ARM64",
    "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre",
--- a/Cpp.Build.props
+++ b/Cpp.Build.props
@@ -94,17 +94,16 @@
    </Link>
  </ItemDefinitionGroup>

-  <!-- Global props -->
-  <PropertyGroup Label="Globals"
-    Condition="'$(OverrideWindowsTargetPlatformVersion)'!='True'">
-    <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
-    <TargetPlatformVersion>10.0.20348.0</TargetPlatformVersion>
+  <!-- Global props OverrideWindowsTargetPlatformVersion-->
+  <PropertyGroup Label="Globals">
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
+    <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
    <WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
  </PropertyGroup>

  <!-- Props that are constant for both Debug and Release configurations -->
  <PropertyGroup Label="Configuration">
-    <PlatformToolset Condition="'$(OverridePlatformToolset)'!='True'">v143</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <DesktopCompatible>true</DesktopCompatible>
    <SpectreMitigation>Spectre</SpectreMitigation>
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,133 +1,3 @@
 <Project>
-  <Import Project="src\Version.props" />
-  <PropertyGroup>
-    <Copyright>Copyright (C) Microsoft Corporation. All rights reserved.</Copyright>
-    <AssemblyCopyright>Copyright (C) Microsoft Corporation. All rights reserved.</AssemblyCopyright>
-    <AssemblyProduct>PowerToys</AssemblyProduct>
-    <AssemblyCompany>Microsoft Corp.</AssemblyCompany>
-    <Company>Microsoft Corporation</Company>
-    <Authors>Microsoft Corporation</Authors>
-    <Product>PowerToys</Product>
-    <NeutralLanguage>en-US</NeutralLanguage>
-    <Platforms>x64;ARM64</Platforms>
-    <PackageTags>PowerToys</PackageTags>
-    <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <AnalysisMode>Recommended</AnalysisMode>
-    <_SkipUpgradeNetAnalyzersNuGetWarning>true</_SkipUpgradeNetAnalyzersNuGetWarning>
-    <NuGetAuditMode>direct</NuGetAuditMode>
-    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>    <!-- Don't add source revision hash to the product version of binaries. -->
-    <PlatformTarget>$(Platform)</PlatformTarget>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
-    <Version>$(Version).0</Version>
-    <RepositoryUrl>https://github.com/microsoft/PowerToys</RepositoryUrl>
-    <RepositoryType>GitHub</RepositoryType>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>PowerToys.Root.Props</_PropertySheetDisplayName>
-    <ForceImportBeforeCppProps>$(MsbuildThisFileDirectory)\Cpp.Build.props</ForceImportBeforeCppProps>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
-    <PackageReference Include="StyleCop.Analyzers">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <Compile Include="$(MSBuildThisFileDirectory)\src\codeAnalysis\GlobalSuppressions.cs" Link="GlobalSuppressions.cs" />
-    <AdditionalFiles Include="$(MSBuildThisFileDirectory)\src\codeAnalysis\StyleCop.json" Link="StyleCop.json" />
-
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <!-- Add ability to run tests via "msbuild /t:Test" -->
-  <!--
-    Workaround an MSBuild bug where Microsoft.Common.Test.targets is missing from the Arm64 installation.
-    See: https://github.com/dotnet/msbuild/pull/9984
-    NB 1: This means that using "/t:Test" is not supported for Arm64 builds and tests will need to be run in an alternate way,
-          eg running tests in VS or invoking vstest.console directly.
-    NB 2: <Sdk> elements do not support conditions, so this is also being worked around.
-          Once the change referenced above is fixed, the ImportGroup below can be replaced with:
-            <Sdk Name="Microsoft.Build.RunVSTest" Version="1.0.319" />
-  -->
-  <ImportGroup Condition="'$(PROCESSOR_ARCHITECTURE)' != 'ARM64'">
-    <Import Project="Sdk.props" Sdk="Microsoft.Build.RunVSTest" Version="1.0.319" />
-    <Import Project="Sdk.targets" Sdk="Microsoft.Build.RunVSTest" Version="1.0.319" />
-  </ImportGroup>
-  <PropertyGroup>
-    <VSTestLogger>trx</VSTestLogger>
-    <!--
-      RunVSTest by default uses %VSINSTALLDIR%\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe,
-      but some of the CI scenarios don't define %VSINSTALLDIR%, so be explicit about where to look for vstest.
-      Note: $(VsInstallRoot) is a built-in MSBuild property, so should always be defined.
-    -->
-    <VSTestToolPath>$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\TestWindow</VSTestToolPath>
-    <!-- No arm64 agents to run the tests. -->
-    <RunVSTest Condition="'$(Platform)' == 'ARM64'">false</RunVSTest>
-  </PropertyGroup>
-
-  <!-- MSBuildCache -->
-  <PropertyGroup>
-    <!-- Off by default -->
-    <MSBuildCacheEnabled Condition="'$(MSBuildCacheEnabled)' == ''">false</MSBuildCacheEnabled>
-
-    <!-- In Azure pipelines, use Pipeline Caching as the cache storage backend. Otherwise, use the local cache. -->
-    <MSBuildCachePackageName Condition="'$(TF_BUILD)' != ''">Microsoft.MSBuildCache.AzurePipelines</MSBuildCachePackageName>
-    <MSBuildCachePackageName Condition="'$(MSBuildCachePackageName)' == ''">Microsoft.MSBuildCache.Local</MSBuildCachePackageName>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(MSBuildCacheEnabled)' == 'true'">
-    <!-- Disable when running in a pipeline as the time to upload or download the massive .pch/.pchast to the cache is greater than the savings they provide. -->
-    <UsePrecompiledHeaders Condition="'$(TF_BUILD)' != ''">false</UsePrecompiledHeaders>
-
-    <!-- Change this to bust the cache -->
-    <MSBuildCacheCacheUniverse Condition="'$(MSBuildCacheCacheUniverse)' == ''">202408150737</MSBuildCacheCacheUniverse>
-
-    <!--
-      Visual Studio telemetry reads various ApplicationInsights.config files and other files after the project is finished, likely in a detached process.
-      This is acceptable and should not impact cache correctness.
-    -->
-    <MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
-      $(MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns);
-      \**\ApplicationInsights.config;
-      $(LocalAppData)\Microsoft\VSApplicationInsights\**;
-      $(LocalAppData)\Microsoft\Windows\INetCache\**;
-      A:\;
-      E:\;
-      $(windir)\**;
-    </MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
-
-    <!-- Unit tests of low-priv processes, eg the preview handler tests, may log to this location. -->
-    <MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
-      $(MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns);
-      $(USERPROFILE)\AppData\LocalLow\Microsoft\PowerToys\**;
-    </MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
-
-    <!-- 
-      This repo uses a common output directory with many projects writing duplicate outputs. Allow everything, but note this costs some performance in the form of requiring
-      the cache to use copies instead of hardlinks when pulling from cache.
-    -->
-    <MSBuildCacheIdenticalDuplicateOutputPatterns>$(MSBuildCacheIdenticalDuplicateOutputPatterns);**</MSBuildCacheIdenticalDuplicateOutputPatterns>
-
-    <!-- version of MSBuildCache is not part of the cache key -->
-    <PackagesConfigFile>$(MSBuildThisFileDirectory)packages.config</PackagesConfigFile>
-    <MSBuildCacheIgnoredInputPatterns>$(MSBuildCacheIgnoredInputPatterns);$(PackagesConfigFile)</MSBuildCacheIgnoredInputPatterns>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(MSBuildCacheEnabled)' == 'true' and '$(MSBuildCachePackageRoot)' == ''">
-    <PackagesConfigContents>$([System.IO.File]::ReadAllText("$(PackagesConfigFile)"))</PackagesConfigContents>
-    <MSBuildCachePackageVersion>$([System.Text.RegularExpressions.Regex]::Match($(PackagesConfigContents), 'Microsoft.MSBuildCache.*?version="(.*?)"').Groups[1].Value)</MSBuildCachePackageVersion>
-    <MSBuildCachePackageRoot>$(MSBuildThisFileDirectory)packages\$(MSBuildCachePackageName).$(MSBuildCachePackageVersion)</MSBuildCachePackageRoot>
-    <MSBuildCacheSharedCompilationPackageRoot>$(MSBuildThisFileDirectory)packages\Microsoft.MSBuildCache.SharedCompilation.$(MSBuildCachePackageVersion)</MSBuildCacheSharedCompilationPackageRoot>
-  </PropertyGroup>
-
-  <ImportGroup Condition="'$(MSBuildCacheEnabled)' == 'true'">
-    <Import Project="$(MSBuildCachePackageRoot)\build\$(MSBuildCachePackageName).props" />
-    <Import Project="$(MSBuildCacheSharedCompilationPackageRoot)\build\Microsoft.MSBuildCache.SharedCompilation.props" />
-  </ImportGroup>
+  <Import Project="$(MSBuildThisFileDirectory)\custom.props" />
 </Project>
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,6 +1,3 @@
 <Project>
-  <Sdk Name="Microsoft.Build.CopyOnWrite" Version="1.0.282" />
-
-  <Import Project="$(MSBuildCachePackageRoot)\build\$(MSBuildCachePackageName).targets" Condition="'$(MSBuildCacheEnabled)' == 'true'" />
-  <Import Project="$(MSBuildCacheSharedCompilationPackageRoot)\build\Microsoft.MSBuildCache.SharedCompilation.targets" Condition="'$(MSBuildCacheEnabled)' == 'true'" />
-</Project>
+  <Import Project="$(MSBuildThisFileDirectory)\custom.targets" />
+</Project>
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -6,14 +6,14 @@
    <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
    <PackageVersion Include="Azure.AI.OpenAI" Version="1.0.0-beta.12" />
    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Collections" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.0.240109" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Collections" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.1.240821" />
    <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
    <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
    <PackageVersion Include="ControlzEx" Version="6.0.0" />
@@ -32,15 +32,19 @@
    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
    <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
-    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2365.46" />
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2739.15" />
    <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="8.0.0" />
    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="8.0.7" />
    <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
    <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
-    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.0.8" />
+    <!-- 
+      TODO: in Common.Dotnet.CsWinRT.props, on upgrade, verify RemoveCsWinRTPackageAnalyzer is no longer needed.  
+      This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail.
+	-->
+    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240428000" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.240829007" />
    <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
    <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
    <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
@@ -79,7 +83,7 @@
    <PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
    <PackageVersion Include="System.Text.Json" Version="8.0.4" />
    <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
-    <PackageVersion Include="UnitsNet" Version="5.50.0" />
+    <PackageVersion Include="UnitsNet" Version="5.56.0" />
    <PackageVersion Include="UTF.Unknown" Version="2.5.1" />
    <PackageVersion Include="WinUIEx" Version="2.2.0" />
    <PackageVersion Include="WPF-UI" Version="3.0.0" />
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1299,14 +1299,14 @@ EXHIBIT A -Mozilla Public License.
 - Appium.WebDriver 4.4.5
 - Azure.AI.OpenAI 1.0.0-beta.12
 - CommunityToolkit.Mvvm 8.2.2
- CommunityToolkit.WinUI.Animations 8.0.240109
- CommunityToolkit.WinUI.Collections 8.0.240109
- CommunityToolkit.WinUI.Controls.Primitives 8.0.240109
- CommunityToolkit.WinUI.Controls.Segmented 8.0.240109
- CommunityToolkit.WinUI.Controls.SettingsControls 8.0.240109
- CommunityToolkit.WinUI.Controls.Sizers 8.0.240109
- CommunityToolkit.WinUI.Converters 8.0.240109
- CommunityToolkit.WinUI.Extensions 8.0.240109
+- CommunityToolkit.WinUI.Animations 8.1.240821
+- CommunityToolkit.WinUI.Collections 8.1.240821
+- CommunityToolkit.WinUI.Controls.Primitives 8.1.240821
+- CommunityToolkit.WinUI.Controls.Segmented 8.1.240821
+- CommunityToolkit.WinUI.Controls.SettingsControls 8.1.240821
+- CommunityToolkit.WinUI.Controls.Sizers 8.1.240821
+- CommunityToolkit.WinUI.Converters 8.1.240821
+- CommunityToolkit.WinUI.Extensions 8.1.240821
 - CommunityToolkit.WinUI.UI.Controls.DataGrid 7.1.2
 - CommunityToolkit.WinUI.UI.Controls.Markdown 7.1.2
 - ControlzEx 6.0.0
@@ -1325,13 +1325,13 @@ EXHIBIT A -Mozilla Public License.
 - Microsoft.Extensions.Logging 8.0.0
 - Microsoft.Extensions.Logging.Abstractions 8.0.0
 - Microsoft.Toolkit.Uwp.Notifications 7.1.2
- Microsoft.Web.WebView2 1.0.2365.46
+- Microsoft.Web.WebView2 1.0.2739.15
 - Microsoft.Win32.SystemEvents 8.0.0
 - Microsoft.Windows.Compatibility 8.0.7
 - Microsoft.Windows.CsWin32 0.2.46-beta
- Microsoft.Windows.CsWinRT 2.0.8
+- Microsoft.Windows.CsWinRT 2.1.1
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
- Microsoft.WindowsAppSDK 1.5.240428000
+- Microsoft.WindowsAppSDK 1.6.240829007
 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
 - Microsoft.Xaml.Behaviors.Wpf 1.1.39
 - ModernWpfUI 0.9.4
@@ -1363,7 +1363,7 @@ EXHIBIT A -Mozilla Public License.
 - System.Text.Encoding.CodePages 8.0.0
 - System.Text.Json 8.0.4
 - UnicodeInformation 2.6.0
- UnitsNet 5.50.0
+- UnitsNet 5.56.0
 - UTF.Unknown 2.5.1
 - WinUIEx 2.2.0
 - WPF-UI 3.0.0
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -171,14 +171,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		src\.editorconfig = src\.editorconfig
 		.vsconfig = .vsconfig
+		src\Common.Dotnet.CsWinRT.props = src\Common.Dotnet.CsWinRT.props
+		src\Common.SelfContained.props = src\Common.SelfContained.props
 		Cpp.Build.props = Cpp.Build.props
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		Directory.Packages.props = Directory.Packages.props
 		Solution.props = Solution.props
-		src\Version.props = src\Version.props
-		src\Common.SelfContained.props = src\Common.SelfContained.props
-		src\Common.Dotnet.CsWinRT.props = src\Common.Dotnet.CsWinRT.props
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Settings.UI.Library", "src\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj", "{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A}"
@@ -277,6 +276,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{B39DC643
 		src\common\utils\modulesRegistry.h = src\common\utils\modulesRegistry.h
 		src\common\utils\MsiUtils.h = src\common\utils\MsiUtils.h
 		src\common\utils\MsWindowsSettings.h = src\common\utils\MsWindowsSettings.h
+		src\common\utils\OnThreadExecutor.h = src\common\utils\OnThreadExecutor.h
 		src\common\utils\os-detect.h = src\common\utils\os-detect.h
 		src\common\utils\package.h = src\common\utils\package.h
 		src\common\utils\ProcessWaiter.h = src\common\utils\ProcessWaiter.h
@@ -456,7 +456,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FileLocksmithExt", "src\mod
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileLocksmithUI", "src\modules\FileLocksmith\FileLocksmithUI\FileLocksmithUI.csproj", "{E69B044A-2F8A-45AA-AD0B-256C59421807}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FileLocksmithLibInterop", "src\modules\FileLocksmith\FileLocksmithLibInterop\FileLocksmithLibInterop.vcxproj", "{C604B37E-9D0E-4484-8778-E8B31B0E1B3A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerToys.FileLocksmithLib.Interop", "src\modules\FileLocksmith\FileLocksmithLibInterop\FileLocksmithLibInterop.vcxproj", "{C604B37E-9D0E-4484-8778-E8B31B0E1B3A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPOWrapper", "src\common\GPOWrapper\GPOWrapper.vcxproj", "{E599C30B-9DC8-4E5A-BF27-93D4CCEDE788}"
 EndProject
@@ -583,6 +583,37 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerToys.Settings.DSC.Sche
 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}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workspaces-common", "workspaces-common", "{BE126CBB-AE12-406A-9837-A05ACFCA57A7}"
+	ProjectSection(SolutionItems) = preProject
+		src\modules\Workspaces\workspaces-common\GuidUtils.h = src\modules\Workspaces\workspaces-common\GuidUtils.h
+		src\modules\Workspaces\workspaces-common\InvokePoint.h = src\modules\Workspaces\workspaces-common\InvokePoint.h
+		src\modules\Workspaces\workspaces-common\MonitorEnumerator.h = src\modules\Workspaces\workspaces-common\MonitorEnumerator.h
+		src\modules\Workspaces\workspaces-common\MonitorUtils.h = src\modules\Workspaces\workspaces-common\MonitorUtils.h
+		src\modules\Workspaces\workspaces-common\VirtualDesktop.h = src\modules\Workspaces\workspaces-common\VirtualDesktop.h
+		src\modules\Workspaces\workspaces-common\WindowEnumerator.h = src\modules\Workspaces\workspaces-common\WindowEnumerator.h
+		src\modules\Workspaces\workspaces-common\WindowFilter.h = src\modules\Workspaces\workspaces-common\WindowFilter.h
+		src\modules\Workspaces\workspaces-common\WindowUtils.h = src\modules\Workspaces\workspaces-common\WindowUtils.h
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowProperties", "WindowProperties", "{14CB58B7-D280-4A7A-95DE-4B2DF14EA000}"
+	ProjectSection(SolutionItems) = preProject
+		src\modules\Workspaces\WindowProperties\WorkspacesWindowPropertyUtils.h = src\modules\Workspaces\WindowProperties\WorkspacesWindowPropertyUtils.h
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesLib", "src\modules\Workspaces\WorkspacesLib\WorkspacesLib.vcxproj", "{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkspacesLauncherUI", "src\modules\Workspaces\WorkspacesLauncherUI\WorkspacesLauncherUI.csproj", "{9C53CC25-0623-4569-95BC-B05410675EE3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesModuleInterface", "src\modules\Workspaces\WorkspacesModuleInterface\WorkspacesModuleInterface.vcxproj", "{45285DF2-9742-4ECA-9AC9-58951FC26489}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesSnapshotTool", "src\modules\Workspaces\WorkspacesSnapshotTool\WorkspacesSnapshotTool.vcxproj", "{3D63307B-9D27-44FD-B033-B26F39245B85}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkspacesEditor", "src\modules\Workspaces\WorkspacesEditor\WorkspacesEditor.csproj", "{367D7543-7DBA-4381-99F1-BF6142A996C4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesLauncher", "src\modules\Workspaces\WorkspacesLauncher\WorkspacesLauncher.vcxproj", "{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2601,6 +2632,78 @@ Global
 		{F055103B-F80B-4D0C-BF48-057C55620033}.Release|x64.Build.0 = Release|x64
 		{F055103B-F80B-4D0C-BF48-057C55620033}.Release|x86.ActiveCfg = Release|x64
 		{F055103B-F80B-4D0C-BF48-057C55620033}.Release|x86.Build.0 = Release|x64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Debug|ARM64.Build.0 = Debug|ARM64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Debug|x64.ActiveCfg = Debug|x64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Debug|x64.Build.0 = Debug|x64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Debug|x86.ActiveCfg = Debug|x64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Debug|x86.Build.0 = Debug|x64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Release|ARM64.ActiveCfg = Release|ARM64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Release|ARM64.Build.0 = Release|ARM64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Release|x64.ActiveCfg = Release|x64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Release|x64.Build.0 = Release|x64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Release|x86.ActiveCfg = Release|x64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Release|x86.Build.0 = Release|x64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Debug|ARM64.Build.0 = Debug|ARM64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Debug|x64.ActiveCfg = Debug|x64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Debug|x64.Build.0 = Debug|x64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Debug|x86.ActiveCfg = Debug|x64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Debug|x86.Build.0 = Debug|x64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Release|ARM64.ActiveCfg = Release|ARM64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Release|ARM64.Build.0 = Release|ARM64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Release|x64.ActiveCfg = Release|x64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Release|x64.Build.0 = Release|x64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Release|x86.ActiveCfg = Release|x64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Release|x86.Build.0 = Release|x64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Debug|ARM64.Build.0 = Debug|ARM64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Debug|x64.ActiveCfg = Debug|x64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Debug|x64.Build.0 = Debug|x64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Debug|x86.ActiveCfg = Debug|x64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Debug|x86.Build.0 = Debug|x64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Release|ARM64.ActiveCfg = Release|ARM64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Release|ARM64.Build.0 = Release|ARM64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Release|x64.ActiveCfg = Release|x64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Release|x64.Build.0 = Release|x64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Release|x86.ActiveCfg = Release|x64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Release|x86.Build.0 = Release|x64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Debug|ARM64.Build.0 = Debug|ARM64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Debug|x64.ActiveCfg = Debug|x64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Debug|x64.Build.0 = Debug|x64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Debug|x86.ActiveCfg = Debug|x64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Debug|x86.Build.0 = Debug|x64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Release|ARM64.ActiveCfg = Release|ARM64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Release|ARM64.Build.0 = Release|ARM64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Release|x64.ActiveCfg = Release|x64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Release|x64.Build.0 = Release|x64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Release|x86.ActiveCfg = Release|x64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Release|x86.Build.0 = Release|x64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Debug|ARM64.Build.0 = Debug|ARM64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Debug|x64.ActiveCfg = Debug|x64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Debug|x64.Build.0 = Debug|x64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Debug|x86.ActiveCfg = Debug|x64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Debug|x86.Build.0 = Debug|x64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Release|ARM64.ActiveCfg = Release|ARM64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Release|ARM64.Build.0 = Release|ARM64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Release|x64.ActiveCfg = Release|x64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Release|x64.Build.0 = Release|x64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Release|x86.ActiveCfg = Release|x64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Release|x86.Build.0 = Release|x64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Debug|ARM64.Build.0 = Debug|ARM64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Debug|x64.ActiveCfg = Debug|x64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Debug|x64.Build.0 = Debug|x64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Debug|x86.ActiveCfg = Debug|x64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Debug|x86.Build.0 = Debug|x64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Release|ARM64.ActiveCfg = Release|ARM64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Release|ARM64.Build.0 = Release|ARM64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Release|x64.ActiveCfg = Release|x64
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2817,6 +2920,15 @@ Global
 		{C0974915-8A1D-4BF0-977B-9587D3807AB7} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{1D6893CB-BC0C-46A8-A76C-9728706CA51A} = {557C4636-D7E1-4838-A504-7D19B725EE95}
 		{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}
+		{14CB58B7-D280-4A7A-95DE-4B2DF14EA000} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
+		{9C53CC25-0623-4569-95BC-B05410675EE3} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
+		{45285DF2-9742-4ECA-9AC9-58951FC26489} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
+		{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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 | [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) |
+| [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.84%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.83%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.83.0/PowerToysUserSetup-0.83.0-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.83.0/PowerToysUserSetup-0.83.0-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.83.0/PowerToysSetup-0.83.0-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.83.0/PowerToysSetup-0.83.0-arm64.exe
+[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
 
 |  Description   | Filename | sha256 hash |
 |----------------|----------|-------------|
-| Per user - x64       | [PowerToysUserSetup-0.83.0-x64.exe][ptUserX64] | C78E24F21C611F2BD774D8460ADD4B9AC8519085CA1253941CB46129331AB8C8 |
-| Per user - ARM64     | [PowerToysUserSetup-0.83.0-arm64.exe][ptUserArm64] | BA1C16003D55587D523A41B960D4A03718123CA37577D5F2A75E151D7653E6D3 |
-| Machine wide - x64   | [PowerToysSetup-0.83.0-x64.exe][ptMachineX64] | 7EC435A10849187D21A383E56A69213C1FF110B7FECA65900D9319D2F8162F35 |
-| Machine wide - ARM64 | [PowerToysSetup-0.83.0-arm64.exe][ptMachineArm64] | 5E147424D1D12DFCA88DC4AA0657B7CC1F3B02812F1EBA3E564FAF691908D840 |
+| 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 |

 This is our preferred method.

@@ -99,117 +99,98 @@ 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.83 - July 2024 Update
+### 0.84 - August 2024 Update

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

 **Highlights**

- - Awake Quality of Life changes, including changing the tray icon to reflect the current mode. Thanks [@dend](https://github.com/dend)!
- - Changes to general GPO policies and new policies for Mouse Without Borders. The names for some intune policy configuration sets might need to be updated as seen in https://github.com/MicrosoftDocs/windows-dev-docs/pull/5045/files . Thanks [@htcfreek](https://github.com/htcfreek)!
+ - 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.

 ### General
- - Reordered GPO policies, making it easier to find some policies. Thanks [@htcfreek](https://github.com/htcfreek)!

+ - Added DSC support for ImageResizer resize sizes property.
+ 
 ### Advanced Paste

- - Fixed CSV parser to support double quotes and escape delimiters when pasting as JSON. Thanks [@GhostVaibhav](https://github.com/GhostVaibhav)!
- - Improved double quote handling in the CSV parser when pasting as JSON. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - 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.

 ### Awake

- - Different modes will now show different icons in the system tray. Thanks [@dend](https://github.com/dend), and [@niels9001](https://github.com/niels9001) for the icon design!
- - Removed the dependency on Windows Forms and used native Win32 APIs instead for the tray icon. Thanks [@dend](https://github.com/dend) and [@BrianPeek](https://github.com/BrianPeek)!
- - Fixed an issue where the UI would become non-responsive after selecting no time for the timed mode. Thanks [@dend](https://github.com/dend)!
- - Refactored code for easier maintenance. Thanks [@dend](https://github.com/dend)!
- - The tray icon will now be shown when running Awake standalone to signal mode. Thanks [@dend](https://github.com/dend)!
- - The tray icon tooltip shows how much time is left on the timer. Thanks [@dend](https://github.com/dend)!
- - Added DPI awareness to the tray icon context menu. Thanks [@dend](https://github.com/dend)!
+ - 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)!

-### Color Picker
+### Hosts File Editor

- - Added support to using the mouse wheel to scroll through the color history. Thanks [@Fefedu973](https://github.com/Fefedu973)!
+ -  Fixed save failure when the hosts file is hidden. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!

 ### File Explorer add-ons

- - Allow copying from the right-click menu in Monaco and Markdown previewers.
+ - Fixed multiple preview form positioning issues causing floating, detached windows, CoreWebView2 related exception and process leak. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!

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

- - Fixed a crash when there were a big number of entries being shown by moving the opened files of a process to another dialog.
-
-### Installer
-
- - Fixed the path where DSC module files were installed for the user-scope installer. (This was a hotfix for 0.82)
-
-### Mouse Without Borders
-
- - Disabled non supported options in the old Mouse Without Borders UI. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Added new GPO policies to control the use of some features. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - 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.

 ### Peek

- - Allow copying from the right-click menu in Dev files and Markdown previews.
-
-### PowerToys Run
-
- - Fixed a crash on Windows 11 build 22000. (This was a hotfix for 0.82)
- - Blocked a transparency fix code from running on Windows 10, since it was causing graphical glitches. (This was a hotfix for 0.82)
- - Accept speed abbreviations like kilometers per hour (kmph) in the Unit Converter plugin. Thanks [@GhostVaibhav](https://github.com/GhostVaibhav)!
- - Added settings to configure behavior of the "First week of year" and "First day of week" calculations in the DateTime plugin. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Fixed wrong initial position of the PowerToys Run when switching between monitors with different dpi values.
- - Started allowing interchangeable use of / and \ in the registry plugin paths.
- - Added support to automatic sign-in after rebooting with the System plugin. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Added suggested use example results to the Value Generator plugin. Thanks [@azlkiniue](https://github.com/azlkiniue)!
+ - Added long paths support. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!

 ### Quick Accent

- - Added support for the Bulgarian character set. Thanks [@octastylos-pseudodipteros](https://github.com/octastylos-pseudodipteros)!
+ - Moved number superscripts and subscripts from Portuguese to all languages definition. Thanks [@octastylos-pseudodipteros](https://github.com/octastylos-pseudodipteros)!

-### Runner
+### PowerRename

- - Add code to handle release tags with an upper V when trying to detect new updates. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Updated the tooltip text of the replace box info button. Thanks [@Agnibaan](https://github.com/Agnibaan)!
+
+### 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.
+
+### Screen Ruler
+
+ - Added multiple measurements support for all measuring tools.

 ### Settings

- - Fixed the UI spacing in the "update available" card. Thanks [@Agnibaan](https://github.com/Agnibaan)!
- - Fixed the information bars in the Mouse Without Borders settings page to hide when the module is disabled. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Improved consistency of the icons used in the Mouse Without Borders settings page. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Improved action keyword information bar padding in the PowerToys Run plugins section. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Fixed a crash in the dashboard when Keyboard Manager Editor settings file became locked.
+ - Improved disabled animations InfoBar in Find My Mouse page. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+
+### 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.

 ### Documentation

- - Added the RDP plugin to PowerToys Run thirdPartyRunPlugins.md docs. Thanks [@anthony81799](https://github.com/anthony81799)!
- - Added the GitHubRepo and ProcessKiller plugins to PowerToys Run thirdPartyRunPlugins.md docs. Thanks [@8LWXpg](https://github.com/8LWXpg)!
- - Fixed a typo in the 0.82.0 release notes in README. Thanks [@walex999](https://github.com/walex999)!
+ - Added ChatGPTPowerToys plugin mention to thirdPartyRunPlugins.md. Thanks [@ferraridavide](https://github.com/ferraridavide)!

 ### Development

- - Disabled FancyZone UI tests, to unblock PRs. We plan to bring them back in the future. (This was a hotfix for 0.82)
- - Fixed an issue where flakiness in CI was causing the installer custom actions DLL from being signed. (This was a hotfix for 0.82)
- - Upgraded the Microsoft.Windows.Compatibility dependency to 8.0.7.
- - Upgraded the System.Text.Json dependency to 8.0.4.
- - Upgraded the Microsoft.Data.Sqlite dependency to 8.0.7.
- - Upgraded the MSBuildCache dependency to 0.1.283-preview. Thanks [@dfederm](https://github.com/dfederm)!
- - Removed an unneeded /Zm compiler flag from Keyboard Manager Editor common build flags.
- - Fixed the winget publish action to handle upper case V in the tag name. Thanks [@mdanish-kh](https://github.com/mdanish-kh)!
- - Removed wildcard items from vcxproj files. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Removed the similar issues bot GitHub actions. Thanks [@craigloewen-msft](https://github.com/craigloewen-msft)!
- - Fixed CODEOWNERS to better protect changes in some files.
- - Switched machines being used in CI and pointed status badges in README to the new machines.
- - Fixed NU1503 build warnings when building PowerToys. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Use the MSTest meta dependency for running the tests instead of the individual testing packages. Thanks [@stan-sz](https://github.com/stan-sz)!
- - Added missing CppWinRT references.
+ - Ported all C++/CX code to C++/WinRT.
+ - 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.

 #### What is being planned for version 0.84

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

 - Stability / bug fixes
- - New utility: Dev Projects
 - Language selection
 - New module: File Actions Menu
+ - New module: New+

 ## PowerToys Community

--- a/custom.props
+++ b/custom.props
@@ -0,0 +1,136 @@
+<Project>
+  <PropertyGroup Label="Version">
+    <VersionMajor>0</VersionMajor>
+    <VersionMinor>86</VersionMinor>
+    <VersionInfoProductName>PowerToys</VersionInfoProductName>
+  </PropertyGroup>
+  <PropertyGroup>
+    <Copyright>Copyright (C) Microsoft Corporation. All rights reserved.</Copyright>
+    <AssemblyCopyright>Copyright (C) Microsoft Corporation. All rights reserved.</AssemblyCopyright>
+    <AssemblyProduct>PowerToys</AssemblyProduct>
+    <AssemblyCompany>Microsoft Corp.</AssemblyCompany>
+    <Company>Microsoft Corporation</Company>
+    <Authors>Microsoft Corporation</Authors>
+    <Product>PowerToys</Product>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <Platforms>x64;ARM64</Platforms>
+    <PackageTags>PowerToys</PackageTags>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <AnalysisMode>Recommended</AnalysisMode>
+    <_SkipUpgradeNetAnalyzersNuGetWarning>true</_SkipUpgradeNetAnalyzersNuGetWarning>
+    <NuGetAuditMode>direct</NuGetAuditMode>
+    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>    <!-- Don't add source revision hash to the product version of binaries. -->
+    <PlatformTarget>$(Platform)</PlatformTarget>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
+    <RepositoryUrl>https://github.com/microsoft/PowerToys</RepositoryUrl>
+    <RepositoryType>GitHub</RepositoryType>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <_PropertySheetDisplayName>PowerToys.Root.Props</_PropertySheetDisplayName>
+    <ForceImportBeforeCppProps>$(MsbuildThisFileDirectory)\Cpp.Build.props</ForceImportBeforeCppProps>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
+    <PackageReference Include="StyleCop.Analyzers">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <Compile Include="$(MSBuildThisFileDirectory)\src\codeAnalysis\GlobalSuppressions.cs" Link="GlobalSuppressions.cs" />
+    <AdditionalFiles Include="$(MSBuildThisFileDirectory)\src\codeAnalysis\StyleCop.json" Link="StyleCop.json" />
+
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <!-- Add ability to run tests via "msbuild /t:Test" -->
+  <!--
+    Workaround an MSBuild bug where Microsoft.Common.Test.targets is missing from the Arm64 installation.
+    See: https://github.com/dotnet/msbuild/pull/9984
+    NB 1: This means that using "/t:Test" is not supported for Arm64 builds and tests will need to be run in an alternate way,
+          eg running tests in VS or invoking vstest.console directly.
+    NB 2: <Sdk> elements do not support conditions, so this is also being worked around.
+          Once the change referenced above is fixed, the ImportGroup below can be replaced with:
+            <Sdk Name="Microsoft.Build.RunVSTest" Version="1.0.319" />
+  -->
+  <ImportGroup Condition="'$(PROCESSOR_ARCHITECTURE)' != 'ARM64'">
+    <Import Project="Sdk.props" Sdk="Microsoft.Build.RunVSTest" Version="1.0.319" />
+    <Import Project="Sdk.targets" Sdk="Microsoft.Build.RunVSTest" Version="1.0.319" />
+  </ImportGroup>
+  <PropertyGroup>
+    <VSTestLogger>trx</VSTestLogger>
+    <!--
+      RunVSTest by default uses %VSINSTALLDIR%\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe,
+      but some of the CI scenarios don't define %VSINSTALLDIR%, so be explicit about where to look for vstest.
+      Note: $(VsInstallRoot) is a built-in MSBuild property, so should always be defined.
+    -->
+    <VSTestToolPath>$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\TestWindow</VSTestToolPath>
+    <!-- No arm64 agents to run the tests. -->
+    <RunVSTest Condition="'$(Platform)' == 'ARM64'">false</RunVSTest>
+  </PropertyGroup>
+
+  <!-- MSBuildCache -->
+  <PropertyGroup>
+    <!-- Off by default -->
+    <MSBuildCacheEnabled Condition="'$(MSBuildCacheEnabled)' == ''">false</MSBuildCacheEnabled>
+
+    <!-- In Azure pipelines, use Pipeline Caching as the cache storage backend. Otherwise, use the local cache. -->
+    <MSBuildCachePackageName Condition="'$(TF_BUILD)' != ''">Microsoft.MSBuildCache.AzurePipelines</MSBuildCachePackageName>
+    <MSBuildCachePackageName Condition="'$(MSBuildCachePackageName)' == ''">Microsoft.MSBuildCache.Local</MSBuildCachePackageName>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(MSBuildCacheEnabled)' == 'true'">
+    <!-- Disable when running in a pipeline as the time to upload or download the massive .pch/.pchast to the cache is greater than the savings they provide. -->
+    <UsePrecompiledHeaders Condition="'$(TF_BUILD)' != ''">false</UsePrecompiledHeaders>
+
+    <!-- Change this to bust the cache -->
+    <MSBuildCacheCacheUniverse Condition="'$(MSBuildCacheCacheUniverse)' == ''">202408150737</MSBuildCacheCacheUniverse>
+
+    <!--
+      Visual Studio telemetry reads various ApplicationInsights.config files and other files after the project is finished, likely in a detached process.
+      This is acceptable and should not impact cache correctness.
+    -->
+    <MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
+      $(MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns);
+      \**\ApplicationInsights.config;
+      $(LocalAppData)\Microsoft\VSApplicationInsights\**;
+      $(LocalAppData)\Microsoft\Windows\INetCache\**;
+      A:\;
+      E:\;
+      $(windir)\**;
+    </MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
+
+    <!-- Unit tests of low-priv processes, eg the preview handler tests, may log to this location. -->
+    <MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
+      $(MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns);
+      $(USERPROFILE)\AppData\LocalLow\Microsoft\PowerToys\**;
+    </MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
+
+    <!-- 
+      This repo uses a common output directory with many projects writing duplicate outputs. Allow everything, but note this costs some performance in the form of requiring
+      the cache to use copies instead of hardlinks when pulling from cache.
+    -->
+    <MSBuildCacheIdenticalDuplicateOutputPatterns>$(MSBuildCacheIdenticalDuplicateOutputPatterns);**</MSBuildCacheIdenticalDuplicateOutputPatterns>
+
+    <!-- version of MSBuildCache is not part of the cache key -->
+    <PackagesConfigFile>$(MSBuildThisFileDirectory)packages.config</PackagesConfigFile>
+    <MSBuildCacheIgnoredInputPatterns>$(MSBuildCacheIgnoredInputPatterns);$(PackagesConfigFile)</MSBuildCacheIgnoredInputPatterns>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(MSBuildCacheEnabled)' == 'true' and '$(MSBuildCachePackageRoot)' == ''">
+    <PackagesConfigContents>$([System.IO.File]::ReadAllText("$(PackagesConfigFile)"))</PackagesConfigContents>
+    <MSBuildCachePackageVersion>$([System.Text.RegularExpressions.Regex]::Match($(PackagesConfigContents), 'Microsoft.MSBuildCache.*?version="(.*?)"').Groups[1].Value)</MSBuildCachePackageVersion>
+    <MSBuildCachePackageRoot>$(MSBuildThisFileDirectory)packages\$(MSBuildCachePackageName).$(MSBuildCachePackageVersion)</MSBuildCachePackageRoot>
+    <MSBuildCacheSharedCompilationPackageRoot>$(MSBuildThisFileDirectory)packages\Microsoft.MSBuildCache.SharedCompilation.$(MSBuildCachePackageVersion)</MSBuildCacheSharedCompilationPackageRoot>
+  </PropertyGroup>
+
+  <ImportGroup Condition="'$(MSBuildCacheEnabled)' == 'true'">
+    <Import Project="$(MSBuildCachePackageRoot)\build\$(MSBuildCachePackageName).props" />
+    <Import Project="$(MSBuildCacheSharedCompilationPackageRoot)\build\Microsoft.MSBuildCache.SharedCompilation.props" />
+  </ImportGroup>
+</Project>
--- a/custom.targets
+++ b/custom.targets
@@ -0,0 +1,6 @@
+<Project>
+  <Sdk Name="Microsoft.Build.CopyOnWrite" Version="1.0.282" />
+
+  <Import Project="$(MSBuildCachePackageRoot)\build\$(MSBuildCachePackageName).targets" Condition="'$(MSBuildCacheEnabled)' == 'true'" />
+  <Import Project="$(MSBuildCacheSharedCompilationPackageRoot)\build\Microsoft.MSBuildCache.SharedCompilation.targets" Condition="'$(MSBuildCacheEnabled)' == 'true'" />
+</Project>
--- a/doc/images/icons/Workspaces.png
+++ b/doc/images/icons/Workspaces.png
--- a/doc/planning/awake.md
+++ b/doc/planning/awake.md
@@ -10,12 +10,23 @@ 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       |
-|:----------------------------------------------------------|:-----------------|
-| [`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      |
+|:-------------------------------------------------------------------|:----------------|
+| [`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 |
+
+### `VISEGRADRELAY_08152024` (August 15, 2024)
+
+>[!NOTE]
+>See pull request: [Awake - `VISEGRADRELAY_08152024`](https://github.com/microsoft/PowerToys/pull/34316)
+
+- [#34148](https://github.com/microsoft/PowerToys/issues/34148) Fixes the issue where the Awake icon is not displayed.
+- [#17969](https://github.com/microsoft/PowerToys/issues/17969) Add the ability to bind the process target to the parent of the Awake launcher.
+- PID binding now correctly ignores irrelevant parameters (e.g., expiration, interval) and only works for indefinite periods.
+- Amending the native API surface to make sure that the Win32 error is set correctly.

 ### `DAISY023_04102024` (April 10, 2024)

--- a/doc/thirdPartyRunPlugins.md
+++ b/doc/thirdPartyRunPlugins.md
@@ -38,6 +38,7 @@ Contact the developers of a plugin directly for assistance with a specific plugi
 | [PowerHexInspector](https://github.com/NaroZeol/PowerHexInspector) | [NaroZeol](https://github.com/NaroZeol) | Peek other forms of an input number |
 | [GitHubRepo](https://github.com/8LWXpg/PowerToysRun-GitHubRepo) | [8LWXpg](https://github.com/8LWXpg) | Search and open GitHub repositories |
 | [ProcessKiller](https://github.com/8LWXpg/PowerToysRun-ProcessKiller) | [8LWXpg](https://github.com/8LWXpg) | Search and kill processes |
+| [ChatGPT](https://github.com/ferraridavide/ChatGPTPowerToys) | [ferraridavide](https://github.com/ferraridavide) | Ask a question to ChatGPT |

 ## Extending software plugins

@@ -49,7 +50,7 @@ Below are community created plugins that target a website or software.  They are
 | [Edge Workspaces](https://github.com/quachpas/PowerToys-Run-EdgeWorkspaces) | [quachpas](https://github.com/quachpas) | Open Microsoft Edge workspaces|
 | [Everything](https://github.com/lin-ycv/EverythingPowerToys) | [Yu Chieh (Victor) Lin](https://github.com/Lin-ycv) | Get search results from Everything |
 | [GitKraken](https://github.com/davidegiacometti/PowerToys-Run-GitKraken) | [davidegiacometti](https://github.com/davidegiacometti) | Open GitKraken repositories |
-| [RDP](https://github.com/anthony81799/PowerToysRun-RDP)) | [anthony81799](https://github.com/anthony81799) | Open Remote Desktop connections |
+| [RDP](https://github.com/anthony81799/PowerToysRun-RDP) | [anthony81799](https://github.com/anthony81799) | Open Remote Desktop connections |
 | [Visual Studio Recents](https://github.com/davidegiacometti/PowerToys-Run-VisualStudio) | [davidegiacometti](https://github.com/davidegiacometti) | Open Visual Studio recents |
 | [WinGet](https://github.com/bostrot/PowerToysRunPluginWinget) | [bostrot](https://github.com/bostrot) | Search and install packages from WinGet |
 | [Scoop](https://github.com/Quriz/PowerToysRunScoop) | [Quriz](https://github.com/Quriz) | Search and install packages from Scoop |
--- a/installer/PowerToysSetup/Common.wxi
+++ b/installer/PowerToysSetup/Common.wxi
@@ -18,6 +18,7 @@
  <?define AdvancedPasteProjectName="AdvancedPaste"?>
  <?define RegistryPreviewProjectName="RegistryPreview"?>
  <?define PeekProjectName="Peek"?>
+  <?define WorkspacesProjectName="Workspaces"?>
  
  <?define RepoDir="$(var.ProjectDir)..\..\" ?>
  <?if $(var.Platform) = x64?>
--- a/installer/PowerToysSetup/PowerToysBootstrapper.wixproj
+++ b/installer/PowerToysSetup/PowerToysBootstrapper.wixproj
@@ -3,11 +3,11 @@
  DefaultTargets="Build"
  InitialTargets="EnsureNuGetPackageBuildImports"
  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
+  <Import Project="..\..\custom.props" />
  <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />

  <PropertyGroup>
-    <DefineConstants>Version=$(Version)</DefineConstants>
+    <DefineConstants>Version=$(VersionMajor).$(VersionMinor)</DefineConstants>
    <Name>PowerToysBootstrapper</Name>
    <ProjectGuid>{31d72625-43c1-41b1-b784-bce4a8dc5543}</ProjectGuid>
  </PropertyGroup>
@@ -84,4 +84,4 @@
    </ItemGroup>
  </Target>
  <Target Name="Restore" />
-</Project>
+</Project>
--- a/installer/PowerToysSetup/PowerToysInstaller.wixproj
+++ b/installer/PowerToysSetup/PowerToysInstaller.wixproj
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureNuGetPackageBuildImports"
  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
+  <Import Project="..\..\custom.props" />
  <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />

  <PropertyGroup Condition="'$(Platform)' == 'x64'">
-    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC</DefineConstants>
+    <DefineConstants>Version=$(VersionMajor).$(VersionMinor);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC</DefineConstants>
    <!-- THIS IS AN INNER LOOP OPTIMIZATION
    The build pipeline builds the Settings and Launcher projects for Publication
    using a specific profile. If you're doing local installer builds, this will
@@ -194,4 +194,4 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
    </ItemGroup>
  </Target>
  <Target Name="Restore" />
-</Project>
+</Project>
--- a/installer/PowerToysSetup/Resources.wxs
+++ b/installer/PowerToysSetup/Resources.wxs
@@ -449,6 +449,15 @@
        </RegistryKey>
        <File Id="PowerOCR_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.PowerOCR.resources.dll" />
      </Component>
+      <Component
+          Id="WorkspacesEditor_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)21">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="WorkspacesEditor_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="WorkspacesEditor_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.WorkspacesEditor.resources.dll" />
+      </Component>
      <?undef IdSafeLanguage?>
      <?undef CompGUIDPrefix?>
      <?endforeach?>
--- a/installer/PowerToysSetupCustomActions/CustomAction.cpp
+++ b/installer/PowerToysSetupCustomActions/CustomAction.cpp
@@ -1223,7 +1223,7 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
    }
    processes.resize(bytes / sizeof(processes[0]));

-    std::array<std::wstring_view, 32> processesToTerminate = {
+    std::array<std::wstring_view, 36> processesToTerminate = {
        L"PowerToys.PowerLauncher.exe",
        L"PowerToys.Settings.exe",
        L"PowerToys.AdvancedPaste.exe",
@@ -1255,6 +1255,10 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
        L"PowerToys.MouseWithoutBordersService.exe",
        L"PowerToys.CropAndLock.exe",
        L"PowerToys.EnvironmentVariables.exe",
+        L"PowerToys.WorkspacesSnapshotTool.exe",
+        L"PowerToys.WorkspacesLauncher.exe",
+        L"PowerToys.WorkspacesLauncherUI.exe",
+        L"PowerToys.WorkspacesEditor.exe",
        L"PowerToys.exe",
    };

--- a/installer/PowerToysSetupCustomActions/Resource.rc
+++ b/installer/PowerToysSetupCustomActions/Resource.rc
@@ -2,7 +2,6 @@
 //
 #include <windows.h>
 #include "resource.h"
-#include "../../src/common/version/version.h"

 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -14,39 +13,6 @@
 /////////////////////////////////////////////////////////////////////////////
 #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" // US English (0x0409), Unicode (0x04B0) charset
-        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 // US English (0x0409), Unicode (1200) charset
-    END
-END
-
 /////////////////////////////////////////////////////////////////////////////
 // English (United States) resources

--- a/src/ActionRunner/actionRunner.base.rc
+++ b/src/ActionRunner/actionRunner.base.rc
@@ -1,36 +1,3 @@
 #include <windows.h>
 #include "resource.h"
-#include "../common/version/version.h"

-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" // US English (0x0409), Unicode (0x04B0) charset
-        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 // US English (0x0409), Unicode (1200) charset
-    END
-END
--- a/src/Common.Dotnet.CsWinRT.props
+++ b/src/Common.Dotnet.CsWinRT.props
@@ -2,7 +2,8 @@
 <!-- Some items may be set in Directory.Build.props in root -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <WindowsSdkPackageVersion>10.0.22621.38</WindowsSdkPackageVersion>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
    <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
@@ -33,4 +34,11 @@
  <ItemGroup>
    <PackageReference Include="Microsoft.Windows.CsWinRT" />
  </ItemGroup>
+
+  <!-- this may need to be removed on future CsWinRT upgrades-->
+  <Target Name="RemoveCsWinRTPackageAnalyzer" BeforeTargets="CoreCompile">
+    <ItemGroup>
+      <Analyzer Remove="@(Analyzer)" Condition="%(Analyzer.NuGetPackageId) == 'Microsoft.Windows.CsWinRT'" />	  
+    </ItemGroup>
+  </Target>
 </Project>
--- a/src/Update/PowerToys.Update.base.rc
+++ b/src/Update/PowerToys.Update.base.rc
@@ -1,36 +1,3 @@
 #include <windows.h>
 #include "resource.h"
-#include "../common/version/version.h"

-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" // US English (0x0409), Unicode (0x04B0) charset
-        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 // US English (0x0409), Unicode (1200) charset
-    END
-END
--- a/src/common/AllExperiments/Experiments.cs
+++ b/src/common/AllExperiments/Experiments.cs
@@ -4,6 +4,7 @@

 using System.Globalization;
 using System.Text.Json;
+
 using Microsoft.PowerToys.Settings.UI.Library.Telemetry.Events;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.VariantAssignment.Client;
--- a/src/common/Common.UI/SettingsDeepLink.cs
+++ b/src/common/Common.UI/SettingsDeepLink.cs
@@ -31,6 +31,7 @@ namespace Common.UI
            EnvironmentVariables,
            Dashboard,
            AdvancedPaste,
+            Workspaces,
        }

        private static string SettingsWindowNameToString(SettingsWindow value)
@@ -77,6 +78,8 @@ namespace Common.UI
                    return "Dashboard";
                case SettingsWindow.AdvancedPaste:
                    return "AdvancedPaste";
+                case SettingsWindow.Workspaces:
+                    return "Workspaces";
                default:
                    {
                        return string.Empty;
--- a/src/common/Common.UI/ThemeManager.cs
+++ b/src/common/Common.UI/ThemeManager.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Linq;
 using System.Windows;
+
 using ManagedCommon;
 using Microsoft.Win32;

--- a/src/common/Display/Display.vcxproj
+++ b/src/common/Display/Display.vcxproj
@@ -24,15 +24,18 @@
  <ItemDefinitionGroup>
    <ClCompile>
      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\common;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
+    <ClInclude Include="DisplayUtils.h" />
+    <ClInclude Include="MonitorEnumerator.h" />
    <ClInclude Include="monitors.h" />
    <ClInclude Include="dpi_aware.h" />
  </ItemGroup>
  <ItemGroup>
+    <ClCompile Include="DisplayUtils.cpp" />
    <ClCompile Include="monitors.cpp" />
    <ClCompile Include="dpi_aware.cpp" />
  </ItemGroup>
--- a/src/common/Display/DisplayUtils.cpp
+++ b/src/common/Display/DisplayUtils.cpp
@@ -0,0 +1,143 @@
+#include "DisplayUtils.h"
+
+#include <algorithm>
+#include <cwctype>
+#include <iterator>
+
+#include <dpi_aware.h>
+#include <MonitorEnumerator.h>
+
+#include <utils/OnThreadExecutor.h>
+
+namespace DisplayUtils
+{
+    std::wstring remove_non_digits(const std::wstring& input)
+    {
+        std::wstring result;
+        std::copy_if(input.begin(), input.end(), std::back_inserter(result), [](wchar_t ch) { return std::iswdigit(ch); });
+        return result;
+    }
+
+    std::pair<std::wstring, std::wstring> SplitDisplayDeviceId(const std::wstring& str) noexcept
+    {
+        // format:  \\?\DISPLAY#{device id}#{instance id}#{some other id}
+        // example: \\?\DISPLAY#GSM1388#4&125707d6&0&UID8388688#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}
+        // output:  { GSM1388, 4&125707d6&0&UID8388688 }
+
+        size_t nameStartPos = str.find_first_of('#');
+        size_t uidStartPos = str.find('#', nameStartPos + 1);
+        size_t uidEndPos = str.find('#', uidStartPos + 1);
+
+        if (nameStartPos == std::string::npos || uidStartPos == std::string::npos || uidEndPos == std::string::npos)
+        {
+            return { str, L"" };
+        }
+
+        return { str.substr(nameStartPos + 1, uidStartPos - nameStartPos - 1), str.substr(uidStartPos + 1, uidEndPos - uidStartPos - 1) };
+    }
+
+    std::pair<bool, std::vector<DisplayUtils::DisplayData>> GetDisplays()
+    {
+        bool success = true;
+        std::vector<DisplayUtils::DisplayData> result{};
+        auto allMonitors = MonitorEnumerator::Enumerate();
+
+        OnThreadExecutor dpiUnawareThread;
+        dpiUnawareThread.submit(OnThreadExecutor::task_t{ [&] {
+            SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE);
+            SetThreadDpiHostingBehavior(DPI_HOSTING_BEHAVIOR_MIXED);
+        } }).wait();
+
+        for (auto& monitorData : allMonitors)
+        {
+            MONITORINFOEX monitorInfo = monitorData.second;
+            MONITORINFOEX dpiUnawareMonitorInfo{};
+
+            dpiUnawareThread.submit(OnThreadExecutor::task_t{ [&] {
+                dpiUnawareMonitorInfo.cbSize = sizeof(dpiUnawareMonitorInfo);
+                if (!GetMonitorInfo(monitorData.first, &dpiUnawareMonitorInfo))
+                {
+                    return;
+                }
+            } }).wait();
+
+            UINT dpi = 0;
+            if (DPIAware::GetScreenDPIForMonitor(monitorData.first, dpi) != S_OK)
+            {
+                success = false;
+                break;
+            }
+
+            DisplayUtils::DisplayData data{
+                .monitor = monitorData.first,
+                .dpi = dpi,
+                .monitorRectDpiAware = monitorInfo.rcMonitor,
+                .monitorRectDpiUnaware = dpiUnawareMonitorInfo.rcMonitor,
+            };
+
+            bool foundActiveMonitor = false;
+            DISPLAY_DEVICE displayDevice{ .cb = sizeof(displayDevice) };
+            DWORD displayDeviceIndex = 0;
+            while (EnumDisplayDevicesW(monitorInfo.szDevice, displayDeviceIndex, &displayDevice, EDD_GET_DEVICE_INTERFACE_NAME))
+            {
+                /* 
+                    * if (WI_IsFlagSet(displayDevice.StateFlags, DISPLAY_DEVICE_ACTIVE) &&
+                        WI_IsFlagClear(displayDevice.StateFlags, DISPLAY_DEVICE_MIRRORING_DRIVER))
+                    */
+                if (((displayDevice.StateFlags & DISPLAY_DEVICE_ACTIVE) == DISPLAY_DEVICE_ACTIVE) &&
+                    (displayDevice.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER) == 0)
+                {
+                    // Find display devices associated with the display.
+                    foundActiveMonitor = true;
+                    break;
+                }
+
+                displayDeviceIndex++;
+            }
+
+            if (foundActiveMonitor)
+            {
+                auto deviceId = SplitDisplayDeviceId(displayDevice.DeviceID);
+                data.id = deviceId.first;
+                data.instanceId = deviceId.second;
+                try
+                {
+                    std::wstring numberStr = displayDevice.DeviceName; // \\.\DISPLAY1\Monitor0
+                    numberStr = numberStr.substr(0, numberStr.find_last_of('\\')); // \\.\DISPLAY1
+                    numberStr = remove_non_digits(numberStr);
+                    data.number = std::stoi(numberStr);
+                }
+                catch (...)
+                {
+                    success = false;
+                    break;
+                }
+            }
+            else
+            {
+                success = false;
+
+                // Use the display name as a fallback value when no proper device was found.
+                data.id = monitorInfo.szDevice;
+                data.instanceId = L"";
+
+                try
+                {
+                    std::wstring numberStr = monitorInfo.szDevice; // \\.\DISPLAY1
+                    numberStr = remove_non_digits(numberStr);
+                    data.number = std::stoi(numberStr);
+                }
+                catch (...)
+                {
+                    success = false;
+                    break;
+                }
+            }
+
+            result.push_back(data);
+        }
+
+        return { success, result };
+    }
+
+}
--- a/src/common/Display/DisplayUtils.h
+++ b/src/common/Display/DisplayUtils.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <Windows.h>
+#include <string>
+#include <vector>
+
+namespace DisplayUtils
+{
+    struct DisplayData
+    {
+        HMONITOR monitor{};
+        std::wstring id;
+        std::wstring instanceId;
+        unsigned int number{};
+        unsigned int dpi{};
+        RECT monitorRectDpiAware{};
+        RECT monitorRectDpiUnaware{};
+    };
+
+    std::pair<bool, std::vector<DisplayData>> GetDisplays();
+};
--- a/src/common/Display/MonitorEnumerator.h
+++ b/src/common/Display/MonitorEnumerator.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include <functional>
+#include <vector>
+#include <Windows.h>
+
+class MonitorEnumerator
+{
+public:
+	static std::vector<std::pair<HMONITOR, MONITORINFOEX>> Enumerate()
+	{
+		MonitorEnumerator inst;
+		EnumDisplayMonitors(NULL, NULL, Callback, reinterpret_cast<LPARAM>(&inst));
+		return inst.m_monitors;
+	}
+
+private:
+	MonitorEnumerator() = default;
+	~MonitorEnumerator() = default;
+
+	static BOOL CALLBACK Callback(HMONITOR monitor, HDC /*hdc*/, LPRECT /*pRect*/, LPARAM param)
+	{
+		MonitorEnumerator* inst = reinterpret_cast<MonitorEnumerator*>(param);
+		MONITORINFOEX mi;
+		mi.cbSize = sizeof(mi);
+		if (GetMonitorInfo(monitor, &mi))
+		{
+			inst->m_monitors.push_back({monitor, mi});
+		}
+
+		return TRUE;
+	}
+
+	std::vector<std::pair<HMONITOR, MONITORINFOEX>> m_monitors;
+};
--- a/src/common/Display/dpi_aware.cpp
+++ b/src/common/Display/dpi_aware.cpp
@@ -1,7 +1,9 @@
 #include "dpi_aware.h"
+
 #include "monitors.h"
 #include <ShellScalingApi.h>
 #include <array>
+#include <cmath>

 namespace DPIAware
 {
@@ -60,6 +62,24 @@ namespace DPIAware
        }
    }

+    void Convert(HMONITOR monitor_handle, RECT& rect)
+    {
+        if (monitor_handle == NULL)
+        {
+            const POINT ptZero = { 0, 0 };
+            monitor_handle = MonitorFromPoint(ptZero, MONITOR_DEFAULTTOPRIMARY);
+        }
+
+        UINT dpi_x, dpi_y;
+        if (GetDpiForMonitor(monitor_handle, MDT_EFFECTIVE_DPI, &dpi_x, &dpi_y) == S_OK)
+        {
+            rect.left = static_cast<long>(std::round(rect.left * static_cast<float>(dpi_x) / DEFAULT_DPI));
+            rect.right = static_cast<long>(std::round(rect.right * static_cast<float>(dpi_x) / DEFAULT_DPI));
+            rect.top = static_cast<long>(std::round(rect.top * static_cast<float>(dpi_y) / DEFAULT_DPI));
+            rect.bottom = static_cast<long>(std::round(rect.bottom * static_cast<float>(dpi_y) / DEFAULT_DPI));
+        }
+    }
+
    void ConvertByCursorPosition(float& width, float& height)
    {
        HMONITOR targetMonitor = nullptr;
--- a/src/common/Display/dpi_aware.h
+++ b/src/common/Display/dpi_aware.h
@@ -12,6 +12,7 @@ namespace DPIAware
    HRESULT GetScreenDPIForPoint(POINT p, UINT& dpi);
    HRESULT GetScreenDPIForCursor(UINT& dpi);
    void Convert(HMONITOR monitor_handle, float& width, float& height);
+    void Convert(HMONITOR monitor_handle, RECT& rect);
    void ConvertByCursorPosition(float& width, float& height);
    void InverseConvert(HMONITOR monitor_handle, float& width, float& height);
    void EnableDPIAwarenessForThisProcess();
--- a/src/common/FilePreviewCommon/MarkdownHelper.cs
+++ b/src/common/FilePreviewCommon/MarkdownHelper.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.

 using System.IO;
+
 using Markdig;

 namespace Microsoft.PowerToys.FilePreviewCommon
--- a/src/common/FilePreviewCommon/MonacoHelper.cs
+++ b/src/common/FilePreviewCommon/MonacoHelper.cs
@@ -8,6 +8,7 @@ using System.Globalization;
 using System.IO;
 using System.Reflection;
 using System.Text.Json;
+
 using Microsoft.PowerToys.FilePreviewCommon.Monaco.Formatters;

 namespace Microsoft.PowerToys.FilePreviewCommon
--- a/src/common/GPOWrapper/GPOWrapper.cpp
+++ b/src/common/GPOWrapper/GPOWrapper.cpp
@@ -1,4 +1,4 @@
-#include "pch.h"
+#include "pch.h"
 #include "GPOWrapper.h"
 #include "GPOWrapper.g.cpp"

@@ -176,6 +176,10 @@ namespace winrt::PowerToys::GPOWrapper::implementation
    {
        return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteOnlineAIModelsValue());
    }
+    GpoRuleConfigured GPOWrapper::GetConfiguredWorkspacesEnabledValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredWorkspacesEnabledValue());
+    }
    GpoRuleConfigured GPOWrapper::GetConfiguredMwbClipboardSharingEnabledValue()
    {
        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredMwbClipboardSharingEnabledValue());
--- a/src/common/GPOWrapper/GPOWrapper.h
+++ b/src/common/GPOWrapper/GPOWrapper.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include "GPOWrapper.g.h"
 #include <common/utils/gpo.h>

@@ -50,6 +50,7 @@ namespace winrt::PowerToys::GPOWrapper::implementation
        static GpoRuleConfigured GetConfiguredQoiPreviewEnabledValue();
        static GpoRuleConfigured GetConfiguredQoiThumbnailsEnabledValue();
        static GpoRuleConfigured GetAllowedAdvancedPasteOnlineAIModelsValue();
+        static GpoRuleConfigured GetConfiguredWorkspacesEnabledValue();
        static GpoRuleConfigured GetConfiguredMwbClipboardSharingEnabledValue();
        static GpoRuleConfigured GetConfiguredMwbFileTransferEnabledValue();
        static GpoRuleConfigured GetConfiguredMwbUseOriginalUserInterfaceValue();
--- 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 GetConfiguredWorkspacesEnabledValue();
            static GpoRuleConfigured GetConfiguredMwbClipboardSharingEnabledValue();
            static GpoRuleConfigured GetConfiguredMwbFileTransferEnabledValue();
            static GpoRuleConfigured GetConfiguredMwbUseOriginalUserInterfaceValue();
--- a/src/common/GPOWrapper/GPOWrapper.rc
+++ b/src/common/GPOWrapper/GPOWrapper.rc
@@ -1,40 +1,7 @@
 #include <windows.h>
 #include "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" // US English (0x0409), Unicode (0x04B0) charset
-        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 // US English (0x0409), Unicode (1200) charset
-    END
-END
--- a/src/common/GPOWrapperProjection/GPOWrapper.cs
+++ b/src/common/GPOWrapperProjection/GPOWrapper.cs
@@ -61,5 +61,10 @@ namespace PowerToys.GPOWrapperProjection
        {
            return (GpoRuleConfigured)PowerToys.GPOWrapper.GPOWrapper.GetRunPluginEnabledValue(pluginID);
        }
+
+        public static GpoRuleConfigured GetConfiguredWorkspacesEnabledValue()
+        {
+            return (GpoRuleConfigured)PowerToys.GPOWrapper.GPOWrapper.GetConfiguredWorkspacesEnabledValue();
+        }
    }
 }
--- a/src/common/ManagedCommon/Logger.cs
+++ b/src/common/ManagedCommon/Logger.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.Globalization;
 using System.IO.Abstractions;
 using System.Reflection;
+
 using PowerToys.Interop;

 namespace ManagedCommon
--- a/src/common/ManagedCommon/ModuleType.cs
+++ b/src/common/ManagedCommon/ModuleType.cs
@@ -30,5 +30,6 @@ namespace ManagedCommon
        MeasureTool,
        ShortcutGuide,
        PowerOCR,
+        Workspaces,
    }
 }
--- a/src/common/ManagedCommon/RunnerHelper.cs
+++ b/src/common/ManagedCommon/RunnerHelper.cs
@@ -6,6 +6,7 @@ using System;
 using System.Diagnostics;
 using System.Reflection;
 using System.Threading.Tasks;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;

--- a/src/common/ManagedCommon/ThemeHelpers.cs
+++ b/src/common/ManagedCommon/ThemeHelpers.cs
@@ -4,6 +4,7 @@

 using System;
 using System.Runtime.InteropServices;
+
 using Microsoft.Win32;

 namespace ManagedCommon
--- a/src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs
+++ b/src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.

 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry.Events;

 namespace Microsoft.PowerToys.Telemetry
--- a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.rc
+++ b/src/common/UnitTests-CommonLib/UnitTests-CommonLib.rc
@@ -1,36 +1,3 @@
 #include <windows.h>
 #include "resource.h"
-#include "../version/version.h"

-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" // US English (0x0409), Unicode (0x04B0) charset
-        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 // US English (0x0409), Unicode (1200) charset
-    END
-END
--- a/src/common/interop/Constants.cpp
+++ b/src/common/interop/Constants.cpp
@@ -51,17 +51,21 @@ namespace winrt::PowerToys::Interop::implementation
    {
        return CommonSharedConstants::SHOW_COLOR_PICKER_SHARED_EVENT;
    }
-    hstring Constants::ShowAdvancedPasteSharedEvent()
+    hstring Constants::AdvancedPasteShowUIMessage()
    {
-        return CommonSharedConstants::SHOW_ADVANCED_PASTE_SHARED_EVENT;
+        return CommonSharedConstants::ADVANCED_PASTE_SHOW_UI_MESSAGE;
    }
-    hstring Constants::AdvancedPasteMarkdownEvent()
+    hstring Constants::AdvancedPasteMarkdownMessage()
    {
-        return CommonSharedConstants::ADVANCED_PASTE_MARKDOWN_EVENT;
+        return CommonSharedConstants::ADVANCED_PASTE_MARKDOWN_MESSAGE;
    }
-    hstring Constants::AdvancedPasteJsonEvent()
+    hstring Constants::AdvancedPasteJsonMessage()
    {
-        return CommonSharedConstants::ADVANCED_PASTE_JSON_EVENT;
+        return CommonSharedConstants::ADVANCED_PASTE_JSON_MESSAGE;
+    }
+    hstring Constants::AdvancedPasteCustomActionMessage()
+    {
+        return CommonSharedConstants::ADVANCED_PASTE_CUSTOM_ACTION_MESSAGE;
    }
    hstring Constants::ShowPowerOCRSharedEvent()
    {
@@ -143,4 +147,12 @@ namespace winrt::PowerToys::Interop::implementation
    {
        return CommonSharedConstants::SHOW_ENVIRONMENT_VARIABLES_ADMIN_EVENT;
    }
+    hstring Constants::WorkspacesLaunchEditorEvent()
+    {
+        return CommonSharedConstants::WORKSPACES_LAUNCH_EDITOR_EVENT;
+    }
+    hstring Constants::WorkspacesHotkeyEvent()
+    {
+        return CommonSharedConstants::WORKSPACES_HOTKEY_EVENT;
+    }
 }
--- a/src/common/interop/Constants.h
+++ b/src/common/interop/Constants.h
@@ -16,9 +16,10 @@ namespace winrt::PowerToys::Interop::implementation
        static hstring FZEToggleEvent();
        static hstring ColorPickerSendSettingsTelemetryEvent();
        static hstring ShowColorPickerSharedEvent();
-        static hstring ShowAdvancedPasteSharedEvent();
-        static hstring AdvancedPasteMarkdownEvent();
-        static hstring AdvancedPasteJsonEvent();
+        static hstring AdvancedPasteShowUIMessage();
+        static hstring AdvancedPasteMarkdownMessage();
+        static hstring AdvancedPasteJsonMessage();
+        static hstring AdvancedPasteCustomActionMessage();
        static hstring ShowPowerOCRSharedEvent();
        static hstring MouseJumpShowPreviewEvent();
        static hstring AwakeExitEvent();
@@ -39,6 +40,8 @@ namespace winrt::PowerToys::Interop::implementation
        static hstring CropAndLockReparentEvent();
        static hstring ShowEnvironmentVariablesSharedEvent();
        static hstring ShowEnvironmentVariablesAdminSharedEvent();
+        static hstring WorkspacesLaunchEditorEvent();
+        static hstring WorkspacesHotkeyEvent();
    };
 }

--- a/src/common/interop/Constants.idl
+++ b/src/common/interop/Constants.idl
@@ -13,9 +13,10 @@ namespace PowerToys
            static String FZEToggleEvent();
            static String ColorPickerSendSettingsTelemetryEvent();
            static String ShowColorPickerSharedEvent();
-            static String ShowAdvancedPasteSharedEvent();
-            static String AdvancedPasteMarkdownEvent();
-            static String AdvancedPasteJsonEvent();
+            static String AdvancedPasteShowUIMessage();
+            static String AdvancedPasteMarkdownMessage();
+            static String AdvancedPasteJsonMessage();
+            static String AdvancedPasteCustomActionMessage();
            static String ShowPowerOCRSharedEvent();
            static String MouseJumpShowPreviewEvent();
            static String AwakeExitEvent();
@@ -36,6 +37,8 @@ namespace PowerToys
            static String CropAndLockReparentEvent();
            static String ShowEnvironmentVariablesSharedEvent();
            static String ShowEnvironmentVariablesAdminSharedEvent();
+            static String WorkspacesLaunchEditorEvent();
+            static String WorkspacesHotkeyEvent();
        }
    }
 }
--- a/src/common/interop/interop-tests/InteropTests.cs
+++ b/src/common/interop/interop-tests/InteropTests.cs
@@ -4,6 +4,7 @@

 using System;
 using System.Threading;
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using PowerToys.Interop;

--- a/src/common/interop/interop.rc
+++ b/src/common/interop/interop.rc
--- a/src/common/interop/shared_constants.h
+++ b/src/common/interop/shared_constants.h
@@ -25,12 +25,14 @@ namespace CommonSharedConstants

    const wchar_t COLOR_PICKER_SEND_SETTINGS_TELEMETRY_EVENT[] = L"Local\\ColorPickerSettingsTelemetryEvent-6c7071d8-4014-46ec-b687-913bd8a422f1";

-    // Path to the event used to show Advanced Paste UI
-    const wchar_t SHOW_ADVANCED_PASTE_SHARED_EVENT[] = L"Local\\ShowAdvancedPasteEvent-9a46be2a-3e05-4186-b56b-4ae986ef2526";
+    // IPC Messages used in Advanced Paste
+    const wchar_t ADVANCED_PASTE_SHOW_UI_MESSAGE[] = L"ShowUI";

-    const wchar_t ADVANCED_PASTE_MARKDOWN_EVENT[] = L"Local\\AdvancedPasteJsonEvent-a18c0798-3ee6-4fc5-bb9f-114c57ac0d47";
+    const wchar_t ADVANCED_PASTE_MARKDOWN_MESSAGE[] = L"PasteMarkdown";

-    const wchar_t ADVANCED_PASTE_JSON_EVENT[] = L"Local\\AdvancedPasteJsonEvent-9ed021ab-b711-4cf3-9f33-135a698a9d21";
+    const wchar_t ADVANCED_PASTE_JSON_MESSAGE[] = L"PasteJson";
+
+    const wchar_t ADVANCED_PASTE_CUSTOM_ACTION_MESSAGE[] = L"CustomAction";

    // Path to the event used to show Color Picker
    const wchar_t SHOW_COLOR_PICKER_SHARED_EVENT[] = L"Local\\ShowColorPickerEvent-8c46be2a-3e05-4186-b56b-4ae986ef2525";
@@ -41,6 +43,10 @@ namespace CommonSharedConstants

    const wchar_t FANCY_ZONES_EDITOR_TOGGLE_EVENT[] = L"Local\\FancyZones-ToggleEditorEvent-1e174338-06a3-472b-874d-073b21c62f14";

+    // Path to the event used by Workspaces
+    const wchar_t WORKSPACES_LAUNCH_EDITOR_EVENT[] = L"Local\\Workspaces-LaunchEditorEvent-a55ff427-cf62-4994-a2cd-9f72139296bf";
+    const wchar_t WORKSPACES_HOTKEY_EVENT[] = L"Local\\PowerToys-Workspaces-HotkeyEvent-2625C3C8-BAC9-4DB3-BCD6-3B4391A26FD0";
+
    const wchar_t SHOW_HOSTS_EVENT[] = L"Local\\Hosts-ShowHostsEvent-5a0c0aae-5ff5-40f5-95c2-20e37ed671f0";

    const wchar_t SHOW_HOSTS_ADMIN_EVENT[] = L"Local\\Hosts-ShowHostsAdminEvent-60ff44e2-efd3-43bf-928a-f4d269f98bec";
--- a/src/common/logger/logger_settings.h
+++ b/src/common/logger/logger_settings.h
@@ -69,6 +69,10 @@ 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 workspacesLauncherLoggerName = "workspaces-launcher";
+    inline const static std::wstring workspacesLauncherLogPath = L"workspaces-launcher-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;
    std::wstring logLevel;
    LogSettings();
--- a/src/common/notifications/BackgroundActivatorDLL/BackgroundActivator.rc
+++ b/src/common/notifications/BackgroundActivatorDLL/BackgroundActivator.rc
@@ -1,36 +1,3 @@
 #include <windows.h>
 #include "resource.h"
-#include "../../version/version.h"

-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" // US English (0x0409), Unicode (0x04B0) charset
-        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 // US English (0x0409), Unicode (1200) charset
-    END
-END
--- a/src/common/utils/OnThreadExecutor.h
+++ b/src/common/utils/OnThreadExecutor.h
@@ -0,0 +1,72 @@
+#pragma once
+
+#include <future>
+#include <thread>
+#include <functional>
+#include <queue>
+#include <atomic>
+
+// OnThreadExecutor allows its caller to off-load some work to a persistently running background thread.
+// This might come in handy if you use the API which sets thread-wide global state and the state needs
+// to be isolated.
+
+class OnThreadExecutor final
+{
+public:
+    using task_t = std::packaged_task<void()>;
+
+    OnThreadExecutor() :
+        _shutdown_request{ false },
+        _worker_thread{ [this] { worker_thread(); } }
+    {
+    }
+
+    ~OnThreadExecutor()
+    {
+        _shutdown_request = true;
+        _task_cv.notify_one();
+        _worker_thread.join();
+    }
+
+    std::future<void> submit(task_t task)
+    {
+        auto future = task.get_future();
+        std::lock_guard lock{ _task_mutex };
+        _task_queue.emplace(std::move(task));
+        _task_cv.notify_one();
+        return future;
+    }
+
+    void cancel()
+    {
+        std::lock_guard lock{ _task_mutex };
+        _task_queue = {};
+        _task_cv.notify_one();
+    }
+
+private:
+    void worker_thread()
+    {
+        while (!_shutdown_request)
+        {
+            task_t task;
+            {
+                std::unique_lock task_lock{ _task_mutex };
+                _task_cv.wait(task_lock, [this] { return !_task_queue.empty() || _shutdown_request; });
+                if (_shutdown_request)
+                {
+                    return;
+                }
+                task = std::move(_task_queue.front());
+                _task_queue.pop();
+            }
+            task();
+        }
+    }
+
+    std::mutex _task_mutex;
+    std::condition_variable _task_cv;
+    std::atomic_bool _shutdown_request;
+    std::queue<std::packaged_task<void()>> _task_queue;
+    std::thread _worker_thread;
+};
--- 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_WORKSPACES = L"ConfigureEnabledUtilityWorkspaces";

    // The registry value names for PowerToys installer and update policies.
    const std::wstring POLICY_DISABLE_PER_USER_INSTALLATION = L"PerUserInstallationDisabled";
@@ -399,6 +400,11 @@ namespace powertoys_gpo {
        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_ADVANCED_PASTE);
    }

+    inline gpo_rule_configured_t getConfiguredWorkspacesEnabledValue()
+    {
+        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_WORKSPACES);
+    }
+
    inline gpo_rule_configured_t getConfiguredVideoConferenceMuteEnabledValue()
    {
        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_VIDEO_CONFERENCE_MUTE);
--- a/src/common/version/version.h
+++ b/src/common/version/version.h
@@ -1,21 +1,7 @@
 #pragma once

-#define STRINGIZE2(s) #s
-#define STRINGIZE(s) STRINGIZE2(s)
-
 #include "Generated Files\version_gen.h"

-#define FILE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, 0
-#define FILE_VERSION_STRING  \
-    STRINGIZE(VERSION_MAJOR) \
-    "." STRINGIZE(VERSION_MINOR) "." STRINGIZE(VERSION_REVISION) ".0"
-#define PRODUCT_VERSION FILE_VERSION
-#define PRODUCT_VERSION_STRING FILE_VERSION_STRING
-
-#define COMPANY_NAME "Microsoft Corporation"
-#define COPYRIGHT_NOTE "Copyright (C) Microsoft Corporation. All rights reserved."
-#define PRODUCT_NAME "PowerToys"
-
 #include <string>

 enum class version_architecture
--- a/src/common/version/version.vcxproj
+++ b/src/common/version/version.vcxproj
@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <PtEmbeddedMajor>$(VersionProductMajor)</PtEmbeddedMajor>
+    <PtEmbeddedMinor>$(VersionProductMinor)</PtEmbeddedMinor>
+    <PtEmbeddedRevision>$(VersionProductBuildRevision)</PtEmbeddedRevision>
+    <PtEmbeddedMajor Condition="'$(PtEmbeddedMajor)'==''">0</PtEmbeddedMajor>
+    <PtEmbeddedMinor Condition="'$(PtEmbeddedMinor)'==''">0</PtEmbeddedMinor>
+    <PtEmbeddedRevision Condition="'$(PtEmbeddedRevision)'==''">0</PtEmbeddedRevision>
+  </PropertyGroup>
  
  <Target Name="GenerateVersionData" BeforeTargets="PrepareForBuild">
    <ItemGroup>
      <HeaderLines Include="#pragma once" />
-      <HeaderLines Include="#define VERSION_MAJOR $(Version.Split('.')[0])" />
-      <HeaderLines Include="#define VERSION_MINOR $(Version.Split('.')[1])" />
-      <HeaderLines Include="#define VERSION_REVISION $(Version.Split('.')[2])" />
+      <HeaderLines Include="#define VERSION_MAJOR $(PtEmbeddedMajor)" />
+      <HeaderLines Include="#define VERSION_MINOR $(PtEmbeddedMinor)" />
+      <HeaderLines Include="#define VERSION_REVISION $(PtEmbeddedRevision)" />
    </ItemGroup>
    <WriteLinesToFile File="Generated Files\version_gen.h" Lines="@(HeaderLines)" Overwrite="true" Encoding="Unicode" WriteOnlyWhenDifferent="true" />
  </Target>
@@ -71,4 +80,4 @@
    <ClCompile Include="helper.cpp" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
--- a/src/dsc/Microsoft.PowerToys.Configure/examples/disableAllModules.dsc.yaml
+++ b/src/dsc/Microsoft.PowerToys.Configure/examples/disableAllModules.dsc.yaml
@@ -57,6 +57,8 @@ properties:
          EnableQoiThumbnail: false
        PowerOcr:
          Enabled: false
+        Workspaces:
+          Enabled: false
        ShortcutGuide:
          Enabled: false
        VideoConference:
--- a/src/dsc/Microsoft.PowerToys.Configure/examples/enableAllModules.dsc.yaml
+++ b/src/dsc/Microsoft.PowerToys.Configure/examples/enableAllModules.dsc.yaml
@@ -57,6 +57,8 @@ properties:
          EnableQoiThumbnail: true
        PowerOcr:
          Enabled: true
+        Workspaces:
+          Enabled: true
        ShortcutGuide:
          Enabled: true
        VideoConference:
--- a/src/dsc/Microsoft.PowerToys.Configure/examples/installAndConfiguration.dsc.yaml
+++ b/src/dsc/Microsoft.PowerToys.Configure/examples/installAndConfiguration.dsc.yaml
@@ -24,4 +24,17 @@ properties:
          FancyzonesEditorHotkey: "Shift+Ctrl+Alt+F"
        FileLocksmith:
          Enabled: false
+        ImageResizer:
+          ImageResizerSizes:
+            - Name: Square2x
+              Width: 200
+              Height: 200
+              Unit: "Percent"
+              Fit: "Stretch"
+            - Name: MyInchSize
+              Width: 1024
+              Height: 1024
+              Unit: "Inch"
+              Fit: "Fit"
+
  configurationVersion: 0.2.0
--- a/src/dsc/PowerToys.Settings.DSC.Schema.Generator/DSCGeneration.cs
+++ b/src/dsc/PowerToys.Settings.DSC.Schema.Generator/DSCGeneration.cs
@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+
 using static PowerToys.Settings.DSC.Schema.Introspection;

 namespace PowerToys.Settings.DSC.Schema;
@@ -21,7 +22,7 @@ internal sealed class DSCGeneration
        public string Type;
    }

-    private static readonly Dictionary<string, AdditionalPropertiesInfo> AdditionalPropertiesInfoPerModule = new Dictionary<string, AdditionalPropertiesInfo> { { "PowerLauncher", new AdditionalPropertiesInfo { Name = "Plugins", Type = "Hashtable[]" } } };
+    private static readonly Dictionary<string, AdditionalPropertiesInfo> AdditionalPropertiesInfoPerModule = new Dictionary<string, AdditionalPropertiesInfo> { { "PowerLauncher", new AdditionalPropertiesInfo { Name = "Plugins", Type = "Hashtable[]" } }, { "ImageResizer", new AdditionalPropertiesInfo { Name = "ImageresizerSizes", Type = "Hashtable[]" } } };

    private static string EmitEnumDefinition(Type type)
    {
--- a/src/dsc/PowerToys.Settings.DSC.Schema.Generator/DocumentationGeneration.cs
+++ b/src/dsc/PowerToys.Settings.DSC.Schema.Generator/DocumentationGeneration.cs
@@ -4,6 +4,7 @@

 using System;
 using System.Linq;
+
 using static PowerToys.Settings.DSC.Schema.Introspection;

 namespace PowerToys.Settings.DSC.Schema;
--- a/src/dsc/PowerToys.Settings.DSC.Schema.Generator/Introspection.cs
+++ b/src/dsc/PowerToys.Settings.DSC.Schema.Generator/Introspection.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text.Json.Serialization;
+
 using Settings.UI.Library.Attributes;

 namespace PowerToys.Settings.DSC.Schema;
--- a/src/dsc/PowerToys.Settings.DSC.Schema.Generator/SampleGeneration.cs
+++ b/src/dsc/PowerToys.Settings.DSC.Schema.Generator/SampleGeneration.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Globalization;
 using System.Linq;
+
 using static PowerToys.Settings.DSC.Schema.Introspection;

 namespace PowerToys.Settings.DSC.Schema;
--- 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.11" 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.12" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
  <policyNamespaces>
    <target prefix="powertoys" namespace="Microsoft.Policies.PowerToys" />
  </policyNamespaces>
-  <resources minRequiredRevision="1.11"/><!-- Last changed with PowerToys v0.83.0 -->
+  <resources minRequiredRevision="1.12"/><!-- Last changed with PowerToys v0.84.0 -->
  <supportedOn>
    <definitions>
      <definition name="SUPPORTED_POWERTOYS_0_64_0" displayName="$(string.SUPPORTED_POWERTOYS_0_64_0)"/>
@@ -20,6 +20,7 @@
      <definition name="SUPPORTED_POWERTOYS_0_81_0" displayName="$(string.SUPPORTED_POWERTOYS_0_81_0)"/>
      <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)"/>
    </definitions>
  </supportedOn>
  <categories>
@@ -364,6 +365,16 @@
        <decimal value="0" />
      </disabledValue>
    </policy>
+    <policy name="ConfigureEnabledUtilityWorkspaces" class="Both" displayName="$(string.ConfigureEnabledUtilityWorkspaces)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityWorkspaces">
+      <parentCategory ref="PowerToys" />
+      <supportedOn ref="SUPPORTED_POWERTOYS_0_84_0" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
    <policy name="ConfigureEnabledUtilityQuickAccent" class="Both" displayName="$(string.ConfigureEnabledUtilityQuickAccent)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityQuickAccent">
      <parentCategory ref="PowerToys" />
      <supportedOn ref="SUPPORTED_POWERTOYS_0_64_0" />
--- 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.11" 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.12" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
  <displayName>PowerToys</displayName>
  <description>PowerToys</description>
  <resources>
@@ -25,6 +25,7 @@
      <string id="SUPPORTED_POWERTOYS_0_81_0">PowerToys version 0.81.0 or later</string>
      <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="ConfigureAllUtilityGlobalEnabledStateDescription">This policy configures the enabled state for all PowerToys utilities.

@@ -219,6 +220,7 @@ If you disable or don't configure this policy, no predefined rules are applied.
      <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>
+      <string id="ConfigureEnabledUtilityWorkspaces">PowerToys Workspaces: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityQuickAccent">Quick Accent: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityRegistryPreview">Registry Preview: Configure enabled state</string>
      <string id="ConfigureEnabledUtilityScreenRuler">Screen Ruler: Configure enabled state</string>
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml.cs
@@ -3,6 +3,11 @@
 // See the LICENSE file in the project root for more information.

 using System;
+using System.Globalization;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Settings;
 using AdvancedPaste.ViewModels;
@@ -13,8 +18,11 @@ using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Windows.Graphics;
 using WinUIEx;
+
 using static AdvancedPaste.Helpers.NativeMethods;

+using DispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue;
+
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
 namespace AdvancedPaste
@@ -26,12 +34,13 @@ namespace AdvancedPaste
    {
        public IHost Host { get; private set; }

+        private readonly DispatcherQueue _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+        private readonly OptionsViewModel viewModel;
+
        private MainWindow window;

        private nint windowHwnd;

-        private OptionsViewModel viewModel;
-
        private bool disposedValue;

        /// <summary>
@@ -74,7 +83,7 @@ namespace AdvancedPaste
        /// Invoked when the application is launched.
        /// </summary>
        /// <param name="args">Details about the launch request and process.</param>
-        protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args)
+        protected override void OnLaunched(LaunchActivatedEventArgs args)
        {
            var cmdArgs = Environment.GetCommandLineArgs();
            if (cmdArgs?.Length > 1)
@@ -88,9 +97,44 @@ namespace AdvancedPaste
                }
            }

-            NativeEventWaiter.WaitForEventLoop(PowerToys.Interop.Constants.ShowAdvancedPasteSharedEvent(), OnAdvancedPasteHotkey);
-            NativeEventWaiter.WaitForEventLoop(PowerToys.Interop.Constants.AdvancedPasteMarkdownEvent(), OnAdvancedPasteMarkdownHotkey);
-            NativeEventWaiter.WaitForEventLoop(PowerToys.Interop.Constants.AdvancedPasteJsonEvent(), OnAdvancedPasteJsonHotkey);
+            if (cmdArgs?.Length > 2)
+            {
+                ProcessNamedPipe(cmdArgs[2]);
+            }
+        }
+
+        private void ProcessNamedPipe(string pipeName)
+        {
+            void OnMessage(string message) => _dispatcherQueue.TryEnqueue(() => OnNamedPipeMessage(message));
+
+            Task.Run(async () =>
+            {
+                var connectTimeout = TimeSpan.FromSeconds(10);
+                await NamedPipeProcessor.ProcessNamedPipeAsync(pipeName, connectTimeout, OnMessage, CancellationToken.None);
+            });
+        }
+
+        private void OnNamedPipeMessage(string message)
+        {
+            var messageParts = message.Split();
+            var messageType = messageParts.First();
+
+            if (messageType == PowerToys.Interop.Constants.AdvancedPasteShowUIMessage())
+            {
+                OnAdvancedPasteHotkey();
+            }
+            else if (messageType == PowerToys.Interop.Constants.AdvancedPasteMarkdownMessage())
+            {
+                OnAdvancedPasteMarkdownHotkey();
+            }
+            else if (messageType == PowerToys.Interop.Constants.AdvancedPasteJsonMessage())
+            {
+                OnAdvancedPasteJsonHotkey();
+            }
+            else if (messageType == PowerToys.Interop.Constants.AdvancedPasteCustomActionMessage())
+            {
+                OnAdvancedPasteCustomActionHotkey(messageParts);
+            }
        }

        private void App_UnhandledException(object sender, Microsoft.UI.Xaml.UnhandledExceptionEventArgs e)
@@ -100,17 +144,43 @@ namespace AdvancedPaste

        private void OnAdvancedPasteJsonHotkey()
        {
-            viewModel.GetClipboardData();
+            viewModel.ReadClipboard();
            viewModel.ToJsonFunction(true);
        }

        private void OnAdvancedPasteMarkdownHotkey()
        {
-            viewModel.GetClipboardData();
+            viewModel.ReadClipboard();
            viewModel.ToMarkdownFunction(true);
        }

        private void OnAdvancedPasteHotkey()
+        {
+            ShowWindow();
+        }
+
+        private void OnAdvancedPasteCustomActionHotkey(string[] messageParts)
+        {
+            if (messageParts.Length != 2)
+            {
+                Logger.LogWarning("Unexpected custom action message");
+            }
+            else
+            {
+                if (!int.TryParse(messageParts[1], CultureInfo.InvariantCulture, out int customActionId))
+                {
+                    Logger.LogWarning($"Unexpected custom action message id {messageParts[1]}");
+                }
+                else
+                {
+                    ShowWindow();
+                    viewModel.ReadClipboard();
+                    viewModel.ExecuteCustomActionWithPaste(customActionId);
+                }
+            }
+        }
+
+        private void ShowWindow()
        {
            viewModel.OnShow();

--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedBorderBrush.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedBorderBrush.cs
@@ -4,6 +4,7 @@

 using System;
 using System.Numerics;
+
 using Microsoft.UI.Composition;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedContentControl.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedContentControl.cs
@@ -9,7 +9,7 @@ namespace AdvancedPaste.Controls
 {
    [TemplatePart(Name = LoadingGrid, Type = typeof(Grid))]
    [TemplatePart(Name = LoadingBrush, Type = typeof(AnimatedBorderBrush))]
-    public class AnimatedContentControl : ContentControl
+    public partial class AnimatedContentControl : ContentControl
    {
        internal const string LoadingGrid = "PART_LoadingGrid";
        internal const string LoadingBrush = "PART_LoadingBrush";
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml
@@ -3,10 +3,11 @@
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:animations="using:CommunityToolkit.WinUI.Animations"
-    xmlns:converters="using:CommunityToolkit.WinUI.Converters"
+    xmlns:converters="using:AdvancedPaste.Converters"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:local="using:AdvancedPaste.Controls"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
    xmlns:ui="using:CommunityToolkit.WinUI"
    mc:Ignorable="d">
    <UserControl.Resources>
@@ -323,7 +324,12 @@
                    </Setter.Value>
                </Setter>
            </Style>
-            <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+            <tkconverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+            <tkconverters:BoolToVisibilityConverter
+                x:Key="BoolToInvertedVisibilityConverter"
+                FalseValue="Visible"
+                TrueValue="Collapsed" />
+            <converters:CountToVisibilityConverter x:Key="CountToVisibilityConverter" />
        </ResourceDictionary>
    </UserControl.Resources>
    <Grid x:Name="PromptBoxGrid" Loaded="Grid_Loaded">
@@ -340,13 +346,12 @@
                    x:Name="InputTxtBox"
                    HorizontalAlignment="Stretch"
                    x:FieldModifier="public"
-                    IsEnabled="{x:Bind ViewModel.IsCustomAIEnabled, Mode=OneWay}"
+                    IsEnabled="{x:Bind ViewModel.IsClipboardDataText, Mode=OneWay}"
                    KeyDown="InputTxtBox_KeyDown"
                    PlaceholderText="{x:Bind ViewModel.InputTxtBoxPlaceholderText, Mode=OneWay}"
                    Style="{StaticResource CustomTextBoxStyle}"
                    TabIndex="0"
-                    Text="{x:Bind Prompt, Mode=TwoWay}"
-                    TextChanging="InputTxtBox_TextChanging">
+                    Text="{x:Bind ViewModel.Query, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
                    <ToolTipService.ToolTip>
                        <TextBlock x:Uid="InputTxtBoxTooltip" />
                    </ToolTipService.ToolTip>
@@ -531,48 +536,63 @@
                            <animations:OffsetAnimation Duration="0:0:1" />
                        </animations:Implicit.Animations>
                    </Button>-->
-                <Button
-                    x:Name="SendBtn"
-                    x:Uid="SendButtonAutomation"
+                <Grid
                    Width="32"
                    Height="32"
                    Margin="0,0,4,0"
-                    Padding="0"
                    HorizontalAlignment="Right"
-                    VerticalAlignment="Stretch"
-                    ui:VisualExtensions.NormalizedCenterPoint="0.5,0.5"
-                    Command="{x:Bind GenerateCustomCommand}"
-                    Content="{ui:FontIcon Glyph=&#xE724;,
-                                          FontSize=16}"
-                    Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
-                    Style="{StaticResource SubtleButtonStyle}"
-                    TabIndex="1"
-                    Visibility="Collapsed">
-                    <ToolTipService.ToolTip>
-                        <TextBlock x:Uid="SendBtnToolTip" TextWrapping="WrapWholeWords" />
-                    </ToolTipService.ToolTip>
-                    <animations:Implicit.ShowAnimations>
-                        <animations:ScaleAnimation
-                            From="0.4"
-                            To="1"
-                            Duration="0:0:0.167" />
-                        <animations:OpacityAnimation
-                            From="0.0"
-                            To="1.0"
-                            Duration="0:0:0.167" />
-                    </animations:Implicit.ShowAnimations>
-                    <animations:Implicit.HideAnimations>
-                        <animations:ScaleAnimation
-                            From="1"
-                            To="0.4"
-                            Duration="0:0:0.167" />
-                        <animations:OpacityAnimation
-                            From="1.0"
-                            To="0.0"
-                            Duration="0:0:0.167" />
-                    </animations:Implicit.HideAnimations>
-                </Button>
-                <!--</StackPanel>-->
+                    VerticalAlignment="Stretch">
+                    <Button
+                        x:Name="SendBtn"
+                        x:Uid="SendButtonAutomation"
+                        Padding="0"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        ui:VisualExtensions.NormalizedCenterPoint="0.5,0.5"
+                        Command="{x:Bind GenerateCustomCommand}"
+                        Content="{ui:FontIcon Glyph=&#xE724;,
+                                              FontSize=16}"
+                        Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
+                        IsEnabled="{x:Bind ViewModel.IsCustomAIEnabled, Mode=OneWay}"
+                        Style="{StaticResource SubtleButtonStyle}"
+                        TabIndex="1"
+                        Visibility="{x:Bind ViewModel.Query.Length, Mode=OneWay, Converter={StaticResource CountToVisibilityConverter}}">
+                        <ToolTipService.ToolTip>
+                            <TextBlock x:Uid="SendBtnToolTip" TextWrapping="WrapWholeWords" />
+                        </ToolTipService.ToolTip>
+                        <animations:Implicit.ShowAnimations>
+                            <animations:ScaleAnimation
+                                From="0.4"
+                                To="1"
+                                Duration="0:0:0.167" />
+                            <animations:OpacityAnimation
+                                From="0.0"
+                                To="1.0"
+                                Duration="0:0:0.167" />
+                        </animations:Implicit.ShowAnimations>
+                        <animations:Implicit.HideAnimations>
+                            <animations:ScaleAnimation
+                                From="1"
+                                To="0.4"
+                                Duration="0:0:0.167" />
+                            <animations:OpacityAnimation
+                                From="1.0"
+                                To="0.0"
+                                Duration="0:0:0.167" />
+                        </animations:Implicit.HideAnimations>
+                    </Button>
+                    <!--  Transparent overlay to show tooltip  -->
+                    <Grid
+                        x:Name="SendBtnOverlay"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        Background="Transparent"
+                        Visibility="{x:Bind ViewModel.IsCustomAIEnabled, Mode=OneWay, Converter={StaticResource BoolToInvertedVisibilityConverter}}">
+                        <ToolTipService.ToolTip>
+                            <ToolTip Content="{x:Bind ViewModel.GeneralErrorText}" />
+                        </ToolTipService.ToolTip>
+                    </Grid>
+                </Grid>
            </Grid>
        </local:AnimatedContentControl>
        <ContentPresenter
@@ -618,7 +638,7 @@
                FontWeight="SemiBold"
                Foreground="{ThemeResource SystemFillColorCriticalBrush}"
                Style="{StaticResource CaptionTextBlockStyle}"
-                Text="{x:Bind ViewModel.InputTxtBoxErrorText, Mode=OneWay}" />
+                Text="{x:Bind ViewModel.ApiErrorText, Mode=OneWay}" />
            <HyperlinkButton
                x:Uid="SettingsBtn"
                Grid.Column="1"
@@ -635,7 +655,6 @@
                <animations:OpacityAnimation To="0.0" Duration="0:0:0.167" />
            </animations:Implicit.HideAnimations>
        </Grid>
-
        <VisualStateManager.VisualStateGroups>
            <VisualStateGroup x:Name="CommonStates">
                <VisualState x:Name="DefaultState" />
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml.cs
@@ -2,8 +2,10 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

+using System;
 using System.Net;
 using System.Threading.Tasks;
+
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Settings;
 using AdvancedPaste.ViewModels;
@@ -18,23 +20,14 @@ namespace AdvancedPaste.Controls
 {
    public sealed partial class PromptBox : Microsoft.UI.Xaml.Controls.UserControl
    {
+        // Minimum time to show spinner when generating custom format using forcePasteCustom
+        private static readonly TimeSpan MinTaskTime = TimeSpan.FromSeconds(2);
+
        private readonly DispatcherQueue _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
        private readonly IUserSettings _userSettings;

-        public static readonly DependencyProperty PromptProperty = DependencyProperty.Register(
-            nameof(Prompt),
-            typeof(string),
-            typeof(PromptBox),
-            new PropertyMetadata(defaultValue: string.Empty));
-
        public OptionsViewModel ViewModel { get; private set; }

-        public string Prompt
-        {
-            get => (string)GetValue(PromptProperty);
-            set => SetValue(PromptProperty, value);
-        }
-
        public static readonly DependencyProperty PlaceholderTextProperty = DependencyProperty.Register(
            nameof(PlaceholderText),
            typeof(string),
@@ -66,6 +59,7 @@ namespace AdvancedPaste.Controls
            _userSettings = App.GetService<IUserSettings>();

            ViewModel = App.GetService<OptionsViewModel>();
+            ViewModel.CustomActionActivated += (_, e) => GenerateCustom(e.ForcePasteCustom);
        }

        private void Grid_Loaded(object sender, RoutedEventArgs e)
@@ -74,27 +68,30 @@ namespace AdvancedPaste.Controls
        }

        [RelayCommand]
-        private void GenerateCustom()
+        private void GenerateCustom() => GenerateCustom(false);
+
+        private void GenerateCustom(bool forcePasteCustom)
        {
            Logger.LogTrace();

            VisualStateManager.GoToState(this, "LoadingState", true);
-            string inputInstructions = InputTxtBox.Text;
+            string inputInstructions = ViewModel.Query;
            ViewModel.SaveQuery(inputInstructions);

            var customFormatTask = ViewModel.GenerateCustomFunction(inputInstructions);
-
-            customFormatTask.ContinueWith(
-                t =>
+            var delayTask = forcePasteCustom ? Task.Delay(MinTaskTime) : Task.CompletedTask;
+            Task.WhenAll(customFormatTask, delayTask)
+                .ContinueWith(
+                _ =>
                {
                    _dispatcherQueue.TryEnqueue(() =>
                    {
-                        ViewModel.CustomFormatResult = t.Result;
+                        ViewModel.CustomFormatResult = customFormatTask.Result;

                        if (ViewModel.ApiRequestStatus == (int)HttpStatusCode.OK)
                        {
                            VisualStateManager.GoToState(this, "DefaultState", true);
-                            if (_userSettings.ShowCustomPreview)
+                            if (_userSettings.ShowCustomPreview && !forcePasteCustom)
                            {
                                PreviewGrid.Width = InputTxtBox.ActualWidth;
                                PreviewFlyout.ShowAt(InputTxtBox);
@@ -130,14 +127,9 @@ namespace AdvancedPaste.Controls
            ClipboardHelper.SetClipboardTextContent(lastQuery.ClipboardData);
        }

-        private void InputTxtBox_TextChanging(Microsoft.UI.Xaml.Controls.TextBox sender, TextBoxTextChangingEventArgs args)
-        {
-            SendBtn.Visibility = InputTxtBox.Text.Length > 0 ? Visibility.Visible : Visibility.Collapsed;
-        }
-
        private void InputTxtBox_KeyDown(object sender, Microsoft.UI.Xaml.Input.KeyRoutedEventArgs e)
        {
-            if (e.Key == Windows.System.VirtualKey.Enter && InputTxtBox.Text.Length > 0)
+            if (e.Key == Windows.System.VirtualKey.Enter && InputTxtBox.Text.Length > 0 && ViewModel.IsCustomAIEnabled)
            {
                GenerateCustom();
            }
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToDoubleConverter.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToDoubleConverter.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections;
+
+using Microsoft.UI.Xaml.Data;
+
+namespace AdvancedPaste.Converters;
+
+public sealed partial class CountToDoubleConverter : IValueConverter
+{
+    public double ValueIfZero { get; set; }
+
+    public double ValueIfNonZero { get; set; }
+
+    public object Convert(object value, Type targetType, object parameter, string language)
+    {
+        bool hasCount = ((value is int intValue) && intValue > 0) || (value is IEnumerable collection && collection.GetEnumerator().MoveNext());
+
+        return hasCount ? ValueIfNonZero : ValueIfZero;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, string language) => throw new NotImplementedException();
+}
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToVisibilityConverter.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToVisibilityConverter.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections;
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Data;
+
+namespace AdvancedPaste.Converters;
+
+public sealed partial class CountToVisibilityConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, string language)
+    {
+        bool hasCount = ((value is int intValue) && intValue > 0) || (value is IEnumerable collection && collection.GetEnumerator().MoveNext());
+
+        if (targetType == typeof(Visibility))
+        {
+            return hasCount ? Visibility.Visible : Visibility.Collapsed;
+        }
+        else if (targetType == typeof(bool))
+        {
+            return hasCount;
+        }
+        else
+        {
+            throw new ArgumentOutOfRangeException(nameof(targetType));
+        }
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, string language) => throw new NotImplementedException();
+}
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/ListViewIndexConverter.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/ListViewIndexConverter.cs
@@ -1,32 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Media;
-
-namespace AdvancedPaste.Converters
-{
-    public sealed class ListViewIndexConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            var presenter = value as ListViewItemPresenter;
-            var item = VisualTreeHelper.GetParent(presenter) as ListViewItem;
-
-            var listView = ItemsControl.ItemsControlFromItemContainer(item);
-            int index = listView.IndexFromContainer(item) + 1;
-#pragma warning disable CA1305 // Specify IFormatProvider
-            return index.ToString();
-#pragma warning restore CA1305 // Specify IFormatProvider
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/MainWindow.xaml.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/MainWindow.xaml.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.

 using System;
+
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Settings;
 using ManagedCommon;
@@ -26,6 +27,18 @@ namespace AdvancedPaste

            _userSettings = App.GetService<IUserSettings>();

+            var baseHeight = MinHeight;
+
+            void UpdateHeight()
+            {
+                var trimmedCustomActionCount = Math.Min(_userSettings.CustomActions.Count, 5);
+                Height = MinHeight = baseHeight + (trimmedCustomActionCount * 40);
+            }
+
+            UpdateHeight();
+
+            _userSettings.CustomActions.CollectionChanged += (_, _) => UpdateHeight();
+
            AppWindow.SetIcon("Assets/AdvancedPaste/AdvancedPaste.ico");
            this.ExtendsContentIntoTitleBar = true;
            this.SetTitleBar(titleBar);
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml
@@ -5,14 +5,21 @@
    xmlns:controls="using:AdvancedPaste.Controls"
    xmlns:converters="using:AdvancedPaste.Converters"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:library="using:Microsoft.PowerToys.Settings.UI.Library"
    xmlns:local="using:AdvancedPaste.Models"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
    xmlns:ui="using:CommunityToolkit.WinUI"
    KeyDown="Page_KeyDown"
    KeyboardAcceleratorPlacementMode="Hidden"
    mc:Ignorable="d">
    <Page.Resources>
-        <converters:ListViewIndexConverter x:Name="listViewIndexConverter" />
+        <tkconverters:BoolToVisibilityConverter x:Name="BoolToVisibilityConverter" />
+        <converters:CountToVisibilityConverter x:Name="countToVisibilityConverter" />
+        <converters:CountToDoubleConverter
+            x:Name="customActionsCountToMinHeightConverter"
+            ValueIfNonZero="40"
+            ValueIfZero="0" />
        <Style
            x:Key="PaddingLessFlyoutPresenterStyle"
            BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
@@ -21,6 +28,38 @@
                <Setter Property="Padding" Value="0" />
            </Style.Setters>
        </Style>
+        <DataTemplate x:Key="PasteFormatTemplate" x:DataType="local:PasteFormat">
+            <Grid>
+                <ToolTipService.ToolTip>
+                    <TextBlock Text="{x:Bind ToolTip}" />
+                </ToolTipService.ToolTip>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="26" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <FontIcon
+                    Margin="0,0,0,0"
+                    VerticalAlignment="Center"
+                    AutomationProperties.AccessibilityView="Raw"
+                    FontSize="16"
+                    Glyph="{x:Bind IconGlyph}" />
+                <TextBlock
+                    Grid.Column="1"
+                    VerticalAlignment="Center"
+                    x:Phase="1"
+                    Text="{x:Bind Name}" />
+                <TextBlock
+                    Grid.Column="2"
+                    Margin="0,0,8,0"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Center"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Style="{StaticResource CaptionTextBlockStyle}"
+                    Text="{x:Bind ShortcutText, Mode=OneWay}"
+                    Visibility="{x:Bind ShortcutText.Length, Mode=OneWay, Converter={StaticResource countToVisibilityConverter}}" />
+            </Grid>
+        </DataTemplate>
    </Page.Resources>
    <Page.KeyboardAccelerators>
        <KeyboardAccelerator Key="Escape" Invoked="KeyboardAccelerator_Invoked" />
@@ -36,6 +75,30 @@
            Key="Number3"
            Invoked="KeyboardAccelerator_Invoked"
            Modifiers="Control" />
+        <KeyboardAccelerator
+            Key="Number4"
+            Invoked="KeyboardAccelerator_Invoked"
+            Modifiers="Control" />
+        <KeyboardAccelerator
+            Key="Number5"
+            Invoked="KeyboardAccelerator_Invoked"
+            Modifiers="Control" />
+        <KeyboardAccelerator
+            Key="Number6"
+            Invoked="KeyboardAccelerator_Invoked"
+            Modifiers="Control" />
+        <KeyboardAccelerator
+            Key="Number7"
+            Invoked="KeyboardAccelerator_Invoked"
+            Modifiers="Control" />
+        <KeyboardAccelerator
+            Key="Number8"
+            Invoked="KeyboardAccelerator_Invoked"
+            Modifiers="Control" />
+        <KeyboardAccelerator
+            Key="Number9"
+            Invoked="KeyboardAccelerator_Invoked"
+            Modifiers="Control" />
    </Page.KeyboardAccelerators>
    <Grid>
        <Grid.RowDefinitions>
@@ -103,73 +166,55 @@
            BorderThickness="0,1,0,0"
            RowSpacing="4">
            <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" MinHeight="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource customActionsCountToMinHeightConverter}}" />
                <RowDefinition Height="Auto" />
                <RowDefinition Height="Auto" />
            </Grid.RowDefinitions>
-
            <ListView
                x:Name="PasteOptionsListView"
+                Grid.Row="0"
                VerticalAlignment="Bottom"
+                IsEnabled="{x:Bind ViewModel.IsClipboardDataText, Mode=OneWay}"
                IsItemClickEnabled="True"
-                ItemClick="PasteOptionsListView_ItemClick"
+                ItemClick="ListView_Click"
                ItemContainerTransitions="{x:Null}"
-                ItemsSource="{x:Bind pasteFormats, Mode=OneWay}"
+                ItemTemplate="{StaticResource PasteFormatTemplate}"
+                ItemsSource="{x:Bind ViewModel.StandardPasteFormats, Mode=OneWay}"
                SelectionMode="None"
-                TabIndex="1">
-                <ListView.ItemTemplate>
-                    <DataTemplate x:DataType="local:PasteFormat">
-                        <Grid>
-                            <ToolTipService.ToolTip>
-                                <TextBlock>
-                                    <Run Text="{x:Bind Name}" />
-                                    <Run Text="(" /><Run Text="Ctrl" /><Run Text="+" /><Run Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource listViewIndexConverter}}" /><Run Text=")" />
-                                </TextBlock>
-                            </ToolTipService.ToolTip>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="26" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Viewbox
-                                x:Name="IconHolderBox"
-                                MaxWidth="16"
-                                MaxHeight="16"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center">
-                                <ContentPresenter
-                                    x:Name="IconHolder"
-                                    x:Phase="2"
-                                    Content="{x:Bind Icon}" />
-                            </Viewbox>
-                            <TextBlock
-                                Grid.Column="1"
-                                VerticalAlignment="Center"
-                                x:Phase="1"
-                                Text="{x:Bind Name}" />
-
-                            <TextBlock
-                                Grid.Column="2"
-                                Margin="0,0,8,0"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Center"
-                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                Style="{StaticResource CaptionTextBlockStyle}">
-                                <Run Text="Ctrl" /><Run Text="+" /><Run Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource listViewIndexConverter}}" />
-                            </TextBlock>
-                        </Grid>
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-            </ListView>
+                TabIndex="1" />

            <Rectangle
                Grid.Row="1"
                Height="1"
                HorizontalAlignment="Stretch"
+                Fill="{ThemeResource DividerStrokeColorDefaultBrush}"
+                Visibility="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource countToVisibilityConverter}}" />
+
+            <ListView
+                x:Name="CustomActionsListView"
+                Grid.Row="2"
+                VerticalAlignment="Top"
+                IsEnabled="{x:Bind ViewModel.IsCustomAIEnabled, Mode=OneWay}"
+                IsItemClickEnabled="True"
+                ItemClick="ListView_Click"
+                ItemContainerTransitions="{x:Null}"
+                ItemTemplate="{StaticResource PasteFormatTemplate}"
+                ItemsSource="{x:Bind ViewModel.CustomActionPasteFormats, Mode=OneWay}"
+                ScrollViewer.VerticalScrollBarVisibility="Visible"
+                ScrollViewer.VerticalScrollMode="Auto"
+                SelectionMode="None"
+                TabIndex="2" />
+
+            <Rectangle
+                Grid.Row="3"
+                Height="1"
+                HorizontalAlignment="Stretch"
                Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
            <!--  x:Uid="ClipboardHistoryButton"  -->
            <Button
-                Grid.Row="2"
+                Grid.Row="4"
                Height="32"
                Margin="4,0,4,4"
                Padding="{StaticResource ButtonPadding}"
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml.cs
@@ -6,8 +6,8 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
+
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Models;
 using AdvancedPaste.ViewModels;
@@ -25,8 +25,8 @@ namespace AdvancedPaste.Pages
    public sealed partial class MainPage : Page
    {
        private readonly ObservableCollection<ClipboardItem> clipboardHistory;
-        private readonly ObservableCollection<PasteFormat> pasteFormats;
        private readonly Microsoft.UI.Dispatching.DispatcherQueue _dispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread();
+        private (VirtualKey Key, DateTime Timestamp) _lastKeyEvent = (VirtualKey.None, DateTime.MinValue);

        public OptionsViewModel ViewModel { get; private set; }

@@ -34,13 +34,6 @@ namespace AdvancedPaste.Pages
        {
            this.InitializeComponent();

-            pasteFormats =
-            [
-                new PasteFormat { Icon = new FontIcon() { Glyph = "\uE8E9" }, Name = ResourceLoaderInstance.ResourceLoader.GetString("PasteAsPlainText"), Format = PasteFormats.PlainText },
-                new PasteFormat { Icon = new FontIcon() { Glyph = "\ue8a5" }, Name = ResourceLoaderInstance.ResourceLoader.GetString("PasteAsMarkdown"), Format = PasteFormats.Markdown },
-                new PasteFormat { Icon = new FontIcon() { Glyph = "\uE943" }, Name = ResourceLoaderInstance.ResourceLoader.GetString("PasteAsJson"), Format = PasteFormats.Json },
-            ];
-
            ViewModel = App.GetService<OptionsViewModel>();

            clipboardHistory = new ObservableCollection<ClipboardItem>();
@@ -121,6 +114,8 @@ namespace AdvancedPaste.Pages
            }
        }

+        private static MainWindow GetMainWindow() => (App.Current as App)?.GetMainWindow();
+
        private void ClipboardHistoryItemDeleteButton_Click(object sender, RoutedEventArgs e)
        {
            Logger.LogTrace();
@@ -135,83 +130,49 @@ namespace AdvancedPaste.Pages
            }
        }

-        private void PasteAsPlain()
-        {
-            ViewModel.ToPlainTextFunction();
-        }
-
-        private void PasteAsMarkdown()
-        {
-            ViewModel.ToMarkdownFunction();
-        }
-
-        private void PasteAsJson()
-        {
-            ViewModel.ToJsonFunction();
-        }
-
-        private void PasteOptionsListView_ItemClick(object sender, ItemClickEventArgs e)
+        private void ListView_Click(object sender, ItemClickEventArgs e)
        {
            if (e.ClickedItem is PasteFormat format)
            {
-                switch (format.Format)
-                {
-                    case PasteFormats.PlainText:
-                        {
-                            PasteAsPlain();
-                            PowerToysTelemetry.Log.WriteEvent(new Telemetry.AdvancedPasteFormatClickedEvent(PasteFormats.PlainText));
-                            break;
-                        }
-
-                    case PasteFormats.Markdown:
-                        {
-                            PasteAsMarkdown();
-                            PowerToysTelemetry.Log.WriteEvent(new Telemetry.AdvancedPasteFormatClickedEvent(PasteFormats.Markdown));
-                            break;
-                        }
-
-                    case PasteFormats.Json:
-                        {
-                            PasteAsJson();
-                            PowerToysTelemetry.Log.WriteEvent(new Telemetry.AdvancedPasteFormatClickedEvent(PasteFormats.Json));
-                            break;
-                        }
-                }
+                ViewModel.ExecutePasteFormat(format);
            }
        }

        private void KeyboardAccelerator_Invoked(Microsoft.UI.Xaml.Input.KeyboardAccelerator sender, Microsoft.UI.Xaml.Input.KeyboardAcceleratorInvokedEventArgs args)
        {
+            if (GetMainWindow()?.Visible is false)
+            {
+                return;
+            }
+
            Logger.LogTrace();

+            var thisKeyEvent = (sender.Key, Timestamp: DateTime.Now);
+            if (thisKeyEvent.Key == _lastKeyEvent.Key && (thisKeyEvent.Timestamp - _lastKeyEvent.Timestamp) < TimeSpan.FromMilliseconds(200))
+            {
+                // Sometimes, multiple keyboard accelerator events are raised for a single Ctrl + VirtualKey press.
+                return;
+            }
+
+            _lastKeyEvent = thisKeyEvent;
+
            switch (sender.Key)
            {
                case VirtualKey.Escape:
-                    {
-                        (App.Current as App).GetMainWindow().Close();
-                        break;
-                    }
+                    GetMainWindow()?.Close();
+                    break;

                case VirtualKey.Number1:
-                    {
-                        PasteAsPlain();
-                        PowerToysTelemetry.Log.WriteEvent(new Telemetry.AdvancedPasteInAppKeyboardShortcutEvent(PasteFormats.PlainText));
-                        break;
-                    }
-
                case VirtualKey.Number2:
-                    {
-                        PasteAsMarkdown();
-                        PowerToysTelemetry.Log.WriteEvent(new Telemetry.AdvancedPasteInAppKeyboardShortcutEvent(PasteFormats.Markdown));
-                        break;
-                    }
-
                case VirtualKey.Number3:
-                    {
-                        PasteAsJson();
-                        PowerToysTelemetry.Log.WriteEvent(new Telemetry.AdvancedPasteInAppKeyboardShortcutEvent(PasteFormats.Json));
-                        break;
-                    }
+                case VirtualKey.Number4:
+                case VirtualKey.Number5:
+                case VirtualKey.Number6:
+                case VirtualKey.Number7:
+                case VirtualKey.Number8:
+                case VirtualKey.Number9:
+                    ViewModel.ExecutePasteFormat(sender.Key);
+                    break;

                default:
                    break;
@@ -222,7 +183,7 @@ namespace AdvancedPaste.Pages
        {
            if (e.Key == VirtualKey.Escape)
            {
-                (App.Current as App).GetMainWindow().Close();
+                GetMainWindow()?.Close();
            }
        }

--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/AICompletionsHelper.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/AICompletionsHelper.cs
@@ -6,6 +6,7 @@ using System;
 using System.Globalization;
 using System.IO;
 using System.Net;
+
 using Azure;
 using Azure.AI.OpenAI;
 using ManagedCommon;
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/ClipboardHelper.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/ClipboardHelper.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+
 using ManagedCommon;
 using Microsoft.UI.Xaml.Media.Imaging;
 using Windows.ApplicationModel.DataTransfer;
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/IUserSettings.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/IUserSettings.cs
@@ -2,6 +2,10 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

+using System.Collections.ObjectModel;
+
+using Microsoft.PowerToys.Settings.UI.Library;
+
 namespace AdvancedPaste.Settings
 {
    public interface IUserSettings
@@ -11,5 +15,7 @@ namespace AdvancedPaste.Settings
        public bool SendPasteKeyCombination { get; }

        public bool CloseAfterLosingFocus { get; }
+
+        public ObservableCollection<AdvancedPasteCustomAction> CustomActions { get; }
    }
 }
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/JsonHelper.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/JsonHelper.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Xml;
+
 using ManagedCommon;
 using Newtonsoft.Json;
 using Windows.ApplicationModel.DataTransfer;
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/MarkdownHelper.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/MarkdownHelper.cs
@@ -6,6 +6,7 @@ using System;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+
 using HtmlAgilityPack;
 using ManagedCommon;
 using Windows.ApplicationModel.DataTransfer;
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/NamedPipeProcessor.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/NamedPipeProcessor.cs
@@ -0,0 +1,37 @@
+// 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.Pipes;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AdvancedPaste.Helpers;
+
+public static class NamedPipeProcessor
+{
+    public static async Task ProcessNamedPipeAsync(string pipeName, TimeSpan connectTimeout, Action<string> messageHandler, CancellationToken cancellationToken)
+    {
+        using NamedPipeClientStream pipeClient = new(".", pipeName, PipeDirection.In);
+
+        await pipeClient.ConnectAsync(connectTimeout, cancellationToken);
+
+        using StreamReader streamReader = new(pipeClient, Encoding.Unicode);
+
+        while (true)
+        {
+            var message = await streamReader.ReadLineAsync(cancellationToken);
+
+            if (message != null)
+            {
+                messageHandler(message);
+            }
+
+            var intraMessageDelay = TimeSpan.FromMilliseconds(10);
+            await Task.Delay(intraMessageDelay, cancellationToken);
+        }
+    }
+}
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/NativeEventWaiter.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/NativeEventWaiter.cs
@@ -1,29 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Threading;
-using Microsoft.UI.Dispatching;
-
-namespace AdvancedPaste.Helpers
-{
-    public static class NativeEventWaiter
-    {
-        public static void WaitForEventLoop(string eventName, Action callback)
-        {
-            var dispatcherQueue = DispatcherQueue.GetForCurrentThread();
-            new Thread(() =>
-            {
-                var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, eventName);
-                while (true)
-                {
-                    if (eventHandle.WaitOne())
-                    {
-                        dispatcherQueue.TryEnqueue(() => callback());
-                    }
-                }
-            }).Start();
-        }
-    }
-}
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs
@@ -3,29 +3,38 @@
 // See the LICENSE file in the project root for more information.

 using System;
+using System.Collections.ObjectModel;
 using System.IO.Abstractions;
 using System.Threading;
+using System.Threading.Tasks;
+
 using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Utilities;

 namespace AdvancedPaste.Settings
 {
-    internal sealed class UserSettings : IUserSettings
+    internal sealed class UserSettings : IUserSettings, IDisposable
    {
        private readonly SettingsUtils _settingsUtils;
+        private readonly TaskScheduler _taskScheduler;
        private readonly IFileSystemWatcher _watcher;
-        private readonly object _loadingSettingsLock = new object();
+        private readonly object _loadingSettingsLock = new();

        private const string AdvancedPasteModuleName = "AdvancedPaste";
        private const int MaxNumberOfRetry = 5;

+        private bool _disposedValue;
+        private CancellationTokenSource _cancellationTokenSource;
+
        public bool ShowCustomPreview { get; private set; }

        public bool SendPasteKeyCombination { get; private set; }

        public bool CloseAfterLosingFocus { get; private set; }

+        public ObservableCollection<AdvancedPasteCustomAction> CustomActions { get; private set; }
+
        public UserSettings()
        {
            _settingsUtils = new SettingsUtils();
@@ -33,10 +42,25 @@ namespace AdvancedPaste.Settings
            ShowCustomPreview = true;
            SendPasteKeyCombination = true;
            CloseAfterLosingFocus = false;
+            CustomActions = [];
+
+            _taskScheduler = TaskScheduler.FromCurrentSynchronizationContext();

            LoadSettingsFromJson();

-            _watcher = Helper.GetFileWatcher(AdvancedPasteModuleName, "settings.json", () => LoadSettingsFromJson());
+            _watcher = Helper.GetFileWatcher(AdvancedPasteModuleName, "settings.json", OnSettingsFileChanged);
+        }
+
+        private void OnSettingsFileChanged()
+        {
+            lock (_loadingSettingsLock)
+            {
+                _cancellationTokenSource?.Cancel();
+                _cancellationTokenSource = new CancellationTokenSource();
+
+                Task.Delay(TimeSpan.FromMilliseconds(500))
+                    .ContinueWith(_ => LoadSettingsFromJson(), _cancellationTokenSource.Token, TaskContinuationOptions.NotOnCanceled, TaskScheduler.Default);
+            }
        }

        private void LoadSettingsFromJson()
@@ -62,9 +86,25 @@ namespace AdvancedPaste.Settings
                        var settings = _settingsUtils.GetSettingsOrDefault<AdvancedPasteSettings>(AdvancedPasteModuleName);
                        if (settings != null)
                        {
-                            ShowCustomPreview = settings.Properties.ShowCustomPreview;
-                            SendPasteKeyCombination = settings.Properties.SendPasteKeyCombination;
-                            CloseAfterLosingFocus = settings.Properties.CloseAfterLosingFocus;
+                            void UpdateSettings()
+                            {
+                                ShowCustomPreview = settings.Properties.ShowCustomPreview;
+                                SendPasteKeyCombination = settings.Properties.SendPasteKeyCombination;
+                                CloseAfterLosingFocus = settings.Properties.CloseAfterLosingFocus;
+
+                                CustomActions.Clear();
+                                foreach (var customAction in settings.Properties.CustomActions.Value)
+                                {
+                                    if (customAction.IsShown && customAction.IsValid)
+                                    {
+                                        CustomActions.Add(customAction);
+                                    }
+                                }
+                            }
+
+                            Task.Factory
+                                .StartNew(UpdateSettings, CancellationToken.None, TaskCreationOptions.None, _taskScheduler)
+                                .Wait();
                        }

                        retry = false;
@@ -82,5 +122,30 @@ namespace AdvancedPaste.Settings
                }
            }
        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private void Dispose(bool disposing)
+        {
+            if (!_disposedValue)
+            {
+                if (disposing)
+                {
+                    _cancellationTokenSource.Dispose();
+                    _watcher.Dispose();
+                }
+
+                _disposedValue = true;
+            }
+        }
+
+        ~UserSettings()
+        {
+            Dispose(false);
+        }
    }
 }
--- a/src/modules/AdvancedPaste/AdvancedPaste/Models/CustomActionActivatedEventArgs.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Models/CustomActionActivatedEventArgs.cs
@@ -0,0 +1,14 @@
+// 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;
+
+namespace AdvancedPaste.Models;
+
+public sealed class CustomActionActivatedEventArgs(string text, bool forcePasteCustom) : EventArgs
+{
+    public string Text { get; private set; } = text;
+
+    public bool ForcePasteCustom { get; private set; } = forcePasteCustom;
+}
--- a/src/modules/AdvancedPaste/AdvancedPaste/Models/CustomQuery.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Models/CustomQuery.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.

 using System.Text.Json;
+
 using AdvancedPaste.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library.Interfaces;

--- a/src/modules/AdvancedPaste/AdvancedPaste/Models/PasteFormat.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Models/PasteFormat.cs
@@ -2,16 +2,38 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using Microsoft.UI.Xaml.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.PowerToys.Settings.UI.Library;

-namespace AdvancedPaste.Models
+namespace AdvancedPaste.Models;
+
+public partial class PasteFormat : ObservableObject
 {
-    public class PasteFormat
+    [ObservableProperty]
+    private string _shortcutText = string.Empty;
+
+    [ObservableProperty]
+    private string _toolTip = string.Empty;
+
+    public PasteFormat()
    {
-        public IconElement Icon { get; set; }
-
-        public string Name { get; set; }
-
-        public PasteFormats Format { get; set; }
    }
+
+    public PasteFormat(AdvancedPasteCustomAction customAction, string shortcutText)
+    {
+        IconGlyph = "\uE945";
+        Name = customAction.Name;
+        Prompt = customAction.Prompt;
+        Format = PasteFormats.Custom;
+        ShortcutText = shortcutText;
+        ToolTip = customAction.Prompt;
+    }
+
+    public string IconGlyph { get; init; }
+
+    public string Name { get; init; }
+
+    public PasteFormats Format { get; init; }
+
+    public string Prompt { get; init; } = string.Empty;
 }
--- a/src/modules/AdvancedPaste/AdvancedPaste/Program.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Program.cs
@@ -4,6 +4,7 @@

 using System;
 using System.Threading;
+
 using ManagedCommon;
 using Microsoft.UI.Dispatching;
 using Microsoft.Windows.AppLifecycle;
--- a/src/modules/AdvancedPaste/AdvancedPaste/Strings/en-us/Resources.resw
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Strings/en-us/Resources.resw
@@ -59,10 +59,7 @@
            : 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: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>
@@ -228,4 +225,7 @@
  <data name="OpenAIGpoDisabled" xml:space="preserve">
    <value>To custom with AI is disabled by your organization</value>
  </data>
-</root>
+  <data name="CtrlKey" xml:space="preserve">
+    <value>Ctrl</value>
+  </data>
+</root>
--- a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteClipboardItemClicked.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteClipboardItemClicked.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.

 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;

--- a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteClipboardItemDeletedEvent.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteClipboardItemDeletedEvent.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.

 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;

--- a/Show More
+++ b/Show More