merge main

clear groups
2025-12-30 17:07:23 +01:00 · 2025-04-10 17:05:33 +08:00 · 2025-04-10 16:43:40 +08:00 · 2025-03-31 22:36:38 +02:00 · 2025-03-31 22:36:06 +02:00 · 2025-03-31 20:53:38 +02:00
655 changed files with 2545 additions and 13685 deletions
--- a/.config/configuration.vsEnterprise.winget
+++ b/.config/configuration.vsEnterprise.winget
@@ -6,16 +6,12 @@ properties:
      directives:
        description: Enable Developer Mode
        allowPrerelease: true
-        # Requires elevation for the set operation
-        securityContext: elevated
      settings:
        Ensure: Present
    - resource: Microsoft.WinGet.DSC/WinGetPackage
      id: vsPackage
      directives:
        description: Install Visual Studio 2022 Enterprise (Any edition will work)
-        # Requires elevation for the set operation
-        securityContext: elevated
      settings:
        id: Microsoft.VisualStudio.2022.Enterprise
        source: winget
@@ -25,8 +21,6 @@ properties:
      directives:
        description: Install required VS workloads
        allowPrerelease: true
-        # Requires elevation for the get and set operations
-        securityContext: elevated
      settings:
        productId: Microsoft.VisualStudio.Product.Enterprise
        channelId: VisualStudio.17.Release
--- a/.config/configuration.vsProfessional.winget
+++ b/.config/configuration.vsProfessional.winget
@@ -6,16 +6,12 @@ properties:
      directives:
        description: Enable Developer Mode
        allowPrerelease: true
-        # Requires elevation for the set operation
-        securityContext: elevated
      settings:
        Ensure: Present
    - resource: Microsoft.WinGet.DSC/WinGetPackage
      id: vsPackage
      directives:
        description: Install Visual Studio 2022 Professional (Any edition will work)
-        # Requires elevation for the set operation
-        securityContext: elevated
      settings:
        id: Microsoft.VisualStudio.2022.Professional
        source: winget
@@ -25,8 +21,6 @@ properties:
      directives:
        description: Install required VS workloads
        allowPrerelease: true
-        # Requires elevation for the get and set operations
-        securityContext: elevated
      settings:
        productId: Microsoft.VisualStudio.Product.Professional
        channelId: VisualStudio.17.Release
--- a/.config/configuration.winget
+++ b/.config/configuration.winget
@@ -6,16 +6,12 @@ properties:
      directives:
        description: Enable Developer Mode
        allowPrerelease: true
-        # Requires elevation for the set operation
-        securityContext: elevated
      settings:
        Ensure: Present
    - resource: Microsoft.WinGet.DSC/WinGetPackage
      id: vsPackage
      directives:
        description: Install Visual Studio 2022 Community (Any edition will work)
-        # Requires elevation for the set operation
-        securityContext: elevated
      settings:
        id: Microsoft.VisualStudio.2022.Community
        source: winget
@@ -25,8 +21,6 @@ properties:
      directives:
        description: Install required VS workloads
        allowPrerelease: true
-        # Requires elevation for the get and set operations
-        securityContext: elevated
      settings:
        productId: Microsoft.VisualStudio.Product.Community
        channelId: VisualStudio.17.Release
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,5 +1,6 @@
 name: "🕷️ Bug report"
 description: Report errors or unexpected behavior
+type: Bug
 labels:
 - Issue-Bug
 - Needs-Triage
@@ -7,8 +8,7 @@ body:
 - type: markdown
  attributes:
    value: Please make sure to [search for existing issues](https://github.com/microsoft/PowerToys/issues) before filing a new one!
- id: version
-  type: input
+- type: input
  attributes:
    label: Microsoft PowerToys version
    placeholder: X.XX.X
@@ -16,8 +16,7 @@ body:
  validations:
    required: true

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

+- type: dropdown
+  attributes:
+    label: Running as admin
+    description: Are you running PowerToys as Admin?
+    options:
+      - "Yes"
+      - "No"
+
 - type: dropdown
  attributes:
    label: Area(s) with issue?
@@ -60,7 +67,7 @@ body:
      - Keyboard Manager
      - Mouse Utilities
      - Mouse Without Borders
-      - New+
+      - New+ 
      - Peek
      - PowerRename
      - PowerToys Run
@@ -99,19 +106,6 @@ body:
  validations:
    required: false

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

 #Tools
-OIP
+OIP
--- a/.github/actions/spell-check/allow/names.txt
+++ b/.github/actions/spell-check/allow/names.txt
@@ -188,8 +188,6 @@ zhaoqpcn
 Zoltan
 Zykova
 Sameerjs
-ruslanlap
-vednig

 # OTHERS

--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -8,7 +8,6 @@ Acceleratorkeys
 ACCEPTFILES
 ACCESSDENIED
 ACCESSTOKEN
-acfs
 AClient
 AColumn
 acrt
@@ -57,10 +56,12 @@ APIIs
 Apm
 APPBARDATA
 APPEXECLINK
+APPICONREFERENCE
 APPLICATIONFRAMEHOST
 appmanifest
 APPMODEL
 APPNAME
+APPPUBLISHER
 appref
 appsettings
 appwindow
@@ -172,9 +173,9 @@ CCHFORMNAME
 CCom
 CContext
 CDeclaration
+cdn
 CElems
 CENTERALIGN
-cer
 certlm
 certmgr
 cfp
@@ -198,7 +199,6 @@ CLIPBOARDUPDATE
 CLIPCHILDREN
 CLIPSIBLINGS
 closesocket
-clp
 CLSCTX
 clsids
 Clusion
@@ -254,6 +254,8 @@ createdump
 CREATEPROCESS
 CREATESCHEDULEDTASK
 CREATESTRUCT
+CREATETHREAD
+CREATEWINDOW
 CREATEWINDOWFAILED
 CRECT
 CRH
@@ -275,7 +277,6 @@ CURSORINFO
 cursorpos
 customaction
 CUSTOMACTIONTEST
-CUSTOMFORMATPLACEHOLDER
 CVal
 cvd
 CVirtual
@@ -307,7 +308,11 @@ DCOM
 DComposition
 DCR
 ddd
+DDEAPPLICATION
+DDECOMMAND
 DDEIf
+DDEIFEXEC
+DDETOPIC
 DDevice
 DDxgi
 Deact
@@ -321,13 +326,16 @@ DEFAULTFLAGS
 DEFAULTICON
 defaultlib
 DEFAULTONLY
+DEFAULTTOFOLDER
 DEFAULTTONEAREST
 DEFAULTTONULL
 DEFAULTTOPRIMARY
+DEFAULTTOSTAR
 DEFERERASE
 DEFPUSHBUTTON
 deinitialization
 DELA
+DELEGATEEXECUTE
 DELETEDKEYIMAGE
 DELETESCANS
 deletethis
@@ -347,7 +355,6 @@ DEVMODE
 DEVMODEW
 devpal
 DIALOGEX
-digicert
 dimm
 DISABLEASACTIONKEY
 DISABLENOSCROLL
@@ -382,6 +389,7 @@ dreamsofameaningfullife
 drivedetectionwarning
 Droid
 DROPFILES
+DROPTARGET
 DSTINVERT
 DSurface
 DTexture
@@ -502,10 +510,12 @@ Fira
 FIXEDFILEINFO
 FIXEDSYS
 flac
+flaticon
 flyouts
 FMask
 fmtid
 FOF
+WANTNUKEWARNING
 FOFX
 FOLDERID
 folderpath
@@ -515,18 +525,17 @@ FORCEMINIMIZE
 FORMATDLGORD
 formatetc
 FORPARSING
+fpvm
 Fqc
 FRAMECHANGED
 frm
 Froml
 FROMTOUCH
-fsanitize
 fsmgmt
 FZE
 gacutil
 Gaeilge
 Gaidhlig
-gameid
 GC'ed
 GCLP
 gdi
@@ -550,6 +559,7 @@ GETSECKEY
 GETSTICKYKEYS
 GETTEXTLENGTH
 GHND
+gifv
 GMEM
 GNumber
 gpedit
@@ -633,7 +643,6 @@ HOTKEYF
 hotkeys
 hotlight
 hotspot
-Hostx
 HPAINTBUFFER
 HRAWINPUT
 HREDRAW
@@ -644,6 +653,7 @@ HROW
 hsb
 HSCROLL
 hsi
+HSSH
 HTCLIENT
 hthumbnail
 HTOUCHINPUT
@@ -681,12 +691,12 @@ iextn
 IFACEMETHOD
 IFACEMETHODIMP
 IFile
+IGNOREBASECLASS
 IGNOREUNKNOWN
 IGo
 iid
 Iindex
 Ijwhost
-ILD
 IMAGEHLP
 IMAGERESIZERCONTEXTMENU
 IMAGERESIZEREXT
@@ -717,7 +727,6 @@ INPUTSINK
 INPUTTYPE
 INSTALLDESKTOPSHORTCUT
 INSTALLDIR
-installdir
 INSTALLFOLDER
 INSTALLFOLDERTOBOOTSTRAPPERINSTALLFOLDER
 INSTALLFOLDERTOPREVIOUSINSTALLFOLDER
@@ -731,6 +740,8 @@ Inste
 Interlop
 INTRESOURCE
 INVALIDARG
+INVALIDCALL
+INVALIDINDEX
 invalidoperatioexception
 ipcmanager
 IPREVIEW
@@ -792,6 +803,7 @@ LEVELID
 LExit
 lhwnd
 LIBID
+libraryincludes
 LIMITSIZE
 LIMITTEXT
 lindex
@@ -893,6 +905,7 @@ MBM
 MBR
 MDICHILD
 MDL
+mdpvm
 mdtext
 mdtxt
 mdwn
@@ -948,7 +961,6 @@ mpmc
 MRM
 MRT
 mru
-MSAL
 msc
 mscorlib
 msctls
@@ -1012,7 +1024,6 @@ netsh
 newcolor
 NEWDIALOGSTYLE
 NEWFILE
-NEWFILEHEADER
 newitem
 newpath
 newplus
@@ -1042,11 +1053,11 @@ NOCRLF
 nodeca
 NODRAWCAPTION
 NODRAWICON
+NOFIXUPS
 NOINHERITLAYOUT
 NOINTERFACE
 NOINVERT
 NOLINKINFO
-nologo
 NOMCX
 NOMINMAX
 NOMIRRORBITMAP
@@ -1058,11 +1069,13 @@ NONELEVATED
 NONINFRINGEMENT
 nonspace
 nonstd
+NOOPEN
 NOOWNERZORDER
 NOPARENTNOTIFY
 NOPREFIX
 NOREDIRECTIONBITMAP
 NOREDRAW
+NOREMAPCLSID
 NOREMOVE
 norename
 NOREPEAT
@@ -1081,10 +1094,11 @@ NOTIFYICONDATAW
 NOTIMPL
 NOTOPMOST
 NOTRACK
+NOTRUNCATE
 NOTSRCCOPY
 NOTSRCERASE
 NOTXORPEN
-notwindows
+NOUSERSETTINGS
 NOZORDER
 NPH
 npmjs
@@ -1210,7 +1224,6 @@ Podcasts
 POINTERID
 POINTERUPDATE
 Pokedex
-Pomodoro
 Popups
 POPUPWINDOW
 POSITIONITEM
@@ -1279,7 +1292,6 @@ pstm
 PStr
 pstream
 pstrm
-pswd
 PSYSTEM
 psz
 ptb
@@ -1306,11 +1318,11 @@ Quarternary
 QUERYENDSESSION
 QUERYOPEN
 QUEUESYNC
+QUICKTIP
 QUNS
 QXZ
 RAII
 RAlt
-Rappl
 randi
 Rasterization
 Rasterize
@@ -1335,6 +1347,7 @@ REFCLSID
 REFIID
 REGCLS
 regfile
+REGISTERCLASSEX
 REGISTERCLASSFAILED
 REGISTRYHEADER
 registrypath
@@ -1346,6 +1359,7 @@ REINSTALLMODE
 reloadable
 Relogger
 remappings
+REMAPRUNDLL
 REMAPSUCCESSFUL
 REMAPUNSUCCESSFUL
 Remotable
@@ -1407,7 +1421,6 @@ sacl
 safeprojectname
 SAMEKEYPREVIOUSLYMAPPED
 SAMESHORTCUTPREVIOUSLYMAPPED
-sancov
 SAVEFAILED
 scanled
 schedtasks
@@ -1423,10 +1436,10 @@ SDDL
 SDKDDK
 sdns
 searchterm
+searchtext
 SEARCHUI
 SECONDARYDISPLAY
 secpol
-securestring
 SEEMASKINVOKEIDLIST
 SELCHANGE
 SENDCHANGE
@@ -1472,7 +1485,6 @@ shellex
 SHELLEXECUTEINFO
 SHELLEXECUTEINFOW
 SHELLEXTENSION
-SHELLICONSIZE
 SHELLNEWVALUE
 SHFILEINFO
 SHFILEOPSTRUCT
@@ -1481,9 +1493,9 @@ SHGDNF
 SHGFI
 SHGFIICON
 SHGFILARGEICON
-SHIL
 shinfo
 shlwapi
+SHNAMEMAPPING
 shobjidl
 SHORTCUTATLEAST
 SHORTCUTMAXONEACTIONKEY
@@ -1513,7 +1525,6 @@ SIDs
 siex
 sigdn
 SIGNINGSCENARIO
-signtool
 Signtool
 SINGLEKEY
 sipolicy
@@ -1535,6 +1546,7 @@ SNAPPROCESS
 snwprintf
 softline
 SOURCECLIENTAREAONLY
+sourced
 sourcedoc
 SOURCEHEADER
 sourcesdirectory
@@ -1580,7 +1592,6 @@ stdcpp
 stdcpplatest
 STDMETHODCALLTYPE
 STDMETHODIMP
-steamapps
 STGC
 STGM
 STGMEDIUM
@@ -1662,7 +1673,6 @@ telephon
 templatenamespace
 testprocess
 TEXCOORD
-TEXTBOXNEWLINE
 TEXTEXTRACTOR
 TEXTINCLUDE
 tfopen
@@ -1675,6 +1685,7 @@ THotkey
 throughs
 TIcon
 TILEDWINDOW
+TILEINFO
 TILLSON
 timedate
 timediff
@@ -1688,6 +1699,9 @@ TLayout
 tlb
 tlbimp
 tlc
+TPMLEFTALIGN
+TPMRETURNCMD
+TMPVAR
 TNP
 Toolhelp
 toolkitconverters
@@ -1695,8 +1709,6 @@ toolwindow
 TOPDOWNDIB
 TOUCHEVENTF
 TOUCHINPUT
-TPMLEFTALIGN
-TPMRETURNCMD
 TRACEHANDLE
 tracelogging
 tracerpt
@@ -1770,6 +1782,7 @@ USRDLL
 UType
 uuidv
 uwp
+ums
 uxt
 uxtheme
 vabdq
@@ -1796,6 +1809,7 @@ VERTSIZE
 VFT
 vget
 vgetq
+videourl
 viewmodel
 VIRTKEY
 VIRTUALDESK
@@ -1829,7 +1843,7 @@ vstprintf
 VSTT
 vswhere
 Vtbl
-WANTNUKEWARNING
+WANTMAPPINGHANDLE
 WANTPALM
 wasdk
 wbem
@@ -1944,7 +1958,7 @@ WUX
 Wwanpp
 XAxis
 xclip
-xcopy
+xdoc
 XDocument
 XElement
 xfd
@@ -1967,13 +1981,13 @@ Yeet
 YIncrement
 yinle
 yinyue
+youtube
 YPels
 YResolution
 YStr
 YTM
 YVIRTUALSCREEN
 ZEROINIT
-Zhiwei
 zonable
 zoneset
 Zoneszonabletester
@@ -1983,11 +1997,3 @@ ZOOMITX
 ZXk
 ZXNs
 zzz
-ACIE
-AOklab
-BCIE
-BOklab
-culori
-Evercoder
-LCh
-CIELCh
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -1,26 +0,0 @@
-# Dependency Review Action
-#
-# This Action will scan dependency manifest files that change as part of a Pull Request,
-# surfacing known-vulnerable versions of the packages declared or updated in the PR.
-# Once installed, if the workflow run is marked as required,
-# PRs introducing known-vulnerable packages will be blocked from merging.
-#
-# As recommended by Microsoft's security guidelines (https://docs.opensource.microsoft.com/security/tsg/actions/#requirements-for-security-hardening-your-own-github-actions), 
-# 3rd-party actions should be pinned to a specific commit hash to prevent supply chain attacks. 
-# This update aligns with best practices; 1st/2nd-party actions is not required hash pinning.
-#
-# Source repository: https://github.com/actions/dependency-review-action
-name: 'Dependency Review'
-on: [pull_request]
-
-permissions:
-  contents: read
-
-jobs:
-  dependency-review:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Checkout Repository'
-        uses: actions/checkout@v4
-      - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v4
--- a/.github/workflows/spelling2.yml
+++ b/.github/workflows/spelling2.yml
@@ -93,7 +93,7 @@ jobs:
    steps:
      - name: check-spelling
        id: spelling
-        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
+        uses: check-spelling/check-spelling@v0.0.24
        with:
          config: .github/actions/spell-check
          suppress_push_for_open_pull_request: ${{ github.actor != 'dependabot[bot]' && 1 }}
@@ -156,7 +156,7 @@ jobs:
    if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
    steps:
      - name: comment
-        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
+        uses: check-spelling/check-spelling@v0.0.24
        with:
          config: .github/actions/spell-check
          checkout: true
@@ -175,7 +175,7 @@ jobs:
    if: (success() || failure()) && needs.spelling.outputs.followup && contains(github.event_name, 'pull_request')
    steps:
      - name: comment
-        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
+        uses: check-spelling/check-spelling@v0.0.24
        with:
          config: .github/actions/spell-check
          checkout: true
@@ -202,7 +202,7 @@ jobs:
      cancel-in-progress: false
    steps:
      - name: apply spelling updates
-        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
+        uses: check-spelling/check-spelling@v0.0.24
        with:
          experimental_apply_changes_via_bot: ${{ github.repository_owner != 'microsoft' && 1 }}
          checkout: true
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@@ -127,7 +127,6 @@

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

@@ -221,7 +220,6 @@
                "WinUI3Apps\\PowerToys.Settings.exe",

                "PowerToys.CmdPalModuleInterface.dll",
-                "CmdPalKeyboardService.dll",
                "*Microsoft.CmdPal.UI_*.msix"
            ],
            "SigningInfo": {
@@ -332,8 +330,6 @@
                "TestableIO.System.IO.Abstractions.Wrappers.dll",
                "WinUI3Apps\\TestableIO.System.IO.Abstractions.Wrappers.dll",
                "WinUI3Apps\\OpenAI.dll",
-                "Testably.Abstractions.FileSystem.Interface.dll",
-                "WinUI3Apps\\Testably.Abstractions.FileSystem.Interface.dll",
                "ColorCode.Core.dll", 
                "ColorCode.UWP.dll",
                "UnitsNet.dll",
--- a/.pipelines/UpdateVersions.ps1
+++ b/.pipelines/UpdateVersions.ps1
@@ -1,24 +1,16 @@
 Param(
-  # Using the default value of 1.7 for winAppSdkVersionNumber and useExperimentalVersion as false
+  # Using the default value of 1.6 for winAppSdkVersionNumber and useExperimentalVersion as false
  [Parameter(Mandatory=$False,Position=1)]
-  [string]$winAppSdkVersionNumber = "1.7",
+  [string]$winAppSdkVersionNumber = "1.6",

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

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

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

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

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

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

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

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

 # Update .csproj files
-Get-ChildItem -Path $rootPath -Recurse *.csproj | ForEach-Object {
-    $file = Read-FileWithEncoding -Path $_.FullName
-    $content = $file.Content
+Get-ChildItem -Recurse *.csproj | ForEach-Object {
+    $content = Get-Content $_.FullName -Raw
    if ($content -match 'PackageReference Include="Microsoft.WindowsAppSDK"') {
        $newVersionString = 'PackageReference Include="Microsoft.WindowsAppSDK" Version="'+ $WinAppSDKVersion + '"'
        $oldVersionString = 'PackageReference Include="Microsoft.WindowsAppSDK" Version="[-.0-9a-zA-Z]*"'
        $content = $content -replace $oldVersionString, $newVersionString
-        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
+        Set-Content -Path $_.FullName -Value $content
        Write-Host "Modified " $_.FullName 
    }
 }
--- a/.pipelines/tsa.json
+++ b/.pipelines/tsa.json
@@ -3,5 +3,5 @@
    "notificationAliases": ["powertoys@microsoft.com"],
    "instanceUrl": "https://microsoft.visualstudio.com",
    "projectName": "OS",
-    "areaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\DIVE\\PowerToys"
+    "areaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys"
 }
--- a/.pipelines/v2/ci-using-the-latest-winappsdk.yml
+++ b/.pipelines/v2/ci-using-the-latest-winappsdk.yml
@@ -33,7 +33,7 @@ parameters:
    default: true
  - name: winAppSDKVersionNumber
    type: string
-    default: 1.7
+    default: 1.6
  - name: useExperimentalVersion
    type: boolean
    default: false
--- a/.pipelines/v2/release.yml
+++ b/.pipelines/v2/release.yml
@@ -148,7 +148,5 @@ extends:
            parameters:
              versionNumber: ${{ parameters.versionNumber }}
              includePublicSymbolServer: ${{ parameters.publishSymbolsToPublic }}
-              ${{ if ne(parameters.publishSymbolsToPublic, true) }}:
-                symbolExpiryTime: 10 # For private builds, expire symbols within 10 days. The default is 100 years.
              subscription: $(SymbolPublishingServiceConnection)
              symbolProject: $(SymbolPublishingProject)
--- a/.pipelines/v2/templates/steps-update-winappsdk-and-restore-nuget.yml
+++ b/.pipelines/v2/templates/steps-update-winappsdk-and-restore-nuget.yml
@@ -17,7 +17,6 @@ steps:
    arguments: >
      -winAppSdkVersionNumber ${{ parameters.versionNumber }}
      -useExperimentalVersion $${{ parameters.useExperimentalVersion }}
-      -rootPath "$(build.sourcesdirectory)"

 - script: echo $(WinAppSDKVersion)
  displayName: 'Display WinAppSDK Version Found'
--- a/COMMUNITY.md
+++ b/COMMUNITY.md
@@ -188,7 +188,6 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 - [@cinnamon-msft](https://github.com/cinnamon-msft) - Kayla Cinnamon - Lead
 - [@nguyen-dows](https://github.com/nguyen-dows) - Christopher Nguyen - Product Manager
 - [@craigloewen-msft](https://github.com/craigloewen-msft) - Craig Loewen - Product Manager
- [@zhiwei-ms](https://github.com/zhiwei-ms) - Zhiwei Yu - Product Manager
 - [@dhowett](https://github.com/dhowett) - Dustin Howett - Dev lead
 - [@yeelam-gordon](https://github.com/yeelam-gordon) - Gordon Lam - Dev lead
 - [@jamrobot](https://github.com/jamrobot) - Jerry Xu - Dev lead
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -10,14 +10,14 @@
    <PackageVersion Include="Azure.AI.OpenAI" Version="1.0.0-beta.17" />
    <PackageVersion Include="CommunityToolkit.Common" Version="8.4.0" />
    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Collections" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.2.250129-preview2" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Collections" Version="8.2.250129-preview2" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.250129-preview2" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.250129-preview2" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.250129-preview2" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.2.250129-preview2" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.2.250129-preview2" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250129-preview2" />
    <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
    <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
    <PackageVersion Include="ControlzEx" Version="6.0.0" />
@@ -29,7 +29,7 @@
    <PackageVersion Include="Mages" Version="3.0.0" />
    <PackageVersion Include="Markdig.Signed" Version="0.34.0" />
    <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
-    <PackageVersion Include="MessagePack" Version="3.1.3" />
+    <PackageVersion Include="MessagePack" Version="2.5.187" />
    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.4" />
    <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
@@ -45,7 +45,7 @@
    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
    <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
+    <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.120-preview" />
    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.4" />
    <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
    <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
@@ -55,13 +55,13 @@
 	-->
    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.250205002" />
    <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
    <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
    <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
    <!-- Moq to stay below v4.20 due to behavior change. need to be sure fixed -->
    <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="MSTest" Version="3.8.3" />
+    <PackageVersion Include="MSTest" Version="3.6.3" />
    <PackageVersion Include="NLog" Version="5.0.4" />
    <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.8" />
    <PackageVersion Include="NLog.Schema" Version="5.2.8" />
@@ -69,7 +69,7 @@
    <PackageVersion Include="ReverseMarkdown" Version="4.1.0" />
    <PackageVersion Include="ScipBe.Common.Office.OneNote" Version="3.0.1" />
    <PackageVersion Include="SharpCompress" Version="0.37.2" />
-    <PackageVersion Include="StreamJsonRpc" Version="2.21.69" />
+    <PackageVersion Include="StreamJsonRpc" Version="2.19.27" />
    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
    <!-- Package System.CodeDom added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Management but the 8.0.1 version wasn't published to nuget. -->
    <PackageVersion Include="System.CodeDom" Version="9.0.4" />
@@ -84,17 +84,14 @@
    <!-- Package System.Diagnostics.PerformanceCounter added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.11. -->
    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.4" />
    <PackageVersion Include="System.Drawing.Common" Version="9.0.4" />
-    <PackageVersion Include="System.IO.Abstractions" Version="22.0.13" />
-    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.13" />
+    <PackageVersion Include="System.IO.Abstractions" Version="21.0.29" />
+    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="21.0.29" />
    <PackageVersion Include="System.Management" Version="9.0.4" />
-    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
-    <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
    <PackageVersion Include="System.Reactive" Version="6.0.1" />
    <PackageVersion Include="System.Runtime.Caching" Version="9.0.4" />
    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.4" />
    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.4" />
    <PackageVersion Include="System.Text.Json" Version="9.0.4" />
-    <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
    <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
    <PackageVersion Include="UnitsNet" Version="5.56.0" />
    <PackageVersion Include="UTF.Unknown" Version="2.5.1" />
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -75,40 +75,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 For more information, please refer to <http://unlicense.org/>
 ```

-## Utility: Command Palette Built-in Extensions
-
-### Calculator
-
-#### Mages
-
-We use the Mages NuGet package for calculating the result of expression.
-
-**Source**: [https://github.com/FlorianRappl/Mages](https://github.com/FlorianRappl/Mages)
-
-```
-The MIT License (MIT)
-
-Copyright (c) 2016 - 2025 Florian Rappl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-```
-
 ## Utility: File Explorer Add-ins

 ### Monaco Editor
@@ -1427,6 +1393,7 @@ SOFTWARE.

 ## NuGet Packages used by PowerToys

+
 - AdaptiveCards.ObjectModel.WinUI3 2.0.0-beta
 - AdaptiveCards.Rendering.WinUI3 2.1.0-beta
 - AdaptiveCards.Templating 2.0.2
@@ -1434,14 +1401,14 @@ SOFTWARE.
 - Azure.AI.OpenAI 1.0.0-beta.17
 - CommunityToolkit.Common 8.4.0
 - CommunityToolkit.Mvvm 8.4.0
- CommunityToolkit.WinUI.Animations 8.2.250402
- CommunityToolkit.WinUI.Collections 8.2.250402
- CommunityToolkit.WinUI.Controls.Primitives 8.2.250402
- CommunityToolkit.WinUI.Controls.Segmented 8.2.250402
- CommunityToolkit.WinUI.Controls.SettingsControls 8.2.250402
- CommunityToolkit.WinUI.Controls.Sizers 8.2.250402
- CommunityToolkit.WinUI.Converters 8.2.250402
- CommunityToolkit.WinUI.Extensions 8.2.250402
+- CommunityToolkit.WinUI.Animations 8.2.250129-preview2
+- CommunityToolkit.WinUI.Collections 8.2.250129-preview2
+- CommunityToolkit.WinUI.Controls.Primitives 8.2.250129-preview2
+- CommunityToolkit.WinUI.Controls.Segmented 8.2.250129-preview2
+- CommunityToolkit.WinUI.Controls.SettingsControls 8.2.250129-preview2
+- CommunityToolkit.WinUI.Controls.Sizers 8.2.250129-preview2
+- CommunityToolkit.WinUI.Converters 8.2.250129-preview2
+- CommunityToolkit.WinUI.Extensions 8.2.250129-preview2
 - CommunityToolkit.WinUI.UI.Controls.DataGrid 7.1.2
 - CommunityToolkit.WinUI.UI.Controls.Markdown 7.1.2
 - ControlzEx 6.0.0
@@ -1452,7 +1419,7 @@ SOFTWARE.
 - LazyCache 2.4.0
 - Mages 3.0.0
 - Markdig.Signed 0.34.0
- MessagePack 3.1.3
+- MessagePack 2.5.187
 - Microsoft.Bcl.AsyncInterfaces 9.0.4
 - Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
 - Microsoft.Data.Sqlite 9.0.4
@@ -1472,20 +1439,20 @@ SOFTWARE.
 - Microsoft.Windows.CsWin32 0.2.46-beta
 - Microsoft.Windows.CsWinRT 2.2.0
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
- Microsoft.WindowsAppSDK 1.7.250401001
- Microsoft.WindowsPackageManager.ComInterop 1.10.340
+- Microsoft.WindowsAppSDK 1.6.250205002
+- Microsoft.WindowsPackageManager.ComInterop 1.10.120-preview
 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
 - Microsoft.Xaml.Behaviors.Wpf 1.1.39
 - ModernWpfUI 0.9.4
 - Moq 4.18.4
- MSTest 3.8.3
+- MSTest 3.6.3
 - NLog.Extensions.Logging 5.3.8
 - NLog.Schema 5.2.8
 - OpenAI 2.0.0
 - ReverseMarkdown 4.1.0
 - ScipBe.Common.Office.OneNote 3.0.1
 - SharpCompress 0.37.2
- StreamJsonRpc 2.21.69
+- StreamJsonRpc 2.19.27
 - StyleCop.Analyzers 1.2.0-beta.556
 - System.CodeDom 9.0.4
 - System.CommandLine 2.0.0-beta4.22272.1
@@ -1496,21 +1463,17 @@ SOFTWARE.
 - System.Diagnostics.EventLog 9.0.4
 - System.Diagnostics.PerformanceCounter 9.0.4
 - System.Drawing.Common 9.0.4
- System.IO.Abstractions 22.0.13
- System.IO.Abstractions.TestingHelpers 22.0.13
+- System.IO.Abstractions 21.0.29
+- System.IO.Abstractions.TestingHelpers 21.0.29
 - System.Management 9.0.4
- System.Net.Http 4.3.4
- System.Private.Uri 4.3.2
 - System.Reactive 6.0.1
 - System.Runtime.Caching 9.0.4
 - System.ServiceProcess.ServiceController 9.0.4
 - System.Text.Encoding.CodePages 9.0.4
 - System.Text.Json 9.0.4
- System.Text.RegularExpressions 4.3.1
 - UnicodeInformation 2.6.0
 - UnitsNet 5.56.0
 - UTF.Unknown 2.5.1
 - WinUIEx 2.2.0
 - WPF-UI 3.0.5
 - WyHash 1.0.5
-
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -624,19 +624,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CommandPalette", "CommandPa
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Built-in Extensions", "Built-in Extensions", "{ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Apps", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Apps\Microsoft.CmdPal.Ext.Apps.csproj", "{6CE438DF-C245-4997-A360-0A0939E4BA34}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Apps", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.Apps\Microsoft.CmdPal.Ext.Apps.csproj", "{6CE438DF-C245-4997-A360-0A0939E4BA34}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Bookmarks", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Bookmark\Microsoft.CmdPal.Ext.Bookmarks.csproj", "{E09AA983-C755-474F-83D6-A5CDF528C070}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Bookmarks", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.Bookmark\Microsoft.CmdPal.Ext.Bookmarks.csproj", "{E09AA983-C755-474F-83D6-A5CDF528C070}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Calc", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Calc\Microsoft.CmdPal.Ext.Calc.csproj", "{6D56B64D-FF1F-488F-AFED-9B9854A5D399}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Calc", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.Calc\Microsoft.CmdPal.Ext.Calc.csproj", "{6D56B64D-FF1F-488F-AFED-9B9854A5D399}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Registry", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Registry\Microsoft.CmdPal.Ext.Registry.csproj", "{92EC89E4-9972-453A-8A1A-3A9E230C146A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Registry", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.Registry\Microsoft.CmdPal.Ext.Registry.csproj", "{92EC89E4-9972-453A-8A1A-3A9E230C146A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsServices", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WindowsServices\Microsoft.CmdPal.Ext.WindowsServices.csproj", "{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsServices", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.WindowsServices\Microsoft.CmdPal.Ext.WindowsServices.csproj", "{51939B4F-1F62-4BFF-A6A2-C08646E5BE95}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsSettings", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WindowsSettings\Microsoft.CmdPal.Ext.WindowsSettings.csproj", "{D1160404-D3D1-497A-883A-4059C07C2273}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsSettings", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.WindowsSettings\Microsoft.CmdPal.Ext.WindowsSettings.csproj", "{D1160404-D3D1-497A-883A-4059C07C2273}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsTerminal", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WindowsTerminal\Microsoft.CmdPal.Ext.WindowsTerminal.csproj", "{40F6D69D-E321-400F-A767-5628C7AE453D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowsTerminal", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.WindowsTerminal\Microsoft.CmdPal.Ext.WindowsTerminal.csproj", "{40F6D69D-E321-400F-A767-5628C7AE453D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extension SDK", "Extension SDK", "{F3D09629-59A2-4924-A4B9-D6BFAA2C1B49}"
 EndProject
@@ -650,9 +650,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.UI", "sr
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample Extensions", "Sample Extensions", "{071E18A4-A530-46B8-AB7D-B862EE55E24E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProcessMonitorExtension", "src\modules\cmdpal\ext\ProcessMonitorExtension\ProcessMonitorExtension.csproj", "{C846F7A7-792A-47D9-B0CB-417C900EE03D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProcessMonitorExtension", "src\modules\cmdpal\Exts\ProcessMonitorExtension\ProcessMonitorExtension.csproj", "{C846F7A7-792A-47D9-B0CB-417C900EE03D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SamplePagesExtension", "src\modules\cmdpal\ext\SamplePagesExtension\SamplePagesExtension.csproj", "{C831231F-891C-4572-9694-45062534B42A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SamplePagesExtension", "src\modules\cmdpal\Exts\SamplePagesExtension\SamplePagesExtension.csproj", "{C831231F-891C-4572-9694-45062534B42A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{7520A2FE-00A2-49B8-83ED-DB216E874C04}"
 EndProject
@@ -660,7 +660,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.UI", "src\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.UI.ViewModels", "src\modules\cmdpal\Microsoft.CmdPal.UI.ViewModels\Microsoft.CmdPal.UI.ViewModels.csproj", "{C66020D1-CB10-4CF7-8715-84C97FD5E5E2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.ClipboardHistory", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.ClipboardHistory\Microsoft.CmdPal.Ext.ClipboardHistory.csproj", "{79775343-7A3D-445D-9104-3DD5B2893DF9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.ClipboardHistory", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.ClipboardHistory\Microsoft.CmdPal.Ext.ClipboardHistory.csproj", "{79775343-7A3D-445D-9104-3DD5B2893DF9}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdPalModuleInterface", "src\modules\cmdpal\CmdPalModuleInterface\CmdPalModuleInterface.vcxproj", "{0ADEB797-C8C7-4FFA-ACD5-2AF6CAD7ECD8}"
 EndProject
@@ -668,15 +668,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkspacesCsharpLibrary", "
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewPlus.ShellExtension.win10", "src\modules\NewPlus\NewShellExtensionContextMenu.win10\NewPlus.ShellExtension.win10.vcxproj", "{0DB0F63A-D2F8-4DA3-A650-2D0B8724218E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Indexer", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Indexer\Microsoft.CmdPal.Ext.Indexer.csproj", "{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Indexer", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.Indexer\Microsoft.CmdPal.Ext.Indexer.csproj", "{453CBB73-A3CB-4D0B-8D24-6940B86FE21D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Shell", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.Shell\Microsoft.CmdPal.Ext.Shell.csproj", "{C0CE3B5E-16D3-495D-B335-CA791B660162}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Shell", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.Shell\Microsoft.CmdPal.Ext.Shell.csproj", "{C0CE3B5E-16D3-495D-B335-CA791B660162}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowWalker", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WindowWalker\Microsoft.CmdPal.Ext.WindowWalker.csproj", "{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowWalker", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.WindowWalker\Microsoft.CmdPal.Ext.WindowWalker.csproj", "{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WebSearch", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WebSearch\Microsoft.CmdPal.Ext.WebSearch.csproj", "{605E914B-7232-4789-AF46-BF5D3DDFC14E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WebSearch", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.WebSearch\Microsoft.CmdPal.Ext.WebSearch.csproj", "{605E914B-7232-4789-AF46-BF5D3DDFC14E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WinGet", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.WinGet\Microsoft.CmdPal.Ext.WinGet.csproj", "{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WinGet", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.WinGet\Microsoft.CmdPal.Ext.WinGet.csproj", "{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.UnitTests", "src\modules\AdvancedPaste\AdvancedPaste.UnitTests\AdvancedPaste.UnitTests.csproj", "{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}"
 EndProject
@@ -690,7 +690,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZoomItModuleInterface", "sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZoomItSettingsInterop", "src\modules\ZoomIt\ZoomItSettingsInterop\ZoomItSettingsInterop.vcxproj", "{CA7D8106-30B9-4AEC-9D05-B69B31B8C461}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.TimeDate", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.TimeDate\Microsoft.CmdPal.Ext.TimeDate.csproj", "{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.TimeDate", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.TimeDate\Microsoft.CmdPal.Ext.TimeDate.csproj", "{DCC6BD67-17BB-47AA-B507-FB0FE43A7449}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UITestAutomation", "src\common\UITestAutomation\UITestAutomation.csproj", "{A558C25D-2007-498E-8B6F-43405AFAE9E2}"
 EndProject
@@ -704,11 +704,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hosts.UITests", "src\module
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegistryPreview.FuzzTests", "src\modules\registrypreview\RegistryPreview.FuzzTests\RegistryPreview.FuzzTests.csproj", "{5702B3CC-8575-48D5-83D8-15BB42269CD3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.System", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.System\Microsoft.CmdPal.Ext.System.csproj", "{64B88F02-CD88-4ED8-9624-989A800230F9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdPalKeyboardService", "src\modules\cmdpal\CmdPalKeyboardService\CmdPalKeyboardService.vcxproj", "{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRename.FuzzingTest", "src\modules\powerrename\PowerRename.FuzzingTest\PowerRename.FuzzingTest.vcxproj", "{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.System", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.System\Microsoft.CmdPal.Ext.System.csproj", "{64B88F02-CD88-4ED8-9624-989A800230F9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -2578,24 +2574,14 @@ Global
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Debug|ARM64.Build.0 = Debug|ARM64
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Debug|x64.ActiveCfg = Debug|x64
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Debug|x64.Build.0 = Debug|x64
+		{64B88F02-CD88-4ED8-9624-989A800230F9}.Debug|x86.ActiveCfg = Debug|x64
+		{64B88F02-CD88-4ED8-9624-989A800230F9}.Debug|x86.Build.0 = Debug|x64
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|ARM64.ActiveCfg = Release|ARM64
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|ARM64.Build.0 = Release|ARM64
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.ActiveCfg = Release|x64
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.Build.0 = Release|x64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|ARM64.Build.0 = Debug|ARM64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|x64.ActiveCfg = Debug|x64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|x64.Build.0 = Debug|x64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|ARM64.ActiveCfg = Release|ARM64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|ARM64.Build.0 = Release|ARM64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|x64.ActiveCfg = Release|x64
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|x64.Build.0 = Release|x64
-		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Debug|x64.ActiveCfg = Debug|x64
-		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Debug|x64.Build.0 = Debug|x64
-		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|ARM64.ActiveCfg = Release|ARM64
-		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.ActiveCfg = Release|x64
-		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.Build.0 = Release|x64
+		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x86.ActiveCfg = Release|x64
+		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x86.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2866,8 +2852,6 @@ Global
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
 		{5702B3CC-8575-48D5-83D8-15BB42269CD3} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
 		{64B88F02-CD88-4ED8-9624-989A800230F9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
-		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}
--- a/doc/Fuzzing/CppFuzzingGuide.md
+++ b/doc/Fuzzing/CppFuzzingGuide.md
@@ -1,117 +0,0 @@
-# 🧪 C++ Project Fuzzing Test Guide
-
-This guide walks you through setting up a **fuzzing test** project for a C++ module using [libFuzzer](https://llvm.org/docs/LibFuzzer.html).
-.
-
---
-
-## 🏗️ Step-by-Step Setup
-
-### 1. Create a New C++ Project
-
- Use **Empty Project** template.
- Name it `<ModuleName>.FuzzingTest`.
-
---
-
-### 2. Update Build Configuration
-
- In **Configuration Manager**, Uncheck Build for both Release|ARM64, Debug|ARM64 and Debug|x64 configurations.
- Note: ARM64 is not supported in this case, so leave ARM64 configurations build disabled.
---
-
-### 3. Enable ASan and libFuzzer in `.vcxproj`
-
-Edit the project file to enable fuzzing:
-
-```xml
-<PropertyGroup>
-  <EnableASAN>true</EnableASAN>
-  <EnableFuzzer>true</EnableFuzzer>
-</PropertyGroup>
-```
-
---
-
-### 4. Add Fuzzing Compiler Flags
-
-Add this to `AdditionalOptions` under the `Fuzzing` configuration:
-
-```xml
-/fsanitize=address
-/fsanitize-coverage=inline-8bit-counters
-/fsanitize-coverage=edge
-/fsanitize-coverage=trace-cmp
-/fsanitize-coverage=trace-div
-%(AdditionalOptions)
-```
-
---
-
-### 5. Link the Sanitizer Coverage Runtime
-
-In `Linker → Input → Additional Dependencies`, add:
-
-```text
-$(VCToolsInstallDir)lib\$(Platform)\libsancov.lib
-```
-
---
-
-### 6. Copy Required Runtime DLL
-
-Add a `PostBuildEvent` to copy the ASAN DLL:
-
-```xml
-<Command>
-  xcopy /y "$(VCToolsInstallDir)bin\Hostx64\x64\clang_rt.asan_dynamic-x86_64.dll" "$(OutDir)"
-</Command>
-```
-
---
-
-### 7. Add Preprocessor Definitions
-
-To avoid annotation issues, add these to the `Preprocessor Definitions`:
-
-```text
-_DISABLE_VECTOR_ANNOTATION;_DISABLE_STRING_ANNOTATION
-```
-
---
-
-## 🧬 Required Code
-
-### `LLVMFuzzerTestOneInput` Entry Point
-
-Every fuzzing project must expose this function:
-
-```cpp
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
-{
-    std::string input(reinterpret_cast<const char*>(data), size);
-
-    try
-    {
-        // Call your module with the input here.
-    }
-    catch (...) {}
-
-    return 0;
-}
-```
-
---
-
-## ⚙️ [Test run in the cloud](https://eng.ms/docs/cloud-ai-platform/azure-edge-platform-aep/aep-security/epsf-edge-and-platform-security-fundamentals/the-onefuzz-service/onefuzz/faq/notwindows/walkthrough)
-
-To submit a job to the cloud you can run with this command:
-
-```
-oip submit --config .\OneFuzzConfig.json --drop-path <your_submission_directory> --platform windows --do-not-file-bugs --duration 1
-```
-You want to run with --do-not-file-bugs because if there is an issue with running the parser in the cloud (which is very possible), you don't want bugs to be created if there is an issue. The --duration task is the number of hours you want the task to run. I recommend just running for 1 hour to make sure things work initially. If you don't specify this parameter, it will default to 48 hours. You can find more about submitting a test job here. 
-
-OneFuzz will send you an email when the job has started.
-
---
--- a/doc/thirdPartyRunPlugins.md
+++ b/doc/thirdPartyRunPlugins.md
@@ -43,9 +43,6 @@ Contact the developers of a plugin directly for assistance with a specific plugi
 | [TailwindCSS](https://github.com/skttl/ptrun-tailwindcss) | [skttl](https://github.com/skttl) | Search the documentation of TailwindCSS |
 | [HttpStatusCodes](https://github.com/grzhan/HttpStatusCodePowerToys) | [grzhan](https://github.com/grzhan) | Search for http status codes |
 | [SVGL](https://github.com/Sameerjs6/powertoys-svgl) | [SameerJS6](https://github.com/SameerJS6) | Search, Browse and copy SVG logos from SVGL. |
-| [QuickNotes](https://github.com/ruslanlap/CommunityPowerToysRunPlugin-QuickNotes) | [ruslanlap](https://github.com/ruslanlap) | Create, manage, and search notes directly from PowerToys Run. |
-| [Weather](https://github.com/ruslanlap/PowerToysRun-Weather) | [ruslanlap](https://github.com/ruslanlap) | Get real-time weather information directly from PowerToys Run. |
-| [Pomodoro](https://github.com/ruslanlap/PowerToysRun-Pomodoro) | [ruslanlap](https://github.com/ruslanlap) | Manage Pomodoro productivity sessions directly from PowerToys Run. |

 ## Extending software plugins

@@ -68,4 +65,3 @@ Below are community created plugins that target a website or software.  They are
 | [Bilibili](https://github.com/Whuihuan/PowerToysRun-Bilibili) | [Whuihuan](https://github.com/Whuihuan) | Use AVID or BVID to parse and jump to Bilibili |
 | [YubicoOauthOTP](https://github.com/dlnilsson/Community.PowerToys.Run.Plugin.YubicoOauthOTP) | [dlnilsson](https://github.com/dlnilsson) | Display generated codes from OATH accounts stored on the YubiKey in powerToys Run  |
 | [Firefox Bookmark](https://github.com/8LWXpg/PowerToysRun-FirefoxBookmark) | [8LWXpg](https://github.com/8LWXpg) | Open bookmarks in Firefox based browser |
-[Linear](https://github.com/vednig/powertoys-linear) | [vednig](https://github.com/vednig) | Create Linear Issues directly from Powertoys Run |
--- a/installer/PowerToysSetup/Product.wxs
+++ b/installer/PowerToysSetup/Product.wxs
@@ -79,7 +79,10 @@
      <ComponentGroupRef Id="ToolComponentGroup" />
      <ComponentGroupRef Id="MonacoSRCHeatGenerated" />
      <ComponentGroupRef Id="WorkspacesComponentGroup" />
-      <ComponentGroupRef Id="CmdPalComponentGroup" />
+
+      <?if $(var.CIBuild) = "true" ?>
+        <ComponentGroupRef Id="CmdPalComponentGroup" />
+      <?endif?>
    </Feature>

    <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" />
--- a/src/Common.Dotnet.CsWinRT.props
+++ b/src/Common.Dotnet.CsWinRT.props
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Some items may be set in Directory.Build.props in root -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project=".\Common.Dotnet.PrepareGeneratedFolder.targets" />
-
  <PropertyGroup>
    <WindowsSdkPackageVersion>10.0.22621.57</WindowsSdkPackageVersion>
    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
--- a/src/Common.Dotnet.PrepareGeneratedFolder.targets
+++ b/src/Common.Dotnet.PrepareGeneratedFolder.targets
@@ -1,16 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <Target Name="EnsureGeneratedBaseFolder" BeforeTargets="XamlPreCompile">
-    <PropertyGroup>
-      <!-- Only create the base 'generated' folder -->
-      <CompilerGeneratedFilesOutputPath>$(ProjectDir)obj\g</CompilerGeneratedFilesOutputPath>
-    </PropertyGroup>
-
-    <!-- Create 'generated' folder if missing -->
-    <MakeDir Directories="$(CompilerGeneratedFilesOutputPath)" />
-
-    <!-- Optional logging for debugging -->
-    <Message Text="Ensured: $(GeneratedBasePath)" Importance="Low" />
-  </Target>
-
-</Project>
--- a/src/codeAnalysis/GlobalSuppressions.cs
+++ b/src/codeAnalysis/GlobalSuppressions.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

@@ -63,16 +63,8 @@ using System.Diagnostics.CodeAnalysis;
 [assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "<Dotnet port with style preservation>", Scope = "namespaceanddescendants", Target = "MouseWithoutBorders")]
 [assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649:File name should match first type name", Justification = "<Dotnet port with style preservation>", Scope = "namespaceanddescendants", Target = "MouseWithoutBorders")]

-// AOT MVVMTK0045
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "AdvancedPaste.ViewModels")]
+// AOT
 [assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "HostsUILib")]
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "EnvironmentVariablesUILib")]
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "Peek.FilePreviewer")]
 [assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "Peek.UI")]
 [assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "Peek.UI.Views")]
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0045:Using [ObservableProperty] on fields is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib")]
-
-// AOT MVVMTK0049
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0049:Using [INotifyPropertyChanged] is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "Peek.FilePreviewer")]
 [assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.INotifyPropertyChangedGenerator", "MVVMTK0049:Using [INotifyPropertyChanged] is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "type", Target = "~T:Peek.UI.Views.TitleBar")]
-[assembly: SuppressMessage("CommunityToolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator", "MVVMTK0049:Using [INotifyPropertyChanged] is not AOT compatible for WinRT", Justification = "Updated MVVM toolkit package introduced this.", Scope = "namespaceanddescendants", Target = "RegistryPreviewUILib")]
--- a/src/common/AllExperiments/Logger.cs
+++ b/src/common/AllExperiments/Logger.cs
@@ -25,7 +25,7 @@ namespace AllExperiments
            }

            // Using InvariantCulture since this is used for a log file name
-            var logFilePath = Path.Combine(ApplicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".log");
+            var logFilePath = Path.Combine(ApplicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".txt");

            Trace.Listeners.Add(new TextWriterTraceListener(logFilePath));

--- a/src/common/ManagedCommon/ColorFormatHelper.cs
+++ b/src/common/ManagedCommon/ColorFormatHelper.cs
@@ -141,40 +141,6 @@ namespace ManagedCommon
            return lab;
        }

-        /// <summary>
-        /// Convert a given <see cref="Color"/> to a Oklab color
-        /// </summary>
-        /// <param name="color">The <see cref="Color"/> to convert</param>
-        /// <returns>The perceptual lightness [0..1] and two chromaticities [-0.5..0.5]</returns>
-        public static (double Lightness, double ChromaticityA, double ChromaticityB) ConvertToOklabColor(Color color)
-        {
-            var linear = ConvertSRGBToLinearRGB(color.R / 255d, color.G / 255d, color.B / 255d);
-            var oklab = GetOklabColorFromLinearRGB(linear.R, linear.G, linear.B);
-            return oklab;
-        }
-
-        /// <summary>
-        /// Convert a given <see cref="Color"/> to a Oklch color
-        /// </summary>
-        /// <param name="color">The <see cref="Color"/> to convert</param>
-        /// <returns>The perceptual lightness [0..1], the chroma [0..0.5], and the hue angle [0°..360°]</returns>
-        public static (double Lightness, double Chroma, double Hue) ConvertToOklchColor(Color color)
-        {
-            var oklab = ConvertToOklabColor(color);
-            var oklch = GetOklchColorFromOklab(oklab.Lightness, oklab.ChromaticityA, oklab.ChromaticityB);
-
-            return oklch;
-        }
-
-        public static (double R, double G, double B) ConvertSRGBToLinearRGB(double r, double g, double b)
-        {
-            // inverse companding, gamma correction must be undone
-            double rLinear = (r > 0.04045) ? Math.Pow((r + 0.055) / 1.055, 2.4) : (r / 12.92);
-            double gLinear = (g > 0.04045) ? Math.Pow((g + 0.055) / 1.055, 2.4) : (g / 12.92);
-            double bLinear = (b > 0.04045) ? Math.Pow((b + 0.055) / 1.055, 2.4) : (b / 12.92);
-            return (rLinear, gLinear, bLinear);
-        }
-
        /// <summary>
        /// Convert a given <see cref="Color"/> to a CIE XYZ color (XYZ)
        /// The constants of the formula matches this Wikipedia page, but at a higher precision:
@@ -190,7 +156,10 @@ namespace ManagedCommon
            double g = color.G / 255d;
            double b = color.B / 255d;

-            (double rLinear, double gLinear, double bLinear) = ConvertSRGBToLinearRGB(r, g, b);
+            // inverse companding, gamma correction must be undone
+            double rLinear = (r > 0.04045) ? Math.Pow((r + 0.055) / 1.055, 2.4) : (r / 12.92);
+            double gLinear = (g > 0.04045) ? Math.Pow((g + 0.055) / 1.055, 2.4) : (g / 12.92);
+            double bLinear = (b > 0.04045) ? Math.Pow((b + 0.055) / 1.055, 2.4) : (b / 12.92);

            return (
                (rLinear * 0.41239079926595948) + (gLinear * 0.35758433938387796) + (bLinear * 0.18048078840183429),
@@ -241,63 +210,6 @@ namespace ManagedCommon
            return (l, a, b);
        }

-        /// <summary>
-        /// Convert a linear RGB color <see cref="double"/> to an Oklab color.
-        /// The constants of this formula come from https://github.com/Evercoder/culori/blob/2bedb8f0507116e75f844a705d0b45cf279b15d0/src/oklab/convertLrgbToOklab.js
-        /// and the implementation is based on https://bottosson.github.io/posts/oklab/
-        /// </summary>
-        /// <param name="r">Linear R value</param>
-        /// <param name="g">Linear G value</param>
-        /// <param name="b">Linear B value</param>
-        /// <returns>The perceptual lightness [0..1] and two chromaticities [-0.5..0.5]</returns>
-        private static (double Lightness, double ChromaticityA, double ChromaticityB)
-            GetOklabColorFromLinearRGB(double r, double g, double b)
-        {
-            double l = (0.41222147079999993 * r) + (0.5363325363 * g) + (0.0514459929 * b);
-            double m = (0.2119034981999999 * r) + (0.6806995450999999 * g) + (0.1073969566 * b);
-            double s = (0.08830246189999998 * r) + (0.2817188376 * g) + (0.6299787005000002 * b);
-
-            double l_ = Math.Cbrt(l);
-            double m_ = Math.Cbrt(m);
-            double s_ = Math.Cbrt(s);
-
-            return (
-                (0.2104542553 * l_) + (0.793617785 * m_) - (0.0040720468 * s_),
-                (1.9779984951 * l_) - (2.428592205 * m_) + (0.4505937099 * s_),
-                (0.0259040371 * l_) + (0.7827717662 * m_) - (0.808675766 * s_)
-            );
-        }
-
-        /// <summary>
-        /// Convert an Oklab color <see cref="double"/> from Cartesian form to its polar form Oklch
-        /// https://bottosson.github.io/posts/oklab/#the-oklab-color-space
-        /// </summary>
-        /// <param name="lightness">The <see cref="lightness"/></param>
-        /// <param name="chromaticity_a">The <see cref="chromaticity_a"/></param>
-        /// <param name="chromaticity_b">The <see cref="chromaticity_b"/></param>
-        /// <returns>The perceptual lightness [0..1], the chroma [0..0.5], and the hue angle [0°..360°]</returns>
-        private static (double Lightness, double Chroma, double Hue)
-            GetOklchColorFromOklab(double lightness, double chromaticity_a, double chromaticity_b)
-        {
-            return GetLCHColorFromLAB(lightness, chromaticity_a, chromaticity_b);
-        }
-
-        /// <summary>
-        /// Convert a color in Cartesian form (Lab) to its polar form (LCh)
-        /// </summary>
-        /// <param name="lightness">The <see cref="lightness"/></param>
-        /// <param name="chromaticity_a">The <see cref="chromaticity_a"/></param>
-        /// <param name="chromaticity_b">The <see cref="chromaticity_b"/></param>
-        /// <returns>The lightness, chroma, and hue angle</returns>
-        private static (double Lightness, double Chroma, double Hue)
-            GetLCHColorFromLAB(double lightness, double chromaticity_a, double chromaticity_b)
-        {
-            // Lab to LCh transformation
-            double chroma = Math.Sqrt(Math.Pow(chromaticity_a, 2) + Math.Pow(chromaticity_b, 2));
-            double hue = Math.Round(chroma, 3) == 0 ? 0.0 : ((Math.Atan2(chromaticity_b, chromaticity_a) * 180d / Math.PI) + 360d) % 360d;
-            return (lightness, chroma, hue);
-        }
-
        /// <summary>
        /// Convert a given <see cref="Color"/> to a natural color (hue, whiteness, blackness)
        /// </summary>
@@ -364,17 +276,12 @@ namespace ManagedCommon
            { "Br", 'p' },   // brightness       percent
            { "In", 'p' },   // intensity        percent
            { "Ll", 'p' },   // lightness (HSL)  percent
+            { "Lc", 'p' },   // lightness(CIELAB)percent
            { "Va", 'p' },   // value            percent
            { "Wh", 'p' },   // whiteness        percent
            { "Bn", 'p' },   // blackness        percent
-            { "Lc", 'p' },   // lightness (CIE)         percent
-            { "Ca", 'p' },   // chromaticityA (CIELAB)  percent
-            { "Cb", 'p' },   // chromaticityB (CIELAB)  percent
-            { "Lo", 'p' },   // lightness (Oklab/Oklch) percent
-            { "Oa", 'p' },   // chromaticityA (Oklab)   percent
-            { "Ob", 'p' },   // chromaticityB (Oklab)   percent
-            { "Oc", 'p' },   // chroma (Oklch)          percent
-            { "Oh", 'p' },   // hue angle (Oklch)       percent
+            { "Ca", 'p' },   // chromaticityA    percent
+            { "Cb", 'p' },   // chromaticityB    percent
            { "Xv", 'i' },   // X value          int
            { "Yv", 'i' },   // Y value          int
            { "Zv", 'i' },   // Z value          int
@@ -517,10 +424,6 @@ namespace ManagedCommon
                    var (lightnessC, _, _) = ConvertToCIELABColor(color);
                    lightnessC = Math.Round(lightnessC, 2);
                    return lightnessC.ToString(CultureInfo.InvariantCulture);
-                case "Lo":
-                    var (lightnessO, _, _) = ConvertToOklabColor(color);
-                    lightnessO = Math.Round(lightnessO, 2);
-                    return lightnessO.ToString(CultureInfo.InvariantCulture);
                case "Wh":
                    var (_, whiteness, _) = ConvertToHWBColor(color);
                    whiteness = Math.Round(whiteness * 100);
@@ -537,22 +440,6 @@ namespace ManagedCommon
                    var (_, _, chromaticityB) = ConvertToCIELABColor(color);
                    chromaticityB = Math.Round(chromaticityB, 2);
                    return chromaticityB.ToString(CultureInfo.InvariantCulture);
-                case "Oa":
-                    var (_, chromaticityAOklab, _) = ConvertToOklabColor(color);
-                    chromaticityAOklab = Math.Round(chromaticityAOklab, 2);
-                    return chromaticityAOklab.ToString(CultureInfo.InvariantCulture);
-                case "Ob":
-                    var (_, _, chromaticityBOklab) = ConvertToOklabColor(color);
-                    chromaticityBOklab = Math.Round(chromaticityBOklab, 2);
-                    return chromaticityBOklab.ToString(CultureInfo.InvariantCulture);
-                case "Oc":
-                    var (_, chromaOklch, _) = ConvertToOklchColor(color);
-                    chromaOklch = Math.Round(chromaOklch, 2);
-                    return chromaOklch.ToString(CultureInfo.InvariantCulture);
-                case "Oh":
-                    var (_, _, hueOklch) = ConvertToOklchColor(color);
-                    hueOklch = Math.Round(hueOklch, 2);
-                    return hueOklch.ToString(CultureInfo.InvariantCulture);
                case "Xv":
                    var (x, _, _) = ConvertToCIEXYZColor(color);
                    x = Math.Round(x * 100, 4);
@@ -608,10 +495,8 @@ namespace ManagedCommon
                case "HSI": return "hsi(%Hu, %Si%, %In%)";
                case "HWB": return "hwb(%Hu, %Wh%, %Bn%)";
                case "NCol": return "%Hn, %Wh%, %Bn%";
-                case "CIEXYZ": return "XYZ(%Xv, %Yv, %Zv)";
                case "CIELAB": return "CIELab(%Lc, %Ca, %Cb)";
-                case "Oklab": return "oklab(%Lo, %Oa, %Ob)";
-                case "Oklch": return "oklch(%Lo, %Oc, %Oh)";
+                case "CIEXYZ": return "XYZ(%Xv, %Yv, %Zv)";
                case "VEC4": return "(%Reff, %Grff, %Blff, 1f)";
                case "Decimal": return "%Dv";
                case "HEX Int": return "0xFF%ReX%GrX%BlX";
--- a/src/common/ManagedCommon/IdRecoveryHelper.cs
+++ b/src/common/ManagedCommon/IdRecoveryHelper.cs
@@ -1,51 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ManagedCommon
-{
-    public static class IdRecoveryHelper
-    {
-        /// <summary>
-        /// Fixes invalid IDs in the given list by assigning unique values.
-        /// It ensures that all IDs are non-empty and unique, correcting any duplicates or empty IDs.
-        /// </summary>
-        /// <param name="items">The list of items that may contain invalid IDs.</param>
-        public static void RecoverInvalidIds<T>(IEnumerable<T> items)
-            where T : class, IHasId
-        {
-            var idSet = new HashSet<int>();
-            int newId = 0;
-            var sortedItems = items.OrderBy(i => i.Id).ToList(); // Sort items by ID for consistent processing
-
-            // Iterate through the list and fix invalid IDs
-            foreach (var item in sortedItems)
-            {
-                // If the ID is invalid or already exists in the set (duplicate), assign a new unique ID
-                if (!idSet.Add(item.Id))
-                {
-                    // Find the next available unique ID
-                    while (idSet.Contains(newId))
-                    {
-                        newId++;
-                    }
-
-                    item.Id = newId;
-                    idSet.Add(newId); // Add the newly assigned ID to the set
-                }
-            }
-        }
-    }
-
-    public interface IHasId
-    {
-        int Id { get; set; }
-    }
-}
--- a/src/common/ManagedCommon/Logger.cs
+++ b/src/common/ManagedCommon/Logger.cs
@@ -54,7 +54,7 @@ namespace ManagedCommon
                Directory.CreateDirectory(applicationLogPath);
            }

-            var logFilePath = Path.Combine(applicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".log");
+            var logFilePath = Path.Combine(applicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".txt");

            Trace.Listeners.Add(new TextWriterTraceListener(logFilePath));

--- a/src/common/UITestAutomation/UITestAutomation.csproj
+++ b/src/common/UITestAutomation/UITestAutomation.csproj
@@ -14,9 +14,6 @@
    <PackageReference Include="Appium.WebDriver" />
    <PackageReference Include="MSTest" />
    <PackageReference Include="System.IO.Abstractions" />
-    <PackageReference Include="System.Net.Http" />
-    <PackageReference Include="System.Private.Uri" />
-    <PackageReference Include="System.Text.RegularExpressions" />
  </ItemGroup>

 </Project>
--- a/src/common/logger/logger_settings.h
+++ b/src/common/logger/logger_settings.h
@@ -8,49 +8,49 @@ struct LogSettings
    inline const static std::wstring logLevelOption = L"logLevel";
    inline const static std::string runnerLoggerName = "runner";
    inline const static std::wstring logPath = L"Logs\\";
-    inline const static std::wstring runnerLogPath = L"RunnerLogs\\runner-log.log";
+    inline const static std::wstring runnerLogPath = L"RunnerLogs\\runner-log.txt";
    inline const static std::string actionRunnerLoggerName = "action-runner";
-    inline const static std::wstring actionRunnerLogPath = L"RunnerLogs\\action-runner-log.log";
+    inline const static std::wstring actionRunnerLogPath = L"RunnerLogs\\action-runner-log.txt";
    inline const static std::string updateLoggerName = "update";
-    inline const static std::wstring updateLogPath = L"UpdateLogs\\update-log.log";
+    inline const static std::wstring updateLogPath = L"UpdateLogs\\update-log.txt";
    inline const static std::string fileExplorerLoggerName = "FileExplorer";
-    inline const static std::wstring fileExplorerLogPath = L"Logs\\file-explorer-log.log";
+    inline const static std::wstring fileExplorerLogPath = L"Logs\\file-explorer-log.txt";
    inline const static std::string gcodePrevLoggerName = "GcodePrevHandler";
-    inline const static std::wstring gcodePrevLogPath = L"logs\\FileExplorer_localLow\\GcodePreviewHandler\\gcode-prev-handler-log.log";
+    inline const static std::wstring gcodePrevLogPath = L"logs\\FileExplorer_localLow\\GcodePreviewHandler\\gcode-prev-handler-log.txt";
    inline const static std::string gcodeThumbLoggerName = "GcodeThumbnailProvider";
-    inline const static std::wstring gcodeThumbLogPath = L"logs\\FileExplorer_localLow\\GcodeThumbnailProvider\\gcode-thumbnail-provider-log.log";
+    inline const static std::wstring gcodeThumbLogPath = L"logs\\FileExplorer_localLow\\GcodeThumbnailProvider\\gcode-thumbnail-provider-log.txt";
    inline const static std::string mdPrevLoggerName = "MDPrevHandler";
-    inline const static std::wstring mdPrevLogPath = L"logs\\FileExplorer_localLow\\MDPrevHandler\\md-prev-handler-log.log";
+    inline const static std::wstring mdPrevLogPath = L"logs\\FileExplorer_localLow\\MDPrevHandler\\md-prev-handler-log.txt";
    inline const static std::string monacoPrevLoggerName = "MonacoPrevHandler";
-    inline const static std::wstring monacoPrevLogPath = L"logs\\FileExplorer_localLow\\MonacoPrevHandler\\monaco-prev-handler-log.log";
+    inline const static std::wstring monacoPrevLogPath = L"logs\\FileExplorer_localLow\\MonacoPrevHandler\\monaco-prev-handler-log.txt";
    inline const static std::string pdfPrevLoggerName = "PdfPrevHandler";
-    inline const static std::wstring pdfPrevLogPath = L"logs\\FileExplorer_localLow\\PdfPrevHandler\\pdf-prev-handler-log.log";
+    inline const static std::wstring pdfPrevLogPath = L"logs\\FileExplorer_localLow\\PdfPrevHandler\\pdf-prev-handler-log.txt";
    inline const static std::string pdfThumbLoggerName = "PdfThumbnailProvider";
-    inline const static std::wstring pdfThumbLogPath = L"logs\\FileExplorer_localLow\\PdfThumbnailProvider\\pdf-thumbnail-provider-log.log";
+    inline const static std::wstring pdfThumbLogPath = L"logs\\FileExplorer_localLow\\PdfThumbnailProvider\\pdf-thumbnail-provider-log.txt";
    inline const static std::string qoiPrevLoggerName = "QoiPrevHandler";
-    inline const static std::wstring qoiPrevLogPath = L"logs\\FileExplorer_localLow\\QoiPreviewHandler\\qoi-prev-handler-log.log";
+    inline const static std::wstring qoiPrevLogPath = L"logs\\FileExplorer_localLow\\QoiPreviewHandler\\qoi-prev-handler-log.txt";
    inline const static std::string qoiThumbLoggerName = "QoiThumbnailProvider";
-    inline const static std::wstring qoiThumbLogPath = L"logs\\FileExplorer_localLow\\QoiThumbnailProvider\\qoi-thumbnail-provider-log.log";
+    inline const static std::wstring qoiThumbLogPath = L"logs\\FileExplorer_localLow\\QoiThumbnailProvider\\qoi-thumbnail-provider-log.txt";
    inline const static std::string stlThumbLoggerName = "StlThumbnailProvider";
-    inline const static std::wstring stlThumbLogPath = L"logs\\FileExplorer_localLow\\StlThumbnailProvider\\stl-thumbnail-provider-log.log";
+    inline const static std::wstring stlThumbLogPath = L"logs\\FileExplorer_localLow\\StlThumbnailProvider\\stl-thumbnail-provider-log.txt";
    inline const static std::string svgPrevLoggerName = "SvgPrevHandler";
-    inline const static std::wstring svgPrevLogPath = L"logs\\FileExplorer_localLow\\SvgPrevHandler\\svg-prev-handler-log.log";
+    inline const static std::wstring svgPrevLogPath = L"logs\\FileExplorer_localLow\\SvgPrevHandler\\svg-prev-handler-log.txt";
    inline const static std::string svgThumbLoggerName = "SvgThumbnailProvider";
-    inline const static std::wstring svgThumbLogPath = L"logs\\FileExplorer_localLow\\SvgThumbnailProvider\\svg-thumbnail-provider-log.log";
+    inline const static std::wstring svgThumbLogPath = L"logs\\FileExplorer_localLow\\SvgThumbnailProvider\\svg-thumbnail-provider-log.txt";
    inline const static std::string launcherLoggerName = "launcher";
-    inline const static std::wstring launcherLogPath = L"LogsModuleInterface\\launcher-log.log";
+    inline const static std::wstring launcherLogPath = L"LogsModuleInterface\\launcher-log.txt";
    inline const static std::string mouseWithoutBordersLoggerName = "mouseWithoutBorders";
-    inline const static std::wstring mouseWithoutBordersLogPath = L"LogsModuleInterface\\mouseWithoutBorders-log.log";
-    inline const static std::wstring awakeLogPath = L"Logs\\awake-log.log";
-    inline const static std::wstring powerAccentLogPath = L"quick-accent-log.log";
+    inline const static std::wstring mouseWithoutBordersLogPath = L"LogsModuleInterface\\mouseWithoutBorders-log.txt";
+    inline const static std::wstring awakeLogPath = L"Logs\\awake-log.txt";
+    inline const static std::wstring powerAccentLogPath = L"quick-accent-log.txt";
    inline const static std::string fancyZonesLoggerName = "fancyzones";
-    inline const static std::wstring fancyZonesLogPath = L"fancyzones-log.log";
+    inline const static std::wstring fancyZonesLogPath = L"fancyzones-log.txt";
    inline const static std::wstring fancyZonesOldLogPath = L"FancyZonesLogs\\"; // needed to clean up old logs
    inline const static std::string shortcutGuideLoggerName = "shortcut-guide";
-    inline const static std::wstring shortcutGuideLogPath = L"ShortcutGuideLogs\\shortcut-guide-log.log";
-    inline const static std::wstring powerOcrLogPath = L"Logs\\text-extractor-log.log";
+    inline const static std::wstring shortcutGuideLogPath = L"ShortcutGuideLogs\\shortcut-guide-log.txt";
+    inline const static std::wstring powerOcrLogPath = L"Logs\\text-extractor-log.txt";
    inline const static std::string keyboardManagerLoggerName = "keyboard-manager";
-    inline const static std::wstring keyboardManagerLogPath = L"Logs\\keyboard-manager-log.log";
+    inline const static std::wstring keyboardManagerLogPath = L"Logs\\keyboard-manager-log.txt";
    inline const static std::string findMyMouseLoggerName = "find-my-mouse";
    inline const static std::string mouseHighlighterLoggerName = "mouse-highlighter";
    inline const static std::string mouseJumpLoggerName = "mouse-jump";
@@ -60,22 +60,22 @@ struct LogSettings
    inline const static std::string alwaysOnTopLoggerName = "always-on-top";
    inline const static std::string powerOcrLoggerName = "TextExtractor";
    inline const static std::string fileLocksmithLoggerName = "FileLocksmith";
-    inline const static std::wstring alwaysOnTopLogPath = L"always-on-top-log.log";
+    inline const static std::wstring alwaysOnTopLogPath = L"always-on-top-log.txt";
    inline const static std::string hostsLoggerName = "hosts";
-    inline const static std::wstring hostsLogPath = L"Logs\\hosts-log.log";
+    inline const static std::wstring hostsLogPath = L"Logs\\hosts-log.txt";
    inline const static std::string registryPreviewLoggerName = "registrypreview";
    inline const static std::string cropAndLockLoggerName = "crop-and-lock";
-    inline const static std::wstring registryPreviewLogPath = L"Logs\\registryPreview-log.log";
+    inline const static std::wstring registryPreviewLogPath = L"Logs\\registryPreview-log.txt";
    inline const static std::string environmentVariablesLoggerName = "environment-variables";
-    inline const static std::wstring cmdNotFoundLogPath = L"Logs\\cmd-not-found-log.log";
+    inline const static std::wstring cmdNotFoundLogPath = L"Logs\\cmd-not-found-log.txt";
    inline const static std::string cmdNotFoundLoggerName = "cmd-not-found";
    inline const static std::string newLoggerName = "NewPlus";
    inline const static std::string workspacesLauncherLoggerName = "workspaces-launcher";
-    inline const static std::wstring workspacesLauncherLogPath = L"workspaces-launcher-log.log";
+    inline const static std::wstring workspacesLauncherLogPath = L"workspaces-launcher-log.txt";
    inline const static std::string workspacesWindowArrangerLoggerName = "workspaces-window-arranger";
-    inline const static std::wstring workspacesWindowArrangerLogPath = L"workspaces-window-arranger-log.log";
+    inline const static std::wstring workspacesWindowArrangerLogPath = L"workspaces-window-arranger-log.txt";
    inline const static std::string workspacesSnapshotToolLoggerName = "workspaces-snapshot-tool";
-    inline const static std::wstring workspacesSnapshotToolLogPath = L"workspaces-snapshot-tool-log.log";
+    inline const static std::wstring workspacesSnapshotToolLogPath = L"workspaces-snapshot-tool-log.txt";
    inline const static std::string zoomItLoggerName = "zoom-it";
    inline const static int retention = 30;
    std::wstring logLevel;
--- a/src/common/utils/logger_helper.h
+++ b/src/common/utils/logger_helper.h
@@ -91,7 +91,7 @@ namespace LoggerHelpers
        currentFolder.append(get_product_version());

        auto logsPath = currentFolder;
-        logsPath.append(L"log.log");
+        logsPath.append(L"log.txt");
        Logger::init(loggerName, logsPath.wstring(), PTSettingsHelper::get_log_settings_file_location());

        delete_other_versions_log_folders(rootFolder.wstring(), currentFolder); 
--- a/src/common/utils/package.h
+++ b/src/common/utils/package.h
@@ -301,7 +301,6 @@ namespace package
        if (!std::filesystem::exists(directoryPath))
        {
            Logger::error(L"The directory '" + directoryPath + L"' does not exist.");
-            return {};
        }

        const std::regex pattern(R"(^.+\.(appx|msix|msixbundle)$)", std::regex_constants::icase);
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/OcrHelpers.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/OcrHelpers.cs
@@ -18,19 +18,10 @@ public static class OcrHelpers
 {
    public static async Task<string> ExtractTextAsync(SoftwareBitmap bitmap, CancellationToken cancellationToken)
    {
-        var ocrLanguage = GetOCRLanguage();
+        var ocrLanguage = GetOCRLanguage() ?? throw new InvalidOperationException("Unable to determine OCR language");
        cancellationToken.ThrowIfCancellationRequested();

-        OcrEngine ocrEngine;
-        if (ocrLanguage is not null)
-        {
-            ocrEngine = OcrEngine.TryCreateFromLanguage(ocrLanguage) ?? throw new InvalidOperationException("Unable to create OCR engine from specified language");
-        }
-        else
-        {
-            ocrEngine = OcrEngine.TryCreateFromUserProfileLanguages() ?? throw new InvalidOperationException("Unable to create OCR engine from user profile language");
-        }
-
+        var ocrEngine = OcrEngine.TryCreateFromLanguage(ocrLanguage) ?? throw new InvalidOperationException("Unable to create OCR engine");
        cancellationToken.ThrowIfCancellationRequested();

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

  <PropertyGroup>
@@ -54,4 +56,7 @@
    <Manifest Include="$(ApplicationManifest)" />
  </ItemGroup>

+  <Target Name="EnsureCompilerGeneratedFilesOutputPathExists" BeforeTargets="XamlPreCompile">
+    <MakeDir Directories="$(CompilerGeneratedFilesOutputPath)" />
+  </Target>
 </Project>
--- a/src/modules/Hosts/Hosts.UITests/Hosts.UITests.csproj
+++ b/src/modules/Hosts/Hosts.UITests/Hosts.UITests.csproj
@@ -20,9 +20,6 @@

    <ItemGroup>
      <PackageReference Include="MSTest" />
-      <PackageReference Include="System.Net.Http" />
-      <PackageReference Include="System.Private.Uri" />
-      <PackageReference Include="System.Text.RegularExpressions" />
      <ProjectReference Include="..\..\..\common\UITestAutomation\UITestAutomation.csproj" />
    </ItemGroup>
 </Project>
--- a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
+++ b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props')" />
  <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" />
  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
  <PropertyGroup Label="Globals">
@@ -141,7 +141,7 @@
    <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
    <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" />
    <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets')" />
  </ImportGroup>
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
@@ -153,7 +153,7 @@
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets'))" />
  </Target>
 </Project>
--- a/src/modules/MeasureTool/MeasureToolCore/packages.config
+++ b/src/modules/MeasureTool/MeasureToolCore/packages.config
@@ -4,5 +4,5 @@
  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
  <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.2428" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.7.250401001" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.6.250205002" targetFramework="native" />
 </packages>
--- a/src/modules/Workspaces/WorkspacesLauncher/AppLauncher.cpp
+++ b/src/modules/Workspaces/WorkspacesLauncher/AppLauncher.cpp
@@ -121,22 +121,6 @@ namespace AppLauncher
        // packaged apps: try launching first by AppUserModel.ID
        // usage example: elevated Terminal
        if (!launched && !app.appUserModelId.empty() && !app.packageFullName.empty())
-        {
-            Logger::trace(L"Launching {} as {} - {app.packageFullName}", app.name, app.appUserModelId, app.packageFullName);
-            auto res = LaunchApp(L"shell:AppsFolder\\" + app.appUserModelId, app.commandLineArgs, app.isElevated);
-            if (res.isOk())
-            {
-                launched = true;
-            }
-            else
-            {
-                launchErrors.push_back({ std::filesystem::path(app.path).filename(), res.error() });
-            }
-        }
-
-        // win32 app with appUserModelId:
-        // usage example: steam games
-        if (!launched && !app.appUserModelId.empty())
        {
            Logger::trace(L"Launching {} as {}", app.name, app.appUserModelId);
            auto res = LaunchApp(L"shell:AppsFolder\\" + app.appUserModelId, app.commandLineArgs, app.isElevated);
--- a/src/modules/Workspaces/WorkspacesLib/AppUtils.cpp
+++ b/src/modules/Workspaces/WorkspacesLib/AppUtils.cpp
@@ -1,6 +1,5 @@
 #include "pch.h"
 #include "AppUtils.h"
-#include "SteamHelper.h"

 #include <atlbase.h>
 #include <propvarutil.h>
@@ -35,8 +34,6 @@ namespace Utils

            constexpr const wchar_t* EdgeFilename = L"msedge.exe";
            constexpr const wchar_t* ChromeFilename = L"chrome.exe";
-
-            constexpr const wchar_t* SteamUrlProtocol = L"steam:";
        }

        AppList IterateAppsFolder()
@@ -141,34 +138,6 @@ namespace Utils
                                else if (prop == NonLocalizable::PackageInstallPathProp || prop == NonLocalizable::InstallPathProp)
                                {
                                    data.installPath = propVariantString.m_pData;
-
-                                    if (!data.installPath.empty())
-                                    {
-                                        const bool isSteamProtocol = data.installPath.rfind(NonLocalizable::SteamUrlProtocol, 0) == 0;
-
-                                        if (isSteamProtocol)
-                                        {
-                                            Logger::info(L"Found steam game: protocol path: {}", data.installPath);
-                                            data.protocolPath = data.installPath;
-
-                                            try
-                                            {
-                                                auto gameId = Steam::GetGameIdFromUrlProtocolPath(data.installPath);
-                                                auto gameFolder = Steam::GetSteamGameInfoFromAcfFile(gameId);
-
-                                                if (gameFolder)
-                                                {
-                                                    data.installPath = gameFolder->gameInstallationPath;
-                                                    Logger::info(L"Found steam game: physical path: {}", data.installPath);
-                                                }
-                                            }
-                                            catch (std::exception ex)
-                                            {
-                                                Logger::error(L"Failed to get installPath for game {}", data.installPath);
-                                                Logger::error("Error: {}", ex.what());
-                                            }
-                                        }
-                                    }
                                }
                            }

@@ -428,10 +397,5 @@ namespace Utils
        {
            return installPath.ends_with(NonLocalizable::ChromeFilename);
        }
-
-        bool AppData::IsSteamGame() const
-        {
-            return protocolPath.rfind(NonLocalizable::SteamUrlProtocol, 0) == 0;
-        }
    }
 }
--- a/src/modules/Workspaces/WorkspacesLib/AppUtils.h
+++ b/src/modules/Workspaces/WorkspacesLib/AppUtils.h
@@ -13,12 +13,10 @@ namespace Utils
            std::wstring packageFullName;
            std::wstring appUserModelId;
            std::wstring pwaAppId;
-            std::wstring protocolPath;
            bool canLaunchElevated = false;

            bool IsEdge() const;
            bool IsChrome() const;
-            bool IsSteamGame() const;
        };

        using AppList = std::vector<AppData>;
--- a/src/modules/Workspaces/WorkspacesLib/SteamGameHelper.cpp
+++ b/src/modules/Workspaces/WorkspacesLib/SteamGameHelper.cpp
@@ -1,171 +0,0 @@
-#include "pch.h"
-#include "SteamHelper.h"
-#include <fstream>
-#include <sstream>
-#include <unordered_map>
-#include <filesystem>
-#include <regex>
-#include <string>
-
-namespace Utils
-{
-
-    static std::wstring Utf8ToWide(const std::string& utf8)
-    {
-        if (utf8.empty())
-            return L"";
-
-        int size = MultiByteToWideChar(CP_UTF8, 0, utf8.data(), static_cast<int>(utf8.size()), nullptr, 0);
-        if (size <= 0)
-            return L"";
-
-        std::wstring wide(size, L'\0');
-        MultiByteToWideChar(CP_UTF8, 0, utf8.data(), static_cast<int>(utf8.size()), wide.data(), size);
-        return wide;
-    }
-
-    namespace Steam
-    {
-        using namespace std;
-        namespace fs = std::filesystem;
-
-        static std::optional<std::wstring> GetSteamExePathFromRegistry()
-        {
-            static std::optional<std::wstring> cachedPath;
-            if (cachedPath.has_value())
-            {
-                return cachedPath;
-            }
-
-            const std::vector<HKEY> roots = { HKEY_CLASSES_ROOT, HKEY_LOCAL_MACHINE, HKEY_USERS };
-            const std::vector<std::wstring> subKeys = {
-                L"steam\\shell\\open\\command",
-                L"Software\\Classes\\steam\\shell\\open\\command",
-            };
-
-            for (HKEY root : roots)
-            {
-                for (const auto& subKey : subKeys)
-                {
-                    HKEY hKey;
-                    if (RegOpenKeyExW(root, subKey.c_str(), 0, KEY_READ, &hKey) == ERROR_SUCCESS)
-                    {
-                        wchar_t value[512];
-                        DWORD size = sizeof(value);
-                        DWORD type = 0;
-
-                        if (RegQueryValueExW(hKey, nullptr, nullptr, &type, reinterpret_cast<LPBYTE>(value), &size) == ERROR_SUCCESS &&
-                            (type == REG_SZ || type == REG_EXPAND_SZ))
-                        {
-                            std::wregex exeRegex(LR"delim("([^"]+steam\.exe)")delim");
-                            std::wcmatch match;
-                            if (std::regex_search(value, match, exeRegex) && match.size() > 1)
-                            {
-                                RegCloseKey(hKey);
-                                cachedPath = match[1].str();
-                                return cachedPath;
-                            }
-                        }
-
-                        RegCloseKey(hKey);
-                    }
-                }
-            }
-
-            cachedPath = std::nullopt;
-            return std::nullopt;
-        }
-
-        static fs::path GetSteamBasePath()
-        {
-            auto steamFolderOpt = GetSteamExePathFromRegistry();
-            if (!steamFolderOpt)
-            {
-                return {};
-            }
-
-            return fs::path(*steamFolderOpt).parent_path() / L"steamapps";
-        }
-
-        static fs::path GetAcfFilePath(const std::wstring& gameId)
-        {
-            auto steamFolderOpt = GetSteamExePathFromRegistry();
-            if (!steamFolderOpt)
-            {
-                return {};
-            }
-
-            return GetSteamBasePath() / (L"appmanifest_" + gameId + L".acf");
-        }
-
-        static fs::path GetGameInstallPath(const std::wstring& gameFolderName)
-        {
-            auto steamFolderOpt = GetSteamExePathFromRegistry();
-            if (!steamFolderOpt)
-            {
-                return {};
-            }
-
-            return GetSteamBasePath() / L"common" / gameFolderName;
-        }
-
-        static unordered_map<wstring, wstring> ParseAcfFile(const fs::path& acfPath)
-        {
-            unordered_map<wstring, wstring> result;
-
-            ifstream file(acfPath);
-            if (!file.is_open())
-                return result;
-
-            string line;
-            while (getline(file, line))
-            {
-                smatch matches;
-                static const regex pattern(R"delim("([^"]+)"\s+"([^"]+)")delim");
-
-                if (regex_search(line, matches, pattern) && matches.size() == 3)
-                {
-                    wstring key = Utf8ToWide(matches[1].str());
-                    wstring value = Utf8ToWide(matches[2].str());
-                    result[key] = value;
-                }
-            }
-
-            return result;
-        }
-
-        std::unique_ptr<Steam::SteamGame> GetSteamGameInfoFromAcfFile(const std::wstring& gameId)
-        {
-            fs::path acfPath = Steam::GetAcfFilePath(gameId);
-
-            if (!fs::exists(acfPath))
-                return nullptr;
-
-            auto kv = ParseAcfFile(acfPath);
-            if (kv.empty() || kv.find(L"installdir") == kv.end())
-                return nullptr;
-
-            fs::path gamePath = Steam::GetGameInstallPath(kv[L"installdir"]);
-            if (!fs::exists(gamePath))
-                return nullptr;
-
-            auto game = std::make_unique<Steam::SteamGame>();
-            game->gameId = gameId;
-            game->gameInstallationPath = gamePath.wstring();
-            return game;
-        }
-
-        std::wstring GetGameIdFromUrlProtocolPath(const std::wstring& urlPath)
-        {
-            const std::wstring steamGamePrefix = L"steam://rungameid/";
-
-            if (urlPath.rfind(steamGamePrefix, 0) == 0)
-            {
-                return urlPath.substr(steamGamePrefix.length());
-            }
-
-            return L"";
-        }
-
-    }
-}
--- a/src/modules/Workspaces/WorkspacesLib/SteamHelper.h
+++ b/src/modules/Workspaces/WorkspacesLib/SteamHelper.h
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "pch.h"
-
-namespace Utils
-{
-    namespace NonLocalizable
-    {
-        const std::wstring AcfFileNameTemplate = L"appmanifest_<gameid>.acfs";
-    }
-
-    namespace Steam
-    {
-        struct SteamGame
-        {
-            std::wstring gameId;
-            std::wstring gameInstallationPath;
-        };
-
-        std::unique_ptr<SteamGame> GetSteamGameInfoFromAcfFile(const std::wstring& gameId);
-
-        std::wstring GetGameIdFromUrlProtocolPath(const std::wstring& urlPath);
-    }
-}
--- a/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj
+++ b/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj
@@ -41,7 +41,6 @@
    <ClInclude Include="pch.h" />
    <ClInclude Include="PwaHelper.h" />
    <ClInclude Include="Result.h" />
-    <ClInclude Include="SteamHelper.h" />
    <ClInclude Include="StringUtils.h" />
    <ClInclude Include="utils.h" />
    <ClInclude Include="WbemHelper.h" />
@@ -58,7 +57,6 @@
      <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
    </ClCompile>
    <ClCompile Include="PwaHelper.cpp" />
-    <ClCompile Include="SteamGameHelper.cpp" />
    <ClCompile Include="two_way_pipe_message_ipc.cpp" />
    <ClCompile Include="WbemHelper.cpp" />
    <ClCompile Include="WorkspacesData.cpp" />
--- a/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj.filters
+++ b/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj.filters
@@ -53,9 +53,6 @@
    <ClInclude Include="StringUtils.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="SteamHelper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="pch.cpp">
@@ -91,9 +88,6 @@
    <ClCompile Include="WbemHelper.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="SteamGameHelper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config" />
--- a/src/modules/Workspaces/WorkspacesSnapshotTool/SnapshotUtils.cpp
+++ b/src/modules/Workspaces/WorkspacesSnapshotTool/SnapshotUtils.cpp
@@ -71,8 +71,6 @@ namespace SnapshotUtils
                continue;
            }

-            Logger::info("Try to get window app:{}", reinterpret_cast<void*>(window));
-
            DWORD pid{};
            GetWindowThreadProcessId(window, &pid);

@@ -120,19 +118,10 @@ namespace SnapshotUtils
            auto data = Utils::Apps::GetApp(processPath, pid, installedApps);
            if (!data.has_value() || data->name.empty())
            {
-                Logger::info(L"Installed app not found:{},{}", reinterpret_cast<void*>(window), processPath);
+                Logger::info(L"Installed app not found: {}", processPath);
                continue;
            }

-            if (!data->IsSteamGame() && !WindowUtils::HasThickFrame(window))
-            {
-                // Only care about steam games if it has no thick frame to remain consistent with
-                // the behavior as before.
-                continue;
-            }
-
-            Logger::info(L"Found app for window:{},{}", reinterpret_cast<void*>(window), processPath);
-
            auto appData = data.value();

            bool isEdge = appData.IsEdge();
--- a/src/modules/Workspaces/WorkspacesWindowArranger/WindowArranger.cpp
+++ b/src/modules/Workspaces/WorkspacesWindowArranger/WindowArranger.cpp
@@ -200,14 +200,6 @@ std::optional<WindowWithDistance> WindowArranger::GetNearestWindow(const Workspa
        }

        auto data = Utils::Apps::GetApp(processPath, pid, m_installedApps);
-
-        if (!data->IsSteamGame() && !WindowUtils::HasThickFrame(window))
-        {
-            // Only care about steam games if it has no thick frame to remain consistent with 
-            // the behavior as before.
-            continue;
-        }
-
        if (!data.has_value())
        {
            continue;
--- a/src/modules/Workspaces/workspaces-common/WindowFilter.h
+++ b/src/modules/Workspaces/workspaces-common/WindowFilter.h
@@ -9,12 +9,10 @@ namespace WindowFilter
    {
        auto style = GetWindowLong(window, GWL_STYLE);
        bool isPopup = WindowUtils::HasStyle(style, WS_POPUP);
+        bool hasThickFrame = WindowUtils::HasStyle(style, WS_THICKFRAME);
        bool hasCaption = WindowUtils::HasStyle(style, WS_CAPTION);
        bool hasMinimizeMaximizeButtons = WindowUtils::HasStyle(style, WS_MINIMIZEBOX) || WindowUtils::HasStyle(style, WS_MAXIMIZEBOX);
-
-        Logger::info("Style for window: {}, {:#x}", reinterpret_cast<void*>(window), style);
-
-        if (isPopup && !(hasCaption || hasMinimizeMaximizeButtons))
+        if (isPopup && !(hasThickFrame && (hasCaption || hasMinimizeMaximizeButtons)))
        {
            // popup windows we want to snap: e.g. Calculator, Telegram
            // popup windows we don't want to snap: start menu, notification popup, tray window, etc.
--- a/src/modules/Workspaces/workspaces-common/WindowUtils.h
+++ b/src/modules/Workspaces/workspaces-common/WindowUtils.h
@@ -121,11 +121,4 @@ namespace WindowUtils

        return std::wstring(title);
    }
-
-    
-    inline bool HasThickFrame(HWND window)
-    {
-        auto style = GetWindowLong(window, GWL_STYLE);
-        return WindowUtils::HasStyle(style, WS_THICKFRAME);
-    }
 }
--- a/src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.def
+++ b/src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.def
@@ -1,3 +0,0 @@
-EXPORTS
-DllCanUnloadNow = WINRT_CanUnloadNow                    PRIVATE
-DllGetActivationFactory = WINRT_GetActivationFactory    PRIVATE
--- a/src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.rc
+++ b/src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.rc
@@ -1,40 +0,0 @@
-#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/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj
+++ b/src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
-  <PropertyGroup Label="Globals">
-    <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
-    <CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>
-    <ProjectGuid>{5f63c743-f6ce-4dba-a200-2b3f8a14e8c2}</ProjectGuid>
-    <ProjectName>CmdPalKeyboardService</ProjectName>
-    <RootNamespace>CmdPalKeyboardService</RootNamespace>
-    <AppxPackage>false</AppxPackage>
-  </PropertyGroup>
-
-  <!-- BEGIN common.build.pre.props -->
-  <PropertyGroup Label="Configuration">
-    <EnableHybridCRT>true</EnableHybridCRT>
-    <UseCrtSDKReferenceStaticWarning Condition="'$(EnableHybridCRT)'=='true'">false</UseCrtSDKReferenceStaticWarning>
-  </PropertyGroup>
-  <!-- END common.build.pre.props -->
-  <!-- BEGIN cppwinrt.build.pre.props -->
-  <PropertyGroup Label="Globals">
-    <CppWinRTEnabled>true</CppWinRTEnabled>
-    <CppWinRTOptimized>true</CppWinRTOptimized>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
-    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
-  </PropertyGroup>
-  <PropertyGroup>
-    <MinimalCoreWin>true</MinimalCoreWin>
-    <AppContainerApplication>true</AppContainerApplication>
-    <WindowsStoreApp>true</WindowsStoreApp>
-    <ApplicationType>Windows Store</ApplicationType>
-    <UseCrtSDKReference Condition="'$(EnableHybridCRT)'=='true'">false</UseCrtSDKReference> <!-- The SDK reference breaks the Hybrid CRT -->
-  </PropertyGroup>
-  <PropertyGroup>
-    <!-- We have to use the Desktop platform for Hybrid CRT to work. -->
-    <_VC_Target_Library_Platform>Desktop</_VC_Target_Library_Platform>
-    <_NoWinAPIFamilyApp>true</_NoWinAPIFamilyApp>
-  </PropertyGroup>
-  <!-- END cppwinrt.build.pre.props -->
-
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="PropertySheet.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <TargetName>CmdPalKeyboardService</TargetName>
-    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level4</WarningLevel>
-      <AdditionalOptions>%(AdditionalOptions) /bigobj</AdditionalOptions>
-      <PreprocessorDefinitions>_WINRT_DLL;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <ModuleDefinitionFile>CmdPalKeyboardService.def</ModuleDefinitionFile>
-      <AdditionalDependencies>Shell32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="KeyboardListener.h">
-      <DependentUpon>KeyboardListener.idl</DependentUpon>
-    </ClInclude>
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="KeyboardListener.cpp">
-      <DependentUpon>KeyboardListener.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Midl Include="KeyboardListener.idl" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="CmdPalKeyboardService.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="PropertySheet.props" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ResourceCompile Include="CmdPalKeyboardService.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="..\..\..\..\deps\spdlog.props" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
-  </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-  </Target>
-
-  <!-- BEGIN common.build.post.props -->
-  <!--
-    The Hybrid CRT model statically links the runtime and STL and dynamically
-    links the UCRT instead of the VC++ CRT. The UCRT ships with Windows.
-    WinAppSDK asserts that this is "supported according to the CRT maintainer."
-
-    This must come before Microsoft.Cpp.targets because it manipulates ClCompile.RuntimeLibrary.
-  -->
-  <ItemDefinitionGroup Condition="'$(EnableHybridCRT)'=='true' and '$(Configuration)'=='Debug'">
-    <ClCompile>
-      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(EnableHybridCRT)'=='true' and ('$(Configuration)'=='Release' or '$(Configuration)'=='AuditMode')">
-    <ClCompile>
-      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
-           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
-           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
-           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
-      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
-      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <!-- END common.build.post.props -->
-
-</Project>
--- a/src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj.filters
+++ b/src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj.filters
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resources">
-      <UniqueIdentifier>accd3aa8-1ba0-4223-9bbe-0c431709210b</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tga;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Generated Files">
-      <UniqueIdentifier>{926ab91d-31b4-48c3-b9a4-e681349f27f0}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="pch.cpp" />
-    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Midl Include="KeyboardListener.idl" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CmdPalKeyboardService.def" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="PropertySheet.props" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="CmdPalKeyboardService.rc">
-      <Filter>Resources</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
--- a/src/modules/cmdpal/CmdPalKeyboardService/KeyboardListener.cpp
+++ b/src/modules/cmdpal/CmdPalKeyboardService/KeyboardListener.cpp
@@ -1,165 +0,0 @@
-#include "pch.h"
-#include "KeyboardListener.h"
-#include "KeyboardListener.g.cpp"
-
-// #include <common/logger/logger.h>
-// #include <common/utils/logger_helper.h>
-#include <common/utils/winapi_error.h>
-
-namespace
-{
-}
-
-namespace winrt::CmdPalKeyboardService::implementation
-{
-    KeyboardListener::KeyboardListener()
-    {
-        s_instance = this;
-    }
-
-    void KeyboardListener::Start()
-    {
-#if defined(DISABLE_LOWLEVEL_HOOKS_WHEN_DEBUGGED)
-        const bool hook_disabled = IsDebuggerPresent();
-#else
-        const bool hook_disabled = false;
-#endif
-        if (!hook_disabled)
-        {
-            if (!s_llKeyboardHook)
-            {
-                s_llKeyboardHook = SetWindowsHookExW(WH_KEYBOARD_LL, LowLevelKeyboardProc, NULL, NULL);
-                if (!s_llKeyboardHook)
-                {
-                    DWORD errorCode = GetLastError();
-                    show_last_error_message(L"SetWindowsHookEx", errorCode, L"CmdPalKeyboardService");
-                }
-            }
-        }
-    }
-
-    void KeyboardListener::Stop()
-    {
-        if (s_llKeyboardHook && UnhookWindowsHookEx(s_llKeyboardHook))
-        {
-            s_llKeyboardHook = NULL;
-        }
-    }
-
-    void KeyboardListener::SetHotkeyAction(bool win, bool ctrl, bool shift, bool alt, uint8_t key, hstring const& id)
-    {
-        Hotkey hotkey = { .win = win, .ctrl = ctrl, .shift = shift, .alt = alt, .key = key };
-        std::unique_lock lock{ mutex };
-
-        HotkeyDescriptor desc = { .hotkey = hotkey, .id = std::wstring(id) };
-        hotkeyDescriptors.insert(desc);
-    }
-
-    void KeyboardListener::ClearHotkey(hstring const& id)
-    {
-        {
-            std::unique_lock lock{ mutex };
-            auto it = hotkeyDescriptors.begin();
-            while (it != hotkeyDescriptors.end())
-            {
-                if (it->id == id)
-                {
-                    it = hotkeyDescriptors.erase(it);
-                }
-                else
-                {
-                    ++it;
-                }
-            }
-        }
-    }
-
-    void KeyboardListener::ClearHotkeys()
-    {
-        {
-            std::unique_lock lock{ mutex };
-            auto it = hotkeyDescriptors.begin();
-            while (it != hotkeyDescriptors.end())
-            {
-                it = hotkeyDescriptors.erase(it);
-            }
-        }
-    }
-
-    void KeyboardListener::SetProcessCommand(ProcessCommand processCommand)
-    {
-        m_processCommandCb = [trigger = std::move(processCommand)](hstring const& id) {
-            trigger(id);
-        };
-    }
-
-    LRESULT KeyboardListener::DoLowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
-    {
-        const auto& keyPressInfo = *reinterpret_cast<KBDLLHOOKSTRUCT*>(lParam);
-
-        if ((wParam != WM_KEYDOWN) && (wParam != WM_SYSKEYDOWN))
-        {
-            return CallNextHookEx(NULL, nCode, wParam, lParam);
-        }
-
-        Hotkey hotkey{
-            .win = (GetAsyncKeyState(VK_LWIN) & 0x8000) || (GetAsyncKeyState(VK_RWIN) & 0x8000),
-            .ctrl = static_cast<bool>(GetAsyncKeyState(VK_CONTROL) & 0x8000),
-            .shift = static_cast<bool>(GetAsyncKeyState(VK_SHIFT) & 0x8000),
-            .alt = static_cast<bool>(GetAsyncKeyState(VK_MENU) & 0x8000),
-            .key = static_cast<unsigned char>(keyPressInfo.vkCode)
-        };
-
-        if (hotkey == Hotkey{})
-        {
-            return CallNextHookEx(NULL, nCode, wParam, lParam);
-        }
-
-        bool do_action = false;
-        std::wstring actionId{};
-
-        {
-            // Hold the lock for the shortest possible duration
-            std::unique_lock lock{ mutex };
-            HotkeyDescriptor dummy{ .hotkey = hotkey };
-            auto it = hotkeyDescriptors.find(dummy);
-            if (it != hotkeyDescriptors.end())
-            {
-                do_action = true;
-                actionId = it->id;
-            }
-        }
-
-        if (do_action)
-        {
-            m_processCommandCb(hstring{ actionId });
-
-            // After invoking the hotkey send a dummy key to prevent Start Menu from activating
-            INPUT dummyEvent[1] = {};
-            dummyEvent[0].type = INPUT_KEYBOARD;
-            dummyEvent[0].ki.wVk = 0xFF;
-            dummyEvent[0].ki.dwFlags = KEYEVENTF_KEYUP;
-            SendInput(1, dummyEvent, sizeof(INPUT));
-
-            // Swallow the key press
-            return 1;
-        }
-
-        return CallNextHookEx(NULL, nCode, wParam, lParam);
-    }
-
-    LRESULT KeyboardListener::LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
-    {
-        if (s_instance == nullptr)
-        {
-            return CallNextHookEx(NULL, nCode, wParam, lParam);
-        }
-
-        if (nCode < 0)
-        {
-            return CallNextHookEx(NULL, nCode, wParam, lParam);
-        }
-
-        return s_instance->DoLowLevelKeyboardProc(nCode, wParam, lParam);
-    }
-}
--- a/src/modules/cmdpal/CmdPalKeyboardService/KeyboardListener.h
+++ b/src/modules/cmdpal/CmdPalKeyboardService/KeyboardListener.h
@@ -1,67 +0,0 @@
-#pragma once
-
-#include "KeyboardListener.g.h"
-#include <mutex>
-#include <spdlog/stopwatch.h>
-#include <set>
-
-namespace winrt::CmdPalKeyboardService::implementation
-{
-    struct KeyboardListener : KeyboardListenerT<KeyboardListener>
-    {
-        struct Hotkey
-        {
-            bool win = false;
-            bool ctrl = false;
-            bool shift = false;
-            bool alt = false;
-            unsigned char key = 0;
-
-            std::strong_ordering operator<=>(const Hotkey&) const = default;
-        };
-
-        struct HotkeyDescriptor
-        {
-            Hotkey hotkey;
-            std::wstring id;
-
-            bool operator<(const HotkeyDescriptor& other) const
-            {
-                return hotkey < other.hotkey;
-            };
-        };
-
-        KeyboardListener();
-
-        void Start();
-        void Stop();
-        void SetHotkeyAction(bool win, bool ctrl, bool shift, bool alt, uint8_t key, hstring const& id);
-        void ClearHotkey(hstring const& id);
-        void ClearHotkeys();
-        void SetProcessCommand(ProcessCommand processCommand);
-
-        static LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam);
-
-    private:
-        LRESULT CALLBACK DoLowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam);
-
-        static inline KeyboardListener* s_instance;
-        HHOOK s_llKeyboardHook = nullptr;
-
-        // Max DWORD for key code to disable keys.
-        const DWORD VK_DISABLED = 0x100;
-        DWORD vkCodePressed = VK_DISABLED;
-
-        std::multiset<HotkeyDescriptor> hotkeyDescriptors;
-        std::mutex mutex;
-
-        std::function<void(hstring const&)> m_processCommandCb;
-    };
-}
-
-namespace winrt::CmdPalKeyboardService::factory_implementation
-{
-    struct KeyboardListener : KeyboardListenerT<KeyboardListener, implementation::KeyboardListener>
-    {
-    };
-}
--- a/src/modules/cmdpal/CmdPalKeyboardService/KeyboardListener.idl
+++ b/src/modules/cmdpal/CmdPalKeyboardService/KeyboardListener.idl
@@ -1,16 +0,0 @@
-
-namespace CmdPalKeyboardService
-{
-    [version(1.0), uuid(78ab07cd-e128-4e73-86aa-e48e6b6d01ff)] delegate void ProcessCommand(String id);
-
-    [default_interface] runtimeclass KeyboardListener {
-        KeyboardListener();
-        void Start();
-        void Stop();
-
-        void SetHotkeyAction(Boolean win, Boolean ctrl, Boolean shift, Boolean alt, UInt8 key, String id);
-        void ClearHotkey(String id);
-        void ClearHotkeys();
-        void SetProcessCommand(ProcessCommand processCommand);
-    }
-}
--- a/src/modules/cmdpal/CmdPalKeyboardService/PropertySheet.props
+++ b/src/modules/cmdpal/CmdPalKeyboardService/PropertySheet.props
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <!--
-    To customize common C++/WinRT project properties: 
-    * right-click the project node
-    * expand the Common Properties item
-    * select the C++/WinRT property page
-
-    For more advanced scenarios, and complete documentation, please see:
-    https://github.com/Microsoft/cppwinrt/tree/master/nuget 
-    -->
-  <PropertyGroup />
-  <ItemDefinitionGroup />
-</Project>
--- a/src/modules/cmdpal/CmdPalKeyboardService/packages.config
+++ b/src/modules/cmdpal/CmdPalKeyboardService/packages.config
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
-</packages>
--- a/src/modules/cmdpal/CmdPalKeyboardService/pch.cpp
+++ b/src/modules/cmdpal/CmdPalKeyboardService/pch.cpp
@@ -1 +0,0 @@
-#include "pch.h"
--- a/src/modules/cmdpal/CmdPalKeyboardService/pch.h
+++ b/src/modules/cmdpal/CmdPalKeyboardService/pch.h
@@ -1,4 +0,0 @@
-#pragma once
-#include <Unknwn.h>
-#include <winrt/Windows.Foundation.h>
-#include <winrt/Windows.Foundation.Collections.h>
--- a/src/modules/cmdpal/CmdPalKeyboardService/resource.h
+++ b/src/modules/cmdpal/CmdPalKeyboardService/resource.h
@@ -1,13 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by PowerToys.MeasureToolCore.rc
-
-//////////////////////////////
-// Non-localizable
-
-#define FILE_DESCRIPTION "CmdPalKeyboardService"
-#define INTERNAL_NAME "CmdPalKeyboardService"
-#define ORIGINAL_FILENAME "CmdPalKeyboardService.dll"
-
-// Non-localizable
-//////////////////////////////
--- a/src/modules/cmdpal/CmdPalModuleInterface/CmdPalModuleInterface.vcxproj
+++ b/src/modules/cmdpal/CmdPalModuleInterface/CmdPalModuleInterface.vcxproj
@@ -2,7 +2,6 @@
 <Project DefaultTargets="Build"
  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
-  <Import Project="..\Microsoft.CmdPal.UI\CmdPal.pre.props" Condition="Exists('..\Microsoft.CmdPal.UI\CmdPal.pre.props')" />
  <PropertyGroup Label="Globals">
    <VCProjectVersion>17.0</VCProjectVersion>
    <Keyword>Win32Proj</Keyword>
@@ -50,20 +49,13 @@
  </ItemGroup>
  <ItemDefinitionGroup>
    <ClCompile>
-      <PreprocessorDefinitions>
-        EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;
-        %(PreprocessorDefinitions);
-      </PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(CommandPaletteBranding)'=='' or '$(CommandPaletteBranding)'=='Dev'">
-        IS_DEV_BRANDING;%(PreprocessorDefinitions)
-      </PreprocessorDefinitions>
+      <PreprocessorDefinitions>EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
    </Link>
  </ItemDefinitionGroup>
-
  <ItemGroup>
    <ClInclude Include="pch.h" />
    <ClInclude Include="resource.h" />
--- a/src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp
+++ b/src/modules/cmdpal/CmdPalModuleInterface/dllmain.cpp
@@ -3,7 +3,6 @@

 #include <interface/powertoy_module_interface.h>

-#include <atomic>
 #include <common/logger/logger.h>
 #include <common/utils/logger_helper.h>
 #include <common/SettingsAPI/settings_helpers.h>
@@ -11,11 +10,10 @@
 #include <common/utils/resources.h>
 #include <common/utils/package.h>
 #include <common/utils/process_path.h>
-#include <common/utils/winapi_error.h>
 #include <common/interop/shared_constants.h>
 #include <Psapi.h>
 #include <TlHelp32.h>
-#include <thread>
+#include <common/utils/winapi_error.h>

 HINSTANCE g_hInst_cmdPal = 0;

@@ -39,6 +37,8 @@ BOOL APIENTRY DllMain(HMODULE hInstance,
 class CmdPal : public PowertoyModuleIface
 {
 private:
+    bool m_enabled = false;
+
    std::wstring app_name;

    //contains the non localized key of the powertoy
@@ -46,10 +46,7 @@ private:

    HANDLE m_hTerminateEvent;

-    // Track if this is the first call to enable
-    bool firstEnableCall = true;
-
-    static bool LaunchApp(const std::wstring& appPath, const std::wstring& commandLineArgs, bool elevated, bool silentFail)
+    void LaunchApp(const std::wstring& appPath, const std::wstring& commandLineArgs, bool elevated)
    {
        std::wstring dir = std::filesystem::path(appPath).parent_path();

@@ -57,10 +54,6 @@ private:
        sei.cbSize = sizeof(SHELLEXECUTEINFO);
        sei.hwnd = nullptr;
        sei.fMask = SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE;
-        if (silentFail)
-        {
-            sei.fMask = sei.fMask | SEE_MASK_FLAG_NO_UI;
-        }
        sei.lpVerb = elevated ? L"runas" : L"open";
        sei.lpFile = appPath.c_str();
        sei.lpParameters = commandLineArgs.c_str();
@@ -71,11 +64,7 @@ private:
        {
            std::wstring error = get_last_error_or_default(GetLastError());
            Logger::error(L"Failed to launch process. {}", error);
-            return false;
        }
-
-        m_launched.store(true);
-        return true;
    }

    std::vector<DWORD> GetProcessesIdByName(const std::wstring& processName)
@@ -133,9 +122,6 @@ private:
    }

 public:
-    static std::atomic<bool> m_enabled;
-    static std::atomic<bool> m_launched;
-
    CmdPal()
    {
        app_name = L"CmdPal";
@@ -147,7 +133,10 @@ public:

    ~CmdPal()
    {
-        CmdPal::m_enabled.store(false);
+        if (m_enabled)
+        {
+        }
+        m_enabled = false;
    }

    // Destroy the powertoy and free memory
@@ -214,23 +203,16 @@ public:
    {
        Logger::trace("CmdPal::enable()");

-        CmdPal::m_enabled.store(true);
+        m_enabled = true;

-        std::wstring packageName = L"Microsoft.CommandPalette";
-        std::wstring launchPath = L"shell:AppsFolder\\Microsoft.CommandPalette_8wekyb3d8bbwe!App";
-#ifdef IS_DEV_BRANDING
-        packageName = L"Microsoft.CommandPalette.Dev";
-        launchPath = L"shell:AppsFolder\\Microsoft.CommandPalette.Dev_8wekyb3d8bbwe!App";
-#endif
-
-        if (!package::GetRegisteredPackage(packageName, false).has_value())
+        try
        {
-            try
+            if (!package::GetRegisteredPackage(L"Microsoft.CommandPalette", false).has_value())
            {
                Logger::info(L"CmdPal not installed. Installing...");

                std::wstring installationFolder = get_module_folderpath();
-#ifdef _DEBUG
+#if _DEBUG
                std::wstring archSubdir = L"x64";
 #ifdef _M_ARM64
                archSubdir = L"ARM64";
@@ -252,34 +234,19 @@ public:
                    }
                }
            }
-            catch (std::exception& e)
-            {
-                std::string errorMessage{ "Exception thrown while trying to install CmdPal package: " };
-                errorMessage += e.what();
-                Logger::error(errorMessage);
-            }
+        }
+        catch (std::exception& e)
+        {
+            std::string errorMessage{ "Exception thrown while trying to install CmdPal package: " };
+            errorMessage += e.what();
+            Logger::error(errorMessage);
        }

-        if (!package::GetRegisteredPackage(packageName, false).has_value())
-        {
-            Logger::error("Cmdpal is not registered, quit..");
-            return;
-        }
-
-        if (!firstEnableCall)
-        {
-            Logger::trace("Not first attempt, try to launch");
-            LaunchApp(launchPath, L"RunFromPT", false /*no elevated*/, false /*error pop up*/);
-        }
-        else
-        {
-            // If first time enable, do retry launch.
-            Logger::trace("First attempt, try to launch");
-            std::thread launchThread(&CmdPal::RetryLaunch, launchPath);
-            launchThread.detach();
-        }
-
-        firstEnableCall = false;
+#if _DEBUG
+        LaunchApp(std::wstring{ L"shell:AppsFolder\\" } + L"Microsoft.CommandPalette.Dev_8wekyb3d8bbwe!App", L"RunFromPT", false);
+#else
+        LaunchApp(std::wstring{ L"shell:AppsFolder\\" } + L"Microsoft.CommandPalette_8wekyb3d8bbwe!App", L"RunFromPT", false);
+#endif
    }

    virtual void disable()
@@ -287,44 +254,7 @@ public:
        Logger::trace("CmdPal::disable()");
        TerminateCmdPal();

-        CmdPal::m_enabled.store(false);
-    }
-
-    static void RetryLaunch(std::wstring path)
-    {
-        const int base_delay_milliseconds = 1000;
-        int max_retry = 9; // 2**9 - 1 seconds. Control total wait time within 10 min.
-        int retry = 0;
-        do
-        {
-            auto launch_result = LaunchApp(path, L"RunFromPT", false, retry < max_retry);
-            if (launch_result)
-            {
-                Logger::info(L"CmdPal launched successfully after {} retries.", retry);
-                return;
-            }
-            else
-            {
-                Logger::error(L"Retry {} launch CmdPal launch failed.", retry);
-            }
-
-            // When we got max retry, we don't need to wait for the next retry.
-            if (retry < max_retry)
-            {
-                int delay = base_delay_milliseconds * (1 << (retry));
-                std::this_thread::sleep_for(std::chrono::milliseconds(delay));
-            }
-            ++retry;
-        } while (retry <= max_retry && m_enabled.load() && !m_launched.load());
-
-        if (!m_enabled.load() || m_launched.load())
-        {
-            Logger::error(L"Retry cancelled. CmdPal is disabled or already launched.");
-        }
-        else
-        {
-            Logger::error(L"CmdPal launch failed after {} attempts.", retry);
-        }
+        m_enabled = false;
    }

    virtual bool on_hotkey(size_t) override
@@ -339,14 +269,11 @@ public:

    virtual bool is_enabled() override
    {
-        return CmdPal::m_enabled.load();
+        return m_enabled;
    }
 };

-std::atomic<bool> CmdPal::m_enabled{ false };
-std::atomic<bool> CmdPal::m_launched{ false };
-
 extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
 {
    return new CmdPal();
-}
+}
--- a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props
+++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props
@@ -9,7 +9,7 @@
    <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.250205002" />
    <PackageVersion Include="Shmuelie.WinRTServer" Version="2.1.1" />
    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
    <PackageVersion Include="System.Text.Json" Version="9.0.3" />
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/AllAppsCommandProvider.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/AllAppsCommandProvider.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/AllAppsPage.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/AllAppsPage.cs
@@ -57,7 +57,7 @@ public sealed partial class AllAppsPage : ListPage
        Stopwatch stopwatch = new();
        stopwatch.Start();

-        var apps = GetPrograms();
+        List<AppItem> apps = GetPrograms();

        this.allAppsSection = apps
                        .Select((app) => new AppListItem(app, true))
@@ -73,15 +73,26 @@ public sealed partial class AllAppsPage : ListPage

    internal List<AppItem> GetPrograms()
    {
-        var uwpResults = AppCache.Instance.Value.UWPs
+        IEnumerable<AppItem> uwpResults = AppCache.Instance.Value.UWPs
            .Where((application) => application.Enabled)
-            .Select(UwpToAppItem);
+            .Select(app =>
+                new AppItem()
+                {
+                    Name = app.Name,
+                    Subtitle = app.Description,
+                    Type = UWPApplication.Type(),
+                    IcoPath = app.LogoType != LogoType.Error ? app.LogoPath : string.Empty,
+                    DirPath = app.Location,
+                    UserModelId = app.UserModelId,
+                    IsPackaged = true,
+                    Commands = app.GetCommands(),
+                });

-        var win32Results = AppCache.Instance.Value.Win32s
+        IEnumerable<AppItem> win32Results = AppCache.Instance.Value.Win32s
            .Where((application) => application.Enabled && application.Valid)
            .Select(app =>
            {
-                var icoPath = string.IsNullOrEmpty(app.IcoPath) ?
+                string icoPath = string.IsNullOrEmpty(app.IcoPath) ?
                    (app.AppType == Win32Program.ApplicationType.InternetShortcutApplication ?
                        app.IcoPath :
                        app.FullPath) :
@@ -105,21 +116,4 @@ public sealed partial class AllAppsPage : ListPage

        return uwpResults.Concat(win32Results).OrderBy(app => app.Name).ToList();
    }
-
-    private AppItem UwpToAppItem(UWPApplication app)
-    {
-        var iconPath = app.LogoType != LogoType.Error ? app.LogoPath : string.Empty;
-        var item = new AppItem()
-        {
-            Name = app.Name,
-            Subtitle = app.Description,
-            Type = UWPApplication.Type(),
-            IcoPath = iconPath,
-            DirPath = app.Location,
-            UserModelId = app.UserModelId,
-            IsPackaged = true,
-            Commands = app.GetCommands(),
-        };
-        return item;
-    }
 }
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/AppCache.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/AppCache.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/AppItem.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/AppItem.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/AppListItem.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/AppListItem.cs
@@ -32,13 +32,7 @@ internal sealed partial class AppListItem : ListItem
        Tags = [_appTag];
        MoreCommands = _app.Commands!.ToArray();

-        _details = new Lazy<Details>(() =>
-        {
-            var t = BuildDetails();
-            t.Wait();
-            return t.Result;
-        });
-
+        _details = new Lazy<Details>(() => BuildDetails());
        _icon = new Lazy<IconInfo>(() =>
        {
            var t = FetchIcon(useThumbnails);
@@ -47,9 +41,8 @@ internal sealed partial class AppListItem : ListItem
        });
    }

-    private async Task<Details> BuildDetails()
+    private Details BuildDetails()
    {
-        // Build metadata, with app type, path, etc.
        var metadata = new List<DetailsElement>();
        metadata.Add(new DetailsElement() { Key = "Type", Data = new DetailsTags() { Tags = [new Tag(_app.Type)] } });
        if (!_app.IsPackaged)
@@ -57,33 +50,10 @@ internal sealed partial class AppListItem : ListItem
            metadata.Add(new DetailsElement() { Key = "Path", Data = new DetailsLink() { Text = _app.ExePath } });
        }

-        // Icon
-        IconInfo? heroImage = null;
-        if (_app.IsPackaged)
-        {
-            heroImage = new IconInfo(_app.IcoPath);
-        }
-        else
-        {
-            try
-            {
-                var stream = await ThumbnailHelper.GetThumbnail(_app.ExePath, true);
-                if (stream != null)
-                {
-                    heroImage = IconInfo.FromStream(stream);
-                }
-            }
-            catch (Exception)
-            {
-                // do nothing if we fail to load an icon.
-                // Logging it would be too NOISY, there's really no need.
-            }
-        }
-
        return new Details()
        {
            Title = this.Title,
-            HeroImage = heroImage ?? this.Icon ?? new IconInfo(string.Empty),
+            HeroImage = this.Icon ?? new IconInfo(string.Empty),
            Metadata = metadata.ToArray(),
        };
    }
@@ -94,6 +64,11 @@ internal sealed partial class AppListItem : ListItem
        if (_app.IsPackaged)
        {
            icon = new IconInfo(_app.IcoPath);
+            if (_details.IsValueCreated)
+            {
+                _details.Value.HeroImage = icon;
+            }
+
            return icon;
        }

@@ -119,6 +94,11 @@ internal sealed partial class AppListItem : ListItem
            icon = new IconInfo(_app.IcoPath);
        }

+        if (_details.IsValueCreated)
+        {
+            _details.Value.HeroImage = icon;
+        }
+
        return icon;
    }
 }
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Assets/AllApps.png
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Assets/AllApps.png
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Assets/AllApps.svg
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Assets/AllApps.svg
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Microsoft.CmdPal.Ext.Apps.csproj
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Microsoft.CmdPal.Ext.Apps.csproj
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/NativeMethods.txt
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/NativeMethods.txt
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/AppxFactory.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/AppxFactory.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/AppxPackageHelper.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/AppxPackageHelper.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/IApplicationActivationManager.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/IApplicationActivationManager.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/IAppxFactory.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/IAppxFactory.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/IAppxManifestApplication.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/IAppxManifestApplication.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/IAppxManifestApplicationsEnumerator.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/IAppxManifestApplicationsEnumerator.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/IAppxManifestProperties.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/IAppxManifestProperties.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/IAppxManifestReader.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/IAppxManifestReader.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/IPackage.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/IPackage.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/IPackageManager.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/IPackageManager.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/IProgram.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/IProgram.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/LogoType.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/LogoType.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/PackageManagerWrapper.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/PackageManagerWrapper.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/PackageWrapper.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/PackageWrapper.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/ProgramSource.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/ProgramSource.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/UWP.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/UWP.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/UWPApplication.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/UWPApplication.cs
@@ -6,11 +6,13 @@ using System;
 using System.Collections.Generic;
 using System.IO.Abstractions;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Xml;
 using Microsoft.CmdPal.Ext.Apps.Commands;
 using Microsoft.CmdPal.Ext.Apps.Properties;
 using Microsoft.CmdPal.Ext.Apps.Utils;
+using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using static Microsoft.CmdPal.Ext.Apps.Utils.Native;
 using PackageVersion = Microsoft.CmdPal.Ext.Apps.Programs.UWP.PackageVersion;
@@ -312,12 +314,7 @@ public class UWPApplication : IProgram
                }
            }

-            // By working from the highest resolution to the lowest, we make
-            // sure that we use the highest quality possible icon for the app.
-            //
-            // FirstOrDefault would result in us using the 1x scaled icon
-            // always, which is usually too small for our needs.
-            var selectedIconPath = paths.LastOrDefault(File.Exists);
+            var selectedIconPath = paths.FirstOrDefault(File.Exists);
            if (!string.IsNullOrEmpty(selectedIconPath))
            {
                LogoPath = selectedIconPath;
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/Win32Program.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/Programs/Win32Program.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/AddBookmarkForm.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/AddBookmarkForm.cs
@@ -34,7 +34,7 @@ internal sealed partial class AddBookmarkForm : FormContent
            "style": "text",
            "id": "name",
            "label": "{{Resources.bookmarks_form_name_label}}",
-            "value": {{JsonSerializer.Serialize(name, BookmarkSerializationContext.Default.String)}},
+            "value": {{JsonSerializer.Serialize(name)}},
            "isRequired": true,
            "errorMessage": "{{Resources.bookmarks_form_name_required}}"
        },
@@ -42,7 +42,7 @@ internal sealed partial class AddBookmarkForm : FormContent
            "type": "Input.Text",
            "style": "text",
            "id": "bookmark",
-            "value": {{JsonSerializer.Serialize(url, BookmarkSerializationContext.Default.String)}},
+            "value": {{JsonSerializer.Serialize(url)}},
            "label": "{{Resources.bookmarks_form_bookmark_label}}",
            "isRequired": true,
            "errorMessage": "{{Resources.bookmarks_form_bookmark_required}}"
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/AddBookmarkPage.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/AddBookmarkPage.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/Assets/Bookmark.png
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/Assets/Bookmark.png
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/Assets/Bookmark.svg
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/Assets/Bookmark.svg
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/BookmarkData.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/BookmarkData.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/BookmarkPlaceholderForm.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/BookmarkPlaceholderForm.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/BookmarkPlaceholderPage.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/BookmarkPlaceholderPage.cs
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/Bookmarks.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/Bookmarks.cs
@@ -28,7 +28,7 @@ public sealed class Bookmarks

            if (!string.IsNullOrEmpty(jsonStringReading))
            {
-                data = JsonSerializer.Deserialize<Bookmarks>(jsonStringReading, BookmarkSerializationContext.Default.Bookmarks) ?? new Bookmarks();
+                data = JsonSerializer.Deserialize<Bookmarks>(jsonStringReading, _jsonOptions) ?? new Bookmarks();
            }
        }

@@ -37,7 +37,7 @@ public sealed class Bookmarks

    public static void WriteToFile(string path, Bookmarks data)
    {
-        var jsonString = JsonSerializer.Serialize(data, BookmarkSerializationContext.Default.Bookmarks);
+        var jsonString = JsonSerializer.Serialize(data, _jsonOptions);

        File.WriteAllText(BookmarksCommandProvider.StateJsonPath(), jsonString);
    }
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/BookmarksCommandProvider.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/BookmarksCommandProvider.cs
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Yu Leng (from Dev Box)	f00eed43e8	merge main	2025-04-10 17:05:33 +08:00
Yu Leng (from Dev Box)	c4fdb71fa0	merge main	2025-04-10 16:43:40 +08:00
Seraphima	3d28d8e501	clear groups	2025-03-31 22:36:38 +02:00
Seraphima	32492772b8	lock	2025-03-31 22:36:06 +02:00
Seraphima	6896f59d48	handle selected items from the grouped list	2025-03-31 20:53:38 +02:00
Seraphima	7ce347149f	HasGrouping observable	2025-03-31 20:48:50 +02:00
Seraphima	626d43f631	pull	2025-03-31 20:14:53 +02:00
Seraphima	83aff2687d	fix exceptions	2025-03-31 20:02:30 +02:00
Seraphima	f8837c4ed0	update groups	2025-03-31 20:01:35 +02:00
Mike Griese	9589d3bd74	Add a sample ; some old styling too	2025-03-31 10:03:40 -05:00
Seraphima	f3b10bfa8e	fix xaml	2025-03-31 16:28:49 +02:00
Seraphima	3e7c7d77df	set IsSourceGrouped	2025-03-31 12:09:35 +02:00
Seraphima	0badb19936	grouping by Section	2025-03-31 12:09:24 +02:00